Changeset 1726 for trunk/build.xml


Ignore:
Timestamp:
11/02/06 09:18:08 (14 years ago)
Author:
curtis
Message:

Fix bugs in dist-visbio targets.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r1702 r1726  
    428428  <target name="dist-visbio-win32" depends="jar-visbio, jar-formats" 
    429429    description="create distribution bundle for VisBio: Windows w/ JRE"> 
    430     <copy todir="${visbio.win32-dir}" preservelastmodified="true"> 
    431       <fileset dir="${dist.dir}/visbio/win32"/> 
     430    <copy todir="${visbio.win32-dir}/VisBio" preservelastmodified="true"> 
     431      <fileset dir="dist/visbio/win32"/> 
    432432      <fileset dir="loci/visbio" includes="${visbio.dist-files}"/> 
    433433      <fileset dir="${jar.dir}" includes="visbio.jar ${visbio.classpath}"/> 
    434434    </copy> 
    435     <fixcrlf srcdir="${visbio.win32-dir}" eol="dos" 
     435    <fixcrlf srcdir="${visbio.win32-dir}/VisBio" eol="dos" 
    436436      includes="${visbio.text-files}"/> 
    437     <untar src="${dist.dir}/jre-win32.tar.gz" dest="${visbio.win32-dir}" 
     437    <untar src="dist/jre-win32.tar.gz" dest="${visbio.win32-dir}/VisBio" 
    438438      overwrite="false" compression="gzip"/> 
    439439    <zip destfile="${dist.dir}/visbio${visbio.version}_win32.zip" 
    440       basedir="${dist.dir}/visbio/win32"/> 
     440      basedir="${visbio.win32-dir}"/> 
    441441  </target> 
    442442 
    443443  <target name="dist-visbio-win32-nojre" depends="jar-visbio, jar-formats" 
    444444    description="create distribution bundle for VisBio: Windows no JRE"> 
    445     <copy todir="${visbio.win32-nojre-dir}" 
     445    <copy todir="${visbio.win32-nojre-dir}/VisBio" 
    446446      preservelastmodified="true"> 
    447       <fileset dir="${dist.dir}/visbio/win32" excludes="launcher.cfg"/> 
    448       <fileset dir="${dist.dir}/visbio/win32-nojre"/> 
     447      <fileset dir="dist/visbio/win32" excludes="launcher.cfg"/> 
     448      <fileset dir="dist/visbio/win32-nojre"/> 
    449449      <fileset dir="loci/visbio" includes="${visbio.dist-files}"/> 
    450450      <fileset dir="${jar.dir}" includes="visbio.jar ${visbio.classpath}"/> 
    451451    </copy> 
    452     <fixcrlf srcdir="${visbio.win32-nojre-dir}" eol="dos" 
     452    <fixcrlf srcdir="${visbio.win32-nojre-dir}/VisBio" eol="dos" 
    453453      includes="${visbio.text-files}"/> 
    454454    <zip destfile="${dist.dir}/visbio${visbio.version}_win32_nojre.zip" 
    455       basedir="${dist.dir}/visbio/win32-nojre"/> 
     455      basedir="${visbio.win32-nojre-dir}"/> 
    456456  </target> 
    457457 
     
    460460    depends="jar-visbio, jar-formats" 
    461461    description="create distribution bundle for VisBio: Mac OS X"> 
    462     <copy todir="${visbio.macosx-dir}" 
     462    <copy todir="${visbio.macosx-dir}/VisBio" 
    463463      preservelastmodified="true"> 
    464       <fileset dir="${dist.dir}/visbio/macosx"/> 
     464      <fileset dir="dist/visbio/macosx"/> 
    465465      <fileset dir="loci/visbio" includes="${visbio.dist-files}"/> 
    466466    </copy> 
    467     <fixcrlf srcdir="${visbio.macosx-dir}" eol="mac" 
     467    <fixcrlf srcdir="${visbio.macosx-dir}/VisBio" eol="mac" 
    468468      includes="${visbio.text-files}"/> 
    469469    <!-- HACK - copy does not preserve permissions; chmod them back --> 
    470470    <chmod perm="+x"> 
    471       <fileset dir="${visbio.macosx-dir}" includes="${visbio.macosx-exec}"/> 
     471      <fileset dir="${visbio.macosx-dir}/VisBio" 
     472        includes="${visbio.macosx-exec}"/> 
    472473    </chmod> 
    473     <copy todir="${visbio.macosx-dir}/VisBio.app/Contents/Resources/Java"> 
     474    <copy 
     475      todir="${visbio.macosx-dir}/VisBio/VisBio.app/Contents/Resources/Java"> 
    474476      <fileset dir="${jar.dir}" includes="visbio.jar ${visbio.classpath}"/> 
    475477    </copy> 
    476478<!-- 
    477479    <tar destfile="${dist.dir}/visbio${visbio.version}_macosx.tar.gz" 
    478       basedir="${dist.dir}/visbio/macosx" compression="gzip"/> 
     480      basedir="${visbio.macosx-dir}" compression="gzip"/> 
    479481--> 
    480482    <!-- HACK - tar does not preserve permissions; use exec instead --> 
     483    <echo>Building tar: visbio${visbio.version}_macosx.tar.gz</echo> 
    481484    <exec executable="tar"> 
    482485      <arg value="czf"/> 
    483486      <arg value="${dist.dir}/visbio${visbio.version}_macosx.tar.gz"/> 
    484487      <arg value="-C"/> 
    485       <arg value="${dist.dir}/visbio/macosx VisBio"/> 
     488      <arg value="${visbio.macosx-dir}"/> 
     489      <arg value="VisBio"/> 
    486490    </exec> 
    487491  </target> 
     
    491495    depends="jar-visbio, jar-formats" 
    492496    description="create distribution bundle for VisBio: Linux w/ JRE"> 
    493     <copy todir="${visbio.linux-dir}" preservelastmodified="true"> 
    494       <fileset dir="${dist.dir}/visbio/linux"/> 
     497    <copy todir="${visbio.linux-dir}/visbio${visbio.version}" 
     498      preservelastmodified="true"> 
     499      <fileset dir="dist/visbio/linux"/> 
    495500      <fileset dir="loci/visbio" includes="${visbio.dist-files}"/> 
    496501      <fileset dir="${jar.dir}" includes="visbio.jar ${visbio.classpath}"/> 
    497502    </copy> 
    498     <fixcrlf srcdir="${visbio.linux-dir}" eol="unix" 
     503    <fixcrlf srcdir="${visbio.linux-dir}/visbio${visbio.version}" eol="unix" 
    499504      includes="${visbio.text-files}"/> 
    500505    <!-- HACK - copy does not preserve permissions; chmod them back --> 
    501506    <chmod perm="+x"> 
    502       <fileset dir="${visbio.linux-dir}" includes="${visbio.linux-exec}"/> 
     507      <fileset dir="${visbio.linux-dir}/visbio${visbio.version}" 
     508        includes="${visbio.linux-exec}"/> 
    503509    </chmod> 
    504510<!-- 
    505     <untar src="${dist.dir}/jre-linux.tar.gz" dest="${visbio.linux-dir}" 
     511    <untar src="dist/jre-linux.tar.gz" 
     512      dest="${visbio.linux-dir}/visbio${visbio.version}" 
    506513      overwrite="false" compression="gzip"/> 
    507514--> 
    508515    <!-- HACK - untar does not restore permissions; use exec instead --> 
     516    <echo>Expanding: jre-linux.tar.gz</echo> 
    509517    <exec executable="tar"> 
    510518      <arg value="xzf"/> 
    511       <arg value="${dist.dir}/jre-linux.tar.gz"/> 
     519      <arg value="dist/jre-linux.tar.gz"/> 
    512520      <arg value="-C"/> 
    513       <arg value="${visbio.linux-dir}"/> 
     521      <arg value="${visbio.linux-dir}/visbio${visbio.version}"/> 
    514522    </exec> 
    515523<!-- 
    516524    <tar destfile="${dist.dir}/visbio${visbio.version}_linux.tar.gz" 
    517       basedir="${dist.dir}/visbio/linux" compression="gzip"/> 
     525      basedir="${visbio.linux-dir}" compression="gzip"/> 
    518526--> 
    519527    <!-- HACK - tar does not preserve permissions; use exec instead --> 
     528    <echo>Building tar: visbio${visbio.version}_linux.tar.gz</echo> 
    520529    <exec executable="tar"> 
    521530      <arg value="czf"/> 
    522531      <arg value="${dist.dir}/visbio${visbio.version}_linux.tar.gz"/> 
    523532      <arg value="-C"/> 
    524       <arg value="${dist.dir}/visbio/linux visbio${visbio.version}"/> 
     533      <arg value="${visbio.linux-dir}"/> 
     534      <arg value="visbio${visbio.version}"/> 
    525535    </exec> 
    526536  </target> 
     
    530540    depends="jar-visbio, jar-formats" 
    531541    description="create distribution bundle for VisBio: cross-platform"> 
    532     <copy todir="${visbio.nojre-dir}" preservelastmodified="true"> 
    533       <fileset dir="${dist.dir}/visbio/linux"/> 
     542    <copy todir="${visbio.nojre-dir}/visbio${visbio.version}" 
     543      preservelastmodified="true"> 
     544      <fileset dir="dist/visbio/linux"/> 
    534545      <fileset dir="loci/visbio" includes="${visbio.dist-files}"/> 
    535546      <fileset dir="${jar.dir}" includes="visbio.jar ${visbio.classpath}"/> 
    536547    </copy> 
    537     <fixcrlf srcdir="${visbio.nojre-dir}" eol="unix" 
     548    <fixcrlf srcdir="${visbio.nojre-dir}/visbio${visbio.version}" eol="unix" 
    538549      includes="${visbio.text-files}"/> 
    539550    <!-- HACK - copy does not preserve permissions; chmod them back --> 
    540551    <chmod perm="+x"> 
    541       <fileset dir="${visbio.nojre-dir}" includes="${visbio.linux-exec}"/> 
     552      <fileset dir="${visbio.nojre-dir}/visbio${visbio.version}" 
     553        includes="${visbio.linux-exec}"/> 
    542554    </chmod> 
    543555<!-- 
    544556    <tar destfile="${dist.dir}/visbio${visbio.version}.tar.gz" 
    545       basedir="${dist.dir}/visbio/nojre" compression="gzip"/> 
     557      basedir="${visbio.nojre-dir}" compression="gzip"/> 
    546558--> 
    547559    <!-- HACK - tar does not preserve permissions; use exec instead --> 
     560    <echo>Building tar: visbio${visbio.version}.tar.gz</echo> 
    548561    <exec executable="tar"> 
    549562      <arg value="czf"/> 
    550563      <arg value="${dist.dir}/visbio${visbio.version}.tar.gz"/> 
    551564      <arg value="-C"/> 
    552       <arg value="${dist.dir}/visbio/nojre visbio${visbio.version}"/> 
     565      <arg value="${visbio.nojre-dir}"/> 
     566      <arg value="visbio${visbio.version}"/> 
    553567    </exec> 
    554568  </target> 
Note: See TracChangeset for help on using the changeset viewer.