Changeset 1600 for trunk/build.xml


Ignore:
Timestamp:
10/10/06 15:27:33 (14 years ago)
Author:
curtis
Message:

Fix MovieStitcher targets; eliminate some hardcoding from build.xml.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r1595 r1600  
    304304    </copy> 
    305305    <mkdir dir="${jar.dir}"/> 
    306     <jar jarfile="${jar.dir}/bio-formats.jar" basedir="${classes.dir}" 
     306    <jar jarfile="${jar.dir}/${formats.jar}" basedir="${classes.dir}" 
    307307      includes="${formats.files}"> 
    308308      <manifest> 
    309         <attribute name="Main-Class" value="loci.formats.ImageViewer"/> 
     309        <attribute name="Main-Class" value="${formats.main}"/> 
    310310        <attribute name="Class-Path" value="${formats.classpath}"/> 
    311311      </manifest> 
     
    335335      <fileset dir="${src.dir}" includes="${visbio.resources}"/> 
    336336    </copy> 
    337     <jar jarfile="${jar.dir}/visbio.jar" basedir="${classes.dir}" 
     337    <jar jarfile="${jar.dir}/${visbio.jar}" basedir="${classes.dir}" 
    338338      includes="${visbio.files}"> 
    339339      <manifest> 
    340         <attribute name="Main-Class" value="loci.visbio.VisBio"/> 
     340        <attribute name="Main-Class" value="${visbio.main}"/> 
    341341        <attribute name="Class-Path" value="${visbio.classpath}"/> 
    342342      </manifest> 
     
    514514  <target name="jar-plugins" depends="compile-plugins, copy-jars, jar-formats" 
    515515    description="generate JAR file for LOCI Plugins for ImageJ"> 
    516     <jar jarfile="${jar.dir}/loci_plugins.jar" 
     516    <jar jarfile="${jar.dir}/${plugins.jar}" 
    517517      basedir="${src.dir}/loci/plugins" includes="plugins.config"> 
    518518      <manifest> 
    519         <attribute name="Main-Class" value="loci.plugins.About"/> 
     519        <attribute name="Main-Class" value="${plugins.main}"/> 
    520520      </manifest> 
    521521    </jar> 
    522     <jar jarfile="${jar.dir}/loci_plugins.jar" basedir="${classes.dir}" 
     522    <jar jarfile="${jar.dir}/${plugins.jar}" basedir="${classes.dir}" 
    523523      includes="${plugins.files}" excludes="loci/plugins/plugins.config" 
    524524      update="true"> 
     
    549549      <fileset dir="${src.dir}" includes="${notebook.resources}"/> 
    550550    </copy> 
    551     <jar jarfile="${jar.dir}/ome-notebook.jar" basedir="${classes.dir}" 
     551    <jar jarfile="${jar.dir}/${notebook.jar}" basedir="${classes.dir}" 
    552552      includes="${notebook.files}"> 
    553553      <manifest> 
    554         <attribute name="Main-Class" 
    555           value="loci.ome.notebook.MetadataNotebook"/> 
     554        <attribute name="Main-Class" value="${notebook.main}"/> 
    556555        <attribute name="Class-Path" value="${notebook.classpath}"/> 
    557556      </manifest> 
     
    578577  <target name="jar-leica" depends="compile-leica, copy-jars, jar-formats" 
    579578    description="generate JAR file for Leica Converter"> 
    580     <jar jarfile="${jar.dir}/LeicaConverter.jar" basedir="${classes.dir}" 
     579    <jar jarfile="${jar.dir}/${leica.jar}" basedir="${classes.dir}" 
    581580      includes="${leica.files}"> 
    582581      <manifest> 
    583         <attribute name="Main-Class" value="loci.apps.leica.LeicaConverter"/> 
     582        <attribute name="Main-Class" value="${leica.main}"/> 
    584583        <attribute name="Class-Path" value="${leica.classpath}"/> 
    585584      </manifest> 
     
    607606    description="generate JAR file for Movie Stitcher"> 
    608607    <mkdir dir="${jar.dir}"/> 
    609     <jar jarfile="${jar.dir}/QTConverter.jar" basedir="${classes.dir}" 
     608    <jar jarfile="${jar.dir}/${stitcher.jar}" basedir="${classes.dir}" 
    610609      includes="${stitcher.files}"> 
    611610      <manifest> 
    612         <attribute name="Main-Class" value="loci.apps.stitcher.QTConverter"/> 
     611        <attribute name="Main-Class" value="${stitcher.main}"/> 
    613612      </manifest> 
    614613    </jar> 
     
    634633  <target name="jar-slim" depends="compile-slim, copy-jars" 
    635634    description="generate JAR file for Slim Plotter"> 
    636     <jar jarfile="${jar.dir}/SlimPlotter.jar" basedir="${classes.dir}" 
     635    <jar jarfile="${jar.dir}/${slim.jar}" basedir="${classes.dir}" 
    637636      includes="${slim.files}"> 
    638637      <manifest> 
    639         <attribute name="Main-Class" value="loci.apps.slim.SlimPlotter"/> 
     638        <attribute name="Main-Class" value="${slim.main}"/> 
    640639        <attribute name="Class-Path" value="${slim.classpath}"/> 
    641640      </manifest> 
Note: See TracChangeset for help on using the changeset viewer.