From 35e88ad9c8304d4f72bc712a57413c753906bc74 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Wed, 21 Jan 2009 17:41:46 +0000
Subject: QPID-1592 : Patch provided by Robert Gemmell to standardise launchers
 for management console.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@736349 13f79535-47bb-0310-9956-ffa450edef68
---
 java/management/eclipse-plugin/build-release.xml | 104 +++++++++++------------
 1 file changed, 48 insertions(+), 56 deletions(-)

(limited to 'java/management/eclipse-plugin/build-release.xml')

diff --git a/java/management/eclipse-plugin/build-release.xml b/java/management/eclipse-plugin/build-release.xml
index 74a47c5e38..b396974c9a 100644
--- a/java/management/eclipse-plugin/build-release.xml
+++ b/java/management/eclipse-plugin/build-release.xml
@@ -25,17 +25,12 @@
     	<condition property="properties.set">
     		<and>
     	        <!-- common properties -->
-    		    <isset property ="mcplugin.contents.dir"/>
-                <isset property ="mcplugin.manifest"/>
                 <isset property ="mcplugin.filename"/>
-                <isset property ="bin.dir"/>
-                <isset property ="startup.jar"/>
-                <isset property ="license.eclipse.txt"/>
                 <isset property ="jmxremote.sasl.manifest"/>
                 <isset property ="qpidmanagementcommon.manifest"/>
                 <!-- platform specific properties -->
-                <isset property ="eclipse.ini"/>
-                <isset property ="bin.includes"/>
+                <isset property ="qpidmc.ini"/>
+                <isset property ="qpidmc.executable"/>
                 <isset property ="release.name"/>
                 <isset property ="release.subdir"/>
                 <isset property ="rcp.libs"/>
@@ -45,75 +40,73 @@
     		        <isset property ="release.tar.gz"/>
     		    </or>
         	</and>
-            <!-- Optional Properties -->
-            <!-- eclipse.executable.companion.library -->
+            <!-- Optional Properties:
+
+    	    For linux libcairo-swt.so file:
+            qpidmc.companion.library
+            
+            -->
         </condition>
 
-        <fail unless="properties.set" message="required properties not set"/>
+        <fail unless="properties.set" message="some required properties were not set"/>
     </target>
 
     <target name="release-bin-prepare">
         <mkdir dir="${release.subdir}"/>
     </target>
 
-    <target name="release-bin-mcplugin-jar">
-    	<jar destfile="${release.subdir}/eclipse/plugins/${mcplugin.filename}.jar" basedir="${mcplugin.contents.dir}" manifest="${mcplugin.manifest}"/>
+    <target name="release-bin-qpid-mc-plugin">
+        <!-- Copy the qpid management-eclipse-plugin module jar -->
+        <copy tofile="${release.subdir}/plugins/${mcplugin.filename}.jar" flatten="true" failonerror="true">
+            <fileset file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar"/>
+        </copy>
     </target>
 
     <target name="release-bin-jmxremote-plugin">
         <!-- Copy the jmxremote.sasl plugin's manifest, creating its plugin directory -->
-        <copy todir="${release.subdir}/eclipse/plugins/jmxremote.sasl_1.0.1/META-INF" flatten="true" failonerror="true">
+        <copy todir="${release.subdir}/plugins/jmxremote.sasl_1.0.1/META-INF" flatten="true" failonerror="true">
             <fileset file="${jmxremote.sasl.manifest}"/>
         </copy>
     </target>
 
     <target name="release-bin-qpidmanagementcommon-plugin">
         <!-- Copy the management common plugin's manifest, creating its plugin directory -->
-        <copy todir="${release.subdir}/eclipse/plugins/qpid-management-common_1.0.0/META-INF" flatten="true" failonerror="true">
+        <copy todir="${release.subdir}/plugins/qpid-management-common_1.0.0/META-INF" flatten="true" failonerror="true">
             <fileset file="${qpidmanagementcommon.manifest}"/>
         </copy>
-        <copy todir="${release.subdir}/eclipse/plugins/qpid-management-common_1.0.0/" flatten="true" failonerror="true">
+        <!-- Copy the qpid management-common module jar -->
+        <copy tofile="${release.subdir}/plugins/qpid-management-common_1.0.0/qpid-management-common.jar" flatten="true" failonerror="true">
             <fileset file="${build.lib}/qpid-management-common-${project.version}.jar"/>
         </copy>
     </target>
