Changeset 7563


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

Backport r7562 to 4.2 branch.

Location:
branches/4.2/components/native/bf-itk
Files:
2 edited

Legend:

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

  • branches/4.2/components/native/bf-itk/build.xml

    r7555 r7563  
    146146  </target> 
    147147 
    148   <target name="dist" depends="check-itk" 
     148  <target name="dist" 
    149149    description="bundle binaries for distribution"> 
    150150    <!-- CTR TODO - check whether all binaries actually exist --> 
     
    152152    <property name="bf-itk.dist.dir" value="${dist.dir}/bf-itk"/> 
    153153    <mkdir dir="${bf-itk.dist.dir}"/> 
    154  
    155     <property name="itk-bin.dir" value="${itk.home}/bin"/> 
    156154 
    157155    <echo/> 
     
    202200 
    203201    <echo/> 
    204     <echo>-- Copying distribution --</echo> 
    205     <echo/> 
    206     <copy todir="${itk.home}/bin"> 
    207       <fileset dir="${bf-itk.dist.dir}"/> 
    208     </copy> 
    209  
    210     <echo/> 
    211202    <echo>-- Copying Bio-Formats ITK plugin --</echo> 
    212203    <echo/> 
    213204    <copy todir="${bf-itk.dist.dir}"> 
    214       <fileset dir="${bf-itk.lib}"/> 
     205      <fileset dir="${bf-itk.lib}" includes="*.so"/> 
     206      <fileset dir="${bf-itk.lib}" includes="*.dylib"/> 
     207      <fileset dir="${bf-itk.lib}" includes="*.jnilib"/> 
     208      <fileset dir="${bf-itk.lib}" includes="*.dll"/> 
    215209    </copy> 
    216210 
     
    246240If you compiled ITK with BUILD_EXAMPLES set to ON, 
    247241you can test the plugin with the following commands: 
    248  
    249   export ITK_AUTOLOAD_PATH="${build.dir}/lib/" 
    250   cd "${itk-bin.dir}" 
    251   ./ImageHistogram1 /path/to/sample/dataset 
    252  
    253 If you run the ant dist target, use this command instead: 
    254  
    255   export ITK_AUTOLOAD_PATH="${build.dir}/dist/bf-itk/" 
     242</echo> 
     243    <if> 
     244      <isset property="isWindows"/> 
     245      <then> 
     246<echo> 
     247  set ITK_EXAMPLES="\path\to\itk\examples" 
     248  set ITK_AUTOLOAD_PATH="${build.dir}\dist\bf-itk" 
     249  cd %ITK_AUTOLOAD_PATH% 
     250  %ITK_EXAMPLES%\ImageHistogram1.exe \path\to\sample\dataset 
     251</echo> 
     252      </then> 
     253      <else> 
     254<echo> 
     255  export ITK_EXAMPLES="/path/to/itk/examples" 
     256  export ITK_AUTOLOAD_PATH="${build.dir}/dist/bf-itk" 
     257  cd $ITK_AUTOLOAD_PATH 
     258  $ITK_EXAMPLES/ImageHistogram1 /path/to/sample/dataset 
     259</echo> 
     260      </else> 
     261    </if> 
     262<echo> 
    256263 
    257264If you use a TIFF file, you can compare the histogram results between 
Note: See TracChangeset for help on using the changeset viewer.