Changeset 20209 for greenstone3/trunk/build.xml

Timestamp:

2009-08-11T12:28:31+12:00 (15 years ago)

Author:

oranfry

Message:

removed all cp.jar files and put in code to create them during compilation

File:

• greenstone3/trunk/build.xml (modified) (5 diffs)

greenstone3/trunk/build.xml

@@ -371 +371 @@
     
 
-  <target name="install-runtime" depends="init,configure,configure-packages,configure-core,compile-web,compile-packages,compile-core"
+  <target name="install-runtime" depends="init,configure,configure-packages,configure-core,compile-web,compile-packages,compile-core,compile-classpath-jars"
     description="Install (configure, compile, install) the runtime system. Needs either common-src or collection-building to have been installed first." />
     
@@ -380 +380 @@
     description="Configure the installation (not the C++ code). Includes setting up config files. Should be re-run if you change the build.properties file."/>
 
-  <target name="clean" depends="init,clean-packages,clean-core,clean-common-src,clean-collection-building"
+  <target name="clean" depends="init,clean-packages,clean-core,clean-common-src,clean-collection-building,clean-classpath-jars"
     description="Remove all old compiled code. Includes runtime and collection-building if necessary"/>
   
-  <target name="distclean" depends="init,distclean-packages,clean-core,distclean-common-src,distclean-collection-building"
+  <target name="distclean" depends="init,distclean-packages,clean-core,distclean-common-src,distclean-collection-building,clean-classpath-jars"
     description="Remove all compiled code and also any Makefiles etc generated during configure-c++. Includes runtime and collection-building as necessary"/>
   
@@ -637 +637 @@
     </javac>
   </target>
+
+  <target name="compile-classpath-jars" depends="init">
+    <if><bool><available file="admin/cp.mf"/></bool>
+      <jar destfile="admin/cp.jar" manifest="admin/cp.mf"/>
+    </if>
+    <if><bool><available file="${lib.java}/cp.mf"/></bool>
+      <jar destfile="${lib.java}/cp.jar" manifest="${lib.java}/cp.mf"/>
+    </if>
+    <if><bool><available file="${lib.jni}/cp.mf"/></bool>
+      <jar destfile="${lib.jni}/cp.jar" manifest="${lib.jni}/cp.mf"/>
+    </if>
+    <if><bool><available file="${web.lib}/cp.mf"/></bool>
+      <jar destfile="${web.lib}/cp.jar" manifest="${web.lib}/cp.mf"/>
+    </if>
+    <jar destfile="cp.jar">
+      <manifest>
+        <attribute name="Class-Path" value="admin/cp.jar lib/java/cp.jar lib/jni/cp.jar web/WEB-INF/lib/cp.jar"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <target name="clean-classpath-jars" depends="init">
+    <delete file="admin/cp.jar"/>
+    <delete file="${lib.java}/cp.jar"/>
+    <delete file="${lib.jni}/cp.jar"/>
+    <delete file="${web.lib}/cp.jar"/>
+    <delete file="cp.jar"/>
+  </target>
+
 
   <target name="svnupdate-web" unless="nosvn.mode">
@@ -933 +962 @@
     <input addproperty="axis.undeploy.servicename" defaultvalue="localsite">Please enter the full name of the service you wish to undeploy.
 To find out which web services you've got deployed, point your browser to http://HOST:PORT/greenstone3/services 
-Or press Enter for undeploying the default:localsite /></input>
+Or press Enter for undeploying the default:localsite /&gt;</input>
      <echo>Name of service to undeploy: ${axis.undeploy.servicename}</echo>
   </target>
@@ -940 +969 @@
     <input addproperty="axis.servicesname" defaultvalue="${base.webservice.name}">Which set of web services do you want to deploy?
 Choose from: ${web.services.list}
-Or press Enter for default:${base.webservice.name} /></input>
+Or press Enter for default:${base.webservice.name} /&gt;</input>
     <echo>${axis.servicesname}</echo>
   </target>