Changeset 1280 for trunk/build.xml


Ignore:
Timestamp:
08/16/06 23:02:56 (14 years ago)
Author:
curtis
Message:

Fix up jar-formats, jar-leica, jar-qt and jar-slim targets.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r1277 r1280  
    4141                   looks-1.2.2.jar 
    4242                   ome-java.jar 
     43                   visad.jar 
    4344                   xmlrpc-1.2-b1.jar (ome-java.jar) 
    4445    Targets:       jar-visbio 
     
    8081    Folders:       loci/apps/leica 
    8182    Main class:    loci.apps.leica.LeicaConverter 
    82     Dependencies:  None (custom built) 
     83    Dependencies:  bio-formats.jar 
     84                   ome-java.jar 
    8385    Targets:       jar-leica 
    8486 
     
    8688    JAR file:      QTConverter.jar 
    8789    Folders:       loci/apps/qt 
     90                   some loci/formats and loci/util 
    8891    Main class:    loci.apps.qt.QTConverter 
    8992    Dependencies:  None (custom built) 
     
    9396    JAR file:      SlimPlotter.jar 
    9497    Folders:       loci/apps/slim 
     98                   some loci/formats and loci/visbio 
    9599    Main class:    loci.apps.slim.SlimPlotter 
    96     Dependencies:  None (custom built) 
     100    Dependencies:  visad.jar 
    97101    Targets:       jar-slim 
    98102 
     
    146150    Notes:     Not used (may be used in the future for flexible skinning) 
    147151 
     152VisAD 
     153    JAR file:  visad.jar 
     154    URL:       http://www.ssec.wisc.edu/~billh/visad.html 
     155    Notes:     Stripped down VisAD library used by VisBio and Slim Plotter 
     156 
    148157Apache XML-RPC 
    149158    JAR file:  xmlrpc-1.2-b1.jar 
    150159    URL:       http://ws.apache.org/xmlrpc/ 
    151160    Notes:     Required for OME Java to communicate with OME servers 
    152  
    153161--> 
    154162 
     
    188196  </target> 
    189197 
    190   <target name="jars" depends="jar-common, jar-formats, jar-visbio, jar-plugins, jar-notebook, jar-leica, jar-qt, jar-slim" 
     198  <target name="jars" 
     199    depends="jar-common, jar-formats, jar-visbio, jar-plugins, jar-notebook, jar-leica, jar-qt, jar-slim" 
    191200    description="generate JAR files for LOCI software packages"/> 
    192201 
     
    237246  <!-- LOCI Common Classes --> 
    238247 
    239   <property name="common.packages" 
    240     value="loci/ome/viewer/** loci/util/**"/> 
    241  
    242   <target name="jar-common" depends="compile" 
     248  <property name="common.files" value="loci/ome/viewer/** loci/util/**"/> 
     249 
     250  <target name="jar-common" depends="compile, copy-jars" 
    243251    description="generate JAR file for LOCI common classes"> 
    244252    <mkdir dir="${jar.dir}"/> 
    245253    <jar jarfile="${jar.dir}/loci-common.jar" basedir="${classes.dir}" 
    246       includes="${common.packages}"> 
     254      includes="${common.files}"> 
    247255      <manifest> 
    248256        <attribute name="Main-Class" value="loci.util.About"/> 
     
    254262 
    255263  <property name="formats.classpath" value="loci-common.jar"/> 
    256   <property name="formats.packages" 
    257     value="loci/browser/** loci/formats/**"/> 
     264  <property name="formats.files" value="loci/browser/** loci/formats/**"/> 
    258265  <property name="formats.resources" value="loci/formats/*.txt"/> 
    259266 
    260   <target name="jar-formats" depends="compile" 
     267  <target name="jar-formats" depends="compile, jar-common" 
    261268    description="generate Bio-Formats JAR file"> 
    262269    <mkdir dir="${jar.dir}"/> 
     
    264271      <fileset dir="${src.dir}" includes="${formats.resources}"/> 
    265272    </copy> 
    266     <jar jarfile="${jar.dir}/bio_formats.jar" basedir="${classes.dir}" 
    267       includes="${formats.packages}"> 
     273    <jar jarfile="${jar.dir}/bio-formats.jar" basedir="${classes.dir}" 
     274      includes="${formats.files}"> 
    268275      <manifest> 
    269276        <attribute name="Main-Class" value="loci.util.About"/> 
     
    275282  <!-- VisBio --> 
    276283 
    277   <property name="visbio.classpath" value="bio_formats.jar commons-httpclient-2.0-rc2.jar commons-logging.jar forms-1.0.4.jar ij.jar loci-common.jar looks-1.2.2.jar ome-java.jar visad.jar xmlrpc-1.2-b1.jar"/> 
    278   <property name="visbio.packages" value="loci/visbio/**"/> 
     284  <property name="visbio.classpath" value="bio-formats.jar commons-httpclient-2.0-rc2.jar commons-logging.jar forms-1.0.4.jar ij.jar loci-common.jar looks-1.2.2.jar ome-java.jar visad.jar xmlrpc-1.2-b1.jar"/> 
     285  <property name="visbio.files" value="loci/visbio/**"/> 
    279286  <property name="visbio.resources" value="loci/visbio/classes.txt loci/visbio/*.png loci/visbio/*.gif loci/visbio/help/*.html loci/visbio/help/*.png loci/visbio/overlays/*.png loci/visbio/view/*.png"/> 
    280287 
    281   <target name="jar-visbio" depends="compile" 
     288  <target name="jar-visbio" 
     289    depends="compile, copy-jars, jar-formats, jar-common" 
    282290    description="generate VisBio JAR file"> 
    283291    <mkdir dir="${jar.dir}"/> 
     
    286294    </copy> 
    287295    <jar jarfile="${jar.dir}/visbio.jar" basedir="${classes.dir}" 
    288       includes="${visbio.packages}"> 
     296      includes="${visbio.files}"> 
    289297      <manifest> 
    290298        <attribute name="Main-Class" value="loci.visbio.VisBio"/> 
     
    299307  </target> 
    300308 
    301   <target name="visad" depends="init"> 
     309  <!-- LOCI Plugins for ImageJ --> 
     310 
     311  <target name="jar-plugins" 
     312    depends="compile, copy-jars, jar-common, jar-formats" 
     313    description="generate LOCI Plugins for ImageJ JAR file"> 
     314    <mkdir dir="${jar.dir}"/> 
    302315    <!-- TODO --> 
    303316  </target> 
    304317 
    305   <!-- LOCI Plugins for ImageJ --> 
    306  
    307   <target name="jar-plugins" depends="compile" 
    308     description="generate LOCI Plugins for ImageJ JAR file"> 
     318  <!-- OME Metadata Notebook --> 
     319 
     320  <target name="jar-notebook" 
     321    depends="compile, copy-jars, jar-common, jar-formats" 
     322    description="generate OME Metadata Notebook JAR file"> 
    309323    <mkdir dir="${jar.dir}"/> 
    310324    <!-- TODO --> 
    311325  </target> 
    312326 
    313  
    314   <!-- OME Metadata Notebook --> 
    315  
    316   <target name="jar-notebook" depends="compile" 
    317     description="generate OME Metadata Notebook JAR file"> 
    318     <mkdir dir="${jar.dir}"/> 
    319     <!-- TODO --> 
    320   </target> 
    321  
    322  
    323327  <!-- Leica Converter --> 
    324328 
    325   <target name="jar-leica" depends="compile" 
     329  <property name="leica.classpath" value="bio-formats.jar ome-java.jar"/> 
     330  <property name="leica.files" value="loci/apps/leica/**"/> 
     331 
     332  <target name="jar-leica" depends="compile, copy-jars, jar-formats" 
    326333    description="generate Leica Converter JAR file"> 
    327334    <mkdir dir="${jar.dir}"/> 
    328     <!-- TODO --> 
    329   </target> 
    330  
     335    <jar jarfile="${jar.dir}/LeicaConverter.jar" basedir="${classes.dir}" 
     336      includes="${leica.files}"> 
     337      <manifest> 
     338        <attribute name="Main-Class" value="loci.apps.leica.LeicaConverter"/> 
     339        <attribute name="Class-Path" value="${leica.classpath}"/> 
     340      </manifest> 
     341    </jar> 
     342  </target> 
    331343 
    332344  <!-- QT TIFF Converter --> 
     345 
     346  <property name="qt.files" value="loci/apps/qt/* loci/util/FilePattern* loci/util/NumberFilter* loci/formats/BitBuffer* loci/formats/BitWriter* loci/formats/ByteVector* loci/formats/ComboFileFilter* loci/formats/Compression* loci/formats/DataTools* loci/formats/DummyMetadataStore* loci/formats/ExtensionFileFilter* loci/formats/FileStitcher* loci/formats/FormatException* loci/formats/FormatFileFilter* loci/formats/FormatHandler* loci/formats/FormatReader* loci/formats/FormatWriter* loci/formats/IFormatHandler* loci/formats/IFormatReader* loci/formats/ImageTools* loci/formats/LZWTreeNode* loci/formats/LegacyQTTools* loci/formats/MetadataStore* loci/formats/OMEXMLMetadataStore* loci/formats/RandomAccessArray* loci/formats/RandomAccessStream* loci/formats/ReflectException* loci/formats/ReflectedUniverse* loci/formats/TiffRational* loci/formats/TiffTools* loci/formats/in/BaseTiffReader* loci/formats/in/LegacyQTReader* loci/formats/in/QTReader* loci/formats/in/TiffReader* loci/formats/out/TiffWriter*"/> 
    333347 
    334348  <target name="jar-qt" depends="compile" 
    335349    description="generate QT TIFF Converter JAR file"> 
    336350    <mkdir dir="${jar.dir}"/> 
    337     <!-- TODO --> 
    338   </target> 
    339  
     351    <jar jarfile="${jar.dir}/QTConverter.jar" basedir="${classes.dir}" 
     352      includes="${qt.files}"> 
     353      <manifest> 
     354        <attribute name="Main-Class" value="loci.apps.qt.QTConverter"/> 
     355      </manifest> 
     356    </jar> 
     357  </target> 
    340358 
    341359  <!-- Slim Plotter --> 
    342360 
    343   <target name="jar-slim" depends="compile" 
     361  <property name="slim.classpath" value="visad.jar"/> 
     362  <property name="slim.files" value="loci/apps/slim/* loci/formats/DataTools* loci/formats/ExtensionFileFilter* loci/formats/ComboFileFilter* loci/visbio/util/OutputConsole* loci/visbio/util/OutputEvent* loci/visbio/util/SwingUtil* loci/visbio/util/LAFUtil*"/> 
     363 
     364  <target name="jar-slim" depends="compile, copy-jars" 
    344365    description="generate Slim Plotter JAR file"> 
    345366    <mkdir dir="${jar.dir}"/> 
    346     <!-- TODO --> 
     367    <jar jarfile="${jar.dir}/SlimPlotter.jar" basedir="${classes.dir}" 
     368      includes="${slim.files}"> 
     369      <manifest> 
     370        <attribute name="Main-Class" value="loci.apps.slim.SlimPlotter"/> 
     371        <attribute name="Class-Path" value="${slim.classpath}"/> 
     372      </manifest> 
     373    </jar> 
    347374  </target> 
    348375 
Note: See TracChangeset for help on using the changeset viewer.