Changeset 5551


Ignore:
Timestamp:
10/06/09 15:42:53 (11 years ago)
Author:
curtis
Message:

Fix up Ant build system; add OSGi bundle export to JAR production.

Location:
trunk
Files:
3 added
21 deleted
45 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/build.properties

    r5508 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
    9 # directory containing third party libraries 
    10 shared-lib.dir      = jar 
    11  
    12 # directory where build scripts place the libraries they create 
    13 shared-artifact.dir = artifacts 
    14  
    159### Javadoc generation ### 
    1610 
    17 merged-docs.classpath = ${shared-lib.dir}/AppleJavaExtensions.jar:\ 
    18                         ${shared-lib.dir}/Ice-3.2.1.jar:\ 
    19                         ${shared-lib.dir}/checkstyle-all-4.2.jar:\ 
    20                         ${shared-lib.dir}/forms-1.0.4.jar:\ 
    21                         ${shared-lib.dir}/looks-1.2.2.jar:\ 
    22                         ${shared-lib.dir}/ij.jar:\ 
    23                         ${shared-lib.dir}/ome-java.jar:\ 
    24                         ${shared-lib.dir}/ome-java-deprecated.jar:\ 
    25                         ${shared-lib.dir}/omero-client-4.0.3.jar:\ 
    26                         ${shared-lib.dir}/omero-common-4.0.3.jar:\ 
    27                         ${shared-lib.dir}/testng-5.7-jdk14.jar:\ 
    28                         ${shared-lib.dir}/visad-lite.jar 
     11merged-docs.classpath = ${lib.dir}/AppleJavaExtensions.jar:\ 
     12                        ${lib.dir}/Ice-3.2.1.jar:\ 
     13                        ${lib.dir}/checkstyle-all-4.2.jar:\ 
     14                        ${lib.dir}/forms-1.0.4.jar:\ 
     15                        ${lib.dir}/looks-1.2.2.jar:\ 
     16                        ${lib.dir}/ij.jar:\ 
     17                        ${lib.dir}/ome-java.jar:\ 
     18                        ${lib.dir}/ome-java-deprecated.jar:\ 
     19                        ${lib.dir}/omero-client-4.0.3.jar:\ 
     20                        ${lib.dir}/omero-common-4.0.3.jar:\ 
     21                        ${lib.dir}/testng-5.7-jdk14.jar:\ 
     22                        ${lib.dir}/visad-lite.jar 
    2923merged-docs.dir       = build/docs 
    3024merged-docs.source    = components/bio-formats/build/src:\ 
     
    5044### LOCI Tools bundle ### 
    5145 
    52 loci-tools.jar       = ${shared-artifact.dir}/loci_tools.jar 
     46loci-tools.jar       = ${artifact.dir}/loci_tools.jar 
    5347loci-tools.main      = loci.formats.gui.ImageViewer 
    5448loci-tools.dir       = loci-tools 
     
    6963### OME Tools bundle ### 
    7064 
    71 ome-tools.jar       = ${shared-artifact.dir}/ome_tools.jar 
     65ome-tools.jar       = ${artifact.dir}/ome_tools.jar 
    7266ome-tools.main      = loci.plugins.ome.About 
    7367ome-tools.dir       = ome-tools 
  • trunk/build.xml

    r5508 r5551  
    291291    URL:       http://rsb.info.nih.gov/ij/ 
    292292    Notes:     used by LOCI plugins for ImageJ and OME plugins for ImageJ; 
    293                bundled with VisBio to achieve ImageJ interconnectivity 
     293               included with VisBio to achieve ImageJ interconnectivity 
    294294    License:   Public domain 
    295295 
     
    406406  </description> 
    407407 
    408   <property file="${user.home}/.ant-global.properties"/> 
    409   <property file="global.properties"/> 
     408  <property name="root.dir" location="${basedir}"/> 
     409  <import file="global.xml"/> 
    410410  <property file="build.properties"/> 
    411  
    412   <!-- Non-core ant tasks --> 
    413  
    414   <taskdef resource="net/sf/antcontrib/antcontrib.properties" 
    415     classpath="${shared-lib.dir}/ant-contrib-1.0b1.jar"/> 
    416   <!-- HACK - some environments do not install the antcontrib tasks properly 
    417   from antcontrib.properties above; also load them from antlib.xml --> 
    418   <taskdef resource="net/sf/antcontrib/antlib.xml" 
    419     classpath="${shared-lib.dir}/ant-contrib-1.0b1.jar"/> 
    420411 
    421412  <!-- Global build targets --> 
     
    462453      clean-ome-notes, clean-ome-editor" 
    463454    description="remove all build files"> 
    464     <delete dir="${shared-artifact.dir}"/> 
     455    <delete dir="${artifact.dir}"/> 
    465456    <delete dir="build"/> 
    466457  </target> 
     
    491482    <!-- copy third party JARs into artifacts folder --> 
    492483    <!-- necessary for runtime classpath dependencies to function properly --> 
    493     <copy todir="${shared-artifact.dir}" preservelastmodified="true"> 
    494       <fileset dir="${shared-lib.dir}" includes="*.jar"/> 
     484    <copy todir="${artifact.dir}" preservelastmodified="true"> 
     485      <fileset dir="${lib.dir}" includes="*.jar"/> 
    495486    </copy> 
    496487  </target> 
     
    789780 
    790781  <target name="dist-visbio" 
    791     description="create distribution bundles for VisBio"> 
     782    description="create distribution archives for VisBio"> 
    792783    <ant dir="components/visbio" target="dist"/> 
    793784  </target> 
    794785 
    795786  <target name="dist-visbio-win32" 
    796     description="create distribution bundle for VisBio: Windows w/ JRE"> 
     787    description="create distribution archive for VisBio: Windows w/ JRE"> 
    797788    <ant dir="components/visbio" target="dist-win32"/> 
    798789  </target> 
    799790 
    800791  <target name="dist-visbio-win32-nojre" 
    801     description="create distribution bundle for VisBio: Windows no JRE"> 
     792    description="create distribution archive for VisBio: Windows no JRE"> 
    802793    <ant dir="components/visbio" target="dist-win32-nojre"/> 
    803794  </target> 
    804795 
    805796  <target name="dist-visbio-macosx" 
    806     description="create distribution bundle for VisBio: Mac OS X"> 
     797    description="create distribution archive for VisBio: Mac OS X"> 
    807798    <ant dir="components/visbio" target="dist-macosx"/> 
    808799  </target> 
    809800 
    810801  <target name="dist-visbio-linux" 
    811     description="create distribution bundle for VisBio: Linux w/ JRE"> 
     802    description="create distribution archive for VisBio: Linux w/ JRE"> 
    812803    <ant dir="components/visbio" target="dist-linux"/> 
    813804  </target> 
    814805 
    815806  <target name="dist-visbio-nojre" 
    816     description="create distribution bundle for VisBio: cross-platform"> 
     807    description="create distribution archive for VisBio: cross-platform"> 
    817808    <ant dir="components/visbio" target="dist-nojre"/> 
    818809  </target> 
     
    844835 
    845836  <target name="dist-slim" 
    846     description="create distribution bundle for SLIM Plotter"> 
     837    description="create distribution archive for SLIM Plotter"> 
    847838    <ant dir="components/slim-plotter" target="dist"/> 
    848839  </target> 
     
    874865 
    875866  <target name="dist-flow" 
    876     description="create distribution bundle for WiscScan Flow Cytometry"> 
     867    description="create distribution archive for WiscScan Flow Cytometry"> 
    877868    <ant dir="components/flow-cytometry" target="dist"/> 
    878869  </target> 
     
    10221013  </target> 
    10231014 
    1024   <!-- Tool bundles --> 
     1015  <!-- Tool collections --> 
    10251016 
    10261017  <target name="tools" depends="copy-jars, jar-common, 
     
    10301021    <for list="${loci-tools.libraries}" param="jar" delimiter=" " trim="true"> 
    10311022      <sequential> 
    1032         <unjar src="${shared-artifact.dir}/@{jar}" dest="${loci-tools.dir}"> 
     1023        <unjar src="${artifact.dir}/@{jar}" dest="${loci-tools.dir}"> 
    10331024          <patternset> 
    10341025            <exclude name="META-INF/**"/> 
     
    10491040    <for list="${ome-tools.libraries}" param="jar" delimiter=" " trim="true"> 
    10501041      <sequential> 
    1051         <unjar src="${shared-artifact.dir}/@{jar}" dest="${ome-tools.dir}"> 
     1042        <unjar src="${artifact.dir}/@{jar}" dest="${ome-tools.dir}"> 
    10521043          <patternset> 
    10531044            <exclude name="META-INF/**"/> 
  • trunk/components/autogen/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = loci-autogen 
    910component.jar            = loci-autogen.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1113                           ${artifact.dir}/bio-formats.jar:\ 
  • trunk/components/autogen/build.xml

    r5490 r5551  
    88 
    99<project name="autogen" default="jar" basedir="."> 
    10   <description> 
    11     Build file for LOCI code generators 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Build file for LOCI code generators</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    1614 
  • trunk/components/bf-ice/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = bf-ice 
    910component.jar            = bf-ice.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1113                           ${artifact.dir}/bio-formats.jar:\ 
  • trunk/components/bf-ice/build.xml

    r5479 r5551  
    88 
    99<project name="bf-ice" default="jar" basedir="."> 
    10   <description> 
    11     Build file for Bio-Formats Ice framework 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Build file for Bio-Formats Ice framework</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    1614</project> 
  • trunk/components/bio-formats/build.properties

    r5528 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = bio-formats 
    910component.jar            = bio-formats.jar 
     11component.version        = 4.0.1 
    1012component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1113                           ${artifact.dir}/ome-xml.jar:\ 
  • trunk/components/bio-formats/build.xml

    r4822 r5551  
    88 
    99<project name="formats" default="jar" basedir="."> 
    10   <description> 
    11     Build file for Bio-Formats project 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Build file for Bio-Formats project</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    16  
    1714</project> 
  • trunk/components/checkstyle/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = loci-checks 
    910component.jar            = loci-checks.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = ${lib.dir}/checkstyle-all-4.2.jar 
    1113component.java-version   = 1.4 
  • trunk/components/checkstyle/build.xml

    r4822 r5551  
    88 
    99<project name="checks" default="jar" basedir="."> 
    10   <description> 
    11     Build file for LOCI Checkstyle checks project 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Build file for LOCI Checkstyle checks project</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    1614</project> 
  • trunk/components/common.properties

    r4859 r5551  
    99### Globals ### 
    1010 
    11 # directory containing third party libraries 
    12 lib.dir      = ${root.dir}/jar 
    13  
    14 # directory where build scripts place the libraries they create 
    15 artifact.dir = ${root.dir}/artifacts 
    16  
    1711# directory containing program source code 
    18 src.dir      = ${base.dir}/src 
     12src.dir      = ${basedir}/src 
    1913 
    2014# working directory to use for transient build files 
    21 build.dir    = ${base.dir}/build 
     15build.dir    = ${basedir}/build 
    2216 
    2317# build subdirectory for filtered source code 
  • trunk/components/common.xml

    r5502 r5551  
    33 
    44Ant build file for logic common to every component. 
     5All component build files inherit from this build file. 
    56Download Apache Ant from http://ant.apache.org/. 
    67Type "ant -p" for a list of targets. 
     
    89 
    910<project> 
    10   <property file="${user.home}/.ant-global.properties"/> 
    11   <property file="${root.dir}/global.properties"/> 
    12   <property file="${root.dir}/common.properties"/> 
    13  
    14   <condition property="isUnix"> 
    15     <os family="unix"/> 
    16   </condition> 
    17   <condition property="isMac"> 
    18     <and> 
    19       <os family="mac"/> 
    20       <os family="unix"/> 
    21     </and> 
    22   </condition> 
    23   <condition property="isWindows"> 
    24     <os family="windows"/> 
    25   </condition> 
    26  
    27   <!-- 
    28   Guess location of the Java runtime classes, saving to jre.runtime property. 
    29   Stolen and adapted from: 
    30     http://forums.gamegardens.com/discussion/mvnforum/viewthread?thread=324 
    31   --> 
    32   <!-- if Mac OS X --> 
    33   <property name="jre.macosx.classes" 
    34     value="/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar"/> 
    35   <property name="jre.macosx.ui" 
    36     value="/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar"/> 
    37   <condition property="jre.runtime" 
    38     value="${jre.macosx.classes}:${jre.macosx.ui}"> 
    39     <isset property="isMac"/> 
    40   </condition> 
    41   <!-- Default for Unix --> 
    42   <property name="jre.runtime" value="${java.home}/lib/rt.jar"/> 
    43  
    44   <!-- Non-core ant tasks --> 
    45  
    46   <taskdef resource="net/sf/antcontrib/antcontrib.properties" 
    47     classpath="${lib.dir}/ant-contrib-1.0b1.jar"/> 
    48   <!-- HACK - some environments do not install the antcontrib tasks properly 
    49     from antcontrib.properties above; also load them from antlib.xml --> 
    50   <taskdef resource="net/sf/antcontrib/antlib.xml" 
    51     classpath="${lib.dir}/ant-contrib-1.0b1.jar"/> 
     11  <import file="${root.dir}/global.xml"/> 
     12  <property file="${root.dir}/components/common.properties"/> 
    5213 
    5314  <!-- Main build targets --> 
     
    7839        <exec executable="svn" outputproperty="svn.log" 
    7940          failifexecutionfails="false"> 
    80           <arg line="info ${base.dir}"/> 
     41          <arg line="info ${basedir}"/> 
    8142        </exec> 
    8243        <if> 
     
    9758    <exec executable="svn" outputproperty="release.version" 
    9859      failifexecutionfails="false"> 
    99       <arg line="info ${base.dir}"/> 
     60      <arg line="info ${basedir}"/> 
    10061    </exec> 
    10162    <propertyregex property="svn.root" input="${release.version}" select="\1"> 
  • trunk/components/common/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = loci-common 
    910component.jar            = loci-common.jar 
     11component.version        = 4.0.1 
    1012component.classpath      = 
    1113component.java-version   = 1.5 
  • trunk/components/common/build.xml

    r4822 r5551  
    88 
    99<project name="common" default="jar" basedir="."> 
    10   <description> 
    11     Common classes used by various LOCI projects 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Common classes used by various LOCI projects</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    1614</project> 
  • trunk/components/flow-cytometry/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = flow-cytometry 
    910component.jar            = flow-cytometry.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = ${artifact.dir}/bio-formats.jar:\ 
    1113                           ${lib.dir}/ij.jar:\ 
  • trunk/components/flow-cytometry/build.xml

    r5414 r5551  
    88 
    99<project name="flow" default="jar" basedir="."> 
    10   <description> 
    11     Build file for WiscScan Flow Cytometry project 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Build file for WiscScan Flow Cytometry project</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    1614 
  • trunk/components/forks/jai/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = jai_imageio 
    910component.jar            = jai_imageio.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = ${lib.dir}/clibwrapper_jiio.jar 
    1113component.java-version   = 1.4 
  • trunk/components/forks/jai/build.xml

    r4822 r5551  
    1111    Slightly modified version of the JAI ImageIO project 
    1212  </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     13  <property name="root.dir" location="../../.."/> 
     14  <import file="${root.dir}/components/java.xml"/> 
    1515  <property file="build.properties"/> 
    1616</project> 
  • trunk/components/forks/mdbtools/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = mdbtools-java 
    910component.jar            = mdbtools-java.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = 
    1113component.java-version   = 1.4 
  • trunk/components/forks/mdbtools/build.xml

    r4822 r5551  
    1111    LOCI's fork of the Java MDB Tools project 
    1212  </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     13  <property name="root.dir" location="../../.."/> 
     14  <import file="${root.dir}/components/java.xml"/> 
    1515  <property file="build.properties"/> 
    1616</project> 
  • trunk/components/forks/poi/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = poi-loci 
    910component.jar            = poi-loci.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1113                           ${lib.dir}/commons-logging.jar 
  • trunk/components/forks/poi/build.xml

    r4822 r5551  
    1111    LOCI's fork of the Apache POI project 
    1212  </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     13  <property name="root.dir" location="../../.."/> 
     14  <import file="${root.dir}/components/java.xml"/> 
    1515  <property file="build.properties"/> 
    1616</project> 
  • trunk/components/java.xml

    r5506 r5551  
    22java.xml 
    33 
    4 Ant build file for logic common to Java components. 
     4Ant build file for logic common to Java-based components. 
     5All Java-based component build files inherit from this build file. 
    56Download Apache Ant from http://ant.apache.org/. 
    67Type "ant -p" for a list of targets. 
     
    89 
    910<project> 
    10   <import file="common.xml"/> 
    11  
    12   <!-- Non-core ant tasks --> 
    13  
    14   <!-- NB - We do not reference ${artifact.dir}/loci-checks.jar directly, 
    15     as doing so causes loci-checks.jar to be locked by some file systems 
    16     (Windows in particular), which causes the clean and clean-jars targets 
    17     to fail. --> 
    18   <taskdef resource="checkstyletask.properties" 
    19     classpath="${lib.dir}/checkstyle-all-4.2.jar:${lib.dir}/loci-checks.jar"/> 
    20  
    21   <taskdef resource="edu/umd/cs/findbugs/anttask/tasks.properties" 
    22     classpath="${lib.dir}/findbugs-ant.jar"/> 
    23  
    24   <!-- 
    25   <taskdef resource="proguard/ant/task.properties" 
    26     classpath="${lib.dir}/proguard.jar"/> 
    27   --> 
     11  <property file="${root.dir}/components/java.properties"/> 
     12  <import file="${root.dir}/components/common.xml"/> 
    2813 
    2914  <!-- Main build targets --> 
     
    7964    <mkdir dir="${artifact.dir}"/> 
    8065    <jar jarfile="${artifact.dir}/${component.jar}" basedir="${classes.dir}"> 
     66<!-- 
    8167      <manifest> 
    8268        <attribute name="Main-Class" value="${component.main-class}"/> 
    8369        <attribute name="Class-Path" value="${component.manifest-cp}"/> 
    8470      </manifest> 
     71--> 
    8572    </jar> 
     73    <!-- NB: Add OSGi bundle metadata. --> 
     74    <echo>Injecting OSGi bundle information...</echo> 
     75    <bundle outputDir="${artifact.dir}" 
     76      bundleName="${component.name}" 
     77      bundleSymbolicName="${domain.prefix}.${component.name}" 
     78      bundleVersion="${component.version}.${svn.revision}" 
     79      classpath="${classes.dir}" 
     80      exportPackage="*;version=&quot;${component.version}&quot;" 
     81      filename="${component.name}"> 
     82      <manifest> 
     83        <attribute name="Main-Class" value="${component.main-class}"/> 
     84        <attribute name="Class-Path" value="${component.manifest-cp}"/> 
     85      </manifest> 
     86    </bundle> 
    8687  </target> 
    8788 
  • trunk/components/legacy/jvmlink/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = jvmlink 
    910component.jar            = jvmlink.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = ${artifact.dir}/loci-common.jar 
    1113component.java-version   = 1.4 
  • trunk/components/legacy/jvmlink/build.xml

    r4822 r5551  
    1111    Build file for JVMLink project 
    1212  </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     13  <property name="root.dir" location="../../.."/> 
     14  <import file="${root.dir}/components/java.xml"/> 
    1515  <property file="build.properties"/> 
    1616</project> 
  • trunk/components/legacy/multi-lut/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = MultiLUT 
    910component.jar            = MultiLUT.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = ${lib.dir}/visad-lite.jar 
    1113component.java-version   = 1.4 
  • trunk/components/legacy/multi-lut/build.xml

    r4822 r5551  
    1111    Build file for Multi LUT app project 
    1212  </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     13  <property name="root.dir" location="../../.."/> 
     14  <import file="${root.dir}/components/java.xml"/> 
    1515  <property file="build.properties"/> 
    1616</project> 
  • trunk/components/legacy/ome-editor/build.properties

    r5043 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = ome-editor 
    910component.jar            = ome-editor.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1113                           ${artifact.dir}/ome-xml.jar:\ 
  • trunk/components/legacy/ome-editor/build.xml

    r4822 r5551  
    1111    Build file for OME Metadata Editor project 
    1212  </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     13  <property name="root.dir" location="../../.."/> 
     14  <import file="${root.dir}/components/java.xml"/> 
    1515  <property file="build.properties"/> 
    1616</project> 
  • trunk/components/legacy/ome-notes/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = ome-notes 
    910component.jar            = ome-notes.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1113                           ${artifact.dir}/bio-formats.jar:\ 
  • trunk/components/legacy/ome-notes/build.xml

    r4822 r5551  
    1111    Build file for OME Notes project 
    1212  </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     13  <property name="root.dir" location="../../.."/> 
     14  <import file="${root.dir}/components/java.xml"/> 
    1515  <property file="build.properties"/> 
    1616</project> 
  • trunk/components/loci-plugins/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = loci_plugins 
    910component.jar            = loci_plugins.jar 
     11component.version        = 4.0.1 
    1012component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1113                           ${artifact.dir}/bio-formats.jar:\ 
  • trunk/components/loci-plugins/build.xml

    r4822 r5551  
    88 
    99<project name="loci-plugins" default="jar" basedir="."> 
    10   <description> 
    11     Build file for LOCI Plugins project 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Build file for LOCI Plugins project</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    1614</project> 
  • trunk/components/native/bf-cpp/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = bf-cpp 
    910component.jar            = bf-cpp.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = 
    1113component.java-version   = 1.5 
  • trunk/components/native/bf-cpp/build.xml

    r5373 r5551  
    55Download Apache Ant from http://ant.apache.org/. 
    66Type "ant -p" for a list of targets. 
    7  
    8 Note that this build file extends common.xml rather than java.xml, 
    9 because this component does not consist of Java source files. 
    107--> 
    118 
     
    1411    Build file for Bio-Formats C++ bindings 
    1512  </description> 
    16   <property file="base.properties"/> 
    17   <import file="${root.dir}/java.xml"/> 
     13  <property name="root.dir" location="../../.."/> 
     14  <import file="${root.dir}/components/java.xml"/> 
    1815  <property file="build.properties"/> 
    1916 
     
    201198    <delete dir="${proxies.dir}"/> 
    202199  </target> 
    203  
    204200</project> 
  • trunk/components/ome-io/build.properties

    r5501 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = ome-io 
    910component.jar            = ome-io.jar 
     11component.version        = 4.0.1 
    1012component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1113                           ${artifact.dir}/bio-formats.jar:\ 
  • trunk/components/ome-io/build.xml

    r4822 r5551  
    88 
    99<project name="ome-io" default="jar" basedir="."> 
    10   <description> 
    11     Build file for OME I/O project 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Build file for OME I/O project</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    1614</project> 
  • trunk/components/ome-plugins/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = ome_plugins 
    910component.jar            = ome_plugins.jar 
     11component.version        = 4.0.1 
    1012component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1113                           ${artifact.dir}/bio-formats.jar:\ 
  • trunk/components/ome-plugins/build.xml

    r4822 r5551  
    88 
    99<project name="ome-plugins" default="jar" basedir="."> 
    10   <description> 
    11     Build file for OME Plugins project 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Build file for OME Plugins project</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    1614</project> 
  • trunk/components/ome-xml/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = ome-xml 
    910component.jar            = ome-xml.jar 
     11component.version        = 4.0.1 
    1012component.classpath      = 
    1113component.java-version   = 1.4 
  • trunk/components/ome-xml/build.xml

    r4822 r5551  
    88 
    99<project name="ome-xml" default="jar" basedir="."> 
    10   <description> 
    11     Build file for OME-XML Java library project 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Build file for OME-XML Java library project</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    1614</project> 
  • trunk/components/slim-plotter/build.properties

    r5495 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = SlimPlotter 
    910component.jar            = SlimPlotter.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1113                           ${artifact.dir}/bio-formats.jar:\ 
  • trunk/components/slim-plotter/build.xml

    r4896 r5551  
    88 
    99<project name="slim" default="jar" basedir="."> 
    10   <description> 
    11     Build file for SLIM Plotter project 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Build file for SLIM Plotter project</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    1614 
  • trunk/components/test-suite/build.properties

    r5531 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = loci-testing-framework 
    910component.jar            = loci-testing-framework.jar 
     11component.version        = 1.0.0 
    1012component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1113                           ${artifact.dir}/bio-formats.jar:\ 
  • trunk/components/test-suite/build.xml

    r5531 r5551  
    88 
    99<project name="tests" default="jar" basedir="."> 
    10   <description> 
    11     Build file for LOCI testing framework project 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Build file for LOCI testing framework project</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    1614 
  • trunk/components/visbio/build.properties

    r5043 r5551  
    77# Type "ant -p" for a list of targets. 
    88 
     9component.name           = visbio 
    910component.jar            = visbio.jar 
     11component.version        = 3.4.0 
    1012component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1113                           ${artifact.dir}/ome-xml.jar:\ 
  • trunk/components/visbio/build.xml

    r4896 r5551  
    88 
    99<project name="visbio" default="jar" basedir="."> 
    10   <description> 
    11     Build file for VisBio project 
    12   </description> 
    13   <property file="base.properties"/> 
    14   <import file="${root.dir}/java.xml"/> 
     10  <description>Build file for VisBio project</description> 
     11  <property name="root.dir" location="../.."/> 
     12  <import file="${root.dir}/components/java.xml"/> 
    1513  <property file="build.properties"/> 
    1614 
  • trunk/global.properties

    r4665 r5551  
    33# 
    44 
    5 # Ant properties file for use with all build scripts. 
     5# Ant properties file for use with global.xml. 
    66# Download Apache Ant from http://ant.apache.org/. 
    77# Type "ant -p" for a list of targets. 
     8 
     9# directory containing third party libraries 
     10lib.dir      = ${root.dir}/jar 
     11 
     12# directory where build scripts place the libraries they create 
     13artifact.dir = ${root.dir}/artifacts 
    814 
    915# copyright strings to use when generating javadocs 
    1016copyright.begin = <i>Copyright &#169; 
    1117copyright.end   = Laboratory for Optical and Computational Instrumentation</i> 
     18 
     19domain.prefix = edu.wisc.loci 
Note: See TracChangeset for help on using the changeset viewer.