-
-    <target name="copy-executable" description="Copy eclipse-rcp execuitable" if="eclipse.executable">
- 
-        <!-- Copy the eclipse rcp executable files -->
-        <copy todir="${release.subdir}/eclipse" flatten="true" failonerror="true">
-            <fileset file="${eclipse.executable}"/>
+    
+    <target name="release-bin-executable-companion-library" if="qpidmc.companion.library">
+        <!-- Copy the rcp executable companion library file -->
+        <copy todir="${release.subdir}" flatten="true" failonerror="true">
+            <fileset file="${qpidmc.companion.library}"/>
         </copy>
-        <chmod dir="${release.subdir}/eclipse" perm="u+rx" includes="**/*"/>
-
-
     </target>
-
-    <target name="release-bin-rcp-deps" description="copy eclipse-rcp dependencies into module release" 
-					depends="copy-executable">    	
+    
+    <target name="release-bin-rcp-deps" description="copy eclipse-rcp dependencies into module release"
+        depends="release-bin-executable-companion-library">
+        
+        <!-- Copy the rcp executable file -->
+        <copy todir="${release.subdir}" flatten="true" failonerror="true">
+            <fileset file="${qpidmc.executable}"/>
+        </copy>
+        <chmod dir="${release.subdir}" perm="u+rx" includes="**/*"/>
         
         <!-- Copy remaining startup & license files -->
-        <copy todir="${release.subdir}/eclipse" flatten="true" failonerror="true">
-            <fileset file="${startup.jar}"/>
-            <fileset file="${eclipse.ini}"/>
-            <fileset file="${license.eclipse.txt}"/>
+        <copy todir="${release.subdir}" flatten="true" failonerror="true">
+            <fileset file="${qpidmc.ini}"/>
         </copy>
 
-        <echo message="${ecl-swt-linux-gtk-x86}"/>
-        <echo message="${management-eclipse-plugin-linux-gtk-x86.libs}"/>
-        <echo message="${rcp.libs}"/>
-        <!-- Copy the eclipse rcp module libs -->
-        <copy todir="${release.subdir}/eclipse/plugins" failonerror="true">
-
+        <!-- Copy the rcp module libs -->
+        <copy todir="${release.subdir}/plugins" failonerror="true">
             <fileset dir="${project.root}" includes="${rcp.libs}"/>
             <globmapper from="lib/*" to="*"/>
         </copy>
 
-        <!-- Copy the relevant bin dir files-->    	
-        <copy todir="${release.subdir}/bin" failonerror="true">
-            <fileset dir="${bin.dir}" includes="${bin.includes}"/>
-        </copy>
-        <chmod dir="${release.subdir}/bin" perm="u+rx" includes="**/*"/>
-
         <!-- Copy the relevant configuration dir -->
         <copy todir="${release.subdir}/configuration" failonerror="true">
             <fileset dir="${rcp.configuration.dir}"/>
@@ -124,16 +117,16 @@
     <target name="release-bin-zip" if="release.zip" description="build mc zip archive">
         <zip destfile="${release.zip}">
             <zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
-                <include name="bin/*"/>
+                <include name="qpidmc*"/>
+                <exclude name="qpidmc.ini"/>
             </zipfileset>
-
-            <zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
-                <include name="eclipse/eclipse*"/>
+            
+            <zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="644">
+                <include name="qpidmc.ini"/>
             </zipfileset>
 
             <zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="644" dirmode="755">
-                <exclude name="bin/**"/>
-                <exclude name="eclipse/eclipse*"/>
+                <exclude name="qpidmc*"/>
             </zipfileset>
         </zip>
     </target>    		
@@ -141,23 +134,22 @@
     <target name="release-bin-gzip" if="release.tar.gz" description="build mc tar.gz archive">
         <tar destfile="${release.tar.gz}" longfile="gnu">
             <tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
-                <include name="bin/*"/>
+                <include name="qpidmc*"/>
+                <exclude name="qpidmc.ini"/>
             </tarfileset>
 
-            <tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
-                <include name="eclipse/eclipse*"/>
+            <tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="644">
+                <include name="qpidmc.ini"/>
             </tarfileset>
 
             <tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="644" dirmode="755">
-                <exclude name="bin/**"/>
-                <exclude name="eclipse/eclipse*"/>
+                <exclude name="qpidmc*"/>
             </tarfileset>
         </tar>
     </target>
 
     
-    
     <target name="release-bin" depends="check,release-bin-prepare,release-bin-rcp-deps,
-        release-bin-mcplugin-jar,release-bin-qpidmanagementcommon-plugin,release-bin-jmxremote-plugin,release-bin-zip,release-bin-gzip"/>
+        release-bin-qpid-mc-plugin,release-bin-qpidmanagementcommon-plugin,release-bin-jmxremote-plugin,release-bin-zip,release-bin-gzip"/>
     
 </project>
-- 
cgit v1.2.1