OmeroImageJ : Fixing build from release-zip target

git-svn-id: file:///home/svn/omero/trunk@5588 05709c45-44f0-0310-885b-81a1db45b4a6
melissalinkert · Oct 26, 2009 · 13970cf · 13970cf
1 parent f553a46
commit 13970cf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/build.py b/build.py
@@ -38,8 +38,6 @@ def build_hudson():
     # Prepare a distribution
     #
     "rm -f OMERO.server-build*.zip"
-    java_omero(["-f","components/tools/OmeroImporter/build.xml","release-win-zip"])
-    java_omero(["-f","components/tools/OmeroImporter/build.xml","release-osx-zip"])
     java_omero("release-zip")
 
     # Install into the hudson repository

diff --git a/build.xml b/build.xml
@@ -246,6 +246,9 @@ java component.
             <zipfileset dir="${dist.dir}/lib/client"    prefix="OMERO.java-${omero.version}/libs" includes="**/*.jar"/>
         </zip>
         <!-- TODO: This should probably be made into another tools target tools-zip -->
+        <ant antfile="${OmeroImporter.comp}/build.xml" dir="${OmeroImporter.comp}" target="release-win-zip" inheritAll="false"/>
+        <ant antfile="${OmeroImporter.comp}/build.xml" dir="${OmeroImporter.comp}" target="release-osx-zip" inheritAll="false"/>
+        <ant antfile="${OmeroImageJ.comp}/build.xml" dir="${OmeroImageJ.comp}" target="tools-dist" inheritAll="false"/>
 	<copy todir="target">
 	    <fileset dir="components/tools/OmeroImporter/target" includes="*.zip"/>
 	</copy>

diff --git a/components/antlib/resources/directories.xml b/components/antlib/resources/directories.xml
@@ -54,6 +54,7 @@
 	<property name="OmeroCpp.comp"     value="${tools.comp}/OmeroCpp"/>
 	<property name="OmeroJava.comp"     value="${tools.comp}/OmeroJava"/>
 	<property name="OmeroImporter.comp"     value="${tools.comp}/OmeroImporter"/>
+	<property name="OmeroImageJ.comp"     value="${tools.comp}/OmeroImageJ/Omero_ImageJ"/>
 	<property name="OmeroWeb.comp"     value="${tools.comp}/OmeroWeb"/>
 	<property name="OmeroPy.comp"     value="${tools.comp}/OmeroPy"/>
 	<property name="OmeroFs.comp"     value="${tools.comp}/OmeroFS"/>
@@ -81,6 +82,9 @@
 	<path id="OmeroImporter.buildpath">
 	  <pathelement location="${OmeroImporter.comp}/build.xml"/>
 	</path>
+	<path id="OmeroImageJ.buildpath">
+	  <pathelement location="${OmeroImageJ.comp}/build.xml"/>
+	</path>
 	<path id="OmeroWeb.buildpath">
 	  <pathelement location="${OmeroWeb.comp}/build.xml"/>
 	</path>

diff --git a/components/tools/OmeroImageJ/Omero_ImageJ/ivy.xml b/components/tools/OmeroImageJ/Omero_ImageJ/ivy.xml
@@ -21,6 +21,6 @@
      <!-- Gui -->
      <dependency org="gui" name="swingx" rev="${versions.swingx}"/>
      <dependency org="gui" name="TableLayout" rev="${versions.tablelayout}"/>
-     <dependency org="gui" name="omero-clients-util" rev="Beta-4.1.0-DEV"/>
+    <dependency org="gui"  name="omero-clients-util" rev="r6779-b12"/>
   </dependencies>
 </ivy-module>