Unwrapped long lines.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@587 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Michael Bayne
2008-07-30 19:00:28 +00:00
parent 0c7a95a8d0
commit 39c7cf1419
+23 -41
View File
@@ -26,13 +26,11 @@
<!-- generates additional methods for distributed object classes --> <!-- generates additional methods for distributed object classes -->
<target name="gendobj" depends="prepare"> <target name="gendobj" depends="prepare">
<taskdef name="dobj" <taskdef name="dobj" classname="com.threerings.presents.tools.GenDObjectTask"
classname="com.threerings.presents.tools.GenDObjectTask"
classpathref="classpath"/> classpathref="classpath"/>
<!-- make sure the dobject class files are all compiled --> <!-- make sure the dobject class files are all compiled -->
<javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false" <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
debug="on" optimize="${build.optimize}" deprecation="on" debug="on" optimize="${build.optimize}" deprecation="on" source="1.4" target="1.4">
source="1.4" target="1.4">
<classpath refid="classpath"/> <classpath refid="classpath"/>
<include name="**/*Object.java"/> <include name="**/*Object.java"/>
</javac> </javac>
@@ -42,29 +40,25 @@
</dobj> </dobj>
</target> </target>
<!-- generates marshaller and dispatcher classes for all invocation <!-- generates marshaller and dispatcher classes for all invocation service declarations -->
service declarations -->
<target name="genservice"> <target name="genservice">
<apply executable="../bin/genservice" failonerror="true" parallel="true"> <apply executable="../bin/genservice" failonerror="true" parallel="true">
<arg value="--classpath"/> <arg value="--classpath"/>
<arg value="${classes.dir}:${narya.classes.dir}"/> <arg value="${classes.dir}:${narya.classes.dir}"/>
<arg value="--sourcedir"/> <arg value="--sourcedir"/>
<arg value="src/java"/> <arg value="src/java"/>
<fileset dir="src/java" includes="**/*Service.java" <fileset dir="src/java" includes="**/*Service.java"/>
excludes="**/InvocationService.java"/>
</apply> </apply>
</target> </target>
<!-- generates sender and decoder classes for all invocation <!-- generates sender and decoder classes for all invocation receiver declarations -->
receiver declarations -->
<target name="genreceiver"> <target name="genreceiver">
<apply executable="../bin/genreceiver" failonerror="true" parallel="true"> <apply executable="../bin/genreceiver" failonerror="true" parallel="true">
<arg value="--classpath"/> <arg value="--classpath"/>
<arg value="${classes.dir}:${narya.classes.dir}"/> <arg value="${classes.dir}:${narya.classes.dir}"/>
<arg value="--sourcedir"/> <arg value="--sourcedir"/>
<arg value="src/java"/> <arg value="src/java"/>
<fileset dir="src/java" includes="**/*Receiver.java" <fileset dir="src/java" includes="**/*Receiver.java"/>
excludes="**/InvocationReceiver.java"/>
</apply> </apply>
</target> </target>
@@ -102,34 +96,26 @@
<!-- test the component metadata bundling process --> <!-- test the component metadata bundling process -->
<target name="cbundles" description="Build component bundles."> <target name="cbundles" description="Build component bundles.">
<!-- define our tasks --> <!-- define our tasks -->
<taskdef name="metabundle" <taskdef name="metabundle" classpathref="classpath"
classname="com.threerings.cast.bundle.tools.MetadataBundlerTask" classname="com.threerings.cast.bundle.tools.MetadataBundlerTask"/>
classpathref="classpath"/> <taskdef name="cbundle" classpathref="classpath"
<taskdef name="cbundle" classname="com.threerings.cast.bundle.tools.ComponentBundlerTask"/>
classname="com.threerings.cast.bundle.tools.ComponentBundlerTask"
classpathref="classpath"/>
<!-- build the metadata bundles --> <!-- build the metadata bundles -->
<metabundle actiondef="${cbundle.dir}/actions.xml" <metabundle actiondef="${cbundle.dir}/actions.xml" classdef="${cbundle.dir}/classes.xml"
classdef="${cbundle.dir}/classes.xml" target="${cbundle.dir}/metadata.jar"/>
target="${cbundle.dir}/metadata.jar"/>
<!-- blow away the components map file so that we get a consistent --> <!-- blow away the components map file so that we get a consistent -->
<!-- mapping every time--> <!-- mapping every time-->
<delete file="${cbundle.dir}/components.map"/> <delete file="${cbundle.dir}/components.map"/>
<!-- build the component bundles --> <!-- build the component bundles -->
<cbundle actiondef="${cbundle.dir}/actions.xml" <cbundle actiondef="${cbundle.dir}/actions.xml" target="${cbundle.dir}/pirate/components.jar"
target="${cbundle.dir}/pirate/components.jar" mapfile="${cbundle.dir}/components.map" root="${cbundle.dir}/pirate">
mapfile="${cbundle.dir}/components.map" <fileset dir="${cbundle.dir}/pirate" includes="**/*.png" excludes="components/**"/>
root="${cbundle.dir}/pirate">
<fileset dir="${cbundle.dir}/pirate" includes="**/*.png"
excludes="components/**"/>
</cbundle> </cbundle>
<cbundle actiondef="${cbundle.dir}/actions.xml" <cbundle actiondef="${cbundle.dir}/actions.xml" target="${cbundle.dir}/vessel/components.jar"
target="${cbundle.dir}/vessel/components.jar" mapfile="${cbundle.dir}/components.map" root="${cbundle.dir}/vessel">
mapfile="${cbundle.dir}/components.map"
root="${cbundle.dir}/vessel">
<fileset dir="${cbundle.dir}/vessel" includes="**/*.png" <fileset dir="${cbundle.dir}/vessel" includes="**/*.png"
excludes="components/**"/> excludes="components/**"/>
</cbundle> </cbundle>
@@ -142,11 +128,9 @@
<delete file="${tbundle.dir}/tilesets.map"/> <delete file="${tbundle.dir}/tilesets.map"/>
<!-- build the tileset bundles --> <!-- build the tileset bundles -->
<taskdef name="tilebundle" <taskdef name="tilebundle" classpathref="classpath"
classname="com.threerings.media.tile.bundle.tools.TileSetBundlerTask" classname="com.threerings.media.tile.bundle.tools.TileSetBundlerTask"/>
classpathref="classpath"/> <tilebundle config="${tbundle.dir}/bundler-config.xml" mapfile="${tbundle.dir}/tilesets.map">
<tilebundle config="${tbundle.dir}/bundler-config.xml"
mapfile="${tbundle.dir}/tilesets.map">
<fileset dir="${tbundle.dir}/ground" includes="**/*.xml"/> <fileset dir="${tbundle.dir}/ground" includes="**/*.xml"/>
</tilebundle> </tilebundle>
<tilebundle config="${tbundle.dir}/bundler-config.xml" <tilebundle config="${tbundle.dir}/bundler-config.xml"
@@ -155,9 +139,8 @@
</tilebundle> </tilebundle>
<!-- build the fringe configurations --> <!-- build the fringe configurations -->
<taskdef name="conffringe" <taskdef name="conffringe" classpathref="classpath"
classname="com.threerings.miso.tile.tools.CompileFringeConfigurationTask" classname="com.threerings.miso.tile.tools.CompileFringeConfigurationTask"/>
classpathref="classpath"/>
<conffringe <conffringe
tilesetmap="${tbundle.dir}/tilesets.map" tilesetmap="${tbundle.dir}/tilesets.map"
fringedef="rsrc/config/miso/tile/fringeconf.xml" fringedef="rsrc/config/miso/tile/fringeconf.xml"
@@ -165,8 +148,7 @@
</target> </target>
<!-- run the tests --> <!-- run the tests -->
<target name="test" depends="compile,cbundles,tsbundles" <target name="test" depends="compile,cbundles,tsbundles" description="Run the tests.">
description="Run the tests.">
<junit printsummary="no" haltonfailure="yes" fork="${junit.fork}"> <junit printsummary="no" haltonfailure="yes" fork="${junit.fork}">
<classpath refid="classpath"/> <classpath refid="classpath"/>
<sysproperty key="test_dir" value="${test.dir}"/> <sysproperty key="test_dir" value="${test.dir}"/>