Changeset 9711 for branches

Timestamp:

2005-04-18T15:31:13+12:00 (19 years ago)

Author:

kjdon

Message:

moved the vishnu stuff into its own build.xml file

File:

• branches/ant-install-branch/gsdl3/build.xml (modified) (6 diffs)

branches/ant-install-branch/gsdl3/build.xml

@@ -128 +128 @@
       <include name="*.jar"/>
     </fileset>
+    
+    <!-- include the jar files from the packages -->
+    <pathelement location="${mg.home}/java/mg.jar"/>
+    <pathelement location="${mgpp.home}/java/mgpp.jar"/>
+    <pathelement location="${vishnu.home}/build/vishnu.jar"/>
     
     <!-- Include all elements that Tomcat exposes to applications -->
@@ -732 +737 @@
       <classpath>
     <path refid="compile.classpath"/>
-    <!-- need to add in package jar files to classpath -->
-    <pathelement location="${mg.home}/java/mg.jar"/>
-    <pathelement location="${mgpp.home}/java/mgpp.jar"/>
-    <pathelement location="${vishnu.home}/vishnu.jar"/>
       </classpath>
     </javac>
@@ -835 +836 @@
     <delete file="${mgpp.home}/jni/org_greenstone_mgpp_MGPPWrapper.h"/>
     <delete file="${mgpp.home}/jni/org_greenstone_mgpp_MGPPPassesWrapper.h"/>
-    <!-- vishnu -->
-    <delete dir="${vishnu.home}/src/classes"/>
-    <delete file="${vishnu.home}/src/vishnu.jar"/>
+    <!-- vishnu : just call the ant target -->
+    <ant antfile="${vishnu.home}/build.xml" dir="${vishnu.home}"
+      inheritall="false" target="clean"/>
 
     <!-- gsdl-as : just call the ant target-->
@@ -868 +869 @@
       </manifest>
     </jar> 
-    <copy file="${mg.home}/java/mg.jar" todir="${javalib}"/>
     <!-- make the c code -->
     <exec executable="make" os="Linux"
@@ -899 +899 @@
       </manifest>
     </jar> 
-    <copy file="${mgpp.home}/java/mgpp.jar" todir="${javalib}"/>
     <!-- c++ code -->
     <exec executable="make" os="Linux"
@@ -911 +910 @@
     <!-- vishnu -->
     <echo>Compiling Vishnu</echo>
-    <mkdir dir="${vishnu.home}/classes"/>
-    <javac srcdir="${vishnu.home}/src"
-      destdir="${vishnu.home}/classes"
-      debug="${compile.debug}"
-      deprecation="${compile.deprecation}"
-      optimize="${compile.optimize}">
-      <classpath>
-    <path refid="compile.classpath"/>
-    <pathelement location="${mg.home}/java/mg.jar"/>
-      </classpath>
-    </javac>
-    <jar destfile="${vishnu.home}/vishnu.jar">
-      <fileset dir="${vishnu.home}/classes"/>
-      <manifest>
-    <attribute name="Built-By" value="${user.name}" />
-      </manifest>
-    </jar>      
-    <copy file="${vishnu.home}/vishnu.jar" todir="${javalib}"/>
-    <copy file="${vishnu.home}/vishnu.jar" todir="${web.lib}"/>
-    <mkdir dir="${web.classes}/vishnu/server"/>
-    <copy file="${vishnu.home}/classes/vishnu/server/VisServlet.class"
-      todir="${web.classes}/vishnu/server"/>
+    <ant antfile="${vishnu.home}/build.xml" dir="${vishnu.home}"
+      inheritall="false" target="compile"/>
 
     <!-- gsdl-as -->