Changeset 1293


Ignore:
Timestamp:
08/18/06 12:58:33 (14 years ago)
Author:
curtis
Message:

Limit VisBio distribution builds with hacked permissions to *nix only;
target 1.4.x with Java compiler.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r1292 r1293  
    178178    <mkdir dir="${classes.dir}"/> 
    179179    <javac srcdir="${dest.dir}" destdir="${classes.dir}" 
    180       classpath="${ext.jars}" deprecation="true"/> 
     180      classpath="${ext.jars}" deprecation="true" source="1.4" target="1.4"/> 
    181181  </target> 
    182182 
     
    267267  <property name="visbio.dist-files" value="bsd-forms.txt bsd-looks.txt gpl-visbio.txt omeul.txt whatsnew.txt *.cpp *.m"/> 
    268268 
     269  <condition property="isUnix"><os family="unix"/></condition> 
     270 
    269271  <target name="dist-visbio" depends="dist-visbio-win32, dist-visbio-win32-nojre, dist-visbio-macosx, dist-visbio-linux, dist-visbio-nojre"/> 
    270272 
     
    304306  <property name="visbio.macosx-dir" value="${dist.dir}/visbio/macosx/VisBio"/> 
    305307 
    306   <target name="dist-visbio-macosx" depends="jar-visbio, jar-formats"> 
     308  <!-- HACK - limit OS to *nix due to file permission issues --> 
     309  <target name="dist-visbio-macosx" if="isUnix" 
     310    depends="jar-visbio, jar-formats"> 
    307311    <copy todir="${visbio.macosx-dir}" 
    308312      preservelastmodified="true"> 
     
    333337    value="${dist.dir}/visbio/linux/visbio${visbio.version}"/> 
    334338 
    335   <target name="dist-visbio-linux" depends="jar-visbio, jar-formats"> 
     339  <!-- HACK - limit OS to *nix due to file permission issues --> 
     340  <target name="dist-visbio-linux" if="isUnix" 
     341    depends="jar-visbio, jar-formats"> 
    336342    <copy todir="${visbio.linux-dir}" preservelastmodified="true"> 
    337343      <fileset dir="dist/visbio/linux"/> 
     
    366372    value="${dist.dir}/visbio/nojre/visbio${visbio.version}"/> 
    367373 
    368   <target name="dist-visbio-nojre" depends="jar-visbio, jar-formats"> 
     374  <!-- HACK - limit OS to *nix due to file permission issues --> 
     375  <target name="dist-visbio-nojre" if="isUnix" 
     376    depends="jar-visbio, jar-formats"> 
    369377    <copy todir="${visbio.nojre-dir}" preservelastmodified="true"> 
    370378      <fileset dir="dist/visbio/linux"/> 
     
    395403    depends="compile, copy-jars, jar-formats" 
    396404    description="generate LOCI Plugins for ImageJ JAR file"> 
     405    <jar jarfile="${jar.dir}/loci_plugins.jar" 
     406      basedir="${src.dir}/loci/plugins" includes="plugins.config"> 
     407      <manifest> 
     408        <attribute name="Main-Class" value="loci.plugins.About"/> 
     409      </manifest> 
     410    </jar> 
    397411    <jar jarfile="${jar.dir}/loci_plugins.jar" basedir="${classes.dir}" 
    398       includes="${plugins.files}"> 
    399       <manifest> 
    400         <attribute name="Main-Class" value="loci.plugins.About"/> 
    401       </manifest> 
     412      includes="${plugins.files}" excludes="loci/plugins/plugins.config" 
     413      update="true"> 
    402414    </jar> 
    403415  </target> 
Note: See TracChangeset for help on using the changeset viewer.