Changeset 5643


Ignore:
Timestamp:
10/28/09 12:30:49 (10 years ago)
Author:
curtis
Message:

Split out OSGi generation into its own target.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r5598 r5643  
    422422      jar-ome-notes, jar-ome-editor" 
    423423    description="generate JAR files for LOCI software packages"/> 
     424 
     425  <target name="osgi" 
     426    depends="copy-jars, osgi-common, osgi-ome-xml, 
     427      osgi-jai, osgi-poi-loci, osgi-mdbtools, 
     428      osgi-formats, osgi-autogen, osgi-bf-ice, 
     429      osgi-loci-plugins, osgi-ome-io, osgi-ome-plugins, 
     430      osgi-visbio, osgi-slim, osgi-flow, 
     431      osgi-checks, osgi-tests, 
     432      osgi-jvmlink, osgi-multi-lut, 
     433      osgi-ome-notes, osgi-ome-editor" 
     434    description="generate OSGi bundles for LOCI software packages"/> 
    424435 
    425436  <!-- 
     
    460471    depends="jars, utils-common, utils-formats, utils-loci-plugins" 
    461472    description="compile all extra utilities"> 
     473    <echo>----------=========== utils ===========----------</echo> 
    462474    <delete> 
    463475      <fileset dir="${toplevel-utils.dir}" includes="*.class"/> 
     
    474486 
    475487  <target name="docs" depends="jars" 
    476     description="generate javadocs for LOCI software packages"> 
     488    description="generate Javadocs for LOCI software packages"> 
     489    <echo>----------=========== Javadocs ===========----------</echo> 
    477490    <tstamp> 
    478491      <format property="YEAR" pattern="yyyy"/> 
     
    515528  </target> 
    516529 
     530  <target name="osgi-common" depends="jar-common" 
     531    description="generate OSGi bundle for LOCI common library"> 
     532    <ant dir="components/common" target="common.osgi"/> 
     533  </target> 
     534 
    517535  <target name="findbugs-common" 
    518536    description="run findbugs on LOCI common library"> 
     
    540558    description="generate JAR file for JAI Image I/O Tools library"> 
    541559    <ant dir="components/forks/jai" target="jai.jar"/> 
     560  </target> 
     561 
     562  <target name="osgi-jai" depends="jar-jai" 
     563    description="generate OSGi bundle for JAI Image I/O Tools library"> 
     564    <ant dir="components/forks/jai" target="jai.osgi"/> 
    542565  </target> 
    543566 
     
    566589  </target> 
    567590 
     591  <target name="osgi-poi-loci" depends="jar-poi-loci" 
     592    description="generate OSGi bundle for Apache POI library"> 
     593    <ant dir="components/forks/poi" target="poi-loci.osgi"/> 
     594  </target> 
     595 
    568596  <target name="findbugs-poi-loci" 
    569597    description="run findbugs on Apache POI library"> 
     
    589617  </target> 
    590618 
     619  <target name="osgi-mdbtools" depends="jar-mdbtools" 
     620    description="generate OSGi bundle for MDB Tools Java library"> 
     621    <ant dir="components/forks/mdbtools" target="mdbtools.osgi"/> 
     622  </target> 
     623 
    591624  <target name="findbugs-mdbtools" 
    592625    description="run findbugs on MDB Tools Java library"> 
     
    609642    description="generate JAR file for OME-XML Java library"> 
    610643    <ant dir="components/ome-xml" target="ome-xml.jar"/> 
     644  </target> 
     645 
     646  <target name="osgi-ome-xml" depends="jar-ome-xml" 
     647    description="generate OSGi bundle for OME-XML Java library"> 
     648    <ant dir="components/ome-xml" target="ome-xml.osgi"/> 
    611649  </target> 
    612650 
     
    635673  </target> 
    636674 
     675  <target name="osgi-formats" depends="jar-formats" 
     676    description="generate OSGi bundle for Bio-Formats"> 
     677    <ant dir="components/bio-formats" target="formats.osgi"/> 
     678  </target> 
     679 
    637680  <target name="findbugs-formats" 
    638681    description="run findbugs on Bio-Formats"> 
     
    665708  </target> 
    666709 
     710  <target name="osgi-autogen" depends="jar-autogen" 
     711    description="generate OSGi bundle for LOCI autogen"> 
     712    <ant dir="components/autogen" target="autogen.osgi"/> 
     713  </target> 
     714 
    667715  <target name="findbugs-autogen" 
    668716    description="run findbugs on LOCI autogen"> 
     
    690738  </target> 
    691739 
     740  <target name="osgi-bf-ice" depends="jar-bf-ice" 
     741    description="generate OSGi bundle for Bio-Formats Ice framework"> 
     742    <ant dir="components/bf-ice" target="bf-ice.osgi"/> 
     743  </target> 
     744 
    692745  <target name="findbugs-bf-ice" 
    693746    description="run findbugs on Bio-Formats Ice framework"> 
     
    715768  </target> 
    716769 
     770  <target name="osgi-loci-plugins" depends="jar-loci-plugins" 
     771    description="generate OSGi bundle for LOCI Plugins for ImageJ"> 
     772    <ant dir="components/loci-plugins" target="loci-plugins.osgi"/> 
     773  </target> 
     774 
    717775  <target name="findbugs-loci-plugins" 
    718776    description="run findbugs on LOCI Plugins for ImageJ"> 
     
    743801    description="generate JAR file for OME I/O"> 
    744802    <ant dir="components/ome-io" target="ome-io.jar"/> 
     803  </target> 
     804 
     805  <target name="osgi-ome-io" depends="jar-ome-io" 
     806    description="generate OSGi bundle for OME I/O"> 
     807    <ant dir="components/ome-io" target="ome-io.osgi"/> 
    745808  </target> 
    746809 
     
    771834  </target> 
    772835 
     836  <target name="osgi-ome-plugins" depends="jar-ome-plugins" 
     837    description="generate OSGi bundle for OME Plugins for ImageJ"> 
     838    <ant dir="components/ome-plugins" target="ome-plugins.osgi"/> 
     839  </target> 
     840 
    773841  <target name="findbugs-ome-plugins" 
    774842    description="run findbugs on OME Plugins for ImageJ"> 
     
    797865  </target> 
    798866 
     867  <target name="osgi-visbio" depends="jar-visbio" 
     868    description="generate OSGi bundle for VisBio"> 
     869    <ant dir="components/visbio" target="visbio.osgi"/> 
     870  </target> 
     871 
    799872  <target name="findbugs-visbio" 
    800873    description="run findbugs on VisBio"> 
     
    853926  </target> 
    854927 
     928  <target name="osgi-slim" depends="jar-slim" 
     929    description="generate OSGi bundle for SLIM Plotter"> 
     930    <ant dir="components/slim-plotter" target="slim.osgi"/> 
     931  </target> 
     932 
    855933  <target name="findbugs-slim" 
    856934    description="run findbugs on SLIM Plotter"> 
     
    883961  </target> 
    884962 
     963  <target name="osgi-flow" depends="jar-flow" 
     964    description="generate OSGi bundle for WiscScan Flow Cytometry"> 
     965    <ant dir="components/flow-cytometry" target="flow.osgi"/> 
     966  </target> 
     967 
    885968  <target name="findbugs-flow" 
    886969    description="run findbugs on WiscScan Flow Cytometry"> 
     
    911994  </target> 
    912995 
     996  <target name="osgi-checks" depends="jar-checks" 
     997    description="generate OSGi bundle for LOCI Checkstyle checks"> 
     998    <ant dir="components/checkstyle" target="checks.osgi"/> 
     999  </target> 
     1000 
    9131001  <target name="findbugs-checks" 
    9141002    description="run findbugs on LOCI Checkstyle checks"> 
     
    9351023  </target> 
    9361024 
     1025  <target name="osgi-tests" depends="jar-tests" 
     1026    description="generate OSGi bundle for LOCI testing framework"> 
     1027    <ant dir="components/test-suite" target="tests.osgi"/> 
     1028  </target> 
     1029 
    9371030  <target name="findbugs-tests" 
    9381031    description="run findbugs on LOCI testing framework"> 
     
    9601053  </target> 
    9611054 
     1055  <target name="osgi-jvmlink" depends="jar-jvmlink" 
     1056    description="generate OSGi bundle for JVMLink"> 
     1057    <ant dir="components/legacy/jvmlink" target="jvmlink.osgi"/> 
     1058  </target> 
     1059 
    9621060  <target name="findbugs-jvmlink" 
    9631061    description="run findbugs on JVMLink"> 
     
    9831081  </target> 
    9841082 
     1083  <target name="osgi-multi-lut" depends="jar-multi-lut" 
     1084    description="generate OSGi bundle for Multi LUT app"> 
     1085    <ant dir="components/legacy/multi-lut" target="multi-lut.osgi"/> 
     1086  </target> 
     1087 
    9851088  <target name="findbugs-multi-lut" 
    9861089    description="run findbugs on Multi LUT app"> 
     
    10071110  </target> 
    10081111 
     1112  <target name="osgi-ome-notes" depends="jar-ome-notes" 
     1113    description="generate OSGi bundle for OME Notes"> 
     1114    <ant dir="components/legacy/ome-notes" target="ome-notes.osgi"/> 
     1115  </target> 
     1116 
    10091117  <target name="findbugs-ome-notes" 
    10101118    description="run findbugs for OME Notes"> 
     
    10321140  </target> 
    10331141 
     1142  <target name="osgi-ome-editor" depends="jar-ome-editor" 
     1143    description="generate OSGi bundle for OME Metadata Editor"> 
     1144    <ant dir="components/legacy/ome-editor" target="ome-editor.osgi"/> 
     1145  </target> 
     1146 
    10341147  <target name="findbugs-ome-editor" 
    10351148    description="run findbugs on OME Metadata Editor"> 
     
    10491162    jar-ome-xml, jar-formats, jar-loci-plugins" 
    10501163    description="create JAR file encompassing several LOCI tools"> 
     1164    <echo>----------=========== loci_tools ===========----------</echo> 
    10511165    <for list="${loci-tools.libraries}" param="jar" delimiter=" " trim="true"> 
    10521166      <sequential> 
     
    10681182  <target name="tools-ome" depends="jar-ome-io, jar-ome-plugins" 
    10691183    description="create JAR file encompassing several OME tools"> 
     1184    <echo>----------=========== ome_tools ===========----------</echo> 
    10701185    <for list="${ome-tools.libraries}" param="jar" delimiter=" " trim="true"> 
    10711186      <sequential> 
  • trunk/components/java.xml

    r5598 r5643  
    7171--> 
    7272    </jar> 
     73  </target> 
     74 
     75  <target name="osgi" depends="jar" 
     76    description="inject OSGi bundle information"> 
    7377    <!-- NB: Add OSGi bundle metadata. --> 
    74     <echo>Injecting OSGi bundle information...</echo> 
    7578    <bundle outputDir="${artifact.dir}" 
    7679      bundleName="${component.name}" 
     
    141144 
    142145  <target name="init" 
    143     depends="init-timestamp, init-revision, init-release, init-manifest-cp"/> 
     146    depends="init-timestamp, init-revision, init-release, init-manifest-cp"> 
     147    <echo>----------=========== ${component.name} ===========----------</echo> 
     148  </target> 
    144149 
    145150  <target name="init-manifest-cp"> 
Note: See TracChangeset for help on using the changeset viewer.