Skip to content

Commit

Permalink
Put source and class in module dependent build/ dirs, allowing compil…
Browse files Browse the repository at this point in the history
…ing more than one module at the same time. Here comes Ant's <parallel>... :)

git-svn-id: https://cdk.svn.sourceforge.net/svnroot/cdk/cdk/trunk@10489 eb4e18e3-b210-0410-a6ab-dec725e4b171
  • Loading branch information
egonw committed Mar 22, 2008
1 parent a2f0b3c commit b868e9e
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions build.xml
Expand Up @@ -306,10 +306,9 @@
classes that are in the same src/ directory. By making a copy first,
we explicitely make it impossible to compile files that are not
marked for a specific module -->
<delete dir="${build.src}"/>
<delete dir="${build}/org"/> <!-- remove the previously compiled .class output -->
<mkdir dir="${build.src}"/>
<copy todir="${build.src}">
<mkdir dir="${build.src}/${module}"/>
<mkdir dir="${build}/${module}"/>
<copy todir="${build.src}/${module}">
<fileset dir="${source}">
<excludesfile name="${build}/java1.4+.javafiles" if="isJava13"/>
<!-- excludesfile name="${build}/java1.4.javafiles" unless="isJava14"/ -->
Expand All @@ -326,7 +325,7 @@
</copy>

<!-- ok, now that we have a copy, compile this copy -->
<javac srcdir="${build.src}" destdir="${build}" optimize="${optimization}"
<javac srcdir="${build.src}/${module}" destdir="${build}/${module}" optimize="${optimization}"
debug="${debug}" deprecation="${deprecation}" target="1.5" source="1.5">
<classpath>
<fileset dir="${lib}" >
Expand Down Expand Up @@ -371,7 +370,7 @@

<!-- and then jar things up into the module jar -->
<jar jarfile="${dist}/jar/cdk-${module}.jar">
<fileset dir="${build}">
<fileset dir="${build}/${module}">
<includesfile name="${build}/${module}.classes" />
<includesfile name="${build}/${module}.autogenerated.classes" if="module.autogenerated.present"/>
<excludesfile name="${build}/java1.4+.classes" if="isJava13"/>
Expand Down Expand Up @@ -399,6 +398,10 @@
<includesfile name="${metainf}/${module}.buildfiles" if="module.buildfiles.present" />
</fileset>
</jar>

<!-- clean up afterwards -->
<delete dir="${build.src}"/>
<delete dir="${build}/${module}"/>
</target>

<!-- Convert the JavaCC .jj file to the correct .java files for the IUPAC parser -->
Expand Down

0 comments on commit b868e9e

Please sign in to comment.