Changeset 4411


Ignore:
Timestamp:
09/18/08 15:45:02 (12 years ago)
Author:
curtis
Message:

Fix slim-dist target.

Location:
trunk
Files:
8 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/build.properties

    r4382 r4411  
    66# Download Apache Ant from http://ant.apache.org/. 
    77# Type "ant -p" for a list of targets. 
    8  
    9 jar.dirs = artifacts \ 
    10            jar 
    118 
    129merged-docs.classpath = jar/AppleJavaExtensions.jar:\ 
  • trunk/build.xml

    r4407 r4411  
    6262    License:       GPL 
    6363 
    64 Slim Plotter 
     64SLIM Plotter 
    6565    An application and curve fitting library for visualization 
    6666    and analysis of combined spectral lifetime data 
     
    200200    URL:       http://users.utu.fi/jaolho/ 
    201201    Notes:     Levenberg-Marquardt algorithm for exponential curve fitting, 
    202                used by Slim Plotter 
     202               used by SLIM Plotter 
    203203    License:   LGPL 
    204204 
     
    289289    JAR file:  visad-lite.jar 
    290290    URL:       http://www.ssec.wisc.edu/~billh/visad.html 
    291     Notes:     stripped down VisAD library used by VisBio and Slim Plotter 
     291    Notes:     stripped down VisAD library used by VisBio and SLIM Plotter 
    292292               for interactive visualization 
    293293    License:   LGPL 
     
    309309  <property file="build.properties"/> 
    310310 
    311   <condition property="isUnix"><os family="unix"/></condition> 
    312  
    313311  <!-- Non-core ant tasks --> 
     312 
     313  <taskdef resource="net/sf/antcontrib/antcontrib.properties" 
     314    classpath="jar/ant-contrib-1.0b1.jar"/> 
     315  <!-- HACK - some environments do not install the antcontrib tasks properly 
     316  from antcontrib.properties above; also load them from antlib.xml --> 
     317  <taskdef resource="net/sf/antcontrib/antlib.xml" 
     318    classpath="jar/ant-contrib-1.0b1.jar"/> 
    314319 
    315320<!-- 
     
    324329    classname="org.testng.TestNGAntTask"/> 
    325330--> 
    326  
    327   <taskdef resource="net/sf/antcontrib/antcontrib.properties" 
    328     classpath="jar/ant-contrib-1.0b1.jar"/> 
    329   <!-- HACK - some environments do not install the antcontrib tasks properly 
    330     from antcontrib.properties above; also load them from antlib.xml --> 
    331   <taskdef resource="net/sf/antcontrib/antlib.xml" 
    332     classpath="jar/ant-contrib-1.0b1.jar"/> 
    333331 
    334332  <!-- Global build targets --> 
     
    555553  </target> 
    556554 
    557   <!-- Slim Plotter --> 
     555  <!-- SLIM Plotter --> 
    558556 
    559557  <target name="style-slim" 
     
    579577  <target name="dist-slim" 
    580578    description="create distribution bundle for SLIM Plotter"> 
    581     <ant dir="components/slim-plotter" target="slim.dist"/> 
     579    <ant dir="components/slim-plotter" target="dist"/> 
    582580  </target> 
    583581 
     
    744742        <for list="${jar.dirs}" param="jardir" delimiter=" " trim="true"> 
    745743          <sequential> 
    746             <available file="@{jardir}/@{jar}" 
     744            <available file="${root.dir}/@{jardir}/@{jar}" 
    747745              property="@{jardir}.@{jar}.present"/> 
    748746            <if> 
    749747              <equals arg1="${@{jardir}.@{jar}.present}" arg2="true" /> 
    750748              <then> 
    751                 <unjar src="@{jardir}/@{jar}" dest="${loci-tools.dir}"> 
     749                <unjar src="${root.dir}/@{jardir}/@{jar}" 
     750                  dest="${loci-tools.dir}"> 
    752751                  <patternset> 
    753752                    <exclude name="META-INF/**"/> 
     
    774773        <for list="${jar.dirs}" param="jardir" delimiter=" " trim="true"> 
    775774          <sequential> 
    776             <available file="@{jardir}/@{jar}" 
     775            <available file="${root.dir}/@{jardir}/@{jar}" 
    777776              property="@{jardir}.@{jar}.present"/> 
    778777            <if> 
    779778              <equals arg1="${@{jardir}.@{jar}.present}" arg2="true" /> 
    780779              <then> 
    781                 <unjar src="@{jardir}/@{jar}" dest="${ome-tools.dir}"> 
     780                <unjar src="${root.dir}/@{jardir}/@{jar}" 
     781                  dest="${ome-tools.dir}"> 
    782782                  <patternset> 
    783783                    <exclude name="META-INF/**"/> 
  • trunk/common.xml

    r4361 r4411  
    1212  <property file="${root.dir}/common.properties"/> 
    1313 
     14  <condition property="isUnix"><os family="unix"/></condition> 
     15 
    1416  <!-- Non-core ant tasks --> 
    1517 
     
    2022  <taskdef resource="checkstyletask.properties" 
    2123    classpath="${lib.dir}/checkstyle-all-4.2.jar:${lib.dir}/loci-checks.jar"/> 
     24 
     25  <taskdef resource="net/sf/antcontrib/antcontrib.properties" 
     26    classpath="${lib.dir}/ant-contrib-1.0b1.jar"/> 
     27  <!-- HACK - some environments do not install the antcontrib tasks properly 
     28  from antcontrib.properties above; also load them from antlib.xml --> 
     29  <taskdef resource="net/sf/antcontrib/antlib.xml" 
     30    classpath="${lib.dir}/ant-contrib-1.0b1.jar"/> 
    2231 
    2332  <!-- 
  • trunk/components/slim-plotter/build.properties

    r4382 r4411  
    2323                           visbio.jar 
    2424 
    25 # CTR TODO - fix dist target 
    26  
    27 slim.classpath    = bio-formats.jar \ 
    28                     lma.jar \ 
    29                     visad-lite.jar 
    30 slim.dist-dir     = ${dist.dir}/slim/SlimPlotter 
    31 slim.exec         = slim \ 
    32                     SlimPlotter.app/Contents/MacOS/JavaApplicationStub 
     25slim.dist-dir  = ${dist.dir}/SlimPlotter 
     26slim.exec      = slim \ 
     27                 SlimPlotter.app/Contents/MacOS/JavaApplicationStub 
  • trunk/components/slim-plotter/build.xml

    r4382 r4411  
    2020    description="create distribution bundle for Slim Plotter"> 
    2121    <copy todir="${slim.dist-dir}" preservelastmodified="true"> 
    22       <fileset dir="dist/slim"/> 
    23       <fileset dir="${jar.dir}" includes="${component.jar} ${slim.classpath}"/> 
     22      <fileset dir="dist"/> 
     23      <fileset dir="${artifact.dir}" includes="${component.jar}"/> 
     24<!-- 
     25      <fileset dir="${artifact.dir}" includes="bio-formats.jar"/> 
     26      <fileset dir="${artifact.dir}" includes="visbio.jar"/> 
     27      <fileset dir="${lib.dir}" includes="lma.jar"/> 
     28      <fileset dir="${lib.dir}" includes="visad-lite.jar"/> 
     29--> 
    2430    </copy> 
     31    <!-- copy JAR libraries in the classpath --> 
     32    <for list="${component.manifest-cp}" param="jar" delimiter=" " trim="true"> 
     33      <sequential> 
     34        <for list="${jar.dirs}" param="jardir" delimiter=" " trim="true"> 
     35          <sequential> 
     36            <available file="${root.dir}/@{jardir}/@{jar}" 
     37              property="@{jardir}.@{jar}.present"/> 
     38            <if> 
     39              <equals arg1="${@{jardir}.@{jar}.present}" arg2="true" /> 
     40              <then> 
     41                <copy todir="${slim.dist-dir}" preservelastmodified="true"> 
     42                  <fileset dir="${root.dir}/@{jardir}" includes="@{jar}"/> 
     43                </copy> 
     44              </then> 
     45            </if> 
     46          </sequential> 
     47        </for> 
     48      </sequential> 
     49    </for> 
     50 
    2551    <!-- HACK - copy does not preserve permissions; chmod them back --> 
    2652    <chmod perm="+x"> 
     
    2955    <!--<zip destfile="${dist.dir}/slim.zip" basedir="${dist.dir}/slim"/>--> 
    3056    <!-- HACK - zip does not preserve permissions; use exec instead --> 
    31     <exec executable="zip" dir="${dist.dir}/slim"> 
     57    <exec executable="zip" dir="${dist.dir}"> 
    3258      <arg value="-r9"/> 
    33       <arg value="../slim.zip"/> 
     59      <arg value="slim.zip"/> 
    3460      <arg value="SlimPlotter"/> 
    3561    </exec> 
  • trunk/components/slim-plotter/dist/SlimPlotter.app/Contents/Info.plist

    r2309 r4411  
    2828        <dict> 
    2929                <key>VMOptions</key> 
    30                 <string>-Xmx256m</string> 
     30                <string>-Xmx512m</string> 
    3131                <key>MainClass</key> 
    32                 <string>loci.apps.slim.SlimPlotter</string> 
     32                <string>loci.slim.SlimPlotter</string> 
    3333                <key>JVMVersion</key> 
    3434                <string>1.4+</string> 
     
    3939                        <string>$APP_PACKAGE/../lma.jar</string> 
    4040                        <string>$APP_PACKAGE/../visad-lite.jar</string> 
     41                        <string>$APP_PACKAGE/../visbio.jar</string> 
    4142                        </array> 
    4243                <key>Properties</key> 
  • trunk/components/slim-plotter/todo.txt

    r4406 r4411  
    33Fit: get rid of hacky crap once setting firstindex/lastindex 
    44Fit: large bin radius results in discontinuities in bright areas? 
     5Fit: 2-component fits can be inaccurate (see Log scale for confirmation) 
    56 
    672D: pixel probe in lifetime mode 
  • trunk/global.properties

    r4368 r4411  
    3737                  poi-loci.jar \ 
    3838                  QTJava.zip 
     39 
     40jar.dirs = artifacts \ 
     41           jar 
Note: See TracChangeset for help on using the changeset viewer.