Changeset 4664


Ignore:
Timestamp:
12/01/08 14:10:48 (11 years ago)
Author:
curtis
Message:
  • Add copy-jars target to fix runtime classpath dependencies.
  • Remove mostly useless global compile target.
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.properties

    r4584 r4664  
    77# Type "ant -p" for a list of targets. 
    88 
    9 merged-docs.classpath = jar/AppleJavaExtensions.jar:\ 
    10                         jar/Ice-3.2.1.jar:\ 
    11                         jar/checkstyle-all-4.2.jar:\ 
    12                         jar/forms-1.0.4.jar:\ 
    13                         jar/looks-1.2.2.jar:\ 
    14                         jar/ij.jar:\ 
    15                         jar/ome-java.jar:\ 
    16                         jar/ome-java-deprecated.jar:\ 
    17                         jar/omero-client-3.0-Beta3.jar:\ 
    18                         jar/omero-common-3.0-Beta3.jar:\ 
    19                         jar/omero-importer-3.0-Beta3.jar:\ 
    20                         jar/omero-model-psql-3.0-Beta3.jar:\ 
    21                         jar/testng-5.7-jdk14.jar:\ 
    22                         jar/visad-lite.jar 
     9shared-lib.dir      = jar 
     10shared-artifact.dir = artifacts 
     11 
     12### Javadoc generation ### 
     13 
     14merged-docs.classpath = ${shared-lib.dir}/AppleJavaExtensions.jar:\ 
     15                        ${shared-lib.dir}/Ice-3.2.1.jar:\ 
     16                        ${shared-lib.dir}/checkstyle-all-4.2.jar:\ 
     17                        ${shared-lib.dir}/forms-1.0.4.jar:\ 
     18                        ${shared-lib.dir}/looks-1.2.2.jar:\ 
     19                        ${shared-lib.dir}/ij.jar:\ 
     20                        ${shared-lib.dir}/ome-java.jar:\ 
     21                        ${shared-lib.dir}/ome-java-deprecated.jar:\ 
     22                        ${shared-lib.dir}/omero-client-3.0-Beta3.jar:\ 
     23                        ${shared-lib.dir}/omero-common-3.0-Beta3.jar:\ 
     24                        ${shared-lib.dir}/omero-importer-3.0-Beta3.jar:\ 
     25                        ${shared-lib.dir}/omero-model-psql-3.0-Beta3.jar:\ 
     26                        ${shared-lib.dir}/testng-5.7-jdk14.jar:\ 
     27                        ${shared-lib.dir}/visad-lite.jar 
    2328merged-docs.dir       = build/docs 
    2429merged-docs.source    = components/bio-formats/build/src:\ 
     
    4449### LOCI Tools bundle ### 
    4550 
    46 loci-tools.jar       = artifacts/loci_tools.jar 
     51loci-tools.jar       = ${shared-artifact.dir}/loci_tools.jar 
    4752loci-tools.main      = loci.formats.gui.ImageViewer 
    4853loci-tools.dir       = loci-tools 
     
    6469### OME Tools bundle ### 
    6570 
    66 ome-tools.jar       = artifacts/ome_tools.jar 
     71ome-tools.jar       = ${shared-artifact.dir}/ome_tools.jar 
    6772ome-tools.main      = loci.plugins.ome.About 
    6873ome-tools.dir       = ome-tools 
  • trunk/build.xml

    r4617 r4664  
    438438 
    439439  <taskdef resource="net/sf/antcontrib/antcontrib.properties" 
    440     classpath="jar/ant-contrib-1.0b1.jar"/> 
     440    classpath="${shared-lib.dir}/ant-contrib-1.0b1.jar"/> 
    441441  <!-- HACK - some environments do not install the antcontrib tasks properly 
    442442  from antcontrib.properties above; also load them from antlib.xml --> 
    443443  <taskdef resource="net/sf/antcontrib/antlib.xml" 
    444     classpath="jar/ant-contrib-1.0b1.jar"/> 
     444    classpath="${shared-lib.dir}/ant-contrib-1.0b1.jar"/> 
    445445 
    446446  <!-- Global build targets --> 
    447447 
    448   <target name="compile" 
    449     depends="compile-common, compile-ome-xml, 
    450       compile-jai, compile-poi-loci, compile-mdbtools, 
    451       compile-formats, compile-formats-auto, compile-formats-ice, 
    452       compile-loci-plugins, compile-ome-io, compile-ome-plugins, 
    453       compile-visbio, compile-slim, compile-flow, 
    454       compile-checks, compile-tests, 
    455       compile-jvmlink, compile-multi-lut, 
    456       compile-ome-notes, compile-ome-editor" 
    457     description="compile classes for LOCI software packages"/> 
    458  
    459448  <target name="jars" 
    460     depends="jar-common, jar-ome-xml, 
     449    depends="copy-jars, jar-common, jar-ome-xml, 
    461450      jar-jai, jar-poi-loci, jar-mdbtools, 
    462451      jar-formats, jar-formats-auto, jar-formats-ice, 
     
    478467      clean-ome-notes, clean-ome-editor" 
    479468    description="remove all build files"> 
    480     <delete dir="artifacts"/> 
     469    <delete dir="${shared-artifact.dir}"/> 
    481470    <delete dir="build"/> 
    482471  </target> 
     
    502491      <!--<link href="http://www.jdocs.com/looks/1.2.2/api/"/>--> 
    503492    </javadoc> 
     493  </target> 
     494 
     495  <target name="copy-jars"> 
     496    <!-- copy third party JARs into artifacts folder --> 
     497    <!-- necessary for runtime classpath dependencies to function properly --> 
     498    <copy todir="${shared-artifact.dir}" preservelastmodified="true"> 
     499      <fileset dir="${shared-lib.dir}"/> 
     500    </copy> 
    504501  </target> 
    505502 
Note: See TracChangeset for help on using the changeset viewer.