Changeset 4612


Ignore:
Timestamp:
11/13/08 11:16:45 (11 years ago)
Author:
curtis
Message:
  • Add exec target to each component.
  • Miscellaneous tweaks to build system.
Location:
trunk
Files:
25 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r4594 r4612  
    4141    Optional:      OME I/O, OME Notes, Apache Jakarta POI, 
    4242                   MDB Tools (Java port), JAI Image I/O Tools, NetCDF 
     43    License:       GPL 
     44 
     45Bio-Formats code generator 
     46    Code that generates the Bio-Formats metadata API, related documentation and 
     47    Ice bindings 
     48    -=- 
     49    JAR file:      bio-formats-auto.jar 
     50    Path:          components/bio-formats-auto 
     51    Project deps:  LOCI Common, Bio-Formats 
     52    Library deps:  Apache Velocity 
     53    Optional:      (none) 
    4354    License:       GPL 
    4455 
     
    244255    JAR file:  checkstyle-all-4.2.jar 
    245256    URL:       http://checkstyle.sourceforge.net/ 
    246     Notes:     used by style targets to check source code style conventions 
     257    Notes:     used by style Ant target to check source code style conventions 
    247258    License:   LGPL 
    248259 
     
    435446  <!-- Global build targets --> 
    436447 
    437   <target name="style" 
    438     depends="style-common, style-jai, style-poi-loci, style-mdbtools, 
    439       style-ome-xml, style-formats, style-formats-ice, 
    440       style-loci-plugins, style-ome-io, style-ome-plugins, 
    441       style-visbio, style-slim, style-flow, 
    442       style-checks, style-tests, 
    443       style-jvmlink, style-multi-lut, 
    444       style-ome-notes, style-ome-editor" 
    445     description="check source code style for LOCI software packages"/> 
    446  
    447448  <target name="compile" 
    448     depends="compile-common, compile-jai, compile-poi-loci, compile-mdbtools, 
    449       compile-ome-xml, compile-formats, compile-formats-ice, 
     449    depends="compile-common, compile-ome-xml, 
     450      compile-jai, compile-poi-loci, compile-mdbtools, 
     451      compile-formats, compile-formats-auto, compile-formats-ice, 
    450452      compile-loci-plugins, compile-ome-io, compile-ome-plugins, 
    451453      compile-visbio, compile-slim, compile-flow, 
     
    456458 
    457459  <target name="jars" 
    458     depends="jar-common, jar-jai, jar-poi-loci, jar-mdbtools, 
    459       jar-ome-xml, jar-formats, jar-formats-ice, jar-loci-plugins, 
    460       jar-ome-io, jar-ome-plugins, 
     460    depends="jar-common, jar-ome-xml, 
     461      jar-jai, jar-poi-loci, jar-mdbtools, 
     462      jar-formats, jar-formats-auto, jar-formats-ice, 
     463      jar-loci-plugins, jar-ome-io, jar-ome-plugins, 
    461464      jar-visbio, jar-slim, jar-flow, 
    462465      jar-checks, jar-tests, 
     
    466469 
    467470  <target name="clean" 
    468     depends="clean-common, clean-jai, clean-poi-loci, clean-mdbtools, 
    469       clean-ome-xml, clean-formats, clean-formats-ice, 
     471    depends="clean-common, clean-ome-xml, 
     472      clean-jai, clean-poi-loci, clean-mdbtools, 
     473      clean-formats, clean-formats-auto, clean-formats-ice, 
    470474      clean-loci-plugins, clean-ome-io, clean-ome-plugins, 
    471475      clean-visbio, clean-slim, clean-flow, 
     
    502506  <!-- LOCI common library --> 
    503507 
    504   <target name="style-common" 
    505     description="check source code style for LOCI common library"> 
    506     <ant dir="components/common" target="common.style"/> 
    507   </target> 
    508  
    509508  <target name="compile-common" 
    510509    description="compile classes for LOCI common library"> 
     
    524523  <!-- JAI Image I/O Tools library --> 
    525524 
    526   <target name="style-jai" 
    527     description="check source code style for JAI Image I/O Tools library"> 
    528     <ant dir="components/forks/jai" target="jai.style"/> 
    529   </target> 
    530  
    531525  <target name="compile-jai" 
    532526    description="compile classes for JAI Image I/O Tools library"> 
     
    545539 
    546540  <!-- Apache POI Java library --> 
    547  
    548   <target name="style-poi-loci" 
    549     depends="style-common" 
    550     description="check source code style for Apache POI library"> 
    551     <ant dir="components/forks/poi" target="poi-loci.style"/> 
    552   </target> 
    553541 
    554542  <target name="compile-poi-loci" 
     
    572560  <!-- MDB Tools Java library --> 
    573561 
    574   <target name="style-mdbtools" 
    575     description="check source code style for MDB Tools Java library"> 
    576     <ant dir="components/forks/mdbtools" target="mdbtools.style"/> 
    577   </target> 
    578  
    579562  <target name="compile-mdbtools" 
    580563    description="compile classes for MDB Tools Java library"> 
     
    594577  <!-- OME-XML Java library --> 
    595578 
    596   <target name="style-ome-xml" 
    597     description="check source code style for OME-XML Java library"> 
    598     <ant dir="components/bio-ome-xml" target="ome-xml.style"/> 
    599   </target> 
    600  
    601579  <target name="compile-ome-xml" 
    602580    description="compile classes for OME-XML Java library"> 
     
    615593 
    616594  <!-- Bio-Formats --> 
    617  
    618   <target name="style-formats" 
    619     depends="style-common, style-ome-xml" 
    620     description="check source code style for Bio-Formats"> 
    621     <ant dir="components/bio-formats" target="formats.style"/> 
    622   </target> 
    623595 
    624596  <target name="compile-formats" 
     
    640612  </target> 
    641613 
     614  <!-- Bio-Formats code generator --> 
     615 
     616  <target name="compile-formats-auto" 
     617    depends="compile-common, compile-formats" 
     618    description="compile classes for Bio-Formats code gen"> 
     619    <ant dir="components/bio-formats-auto" target="formats-auto.compile"/> 
     620  </target> 
     621 
     622  <target name="jar-formats-auto" 
     623    depends="jar-common, jar-formats" 
     624    description="generate JAR file for Bio-Formats code gen"> 
     625    <ant dir="components/bio-formats-auto" target="formats-auto.jar"/> 
     626  </target> 
     627 
     628  <target name="clean-formats-auto" 
     629    depends="clean-common, clean-formats" 
     630    description="remove build files for Bio-Formats code gen"> 
     631    <ant dir="components/bio-formats-auto" target="formats-auto.clean"/> 
     632  </target> 
     633 
    642634  <!-- Bio-Formats Ice framework --> 
    643  
    644   <target name="style-formats-ice" 
    645     depends="style-formats" 
    646     description="check source code style for Bio-Formats Ice framework"> 
    647     <ant dir="components/bio-formats-ice" target="formats-ice.style"/> 
    648   </target> 
    649635 
    650636  <target name="compile-formats-ice" 
     
    668654  <!-- LOCI Plugins for ImageJ --> 
    669655 
    670   <target name="style-loci-plugins" 
    671     depends="style-common, style-formats" 
    672     description="check source code style for LOCI Plugins for ImageJ"> 
    673     <ant dir="components/loci-plugins" target="loci-plugins.style"/> 
    674   </target> 
    675  
    676656  <target name="compile-loci-plugins" 
    677657    depends="compile-common, compile-formats" 
     
    694674  <!-- OME I/O --> 
    695675 
    696   <target name="style-ome-io" 
    697     depends="style-common, style-formats" 
    698     description="check source code style for OME I/O"> 
    699     <ant dir="components/ome-io" target="ome-io.style"/> 
    700   </target> 
    701  
    702676  <target name="compile-ome-io" 
    703677    depends="compile-common, compile-formats" 
     
    719693 
    720694  <!-- OME Plugins for ImageJ --> 
    721  
    722   <target name="style-ome-plugins" 
    723     depends="style-common, style-formats, style-loci-plugins, style-ome-io" 
    724     description="check source code style for OME Plugins for ImageJ"> 
    725     <ant dir="components/ome-plugins" target="ome-plugins.style"/> 
    726   </target> 
    727695 
    728696  <target name="compile-ome-plugins" 
     
    747715  <!-- VisBio --> 
    748716 
    749   <target name="style-visbio" 
    750     depends="style-common, style-ome-xml, style-formats, 
    751       style-ome-io, style-poi-loci" 
    752     description="check source code style for VisBio"> 
    753     <ant dir="components/visbio" target="visbio.style"/> 
    754   </target> 
    755717 
    756718  <target name="compile-visbio" 
     
    806768  <!-- SLIM Plotter --> 
    807769 
    808   <target name="style-slim" 
    809     depends="style-common, style-formats, style-visbio" 
    810     description="check source code style for SLIM Plotter"> 
    811     <ant dir="components/slim-plotter" target="slim.style"/> 
    812   </target> 
    813  
    814770  <target name="compile-slim" 
    815771    depends="compile-common, compile-formats, compile-visbio" 
     
    837793  <!-- WiscScan Flow Cytometry --> 
    838794 
    839   <target name="style-flow" 
    840     depends="style-formats" 
    841     description="check source code style for WiscScan Flow Cytometry"> 
    842     <ant dir="components/flow-cytometry" target="flow.style"/> 
    843   </target> 
    844  
    845795  <target name="compile-flow" 
    846796    depends="compile-formats" 
     
    863813  <!-- LOCI Checkstyle checks --> 
    864814 
    865   <target name="style-checks" 
    866     description="check source code style for LOCI Checkstyle checks"> 
    867     <ant dir="components/checkstyle" target="checks.style"/> 
    868   </target> 
    869  
    870815  <target name="compile-checks" 
    871816    description="compile classes for LOCI Checkstyle checks"> 
     
    884829 
    885830  <!-- LOCI testing framework --> 
    886  
    887   <target name="style-tests" 
    888     depends="style-common, style-formats" 
    889     description="check source code style for LOCI testing framework"> 
    890     <ant dir="components/test-suite" target="tests.style"/> 
    891   </target> 
    892831 
    893832  <target name="compile-tests" 
     
    911850  <!-- JVMLink --> 
    912851 
    913   <target name="style-jvmlink" 
    914     depends="style-common" 
    915     description="check source code style for JVMLink"> 
    916     <ant dir="components/legacy/jvmlink" target="jvmlink.style"/> 
    917   </target> 
    918  
    919852  <target name="compile-jvmlink" 
    920853    depends="compile-common" 
     
    937870  <!-- Multi LUT app --> 
    938871 
    939   <target name="style-multi-lut" 
    940     description="check source code style for Multi LUT app"> 
    941     <ant dir="components/legacy/multi-lut" target="multi-lut.style"/> 
    942   </target> 
    943  
    944872  <target name="compile-multi-lut" 
    945873    description="compile classes for Multi LUT app"> 
     
    958886 
    959887  <!-- OME Notes --> 
    960  
    961   <target name="style-ome-notes" 
    962     depends="style-common, style-formats" 
    963     description="check source code style for OME Notes"> 
    964     <ant dir="components/legacy/ome-notes" target="ome-notes.style"/> 
    965   </target> 
    966888 
    967889  <target name="compile-ome-notes" 
     
    984906 
    985907  <!-- OME Metadata Editor --> 
    986  
    987   <target name="style-ome-editor" 
    988     depends="style-common, style-ome-xml, style-formats" 
    989     description="check source code style for OME Metadata Editor"> 
    990     <ant dir="components/legacy/ome-editor" target="ome-editor.style"/> 
    991   </target> 
    992908 
    993909  <target name="compile-ome-editor" 
  • trunk/common.xml

    r4609 r4612  
    3939 
    4040  <!-- Main build targets --> 
    41  
    42   <target name="dev-compile" description="compile classes in-place (no copy)"> 
    43     <javac debug="true" deprecation="true" 
    44       source="${component.java-version}" 
    45       target="${component.java-version}" 
    46       srcdir="${src.dir}" destdir="${src.dir}" 
    47       classpath="${component.classpath}" 
    48       includes="${component.source}"/> 
    49   </target> 
    50  
    51   <target name="dev-clean" description="remove classes in-place (no copy)"> 
    52     <delete> 
    53       <fileset dir="${src.dir}" includes="**/*.class"/> 
    54     </delete> 
    55   </target> 
    5641 
    5742  <target name="compile" depends="copy-source" 
     
    6550  </target> 
    6651 
    67   <!-- CTR TODO FINISH THIS 
    6852  <target name="exec" depends="compile" description="execute package"> 
    69      <java classname="component.manifest-main" 
    70        classpath="${}" 
    71   </target> 
    72   --> 
     53    <java fork="true" classname="${component.main-class}" 
     54      classpath="${classes.dir}:${component.runtime-cp}"/> 
     55  </target> 
    7356 
    7457  <target name="findbugs" depends="compile" 
     
    10891    <jar jarfile="${artifact.dir}/${component.jar}" basedir="${classes.dir}"> 
    10992      <manifest> 
    110         <attribute name="Main-Class" value="${component.manifest-main}"/> 
     93        <attribute name="Main-Class" value="${component.main-class}"/> 
    11194        <attribute name="Class-Path" value="${component.manifest-cp}"/> 
    11295      </manifest> 
     
    175158            getting-subversion-revision-in-ant/ 
    176159        --> 
    177         <property name="revision" value="HEAD"/> 
    178160        <exec executable="svn" outputproperty="svn.log" 
    179161          failifexecutionfails="false"> 
    180           <arg line="info ${base.dir} -r ${revision}"/> 
     162          <arg line="info ${base.dir}"/> 
    181163        </exec> 
    182164        <if> 
    183165          <isset property="svn.log"/> 
    184166          <then> 
    185             <!--<echo>${svn.log}</echo>--> 
    186167            <propertyregex property="svn.revision" 
    187168              input="${svn.log}" select="\1"> 
    188169              <regexp pattern="Revision: ([0-9]*)"/> 
    189170            </propertyregex> 
    190             <echo>SVN revision: ${svn.revision}</echo> 
     171            <!--<echo>SVN revision: ${svn.revision}</echo>--> 
    191172          </then> 
    192173        </if> 
    193174      </else> 
    194175    </if> 
     176    <!-- construct manifest classpath --> 
     177    <propertyregex property="component.manifest-cp-temp" 
     178      input="${component.runtime-cp}" replace="" 
     179      defaultValue="${component.runtime-cp}"> 
     180      <regexp pattern="[^\:]*\/"/> 
     181    </propertyregex> 
     182    <propertyregex property="component.manifest-cp" 
     183      input="${component.manifest-cp-temp}" replace=" " 
     184      defaultValue="${component.manifest-cp-temp}"> 
     185      <regexp pattern=":"/> 
     186    </propertyregex> 
     187    <!--<echo>Manifest-Classpath: ${component.manifest-cp}</echo>--> 
    195188  </target> 
    196189 
  • trunk/components/bio-formats-auto/build.properties

    r4609 r4612  
    33# 
    44 
    5 # Ant properties file for Bio-Formats code generation framework. 
     5# Ant properties file for Bio-Formats code generator. 
    66# Download Apache Ant from http://ant.apache.org/. 
    77# Type "ant -p" for a list of targets. 
     
    1717                           **/*.vm 
    1818 
    19 component.manifest-main  = MetadataAutogen 
    20 component.manifest-cp    = loci-common.jar \ 
    21                            bio-formats.jar \ 
    22                            velocity-dep-1.5.jar 
     19component.main-class     = MetadataAutogen 
     20component.runtime-cp     = ${component.classpath} 
  • trunk/components/bio-formats-auto/build.xml

    r4609 r4612  
    22build.xml 
    33 
    4 Ant build file for Bio-Formats code generation framework. 
     4Ant build file for Bio-Formats code generator. 
    55Download Apache Ant from http://ant.apache.org/. 
    66Type "ant -p" for a list of targets. 
     
    99<project name="formats-auto" default="jar" basedir="."> 
    1010  <description> 
    11     Build file for Bio-Formats code generation framework 
     11    Build file for Bio-Formats code generator 
    1212  </description> 
    1313  <property file="base.properties"/> 
     
    1515  <property file="build.properties"/> 
    1616 
    17   <!-- CTR TODO FINISH THIS 
    18   <target name="autogen-meta" depends="jar" 
    19     description="autogenerate Bio-Formats metadata classes"> 
    20     <java classname="MetadataAutogen" 
    21       classpath="${component.classpath}" 
    22       fork="true" dir="${base.dir}/src/loci/formats"/> 
     17  <target name="gen-meta" depends="compile" 
     18    description="generate code for Bio-Formats metadata classes"> 
     19    <java classname="${component.main-class}" 
     20      classpath="${classes.dir}:${component.runtime-cp}" 
     21      fork="true" dir="${root.dir}/components/bio-formats/src/loci/formats"/> 
    2322  </target> 
    2423 
    25   <target name="autogen-ice" depends="jar" 
    26     description="autogenerate Bio-Formats Ice framework"> 
    27     <java classname="MetadataAutogen" 
    28       classpath="${auto.classpath}" 
    29       fork="true" dir="${base.dir}/../bio-formats-ice/src"> 
     24  <target name="gen-ice" depends="compile" 
     25    description="generate code for Bio-Formats Ice framework"> 
     26    <java classname="${component.main-class}" 
     27      classpath="${classes.dir}:${component.runtime-cp}" 
     28      fork="true" dir="${root.dir}/components/bio-formats-ice/src"> 
    3029      <arg value="-ice"/> 
    3130    </java> 
    3231  </target> 
    33   --> 
    3432 
    3533</project> 
  • trunk/components/bio-formats-ice/build.properties

    r4563 r4612  
    1515component.resources-text = (none) 
    1616 
    17 component.manifest-main  = loci.ice.formats.NoMainClassYet 
    18 component.manifest-cp    = bio-formats.jar \ 
    19                            Ice-3.2.1.jar 
     17component.main-class     = (none) 
     18component.runtime-cp     = ${component.classpath} 
  • trunk/components/bio-formats/build.properties

    r4609 r4612  
    1616component.resources-text = loci/formats/*.txt 
    1717 
    18 component.manifest-main  = loci.formats.gui.ImageViewer 
    19 component.manifest-cp    = loci-common.jar \ 
    20                            ome-xml.jar \ 
    21                            ome-io.jar \ 
    22                            ome-notes.jar \ 
    23                            poi-loci.jar \ 
    24                            mdbtools-java.jar \ 
    25                            jai_imageio.jar \ 
    26                            forms-1.0.4.jar \ 
    27                            netcdf-4.0.jar 
     18component.main-class     = loci.formats.gui.ImageViewer 
     19component.runtime-cp     = ${component.classpath}:\ 
     20                           ${artifact.dir}/ome-io.jar:\ 
     21                           ${artifact.dir}/ome-notes.jar:\ 
     22                           ${artifact.dir}/poi-loci.jar:\ 
     23                           ${artifact.dir}/mdbtools-java.jar:\ 
     24                           ${artifact.dir}/jai_imageio.jar:\ 
     25                           ${lib.dir}/netcdf-4.0.jar 
  • trunk/components/checkstyle/build.properties

    r4357 r4612  
    1414component.resources-text = loci/checks/messages.properties 
    1515 
    16 component.manifest-main  = loci.checks.About 
    17 component.manifest-cp    = checkstyle-all-4.2.jar 
     16component.main-class     = loci.checks.About 
     17component.runtime-cp     = ${component.classpath} 
  • trunk/components/common/build.properties

    r4521 r4612  
    1414component.resources-text = (none) 
    1515 
    16 component.manifest-main  = (none) 
    17 component.manifest-cp    = (none) 
     16component.main-class     = (none) 
     17component.runtime-cp     = (none) 
  • trunk/components/flow-cytometry/build.properties

    r4367 r4612  
    1616component.resources-text = (none) 
    1717 
    18 component.manifest-main  = loci.apps.flow.JVMLinkFlowCytometry 
    19 component.manifest-cp    = bio-formats.jar \ 
    20                            ij.jar \ 
    21                            visad-lite.jar 
     18component.main-class     = loci.apps.flow.JVMLinkFlowCytometry 
     19component.runtime-cp     = ${component.classpath} 
  • trunk/components/forks/jai/build.properties

    r4533 r4612  
    1414component.resources-text = (none) 
    1515 
    16 component.manifest-main  = (none) 
    17 component.manifest-cp    = clibwrapper_jiio.jar 
     16component.main-class     = (none) 
     17component.runtime-cp     = ${component.classpath} 
  • trunk/components/forks/mdbtools/build.properties

    r4431 r4612  
    1414component.resources-text = (none) 
    1515 
    16 component.manifest-main  = (none) 
    17 component.manifest-cp    = (none) 
     16component.main-class     = (none) 
     17component.runtime-cp     = (none) 
  • trunk/components/forks/poi/build.properties

    r4533 r4612  
    1515component.resources-text = (none) 
    1616 
    17 component.manifest-main  = (none) 
    18 component.manifest-cp    = loci-common.jar \ 
    19                            commons-logging.jar 
     17component.main-class     = (none) 
     18component.runtime-cp     = ${component.classpath} 
  • trunk/components/legacy/jvmlink/build.properties

    r4528 r4612  
    1414component.resources-text = (none) 
    1515 
    16 component.manifest-main  = loci.jvmlink.JVMLinkServer 
    17 component.manifest-cp    = loci-common.jar 
     16component.main-class     = loci.jvmlink.JVMLinkServer 
     17component.runtime-cp     = ${component.classpath} 
  • trunk/components/legacy/multi-lut/build.properties

    r4357 r4612  
    1414component.resources-text = (none) 
    1515 
    16 component.manifest-main  = loci.apps.MultiLUT 
    17 component.manifest-cp    = visad-lite.jar 
     16component.main-class     = loci.apps.MultiLUT 
     17component.runtime-cp     = ${component.classpath} 
  • trunk/components/legacy/ome-editor/build.properties

    r4533 r4612  
    1919                           loci/ome/editor/TypeDefs/** 
    2020 
    21 component.manifest-main  = loci.ome.editor.MetadataEditor 
    22 component.manifest-cp    = loci-common.jar \ 
    23                            ome-xml.jar \ 
    24                            bio-formats.jar \ 
    25                            forms-1.0.4.jar \ 
    26                            ome-java-deprecated.jar 
     21component.main-class     = loci.ome.editor.MetadataEditor 
     22component.runtime-cp     = ${component.classpath} 
  • trunk/components/legacy/ome-notes/build.properties

    r4533 r4612  
    1616component.resources-text = loci/ome/notes/templates/** 
    1717 
    18 component.manifest-main  = loci.ome.notes.Notes 
    19 component.manifest-cp    = loci-common.jar \ 
    20                            bio-formats.jar \ 
    21                            forms-1.0.4.jar \ 
    22                            ome-java-deprecated.jar 
     18component.main-class     = loci.ome.notes.Notes 
     19component.runtime-cp     = ${component.classpath}:\ 
     20                           ${lib.dir}/ome-java-deprecated.jar 
  • trunk/components/loci-plugins/build.properties

    r4533 r4612  
    1818                           loci/plugins/config/*.txt 
    1919 
    20 component.manifest-main  = loci.plugins.About 
    21 component.manifest-cp    = loci-common.jar \ 
    22                            bio-formats.jar \ 
    23                            ome-io.jar \ 
    24                            visbio.jar \ 
    25                            forms-1.0.4.jar \ 
    26                            ij.jar 
     20component.main-class     = loci.plugins.About 
     21component.runtime-cp     = ${component.classpath}:\ 
     22                           ${artifact.dir}/ome-io.jar:\ 
     23                           ${artifact.dir}/visbio.jar 
  • trunk/components/ome-io/build.properties

    r4533 r4612  
    1919component.resources-text = (none) 
    2020 
    21 component.manifest-main  = loci.ome.io.OMEWriter 
    22 component.manifest-cp    = loci-common.jar \ 
    23                            bio-formats.jar \ 
    24                            omero-client-3.0-Beta3.jar \ 
    25                            omero-common-3.0-Beta3.jar \ 
    26                            omero-importer-3.0-Beta3.jar \ 
    27                            omero-model-psql-3.0-Beta3.jar \ 
    28                            ome-java.jar 
     21component.main-class     = loci.ome.io.OMEWriter 
     22component.runtime-cp     = ${component.classpath}:\ 
     23                           ${lib.dir}/ome-java.jar 
  • trunk/components/ome-plugins/build.properties

    r4533 r4612  
    1818component.resources-text = plugins.config 
    1919 
    20 component.manifest-main  = loci.plugins.ome.About 
    21 component.manifest-cp    = loci-common.jar \ 
    22                            bio-formats.jar \ 
    23                            loci_plugins.jar \ 
    24                            ome-io.jar \ 
    25                            ij.jar 
     20component.main-class     = loci.plugins.ome.About 
     21component.runtime-cp     = ${component.classpath} 
  • trunk/components/ome-xml/build.properties

    r4361 r4612  
    1414component.resources-text = (none) 
    1515 
    16 component.manifest-main  = ome.xml.About 
    17 component.manifest-cp    = (none) 
     16component.main-class     = ome.xml.About 
     17component.runtime-cp     = (none) 
  • trunk/components/slim-plotter/build.properties

    r4533 r4612  
    1818component.resources-text = (none) 
    1919 
    20 component.manifest-main  = loci.slim.SlimPlotter 
    21 component.manifest-cp    = loci-common.jar \ 
    22                            bio-formats.jar \ 
    23                            visbio.jar \ 
    24                            lma.jar \ 
    25                            visad-lite.jar 
     20component.main-class     = loci.slim.SlimPlotter 
     21component.runtime-cp     = ${component.classpath} 
    2622 
    2723slim.dist-dir  = ${dist.dir}/SlimPlotter 
  • trunk/components/test-suite/build.properties

    r4611 r4612  
    2525component.resources-text = (none) 
    2626 
    27 component.manifest-main  = (TODO) 
    28 component.manifest-cp    = loci-common.jar \ 
    29                            bio-formats.jar \ 
    30                            testng-5.7-jdk14.jar 
     27component.main-class     = (none) 
     28component.runtime-cp     = ${component.classpath} 
  • trunk/components/test-suite/build.xml

    r4449 r4612  
    2121    description="run all automated tests"> 
    2222    <testng sourcedir="${dest.dir}" 
    23       classpath="${component.classpath}:${classes.dir}" 
     23      classpath="${classes.dir}:${component.classpath}" 
    2424      annotations="Javadoc" groups="all" testname="All tests" 
    2525      listener="loci.tests.testng.DotTestListener" 
     
    3737    description="generate config files for automated test suite"> 
    3838    <testng sourcedir="${dest.dir}" 
    39       classpath="${component.classpath}:${classes.dir}" 
     39      classpath="${classes.dir}:${component.classpath}" 
    4040      annotations="Javadoc" groups="config" testname="Config generation" 
    4141      listener="loci.tests.testng.DotTestListener" 
     
    5353    description="run automated tests in group 'fast'"> 
    5454    <testng sourcedir="${dest.dir}" 
    55       classpath="${component.classpath}:${classes.dir}" 
     55      classpath="${classes.dir}:${component.classpath}" 
    5656      annotations="Javadoc" groups="fast" testname="Fast tests" 
    5757      listener="loci.tests.testng.DotTestListener" 
     
    6969    description="run automated tests in group 'pixels'"> 
    7070    <testng sourcedir="${dest.dir}" 
    71       classpath="${component.classpath}:${classes.dir}" 
     71      classpath="${classes.dir}:${component.classpath}" 
    7272      annotations="Javadoc" groups="pixels" testname="Pixels tests" 
    7373      listener="loci.tests.testng.DotTestListener" 
     
    8585    description="run automated tests in group 'xml'"> 
    8686    <testng sourcedir="${dest.dir}" 
    87       classpath="${component.classpath}:${classes.dir}" 
     87      classpath="${classes.dir}:${component.classpath}" 
    8888      annotations="Javadoc" groups="xml" testname="XML tests" 
    8989      listener="loci.tests.testng.DotTestListener" 
  • trunk/components/visbio/build.properties

    r4533 r4612  
    2525                           loci/visbio/help/*.html 
    2626 
    27 component.manifest-main  = loci.visbio.VisBio 
    28 component.manifest-cp    = loci-common.jar \ 
    29                            ome-xml.jar \ 
    30                            bio-formats.jar \ 
    31                            ome-io.jar \ 
    32                            poi-loci.jar \ 
    33                            AppleJavaExtensions.jar \ 
    34                            forms-1.0.4.jar \ 
    35                            ij.jar \ 
    36                            looks-1.2.2.jar \ 
    37                            visad-lite.jar 
     27component.main-class     = loci.visbio.VisBio 
     28component.runtime-cp     = ${component.classpath} 
    3829 
    3930# CTR TODO - fix dist targets 
  • trunk/scan-deps.pl

    r4609 r4612  
    4949my %bioFormatsAuto = ( 
    5050  NAME    => "bio-formats-auto", 
    51   TITLE   => "Bio-Formats code generation framework", 
     51  TITLE   => "Bio-Formats code generator", 
    5252  PATH    => "components/bio-formats-auto", 
    5353  JAR     => "bio-formats-auto.jar", 
    54   PACKAGE => "loci.formats.auto", 
     54  PACKAGE => "(none)", 
    5555  DESC    => <<ZZ, 
    5656Code that generates the Bio-Formats metadata API, related documentation and Ice 
     
    340340  URL     => "http://checkstyle.sourceforge.net/", 
    341341  NOTES   => <<ZZ, 
    342 used by style targets to check source code style conventions 
     342used by style Ant target to check source code style conventions 
    343343ZZ 
    344344); 
     
    830830      $inCompile = 1; 
    831831    } 
    832     elsif ($line =~ /^component.manifest-cp/) { 
     832    elsif ($line =~ /^component.runtime-cp/) { 
    833833      # found the runtime classpath variable 
    834834      $inManifest = 1; 
     
    844844        } 
    845845        elsif ($inManifest) { 
    846           push(@runtime, $line); 
     846          if ($line =~ /\${component.classpath}/) { 
     847            push(@runtime, @compile); 
     848          } 
     849          else { 
     850            push(@runtime, $line); 
     851          } 
    847852        } 
    848853      } 
     
    889894 
    890895  # verify compile-time classpath 
    891   my @deps = (@projDeps, @libDeps); 
     896  my @deps = (); 
     897  foreach my $dep (@projDeps) { 
     898    push(@deps, "\${artifact.dir}/$$dep{JAR}"); 
     899  } 
     900  foreach my $dep (@libDeps) { 
     901    push(@deps, "\${lib.dir}/$$dep{JAR}"); 
     902  } 
    892903  my @cp = @{$$c{COMPILE}}; 
    893904  my $compileError = 0; 
     
    898909  else { 
    899910    for (my $i = 0; $i < @cp; $i++) { 
    900       my $dep = $deps[$i]; 
     911      my $depJar = $deps[$i]; 
    901912      my $cpJar = $cp[$i]; 
    902       my $prefix = $i < @projDeps ? '${artifact.dir}' : '${lib.dir}'; 
    903       my $depJar = "$prefix/$$dep{JAR}"; 
    904913      if ($cpJar ne $depJar) { 
    905914        print STDERR "Dependency mismatch for $name compile time classpath:\n"; 
     
    924933 
    925934  # verify Eclipse classpath 
    926   # tweak list of dependencies 
    927935  @deps = (); 
    928936  foreach my $dep (@projDeps) { 
    929     push(@deps, "/" . $$dep{NAME}); 
     937    push(@deps, "/$$dep{NAME}"); 
    930938  } 
    931939  foreach my $dep (@libDeps) { 
    932     push(@deps, "LOCI_JARS/" . $$dep{JAR}); 
     940    push(@deps, "LOCI_JARS/$$dep{JAR}"); 
    933941  } 
    934942  push(@deps, "build/classes"); 
     
    968976 
    969977  # verify runtime classpath 
    970   @deps = (@projDeps, @projOpt, @libDeps, @libOpt); 
     978  @deps = (); 
     979  foreach my $dep (@projDeps) { 
     980    push(@deps, "\${artifact.dir}/$$dep{JAR}"); 
     981  } 
     982  foreach my $dep (@libDeps) { 
     983    push(@deps, "\${lib.dir}/$$dep{JAR}"); 
     984  } 
     985  foreach my $dep (@projOpt) { 
     986    push(@deps, "\${artifact.dir}/$$dep{JAR}"); 
     987  } 
     988  foreach my $dep (@libOpt) { 
     989    push(@deps, "\${lib.dir}/$$dep{JAR}"); 
     990  } 
    971991  @cp = @{$$c{RUNTIME}}; 
    972992  my $runtimeError = 0; 
     
    977997  else { 
    978998    for (my $i = 0; $i < @cp; $i++) { 
    979       my $dep = $deps[$i]; 
     999      my $depJar = $deps[$i]; 
    9801000      my $cpJar = $cp[$i]; 
    981       my $depJar = $$dep{JAR}; 
    9821001      if ($cpJar ne $depJar) { 
    9831002        print STDERR "Dependency mismatch for $name runtime classpath:\n"; 
     
    9891008  } 
    9901009  if ($runtimeError) { 
    991     print STDERR "  project deps          ="; 
     1010    print STDERR "  project deps         ="; 
    9921011    foreach my $q (@projDeps) { 
    9931012      print STDERR " $$q{NAME}"; 
    9941013    } 
    995     print STDERR "\n  reflected projects    ="; 
     1014    print STDERR "\n  reflected projects   ="; 
    9961015    foreach my $q (@projOpt) { 
    9971016      print STDERR " $$q{NAME}"; 
    9981017    } 
    999     print STDERR "\n  library deps          ="; 
     1018    print STDERR "\n  library deps         ="; 
    10001019    foreach my $q (@libDeps) { 
    10011020      print STDERR " $$q{NAME}"; 
    10021021    } 
    1003     print STDERR "\n  reflected libraries   ="; 
     1022    print STDERR "\n  reflected libraries  ="; 
    10041023    foreach my $q (@libOpt) { 
    10051024      print STDERR " $$q{NAME}"; 
    10061025    } 
    1007     print STDERR "\n  component.manifest-cp = @cp\n"; 
     1026    print STDERR "\n  component.runtime-cp = @cp\n"; 
    10081027    print STDERR "\n"; 
    10091028  } 
Note: See TracChangeset for help on using the changeset viewer.