Changeset 7565


Ignore:
Timestamp:
01/20/11 14:51:23 (9 years ago)
Author:
hinerm
Message:

Backport -r7564 to 4.2 branch.

Location:
branches/4.2/components/native/bf-cpp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/4.2/components/native/bf-cpp

  • branches/4.2/components/native/bf-cpp/build.properties

    r7555 r7565  
    1919component.main-class     = 
    2020component.runtime-cp     = ${component.classpath} 
     21 
     22bf-cpp.build.windows     = ../bf-cpp/build/Debug 
     23bf-cpp.build.other       = ../bf-cpp/build/ 
     24 
     25jace.build.windows       = ../bf-cpp/build/jace/Debug 
     26jace.build.other         = ../bf-cpp/build/jace 
    2127 
    2228# Override if Ant cannot find your Java runtime classes. 
  • branches/4.2/components/native/bf-cpp/build.xml

    r7555 r7565  
    178178  </target> 
    179179 
     180 
     181  <target name="dist" 
     182    description="bundle binaries for distribution"> 
     183    <!-- CTR TODO - check whether all binaries actually exist --> 
     184 
     185    <property name="bf-cpp.dist.dir" value="${dist.dir}/bf-cpp"/> 
     186    <mkdir dir="${bf-cpp.dist.dir}"/> 
     187 
     188    <echo/> 
     189    <echo>-- Copying Bio-Formats Java libraries --</echo> 
     190    <echo/> 
     191    <if> 
     192      <isset property="isWindows"/> 
     193      <then> 
     194        <property name="bf-cpp.build" value="${bf-cpp.build.windows}"/> 
     195        <property name="jace.build" value="${jace.build.windows}"/> 
     196      </then> 
     197      <else> 
     198        <property name="bf-cpp.build" value="${bf-cpp.build.other}"/> 
     199        <property name="jace.build" value="${jace.build.other}"/> 
     200      </else> 
     201    </if> 
     202    <copy file="${bf-cpp.build}/loci_tools.jar" todir="${bf-cpp.dist.dir}"/> 
     203    <copy file="${bf-cpp.build}/jace-runtime.jar" todir="${bf-cpp.dist.dir}"/> 
     204 
     205    <echo/> 
     206    <echo>-- Copying Bio-Formats C++ shared libraries --</echo> 
     207    <echo/> 
     208    <copy todir="${bf-cpp.dist.dir}"> 
     209      <fileset dir="${bf-cpp.build}" includes="*.so"/> 
     210      <fileset dir="${bf-cpp.build}" includes="*.dylib"/> 
     211      <fileset dir="${bf-cpp.build}" includes="*.jnilib"/> 
     212      <fileset dir="${bf-cpp.build}" includes="*.dll"/> 
     213      <fileset dir="${bf-cpp.build}" includes="*.jar"/> 
     214      <fileset dir="${jace.build}" includes="*.so"/> 
     215      <fileset dir="${jace.build}" includes="*.dylib"/> 
     216      <fileset dir="${jace.build}" includes="*.jnilib"/> 
     217      <fileset dir="${jace.build}" includes="*.dll"/> 
     218    </copy> 
     219 
     220    <echo/> 
     221    <echo>-- Creating distribution archive --</echo> 
     222    <echo/> 
     223    <if> 
     224      <isset property="isWindows"/> 
     225      <then> 
     226        <!-- make a zip archive --> 
     227        <zip destfile="${dist.dir}/bf-cpp.zip" basedir="${bf-cpp.dist.dir}"/> 
     228      </then> 
     229      <else> 
     230        <!-- make a tar.gz archive --> 
     231        <!--<tar destfile="${dist.dir}/bf-cpp.tar.gz" 
     232          basedir="${bf-cpp.dist.dir}" compression="gzip"/>--> 
     233        <!-- HACK - tar does not preserve permissions; use exec instead --> 
     234        <echo>Building tar: bf-cpp.tar.gz</echo> 
     235        <exec executable="tar"> 
     236          <arg value="czf"/> 
     237          <arg value="${dist.dir}/bf-cpp.tar.gz"/> 
     238          <arg value="-C"/> 
     239          <arg value="${dist.dir}"/> 
     240          <arg value="bf-cpp"/> 
     241        </exec> 
     242      </else> 
     243    </if> 
     244  </target> 
     245 
     246 
     247 
    180248  <target name="compile-proxies" depends="gen-makefile, copy-libs" 
    181249    description="build Bio-Formats C++ library"> 
     
    192260In Visual Studio, press F7, or select 
    193261"Build solution" from the "Build" menu. 
    194  
    195262After the build is complete, you will need to 
    196263copy jace.dll from ${build.dir}\jace\Debug to ${build.dir}\Debug 
Note: See TracChangeset for help on using the changeset viewer.