Changeset 1398


Ignore:
Timestamp:
Oct 5, 2011, 3:51:28 PM (10 years ago)
Author:
Nicklas Nordborg
Message:

References #313: Updates required for BASE 3 support

Fixed build script so that it can download BASE JAR files. Set <min-base-version> in extensions.xml. Moved 3rd-party licenses to the META-INF/lib directory. Added .classpath t make it easier for Eclipse developers.

Location:
extensions/net.sf.basedb.ftp/trunk
Files:
1 added
3 edited
3 moved

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.ftp/trunk

    • Property svn:ignore
      •  

        old new  
        44build.properties
        55.project
        6 .classpath
         6.settings
  • extensions/net.sf.basedb.ftp/trunk/META-INF/extensions.xml

    r1382 r1398  
    3030      This extension adds an FTP server to your BASE installation.
    3131    </description>
    32     <version>1.2pre</version>
    33     <copyright>BASE 2 development team</copyright>
     32    <version>1.2-dev</version>
     33    <min-base-version>3.0.0</min-base-version>
     34    <copyright>BASE development team</copyright>
    3435    <email>basedb-users@lists.sourceforge.net</email>
    3536    <url>http://baseplugins.thep.lu.se/wiki/net.sf.basedb.ftp</url>
  • extensions/net.sf.basedb.ftp/trunk/build.xml

    r1382 r1398  
    3232  <!-- variables used -->
    3333  <property name="name" value="base-ftpserver" />
    34   <property name="version" value="1.2pre" />
     34  <property name="version" value="1.2-dev" />
    3535  <property name="src" location="src" description="Location of source files" />
    3636  <property name="build" location="build" description="Location of compiled files" />
     
    4545  <property name="javac.target" value="1.6" />
    4646  <property name="javac.encoding" value="UTF-8" />
    47   <property name="depend.jars.directory" value="http://base2.thep.lu.se/base/jars/" />
    48   <property name="depend.jars.core" value="base-core-3.0.0.jar" />
    49   <property name="depend.jars.webclient" value="base-webclient-3.0.0.jar" />
     47  <property name="depend.base-version"
     48    value="3.0.0"
     49    description="The BASE version that this project depends on."
     50  />
     51  <property name="depend.jars"
     52    value="http://base2.thep.lu.se/base/jars/${depend.base-version}"
     53    description="The location of the BASE core JARs that this project depends on."
     54  />
    5055
    5156  <!-- set up classpath for compiling -->
     
    135140      encoding="UTF-8"
    136141    />
     142    <replaceregexp
     143      file="META-INF/extensions.xml"
     144      match="&lt;min-base-version&gt;.*&lt;/min-base-version&gt;"
     145      replace="&lt;min-base-version&gt;${depend.base-version}&lt;/min-base-version&gt;"
     146      encoding="UTF-8"
     147    />
    137148    <echo>Don't forget to commit the changes to the subversion repository!</echo>
    138149  </target>
     
    140151  <target
    141152    name="checkjar"
    142     description="Checks that the ${depend.jars.core} and ${depend.jars.webclient} exists."
     153    description="Checks that the required BASE JAR files exists."
    143154    >
    144155    <available classname="net.sf.basedb.core.Application"
     
    146157    <available classname="net.sf.basedb.clients.web.extensions.menu.FixedMenuItemFactory"
    147158      classpathref="classpath" property="baseweb" />
    148     <fail unless="basecore" message="Can't find ${depend.jars.core} in ./lib/compile. Try 'ant download-lib' to download the missing file." />
    149     <fail unless="baseweb" message="Can't find ${depend.jars.webclient} in ./lib/compile. Try 'ant download-lib' to download the missing file." />
    150     <echo>Found ${depend.jars.core} and ${depend.jars.webclient}.</echo>
     159    <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." />
     160    <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." />
     161    <echo>Found all requried BASE core JAR files.</echo>
    151162  </target>
    152163 
    153164  <target
    154165    name="download-lib"
    155     description="Download ${depend.jars.core} and ${depend.jars.webclient}"
     166    description="Download BASE JAR files"
    156167    >
    157168    <echo>
     
    162173-------------------------------------------------------
    163174    </echo>
    164     <download-lib file="${depend.jars.core}" />
    165     <download-lib file="${depend.jars.webclient}" />
     175    <download-lib file="base-core-${depend.base-version}.jar" />
     176    <download-lib file="base-webclient-${depend.base-version}.jar" />
    166177  </target>
    167178 
     
    171182      <get
    172183        dest="lib/compile/@{file}"
    173         src="${depend.jars.directory}/@{file}"
     184        src="${depend.jars}/@{file}"
    174185        usetimestamp="true"
    175186        verbose="true"
Note: See TracChangeset for help on using the changeset viewer.