Add hot-deploy build.py helpers

melissalinkert · Jan 3, 2013 · 59d4564 · 59d4564
1 parent d9ff111
commit 59d4564
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 6 deletions.
diff --git a/build.py b/build.py
@@ -119,12 +119,24 @@ def choose_omero_version():
         del os.environ['CLASSPATH']
 
     try:
-        if len(args) > 0 and args[0] == "-perf":
-            args.pop(0)
-            A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split() + args
-            java_omero(A)
-        else:
-            java_omero(args)
+        additions = []
+        while len(args) > 0 and args[0] in ("-perf", "-py", "-cpp"):
+            if args[0] == "-perf":
+                args.pop(0)
+                A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split()
+                additions.extend(A)
+            elif args[0] == "-py":
+                args.pop(0)
+                F = os.path.sep.join(["components","tools","OmeroPy","build.xml"])
+                A = ["-f", F]
+                additions.extend(A)
+            elif args[0] == "-cpp":
+                args.pop(0)
+                F = os.path.sep.join(["components","tools","OmeroCpp","build.xml"])
+                A = ["-f", F]
+                additions.extend(A)
+        args = additions + args
+        java_omero(args)
         notification(""" Finished: %s """ % " ".join(args), 0)
     except KeyboardInterrupt:
         sys.stderr.write("\nCancelled by user\n")

diff --git a/build.xml b/build.xml
@@ -914,6 +914,74 @@ omero.version=${omero.version}
         <copy file="components/insight/SRC/org/openmicroscopy/shoola/env/ui/graphx/omeabout-bk.png" tofile="${dist.dir}/lib/insight/ome.png"/>
     </target>
 
+    <target name="hot-blitz" depends="init">
+        <property name="targets" value="install"/>
+        <hotdeploy component="${blitz.comp}" targets="${targets}"/>
+    </target>
+
+    <target name="hot-common" depends="init">
+        <property name="targets" value="install"/>
+        <hotdeploy component="${common.comp}" targets="${targets}"/>
+    </target>
+
+    <target name="hot-model" depends="init">
+        <ant antfile="${dsl.comp}/build.xml" dir="${dsl.comp}" target="install" inheritAll="false"/>
+        <ant antfile="${model.comp}/build.xml" dir="${model.comp}" target="clean" inheritAll="false"/>
+        <property name="targets" value="install"/>
+        <hotdeploy component="${model.comp}" targets="${targets}"/>
+    </target>
+
+    <target name="hot-romio" depends="init">
+        <property name="targets" value="install"/>
+        <hotdeploy component="${romio.comp}" targets="${targets}"/>
+    </target>
+
+    <target name="hot-server" depends="init">
+        <property name="targets" value="install"/>
+        <hotdeploy component="${server.comp}" targets="${targets}"/>
+    </target>
+
+    <macrodef name="hotdeploy">
+        <attribute name="targets"/>
+        <attribute name="component"/>
+        <sequential>
+            <for list="@{targets}" param="target">
+                <sequential>
+                    <ant antfile="@{component}/build.xml" dir="@{component}" target="@{target}" inheritAll="false"/>
+                </sequential>
+            </for>
+            <antcall target="copy-client" inheritRefs="true" inheritAll="true"/>
+            <antcall target="copy-server" inheritRefs="true" inheritAll="true"/>
+            <ice-admin>
+                <arg value="server"/>
+                <arg value="stop"/>
+                <arg value="Blitz-0"/>
+            </ice-admin>
+            <ice-admin>
+                <arg value="server"/>
+                <arg value="stop"/>
+                <arg value="Indexer-0"/>
+            </ice-admin>
+            <ice-admin>
+                <arg value="server"/>
+                <arg value="stop"/>
+                <arg value="PixelData-0"/>
+            </ice-admin>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="ice-admin">
+        <element name="args" implicit="yes"/>
+        <sequential>
+            <exec executable="python" dir="${dist.dir}" failonerror="true">
+                <arg value="bin/omero"/>
+                <arg value="admin"/>
+                <arg value="ice"/>
+                <args/>
+            </exec>
+        </sequential>
+    </macrodef>
+
     <macrodef name="gitdescribe">
 
         <attribute name="regexp" default="^(v.)?(.*?)(-[0-9]+)?((-)g(.*?))?$"/>

diff --git a/components/antlib/resources/global.xml b/components/antlib/resources/global.xml
@@ -60,6 +60,7 @@
 	<property name="common.comp"    value="${components.dir}/common"/>
 	<property name="server.comp"    value="${components.dir}/server"/>
 	<property name="nio.comp"       value="${components.dir}/romio"/>
+	<property name="romio.comp"     value="${components.dir}/romio"/>
 	<property name="render.comp"    value="${components.dir}/rendering"/>
 	<property name="import.comp"    value="${components.dir}/importer"/>
 	<property name="blitz.comp"     value="${components.dir}/blitz"/>