Modified:
trunk/build7.xml
Log:
build
Modified: trunk/build7.xml
==============================================================================
--- trunk/build7.xml (original)
+++ trunk/build7.xml Sat May 19 04:01:18 2007
@@ -2,10 +2,10 @@
<target name="dist" depends="prepare, setupCM, copyResources, copyRedist, doCompile, doTests, makeVersion, makeClassesJar, makeZIP"/>
<target name="integrate" depends="setupCM, setupCMWritable, dist, commitCM"/>
- <property name="dir.build" value="../build"/>
+ <property name="dir.build" value="build"/>
<property name="dir.class" value="${dir.build}/class"/>
<property name="dir.dist" value="${dir.build}/dist"/>
- <property name="dir.cm" value="../../CM/TRACKLINK"/>
+ <property name="dir.cm" value="../tracklink.cm"/>
<property name="build.properties" value="build.properties"/>
<property name="file.buildprops" location="${dir.cm}/${build.properties}"/>
@@ -16,10 +16,7 @@
<fileset dir="${idea.home}/redist">
<include name="*.jar"/>
</fileset>
- <fileset dir="../lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir=".">
+ <fileset dir="lib">
<include name="*.jar"/>
</fileset>
</path>
@@ -41,28 +38,36 @@
<target name="copyResources">
<copy todir="${dir.class}">
- <fileset dir="../src" includes="META-INF/**"/>
- <fileset dir="../src" includes="**/*.properties"/>
+ <fileset dir="modules/plugin/" includes="META-INF/**"/>
+ <fileset dir="modules/tracklink/src" includes="META-INF/**"/>
+ <fileset dir="modules/tracklink/src" includes="**/*.properties"/>
+ <fileset dir="modules/selena/src" includes="META-INF/**"/>
+ <fileset dir="modules/selena/src" includes="**/*.properties"/>
</copy>
<copy todir="${dir.class}">
- <fileset dir="../rc"/>
+ <fileset dir="modules/tracklink/rc"/>
</copy>
</target>
<target name="copyRedist">
<copy todir="${dir.dist}">
- <fileset dir="../lib" includes="xmlrpc.jar"/>
- <fileset dir="../lib" includes="commons-codec.jar"/>
- <fileset dir="../redist" includes="*.jar"/>
+ <fileset dir="lib" includes="xmlrpc.jar"/>
+ <fileset dir="lib" includes="commons-codec.jar"/>
+ <fileset dir="redist" includes="*.jar"/>
</copy>
</target>
<target name="doCompile">
- <gjc srcdir="../src" destdir="${dir.class}"/>
+ <gjc destdir="${dir.class}">
+ <src path="modules/tracklink/src"/>
+ <src path="modules/selena/src"/>
+ </gjc>
</target>
<target name="doTests">
- <junit dir="../tests"/>
+ <junit dir="modules/plugin/tests"/>
+ <junit dir="modules/tracklink/tests"/>
+ <junit dir="modules/selena/tests"/>
</target>
<target name="makeClassesJar">
@@ -82,7 +87,7 @@
<fileset dir="${dir.dist}" includes="*.jar"/>
</move>
<copy todir="${dir.dist}/tracklink">
- <fileset dir="../distimage" excludes="**/CVS/**/*"/>
+ <fileset dir="distimage" excludes="**/CVS/**/*"/>
</copy>
</target>
@@ -134,7 +139,7 @@
</target>
<target name="commitCM" if="cm.writable">
- <cvs command="commit -mbuild.${tracklink.build} ${build.properties}" dest="${dir.cm}" failonerror="true" quiet="true"/>
+ <exec command="svn commit -mbuild.${tracklink.build} ${build.properties}" dir="${dir.cm}" failonerror="true"/>
</target>
</project>