Changeset 1395 for extensions/net.sf.basedb.mev/trunk/build.xml

Timestamp:

Sep 15, 2011, 2:58:04 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #312: Updates required for BASE 3 support

Fixes build script so that it:

• Can download BASE JAR file with ant download-lib
• Put the current version numbers in various places
• Removed obsolete file META-INF/base-plugins.xml

Fixes JSP files so that the compile against the BASE 3 API.

Fixes installation plug-in so that it doesn't crash when updating.

File:

• extensions/net.sf.basedb.mev/trunk/build.xml (modified) (8 diffs)

extensions/net.sf.basedb.mev/trunk/build.xml

@@ -10 +10 @@
   <!-- variables used -->
   <property name="name" value="mev-launcher" />
-  <property name="version" value="1.8pre" />
-  <property name="minbaseversion" value="3.0" 
-      description="Minimal BASE version required by the plug-ins" />
+  <property name="version" value="1.8-alfa" />
   <property name="src" location="src" description="Location of source files" />
   <property name="build" location="build" description="Location of compiled files" />
@@ -25 +23 @@
   <property name="javac.target" value="1.6" />
   <property name="javac.encoding" value="UTF-8" />
-  <property name="depend.jars" value="http://base2.thep.lu.se/base/jars/" />
+  <property name="depend.base-version" 
+    value="3.0.0" 
+    description="The BASE version that this project depends on."
+  />
+  <property name="depend.jars" 
+    value="http://base2.thep.lu.se/base/jars/${depend.base-version}" 
+    description="The location of the BASE core JARs that this project depends on."
+  />
 
   <!-- set up classpath for compiling -->
@@ -84 +89 @@
       <fileset dir="." includes="META-INF/*" />
     </copy>
-    <replace token="%%plugins.jar%%" value="${jar.name}" file="${build}/server/META-INF/base-plugins.xml" />
     <jar 
       jarfile="${jar.name}" 
@@ -180 +184 @@
     />
     
-    <echo>base-plugins.xml</echo>
     <replaceregexp 
-      file="META-INF/base-plugins.xml"
-      match="&lt;minbaseversion&gt;.*&lt;/minbaseversion&gt;"
-      replace="&lt;minbaseversion&gt;${minbaseversion}&lt;/minbaseversion&gt;"
+      file="META-INF/extensions.xml"
+      match="&lt;min-base-version&gt;.*&lt;/min-base-version&gt;"
+      replace="&lt;min-base-version&gt;${depend.base-version}&lt;/min-base-version&gt;"
       encoding="UTF-8"
-      flags="g"
     />
     <echo>Don't forget to commit the changes to the subversion repository!</echo>
@@ -193 +195 @@
   <target 
     name="checkjar"
-    description="Checks that the base-core-3.0.0.jar, base-webclient-3.0.0.jar, base-coreplugins-3.0.0.jar and base-webservices-client-3.0.0.jar exists."
+    description="Checks that the required BASE JAR files exists."
     >
     <available classname="net.sf.basedb.util.export.spotdata.AbstractBioAssaySetExporter" 
@@ -203 +205 @@
     <available classname="net.sf.basedb.info.BioAssaySetInfo" 
       classpathref="classpath" property="basewebservice" />
-    <fail unless="basecore" message="Can't find base-core-3.0.0.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
-    <fail unless="baseplugins" message="Can't find base-coreplugins-3.0.0.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
-    <fail unless="baseweb" message="Can't find base-webclient-3.0.0.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
-    <fail unless="basewebservice" message="Can't find base-webservices-client-3.0.0.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
-    <echo>Found base-core-3.0.0.jar, base-coreplugins-3.0.0.jar, base-webclient-3.0.0.jar and base-webservices-client-3.0.0.jar.</echo>
+    <fail unless="basecore" message="Can't find base-core-${depend.base-version}.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
+    <fail unless="baseplugins" message="Can't find base-coreplugins-${depend.base-version}.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
+    <fail unless="baseweb" message="Can't find base-webclient-${depend.base-version}.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
+    <fail unless="basewebservice" message="Can't find base-webservices-client-${depend.base-version}.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
+    <echo>Found all requried BASE core JAR files.</echo>
   </target>
   
@@ -251 +253 @@
   <target 
     name="download-lib"
-    description="Download base-core-3.0.0.jar, base-webclient-3.0.0.jar, base-coreplugins-3.0.0.jar and base-webservices-client-3.0.0.jar"
+    description="Download base-core-3.x.jar, base-webclient-3.0.0.jar, base-coreplugins-3.x.jar and base-webservices-client-3.0x.jar"
     >
     <echo>
@@ -260 +262 @@
 -------------------------------------------------------
     </echo>
-    <download-lib file="base-core-3.0.0.jar" />
-    <download-lib file="base-webclient-3.0.0.jar" />
-    <download-lib file="base-coreplugins-3.0.0.jar" />
-    <download-lib file="base-webservices-client-3.0.0.jar" />
+    <download-lib file="base-core-${depend.base-version}.jar" />
+    <download-lib file="base-webclient-${depend.base-version}.jar" />
+    <download-lib file="base-coreplugins-${depend.base-version}.jar" />
+    <download-lib file="base-webservices-client-${depend.base-version}.jar" />
   </target>