r35355 - /packages/jeuclid/trunk/debian/build.xml

[sylvestre-guest at users.alioth.debian.org]

Author: sylvestre-guest
Date: Fri Dec 12 14:45:29 2008
New Revision: 35355

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35355
Log:
Fixed some issues reported by Brennan Ashton (thx btw) 

Modified:
    packages/jeuclid/trunk/debian/build.xml

Modified: packages/jeuclid/trunk/debian/build.xml
URL: http://svn.debian.org/wsvn/debian-science/packages/jeuclid/trunk/debian/build.xml?rev=35355&op=diff
==============================================================================
--- packages/jeuclid/trunk/debian/build.xml (original)
+++ packages/jeuclid/trunk/debian/build.xml Fri Dec 12 14:45:29 2008
@@ -11,7 +11,6 @@
      <pathelement location="/usr/share/java/xalan2.jar" />
   </path>
 
-
   <target name="init" description="Init dependencies">
     <mkdir dir="${build.directory}"/>
     <echo message="------------------- ${ant.project.name} ----------------"/>
@@ -122,10 +121,10 @@
 
   <target name="compile-core" depends="init" description="Compile the core code">
   <property name="package.name" value="jeuclid-core" />
-  <property name="full.build.output" value="${package.name}/${build.output}" />
-
-    <mkdir dir="${full.build.output}"/>
-    <javac destdir="${full.build.output}" debug="true" deprecation="true" optimize="false" source="1.5" target="1.5">
+  <property name="full.build.output.core" value="${package.name}/${build.output}" />
+
+    <mkdir dir="${full.build.output.core}"/>
+    <javac destdir="${full.build.output.core}" debug="true" deprecation="true" optimize="false" source="1.5" target="1.5">
       <src>
         <pathelement location="${package.name}/src/main/java"/>
 
@@ -133,30 +132,34 @@
       <exclude name="**/FreeHep*" />
       <classpath refid="libs-build-classpath"/>
     </javac>
-    <copy todir="${full.build.output}">
+    <copy todir="${full.build.output.core}">
       <fileset dir="${package.name}/src/main/resources"/>
     </copy>
-    <jar jarfile="${build.directory}/${package.name}.jar" basedir="${full.build.output}"/>
+    <jar jarfile="${build.directory}/${package.name}.jar" basedir="${full.build.output.core}"/>
   </target>
 
 
   <target name="compile-mathviewer" depends="init, compile-core" description="Compile the mathviewer code">
   <property name="package.name.mathviewer" value="jeuclid-mathviewer" />
-  <property name="full.build.output" value="${package.name.mathviewer}/${build.output}" />
-
-    <mkdir dir="${full.build.output}"/>
-    <javac destdir="${full.build.output}" debug="true" deprecation="true" optimize="false" source="1.5" target="1.5">
+  <property name="full.build.output.mathviewer" value="${package.name.mathviewer}/${build.output}" />
+    <mkdir dir="${full.build.output.mathviewer}"/>
+    <javac destdir="${package.name.mathviewer}/${build.output}" debug="true" deprecation="true" optimize="false" source="1.5" target="1.5">
       <src>
         <pathelement location="${package.name.mathviewer}/src/main/java"/>
 
       </src>
       <exclude name="**/FreeHep*" />
-      <classpath refid="libs-build-classpath"/>
-    </javac>
-    <copy todir="${full.build.output}">
+      <classpath>
+        <fileset dir="${build.directory}">
+          <include name="jeuclid-core.jar"/>
+        </fileset>
+        <path refid="libs-build-classpath"/>
+      </classpath>
+    </javac>
+    <copy todir="${full.build.output.mathviewer}">
       <fileset dir="${package.name.mathviewer}/src/main/resources"/>
     </copy>
-    <jar jarfile="${build.directory}/${package.name.mathviewer}.jar" basedir="${full.build.output}">
+    <jar jarfile="${build.directory}/${package.name.mathviewer}.jar" basedir="${full.build.output.mathviewer}">
       <manifest>
         <attribute name="Main-Class" value="net.sourceforge.jeuclid.app.mathviewer.MathViewer"/>
       </manifest>
@@ -165,17 +168,22 @@
 
   <target name="compile-cli" depends="init, compile-core" description="Compile the jeuclid cli">
   <property name="package.name.cli" value="jeuclid-cli" />
-  <property name="full.build.output" value="${package.name.cli}/${build.output}" />
-
-    <mkdir dir="${full.build.output}"/>
-    <javac destdir="${full.build.output}" debug="true" deprecation="true" optimize="false" source="1.5" target="1.5">
+  <property name="full.build.output.cli" value="${package.name.cli}/${build.output}" />
+
+    <mkdir dir="${full.build.output.cli}"/>
+    <javac destdir="${full.build.output.cli}" debug="true" deprecation="true" optimize="false" source="1.5" target="1.5">
       <src>
         <pathelement location="${package.name.cli}/src/main/java"/>
 
       </src>
-      <classpath refid="libs-build-classpath"/>
-    </javac>
-    <jar jarfile="${build.directory}/${package.name.cli}.jar" basedir="${full.build.output}">
+      <classpath>
+        <fileset dir="${build.directory}">
+          <include name="jeuclid-core.jar"/>
+        </fileset>
+        <path refid="libs-build-classpath"/>
+      </classpath>
+    </javac>
+    <jar jarfile="${build.directory}/${package.name.cli}.jar" basedir="${full.build.output.cli}">
       <manifest>
         <attribute name="Main-Class" value="net.sourceforge.jeuclid.app.Mml2xxx"/>
       </manifest>
@@ -186,20 +194,25 @@
 
   <target name="compile-fop" depends="init, compile-core" description="Compile the jeuclid fop">
   <property name="package.name.fop" value="jeuclid-fop" />
-  <property name="full.build.output" value="${package.name.fop}/${build.output}" />
-
-    <mkdir dir="${full.build.output}"/>
-    <javac destdir="${full.build.output}" debug="true" deprecation="true" optimize="false" source="1.5" target="1.5">
+  <property name="full.build.output.fop" value="${package.name.fop}/${build.output}" />
+
+    <mkdir dir="${full.build.output.fop}"/>
+    <javac destdir="${full.build.output.fop}" debug="true" deprecation="true" optimize="false" source="1.5" target="1.5">
       <src>
         <pathelement location="${package.name.fop}/src/main/java"/>
 
       </src>
-      <classpath refid="libs-build-classpath"/>
-    </javac>
-    <copy todir="${full.build.output}">
+      <classpath>
+        <fileset dir="${build.directory}">
+          <include name="jeuclid-core.jar"/>
+        </fileset>
+        <path refid="libs-build-classpath"/>
+      </classpath>
+    </javac>
+    <copy todir="${full.build.output.fop}">
       <fileset dir="${package.name.fop}/src/main/resources"/>
     </copy>
-    <jar jarfile="${build.directory}/${package.name.fop}.jar" basedir="${full.build.output}"/>
+    <jar jarfile="${build.directory}/${package.name.fop}.jar" basedir="${full.build.output.fop}"/>
   </target>
 
 
@@ -213,5 +226,4 @@
                 <delete dir="jeuclid-cli/${build.directory}"/>
                 <delete dir="jeuclid-fop/${build.directory}"/>
         </target>
-
 </project>