multi-php-version support; build with php53 for now

[packages/ice.git] / java-build.patch

Don't put manifest in jar; don't build demo or test; use system jgoodies

diff -ur Ice-3.4.0.orig/java/build.xml Ice-3.4.0/java/build.xml
--- Ice-3.4.0.orig/java/build.xml	2010-03-12 12:51:00.743391980 +0000
+++ Ice-3.4.0/java/build.xml	2010-03-12 12:54:01.002548076 +0000
@@ -230,7 +230,6 @@
             <include name="Freeze/**"/>
             <manifest>
                 <attribute name="Built-By" value="ZeroC, Inc."/>
-                <attribute name="Class-Path" value="db.jar db-${db.version}.jar /usr/share/java/db-${db.version}.jar ../db.jar"/>
             </manifest>
         </jar>
         <jar jarfile="${lib.dir}/Freeze.jar" basedir="${src.dir}" update="yes">
@@ -508,17 +507,12 @@
     </condition>
 
     <target name="icegridadmin-plain-jar" depends="icegridadmin-compile" if="build-icegridadmin-plain-jar" unless="ice.bin.dist">
-        <manifest file="${lib.dir}/icegridgui.mf">
-            <attribute name="Main-Class" value="IceGridGUI.Main"/>
-            <attribute name="Class-Path" value="Ice.jar ${jgoodies.forms} ${jgoodies.looks} ${jgoodies.common} ../resources/ "/>
-        </manifest>
-        <jar jarfile="${lib.dir}/IceGridGUI.jar" manifest="${lib.dir}/icegridgui.mf" basedir="${lib.dir}">
+        <jar jarfile="${lib.dir}/IceGridGUI.jar" basedir="${lib.dir}">
             <include name="IceGridGUI/**"/>
         </jar>
         <jar jarfile="${lib.dir}/IceGridGUI.jar" basedir="resources" update="true">
             <include name="icons/**"/>
         </jar>
-        <delete file="${lib.dir}/icegridgui.mf" />
     </target>
 
     <target name="icegridadmin-pro-jar" depends="ice-jar,icegridadmin-compile" if="build-icegridadmin-pro-jar" unless="ice.bin.dist">
@@ -607,8 +601,6 @@
     <target name="test" depends="test-compile, ice-compile"/>
 
     <target name="all" depends="jar">
-      <ant inheritAll="false" dir="test"/>
-      <ant inheritAll="false" dir="demo"/>
     </target>
 
     <target name="install-common">
--- Ice-3.4.1/java/config/build.properties~	2010-06-03 19:48:34.000000000 +0300
+++ Ice-3.4.1/java/config/build.properties	2010-06-10 11:01:36.101008204 +0300
@@ -31,9 +31,9 @@
 # These properties only need to be set if you want to build the
 # standalone jar for the IceGrid GUI.
 #
-jgoodies.common = /usr/share/java/jgoodies-common-1.2.0.jar
-jgoodies.forms  = /usr/share/java/jgoodies-forms-1.4.1.jar
-jgoodies.looks  = /usr/share/java/jgoodies-looks-2.4.1.jar
+jgoodies.common = /usr/share/java/jgoodies-common.jar
+jgoodies.forms  = /usr/share/java/jgoodies-forms.jar
+jgoodies.looks  = /usr/share/java/jgoodies-looks.jar
 #jgoodies.common = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/jgoodies-common-1.2.0.jar
 #jgoodies.forms  = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/jgoodies-forms-1.4.1.jar
 #jgoodies.looks  = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/jgoodies-looks-2.4.1.jar