Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.mev/trunk/build.xml

    r1384 r1395  
    1010  <!-- variables used -->
    1111  <property name="name" value="mev-launcher" />
    12   <property name="version" value="1.8pre" />
    13   <property name="minbaseversion" value="3.0"
    14       description="Minimal BASE version required by the plug-ins" />
     12  <property name="version" value="1.8-alfa" />
    1513  <property name="src" location="src" description="Location of source files" />
    1614  <property name="build" location="build" description="Location of compiled files" />
     
    2523  <property name="javac.target" value="1.6" />
    2624  <property name="javac.encoding" value="UTF-8" />
    27   <property name="depend.jars" value="http://base2.thep.lu.se/base/jars/" />
     25  <property name="depend.base-version"
     26    value="3.0.0"
     27    description="The BASE version that this project depends on."
     28  />
     29  <property name="depend.jars"
     30    value="http://base2.thep.lu.se/base/jars/${depend.base-version}"
     31    description="The location of the BASE core JARs that this project depends on."
     32  />
    2833
    2934  <!-- set up classpath for compiling -->
     
    8489      <fileset dir="." includes="META-INF/*" />
    8590    </copy>
    86     <replace token="%%plugins.jar%%" value="${jar.name}" file="${build}/server/META-INF/base-plugins.xml" />
    8791    <jar
    8892      jarfile="${jar.name}"
     
    180184    />
    181185   
    182     <echo>base-plugins.xml</echo>
    183186    <replaceregexp
    184       file="META-INF/base-plugins.xml"
    185       match="&lt;minbaseversion&gt;.*&lt;/minbaseversion&gt;"
    186       replace="&lt;minbaseversion&gt;${minbaseversion}&lt;/minbaseversion&gt;"
     187      file="META-INF/extensions.xml"
     188      match="&lt;min-base-version&gt;.*&lt;/min-base-version&gt;"
     189      replace="&lt;min-base-version&gt;${depend.base-version}&lt;/min-base-version&gt;"
    187190      encoding="UTF-8"
    188       flags="g"
    189191    />
    190192    <echo>Don't forget to commit the changes to the subversion repository!</echo>
     
    193195  <target
    194196    name="checkjar"
    195     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."
     197    description="Checks that the required BASE JAR files exists."
    196198    >
    197199    <available classname="net.sf.basedb.util.export.spotdata.AbstractBioAssaySetExporter"
     
    203205    <available classname="net.sf.basedb.info.BioAssaySetInfo"
    204206      classpathref="classpath" property="basewebservice" />
    205     <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." />
    206     <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." />
    207     <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." />
    208     <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." />
    209     <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>
     207    <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." />
     208    <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." />
     209    <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." />
     210    <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." />
     211    <echo>Found all requried BASE core JAR files.</echo>
    210212  </target>
    211213 
     
    251253  <target
    252254    name="download-lib"
    253     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"
     255    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"
    254256    >
    255257    <echo>
     
    260262-------------------------------------------------------
    261263    </echo>
    262     <download-lib file="base-core-3.0.0.jar" />
    263     <download-lib file="base-webclient-3.0.0.jar" />
    264     <download-lib file="base-coreplugins-3.0.0.jar" />
    265     <download-lib file="base-webservices-client-3.0.0.jar" />
     264    <download-lib file="base-core-${depend.base-version}.jar" />
     265    <download-lib file="base-webclient-${depend.base-version}.jar" />
     266    <download-lib file="base-coreplugins-${depend.base-version}.jar" />
     267    <download-lib file="base-webservices-client-${depend.base-version}.jar" />
    266268  </target>
    267269 
Note: See TracChangeset for help on using the changeset viewer.