Changeset 2182


Ignore:
Timestamp:
Dec 13, 2013, 9:31:28 AM (8 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #552: PluginUtilities?-0.2.jar is in incorrect location

Download to the 'lib' directory as before but only untar the JAR file we need and place it in META-INF/lib directory. The other changes are just to make sure the JAR file is included when copying to 'dist' directory and removed when cleaning up.

Location:
plugins/base2/net.sf.basedb.normalizers/trunk
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • plugins/base2/net.sf.basedb.normalizers/trunk/.classpath

    r2179 r2182  
    33  <classpathentry kind="src" path="src"/>
    44  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
    5   <classpathentry kind="lib" path="lib/PluginUtilities-0.2/PluginUtilities-0.2.jar"/>
    65  <classpathentry kind="lib" path="lib/compile/base-core-3.2.4.jar"/>
    76  <classpathentry kind="lib" path="lib/compile/base-coreplugins-3.2.4.jar"/>
     7  <classpathentry kind="lib" path="META-INF/lib/PluginUtilities-0.2.jar"/>
    88  <classpathentry kind="output" path="bin"/>
    99</classpath>
  • plugins/base2/net.sf.basedb.normalizers/trunk/build.xml

    r2180 r2182  
    9191      <include name="**/*.jar"/>
    9292    </fileset>
     93    <fileset dir="META-INF/lib">
     94      <include name="**/*.jar"/>
     95    </fileset>
    9396  </path>
    9497
     
    110113    depends="clean">
    111114    <delete failonerror="false" includeemptydirs="true">
    112       <fileset dir="lib/${PluginUtilitiesBase}" defaultexcludes="no" />
     115      <fileset file="META-INF/lib/${PluginUtilitiesBase}.jar" />
    113116      <fileset file="lib/${PluginUtilitiesBase}.tgz" />
    114117      <fileset dir="lib/compile" defaultexcludes="no">
     
    123126    depends="clean,build,manifest"
    124127    >
    125     <copy file="lib/${PluginUtilitiesBase}/${PluginUtilitiesBase}.jar"
    126           tofile="${build}/lib/PluginUtilities.jar" />
    127128    <jar
    128129      jarfile="${dist}/${jar}"
     
    141142    <manifest file="${build}/META-INF/MANIFEST.MF">
    142143      <attribute name="Built-By" value="${user.name}"/>
    143       <attribute name="Class-Path" value="lib/PluginUtilities.jar"/>
     144      <attribute name="Class-Path" value="lib/${PluginUtilitiesBase}.jar"/>
    144145    </manifest>
    145146  </target>
     
    216217    </javac>
    217218    <copy todir="${build}">
    218       <fileset dir="." includes="META-INF/*" />
     219      <fileset dir="." includes="META-INF/**" />
    219220    </copy>
    220221   
     
    270271    <available classname="net.sf.basedb.plugins.AbstractRunBinaryPlugin"
    271272      classpathref="classpath"
    272       classpath="lib/${PluginUtilitiesBase}/${PluginUtilitiesBase}.jar"
     273      classpath="META-INF/lib/${PluginUtilitiesBase}/${PluginUtilitiesBase}.jar"
    273274      property="pluginutilities" />
    274275    <fail unless="base-core" message="Can't find base-core-${depend.base-version}.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
    275276    <fail unless="base-coreplugins" message="Can't find base-coreplugins-${depend.base-version}.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
    276     <fail unless="pluginutilities" message="Can't find PluginUtilities jar file ./lib. Try 'ant download-lib' to download the missing file." />
     277    <fail unless="pluginutilities" message="Can't find PluginUtilities jar file in ./META-INF/lib. Try 'ant download-lib' to download the missing file." />
    277278    <echo>Found all required jar files</echo>
    278279  </target>
     
    340341      tofile="${PluginUtilitiesBase}.tgz"
    341342    />
    342     <untar src="lib/${PluginUtilitiesBase}.tgz" dest="lib"
    343            compression="gzip" />
     343    <!-- Extract the PluginUtilities.jar file to the META-INF/lib directory -->
     344    <untar src="lib/${PluginUtilitiesBase}.tgz" dest="META-INF/lib" compression="gzip" >
     345      <patternset>
     346        <include name="${PluginUtilitiesBase}/*.jar" />
     347      </patternset>
     348      <flattenmapper/>
     349    </untar>
    344350  </target>
    345351
Note: See TracChangeset for help on using the changeset viewer.