Changeset 7424


Ignore:
Timestamp:
12/15/10 13:20:27 (9 years ago)
Author:
hinerm
Message:

Enhanced BF-ITK build for windows. The dist target is now specific to a Debug project configuration. Adjusted build.xml and build.properties to account for this specificity. Fixed a constant definition in itkBioFormatsImageIO.cxx

Location:
trunk/components/native/bf-itk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/native/bf-itk/build.properties

    r5726 r7424  
    2020component.runtime-cp     = ${component.classpath} 
    2121 
    22 bf-cpp.dir.windows = ../bf-cpp/build/Debug 
    23 bf-cpp.dir.other   = ../bf-cpp/build 
     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 
     27 
     28bf-itk.build.windows = ../bf-itk/build/lib/Debug 
     29bf-itk.build.other   = ../bf-itk/build/lib 
    2430 
    2531# Override if Ant cannot find your Java runtime classes. 
  • trunk/components/native/bf-itk/build.xml

    r7221 r7424  
    161161      <isset property="isWindows"/> 
    162162      <then> 
    163         <property name="bf-cpp.dir" value="${bf-cpp.dir.windows}"/> 
    164       </then> 
    165       <else> 
    166         <property name="bf-cpp.dir" value="${bf-cpp.dir.other}"/> 
    167       </else> 
    168     </if> 
    169     <copy file="${bf-cpp.dir}/loci_tools.jar" todir="${bf-itk.dist.dir}"/> 
    170     <copy file="${bf-cpp.dir}/jace-runtime.jar" todir="${bf-itk.dist.dir}"/> 
     163        <property name="bf-cpp.build" value="${bf-cpp.build.windows}"/> 
     164        <property name="jace.build" value="${jace.build.windows}"/> 
     165        <property name="bf-itk.build" value="${bf-itk.build.windows}"/>  
     166      </then> 
     167      <else> 
     168        <property name="bf-cpp.build" value="${bf-cpp.build.other}"/> 
     169        <property name="jace.build" value="${jace.build.other}"/> 
     170        <property name="bf-itk.build" value="${bf-itk.build.other}"/> 
     171      </else> 
     172    </if> 
     173    <copy file="${bf-cpp.build}/loci_tools.jar" todir="${bf-itk.dist.dir}"/> 
     174    <copy file="${bf-cpp.build}/jace-runtime.jar" todir="${bf-itk.dist.dir}"/> 
    171175 
    172176    <echo/> 
     
    174178    <echo/> 
    175179    <copy todir="${bf-itk.dist.dir}"> 
    176       <fileset dir="${bf-cpp.dir}" includes="*.so"/> 
    177       <fileset dir="${bf-cpp.dir}" includes="*.dylib"/> 
    178       <fileset dir="${bf-cpp.dir}" includes="*.jnilib"/> 
    179       <fileset dir="${bf-cpp.dir}" includes="*.dll"/> 
    180       <fileset dir="${bf-cpp.dir}/jace" includes="*.so"/> 
    181       <fileset dir="${bf-cpp.dir}/jace" includes="*.dylib"/> 
    182       <fileset dir="${bf-cpp.dir}/jace" includes="*.jnilib"/> 
    183       <fileset dir="${bf-cpp.dir}/jace" includes="*.dll"/> 
     180      <fileset dir="${bf-cpp.build}" includes="*.so"/> 
     181      <fileset dir="${bf-cpp.build}" includes="*.dylib"/> 
     182      <fileset dir="${bf-cpp.build}" includes="*.jnilib"/> 
     183      <fileset dir="${bf-cpp.build}" includes="*.dll"/> 
     184      <fileset dir="${jace.build}" includes="*.so"/> 
     185      <fileset dir="${jace.build}" includes="*.dylib"/> 
     186      <fileset dir="${jace.build}" includes="*.jnilib"/> 
     187      <fileset dir="${jace.build}" includes="*.dll"/> 
    184188    </copy> 
    185189 
     
    195199    <echo/> 
    196200    <copy todir="${bf-itk.dist.dir}"> 
    197       <fileset dir="${build.dir}/lib"/> 
     201      <fileset dir="${bf-itk.build}"/> 
    198202    </copy> 
    199203 
  • trunk/components/native/bf-itk/itkBioFormatsImageIO.cxx

    r7310 r7424  
    7171#if defined (_WIN32) 
    7272#define PATHSTEP ';' 
    73 #define SLASH '\' 
     73#define SLASH '\\' 
    7474#else 
    7575#define PATHSTEP ':' 
Note: See TracChangeset for help on using the changeset viewer.