Changeset 7563

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:

• . (modified) (1 prop)
• build.xml (modified) (4 diffs)

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

@@ -146 +146 @@
   </target>
 
-  <target name="dist" depends="check-itk"
+  <target name="dist"
     description="bundle binaries for distribution">
     <!-- CTR TODO - check whether all binaries actually exist -->
@@ -152 +152 @@
     <property name="bf-itk.dist.dir" value="${dist.dir}/bf-itk"/>
     <mkdir dir="${bf-itk.dist.dir}"/>
-
-    <property name="itk-bin.dir" value="${itk.home}/bin"/>
 
     <echo/>
@@ -202 +200 @@
 
     <echo/>
-    <echo>-- Copying distribution --</echo>
-    <echo/>
-    <copy todir="${itk.home}/bin">
-      <fileset dir="${bf-itk.dist.dir}"/>
-    </copy>
-
-    <echo/>
     <echo>-- Copying Bio-Formats ITK plugin --</echo>
     <echo/>
     <copy todir="${bf-itk.dist.dir}">
-      <fileset dir="${bf-itk.lib}"/>
+      <fileset dir="${bf-itk.lib}" includes="*.so"/>
+      <fileset dir="${bf-itk.lib}" includes="*.dylib"/>
+      <fileset dir="${bf-itk.lib}" includes="*.jnilib"/>
+      <fileset dir="${bf-itk.lib}" includes="*.dll"/>
     </copy>
 
@@ -246 +240 @@
 If you compiled ITK with BUILD_EXAMPLES set to ON,
 you can test the plugin with the following commands:
-
-  export ITK_AUTOLOAD_PATH="${build.dir}/lib/"
-  cd "${itk-bin.dir}"
-  ./ImageHistogram1 /path/to/sample/dataset
-
-If you run the ant dist target, use this command instead:
-
-  export ITK_AUTOLOAD_PATH="${build.dir}/dist/bf-itk/"
+</echo>
+    <if>
+      <isset property="isWindows"/>
+      <then>
+<echo>
+  set ITK_EXAMPLES="\path\to\itk\examples"
+  set ITK_AUTOLOAD_PATH="${build.dir}\dist\bf-itk"
+  cd %ITK_AUTOLOAD_PATH%
+  %ITK_EXAMPLES%\ImageHistogram1.exe \path\to\sample\dataset
+</echo>
+      </then>
+      <else>
+<echo>
+  export ITK_EXAMPLES="/path/to/itk/examples"
+  export ITK_AUTOLOAD_PATH="${build.dir}/dist/bf-itk"
+  cd $ITK_AUTOLOAD_PATH
+  $ITK_EXAMPLES/ImageHistogram1 /path/to/sample/dataset
+</echo>
+      </else>
+    </if>
+<echo>
 
 If you use a TIFF file, you can compare the histogram results between