Changeset 4896


Ignore:
Timestamp:
03/10/09 00:00:57 (11 years ago)
Author:
curtis
Message:

Fix VisBio dist targets.

Location:
trunk/components
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/components/slim-plotter/build.properties

    r4612 r4896  
    2121component.runtime-cp     = ${component.classpath} 
    2222 
    23 slim.dist-dir  = ${dist.dir}/SlimPlotter 
    24 slim.exec      = slim \ 
    25                  SlimPlotter.app/Contents/MacOS/JavaApplicationStub 
     23# Properties for dist target 
     24 
     25slim.exec       = slim \ 
     26                  SlimPlotter.app/Contents/MacOS/JavaApplicationStub 
  • trunk/components/slim-plotter/build.xml

    r4822 r4896  
    1717  <target name="dist" if="isUnix" depends="jar" 
    1818    description="create distribution bundle for Slim Plotter"> 
    19     <copy todir="${slim.dist-dir}" preservelastmodified="true"> 
     19    <copy todir="${dist.dir}/SlimPlotter" preservelastmodified="true"> 
    2020      <fileset dir="dist"/> 
    21       <fileset dir="${artifact.dir}" includes="${component.jar}"/> 
     21      <fileset dir="${artifact.dir}" includes= 
     22        "${component.jar} ${component.manifest-cp}"/> 
    2223    </copy> 
    23     <!-- copy JAR libraries in the classpath --> 
    24     <for list="${component.manifest-cp}" param="jar" delimiter=" " trim="true"> 
    25       <sequential> 
    26         <for list="${jar.dirs}" param="jardir" delimiter=" " trim="true"> 
    27           <sequential> 
    28             <available file="${root.dir}/@{jardir}/@{jar}" 
    29               property="@{jardir}.@{jar}.present"/> 
    30             <if> 
    31               <equals arg1="${@{jardir}.@{jar}.present}" arg2="true" /> 
    32               <then> 
    33                 <copy todir="${slim.dist-dir}" preservelastmodified="true"> 
    34                   <fileset dir="${root.dir}/@{jardir}" includes="@{jar}"/> 
    35                 </copy> 
    36               </then> 
    37             </if> 
    38           </sequential> 
    39         </for> 
    40       </sequential> 
    41     </for> 
    4224    <!-- HACK - copy does not preserve permissions; chmod them back --> 
    4325    <chmod perm="+x"> 
    44       <fileset dir="${slim.dist-dir}" includes="${slim.exec}"/> 
     26      <fileset dir="${dist.dir}/SlimPlotter" includes="${slim.exec}"/> 
    4527    </chmod> 
    46     <!--<zip destfile="${dist.dir}/slim.zip" basedir="${dist.dir}/slim"/>--> 
     28    <!--<zip destfile="slim.zip" basedir="${dist.dir}"/>--> 
    4729    <!-- HACK - zip does not preserve permissions; use exec instead --> 
    4830    <exec executable="zip" dir="${dist.dir}"> 
  • trunk/components/visbio/build.properties

    r4612 r4896  
    2828component.runtime-cp     = ${component.classpath} 
    2929 
    30 # CTR TODO - fix dist targets 
     30# Properties for dist targets 
    3131 
    32 visbio.classpath       = bio-formats.jar ${libs.bioformats} \ 
    33                          ome-java.jar ${libs.omejava} \ 
    34                          ${libs.omero} \ 
    35                          forms-1.0.4.jar \ 
    36                          ij.jar \ 
    37                          looks-1.2.2.jar \ 
    38                          visad-lite.jar 
    39 visbio.dist-files      = bsd-forms.txt \ 
    40                          bsd-looks.txt \ 
    41                          gpl-visbio.txt \ 
    42                          whatsnew.txt \ 
    43                          *.cpp \ 
    44                          *.m 
    45 visbio.docs-dir        = ${docs.dir}/visbio 
    46 visbio.win32-dir       = ${dist.dir}/visbio/win32 
    47 visbio.win32-nojre-dir = ${dist.dir}/visbio/win32-nojre 
    48 visbio.macosx-dir      = ${dist.dir}/visbio/macosx 
    49 visbio.linux-dir       = ${dist.dir}/visbio/linux 
    50 visbio.nojre-dir       = ${dist.dir}/visbio/nojre 
    51 visbio.text-files      = *.txt \ 
    52                          *.cpp \ 
    53                          *.m \ 
    54                          plugins/*.txt 
    55 visbio.macosx-exec     = visbio \ 
    56                          VisBio.app/Contents/MacOS/JavaApplicationStub 
    57 visbio.linux-exec      = visbio 
     32visbio.dist-jars            = jai_imageio.jar \ 
     33                              mdbtools-java.jar \ 
     34                              netcdf-4.0.jar \ 
     35                              ome-java.jar \ 
     36                              ome-notes.jar \ 
     37                              omero-client-3.0-Beta3.jar \ 
     38                              omero-common-3.0-Beta3.jar \ 
     39                              omero-importer-3.0-Beta3.jar \ 
     40                              omero-model-psql-3.0-Beta3.jar 
     41visbio.dist-resources       = bsd-forms.txt \ 
     42                              bsd-looks.txt \ 
     43                              gpl-visbio.txt \ 
     44                              whatsnew.txt \ 
     45                              *.cpp \ 
     46                              *.m 
     47visbio.dist-text-files      = *.txt \ 
     48                              *.cpp \ 
     49                              *.m \ 
     50                              plugins/*.txt 
     51 
     52visbio.dist-win32-dir       = ${dist.dir}/win32 
     53visbio.dist-win32-nojre-dir = ${dist.dir}/win32-nojre 
     54visbio.dist-macosx-dir      = ${dist.dir}/macosx 
     55visbio.dist-linux-dir       = ${dist.dir}/linux 
     56visbio.dist-nojre-dir       = ${dist.dir}/nojre 
     57 
     58visbio.exec-macosx          = visbio \ 
     59                              VisBio.app/Contents/MacOS/JavaApplicationStub 
     60visbio.exec-linux           = visbio 
  • trunk/components/visbio/build.xml

    r4822 r4896  
    1515  <property file="build.properties"/> 
    1616 
    17   <!-- CTR TODO - fix dist targets --> 
    18  
    1917  <target name="dist" 
    20     depends="dist-win32, dist-win32-nojre, dist-macosx, 
    21       dist-linux, dist-nojre" 
    22     description="create distribution bundles"/> 
     18    depends="dist-win32, dist-win32-nojre, dist-macosx, dist-linux, dist-nojre" 
     19    description="create distribution bundles for VisBio"/> 
    2320 
    2421  <target name="dist-win32" depends="jar" 
    2522    description="create distribution bundle: Windows w/ JRE"> 
    26     <copy todir="${visbio.win32-dir}/VisBio" preservelastmodified="true"> 
    27       <fileset dir="dist/visbio/win32"/> 
    28       <fileset dir="loci/visbio" includes="${visbio.dist-files}"/> 
    29       <fileset dir="${jar.dir}" includes="${component.jar} ${visbio.classpath}"/> 
     23    <copy todir="${visbio.dist-win32-dir}/VisBio" preservelastmodified="true"> 
     24      <fileset dir="dist/win32"/> 
     25      <fileset dir="${dest.dir}/loci/visbio" 
     26        includes="${visbio.dist-resources}"/> 
     27      <fileset dir="${artifact.dir}" includes= 
     28        "${component.jar} ${component.manifest-cp} ${visbio.dist-jars}"/> 
    3029    </copy> 
    31     <fixcrlf srcdir="${visbio.win32-dir}/VisBio" eol="dos" 
    32       includes="${visbio.text-files}"/> 
    33     <untar src="dist/jre-win32.tar.gz" dest="${visbio.win32-dir}/VisBio" 
     30    <fixcrlf srcdir="${visbio.dist-win32-dir}/VisBio" 
     31      eol="dos" includes="${visbio.dist-text-files}"/> 
     32    <untar src="${root.dir}/dist/jre-win32.tar.gz" 
     33      dest="${visbio.dist-win32-dir}/VisBio" 
    3434      overwrite="false" compression="gzip"/> 
    3535    <zip destfile="${dist.dir}/visbio${visbio.version}_win32.zip" 
    36       basedir="${visbio.win32-dir}"/> 
     36      basedir="${visbio.dist-win32-dir}"/> 
    3737  </target> 
    3838 
    3939  <target name="dist-win32-nojre" depends="jar" 
    4040    description="create distribution bundle: Windows no JRE"> 
    41     <copy todir="${visbio.win32-nojre-dir}/VisBio" 
     41    <copy todir="${visbio.dist-win32-nojre-dir}/VisBio" 
    4242      preservelastmodified="true"> 
    43       <fileset dir="dist/visbio/win32" excludes="launcher.cfg"/> 
    44       <fileset dir="dist/visbio/win32-nojre"/> 
    45       <fileset dir="loci/visbio" includes="${visbio.dist-files}"/> 
    46       <fileset dir="${jar.dir}" includes="${component.jar} ${visbio.classpath}"/> 
     43      <fileset dir="dist/win32" excludes="launcher.cfg"/> 
     44      <fileset dir="dist/win32-nojre"/> 
     45      <fileset dir="${dest.dir}/loci/visbio" 
     46        includes="${visbio.dist-resources}"/> 
     47      <fileset dir="${artifact.dir}" includes= 
     48        "${component.jar} ${component.manifest-cp} ${visbio.dist-jars}"/> 
    4749    </copy> 
    48     <fixcrlf srcdir="${visbio.win32-nojre-dir}/VisBio" eol="dos" 
    49       includes="${visbio.text-files}"/> 
     50    <fixcrlf srcdir="${visbio.dist-win32-nojre-dir}/VisBio" 
     51      eol="dos" includes="${visbio.dist-text-files}"/> 
    5052    <zip destfile="${dist.dir}/visbio${visbio.version}_win32_nojre.zip" 
    51       basedir="${visbio.win32-nojre-dir}"/> 
     53      basedir="${visbio.dist-win32-nojre-dir}"/> 
    5254  </target> 
    5355 
     
    5557  <target name="dist-macosx" if="isUnix" depends="jar" 
    5658    description="create distribution bundle: Mac OS X"> 
    57     <copy todir="${visbio.macosx-dir}/VisBio" 
     59    <copy todir="${visbio.dist-macosx-dir}/VisBio" 
    5860      preservelastmodified="true"> 
    59       <fileset dir="dist/visbio/macosx"/> 
    60       <fileset dir="loci/visbio" includes="${visbio.dist-files}"/> 
     61      <fileset dir="dist/macosx"/> 
     62      <fileset dir="${dest.dir}/loci/visbio" 
     63        includes="${visbio.dist-resources}"/> 
    6164    </copy> 
    62     <fixcrlf srcdir="${visbio.macosx-dir}/VisBio" eol="mac" 
    63       includes="${visbio.text-files}"/> 
     65    <fixcrlf srcdir="${visbio.dist-macosx-dir}/VisBio" 
     66      eol="mac" includes="${visbio.dist-text-files}"/> 
    6467    <!-- HACK - copy does not preserve permissions; chmod them back --> 
    6568    <chmod perm="+x"> 
    66       <fileset dir="${visbio.macosx-dir}/VisBio" 
    67         includes="${visbio.macosx-exec}"/> 
     69      <fileset dir="${visbio.dist-macosx-dir}/VisBio" 
     70        includes="${visbio.exec-macosx}"/> 
    6871    </chmod> 
    69     <copy 
    70       todir="${visbio.macosx-dir}/VisBio/VisBio.app/Contents/Resources/Java"> 
    71       <fileset dir="${jar.dir}" includes="${component.jar} ${visbio.classpath}"/> 
     72    <copy todir= 
     73      "${visbio.dist-macosx-dir}/VisBio/VisBio.app/Contents/Resources/Java"> 
     74      <fileset dir="${artifact.dir}" includes= 
     75        "${component.jar} ${component.manifest-cp} ${visbio.dist-jars}"/> 
    7276    </copy> 
    7377    <!--<tar destfile="${dist.dir}/visbio${visbio.version}_macosx.tar.gz" 
    74       basedir="${visbio.macosx-dir}" compression="gzip"/>--> 
     78      basedir="${visbio.dist-macosx-dir}" compression="gzip"/>--> 
    7579    <!-- HACK - tar does not preserve permissions; use exec instead --> 
    7680    <echo>Building tar: visbio${visbio.version}_macosx.tar.gz</echo> 
     
    7983      <arg value="${dist.dir}/visbio${visbio.version}_macosx.tar.gz"/> 
    8084      <arg value="-C"/> 
    81       <arg value="${visbio.macosx-dir}"/> 
     85      <arg value="${visbio.dist-macosx-dir}"/> 
    8286      <arg value="VisBio"/> 
    8387    </exec> 
     
    8892    depends="jar" 
    8993    description="create distribution bundle: Linux w/ JRE"> 
    90     <copy todir="${visbio.linux-dir}/visbio${visbio.version}" 
     94    <copy todir="${visbio.dist-linux-dir}/visbio${visbio.version}" 
    9195      preservelastmodified="true"> 
    92       <fileset dir="dist/visbio/linux"/> 
    93       <fileset dir="loci/visbio" includes="${visbio.dist-files}"/> 
    94       <fileset dir="${jar.dir}" includes="${component.jar} ${visbio.classpath}"/> 
     96      <fileset dir="dist/linux"/> 
     97      <fileset dir="${dest.dir}/loci/visbio" 
     98        includes="${visbio.dist-resources}"/> 
     99      <fileset dir="${artifact.dir}" includes= 
     100        "${component.jar} ${component.manifest-cp} ${visbio.dist-jars}"/> 
    95101    </copy> 
    96     <fixcrlf srcdir="${visbio.linux-dir}/visbio${visbio.version}" eol="unix" 
    97       includes="${visbio.text-files}"/> 
     102    <fixcrlf srcdir="${visbio.dist-linux-dir}/visbio${visbio.version}" 
     103      eol="unix" includes="${visbio.dist-text-files}"/> 
    98104    <!-- HACK - copy does not preserve permissions; chmod them back --> 
    99105    <chmod perm="+x"> 
    100       <fileset dir="${visbio.linux-dir}/visbio${visbio.version}" 
    101         includes="${visbio.linux-exec}"/> 
     106      <fileset dir="${visbio.dist-linux-dir}/visbio${visbio.version}" 
     107        includes="${visbio.exec-linux}"/> 
    102108    </chmod> 
    103     <!--<untar src="dist/jre-linux.tar.gz" 
    104       dest="${visbio.linux-dir}/visbio${visbio.version}" 
     109    <!--<untar src="${root.dir}/dist/jre-linux.tar.gz" 
     110      dest="${visbio.dist-linux-dir}/visbio${visbio.version}" 
    105111      overwrite="false" compression="gzip"/>--> 
    106112    <!-- HACK - untar does not restore permissions; use exec instead --> 
     
    108114    <exec executable="tar"> 
    109115      <arg value="xzf"/> 
    110       <arg value="dist/jre-linux.tar.gz"/> 
     116      <arg value="${root.dir}/dist/jre-linux.tar.gz"/> 
    111117      <arg value="-C"/> 
    112       <arg value="${visbio.linux-dir}/visbio${visbio.version}"/> 
     118      <arg value="${visbio.dist-linux-dir}/visbio${visbio.version}"/> 
    113119    </exec> 
    114120    <!--<tar destfile="${dist.dir}/visbio${visbio.version}_linux.tar.gz" 
    115       basedir="${visbio.linux-dir}" compression="gzip"/>--> 
     121      basedir="${visbio.dist-linux-dir}" compression="gzip"/>--> 
    116122    <!-- HACK - tar does not preserve permissions; use exec instead --> 
    117123    <echo>Building tar: visbio${visbio.version}_linux.tar.gz</echo> 
     
    120126      <arg value="${dist.dir}/visbio${visbio.version}_linux.tar.gz"/> 
    121127      <arg value="-C"/> 
    122       <arg value="${visbio.linux-dir}"/> 
     128      <arg value="${visbio.dist-linux-dir}"/> 
    123129      <arg value="visbio${visbio.version}"/> 
    124130    </exec> 
     
    128134  <target name="dist-nojre" if="isUnix" depends="jar" 
    129135    description="create distribution bundle: cross-platform"> 
    130     <copy todir="${visbio.nojre-dir}/visbio${visbio.version}" 
     136    <copy todir="${visbio.dist-nojre-dir}/visbio${visbio.version}" 
    131137      preservelastmodified="true"> 
    132       <fileset dir="dist/visbio/linux"/> 
    133       <fileset dir="loci/visbio" includes="${visbio.dist-files}"/> 
    134       <fileset dir="${jar.dir}" includes="${component.jar} ${visbio.classpath}"/> 
     138      <fileset dir="dist/linux"/> 
     139      <fileset dir="${dest.dir}/loci/visbio" 
     140        includes="${visbio.dist-resources}"/> 
     141      <fileset dir="${artifact.dir}" includes= 
     142        "${component.jar} ${component.manifest-cp} ${visbio.dist-jars}"/> 
    135143    </copy> 
    136     <fixcrlf srcdir="${visbio.nojre-dir}/visbio${visbio.version}" eol="unix" 
    137       includes="${visbio.text-files}"/> 
     144    <fixcrlf srcdir="${visbio.dist-nojre-dir}/visbio${visbio.version}" 
     145      eol="unix" includes="${visbio.dist-text-files}"/> 
    138146    <!-- HACK - copy does not preserve permissions; chmod them back --> 
    139147    <chmod perm="+x"> 
    140       <fileset dir="${visbio.nojre-dir}/visbio${visbio.version}" 
    141         includes="${visbio.linux-exec}"/> 
     148      <fileset dir="${visbio.dist-nojre-dir}/visbio${visbio.version}" 
     149        includes="${visbio.exec-linux}"/> 
    142150    </chmod> 
    143151    <!--<tar destfile="${dist.dir}/visbio${visbio.version}.tar.gz" 
    144       basedir="${visbio.nojre-dir}" compression="gzip"/>--> 
     152      basedir="${visbio.dist-nojre-dir}" compression="gzip"/>--> 
    145153    <!-- HACK - tar does not preserve permissions; use exec instead --> 
    146154    <echo>Building tar: visbio${visbio.version}.tar.gz</echo> 
     
    149157      <arg value="${dist.dir}/visbio${visbio.version}.tar.gz"/> 
    150158      <arg value="-C"/> 
    151       <arg value="${visbio.nojre-dir}"/> 
     159      <arg value="${visbio.dist-nojre-dir}"/> 
    152160      <arg value="visbio${visbio.version}"/> 
    153161    </exec> 
Note: See TracChangeset for help on using the changeset viewer.