[asterisk-scf-commits] asterisk-scf/integration/ice.git branch "java-windows-auto-path" created.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Fri Feb 18 12:42:59 CST 2011


branch "java-windows-auto-path" has been created
        at  9bb67bdb5b422893b3216821f6e84224469df9fe (commit)

- Log -----------------------------------------------------------------
commit 9bb67bdb5b422893b3216821f6e84224469df9fe
Author: David M. Lee <dlee at digium.com>
Date:   Wed Oct 13 10:17:58 2010 -0500

    Fixed windows auto-path logic for builds on x64 machines.

diff --git a/java/config/build-win.properties b/java/config/build-win.properties
index 536213b..6ef1fd1 100644
--- a/java/config/build-win.properties
+++ b/java/config/build-win.properties
@@ -17,5 +17,5 @@ prefix		= C:/Ice-${ice.version}
 # These properties only need to be set if you want to build the
 # standalone jar for the IceGrid GUI.
 #
-jgoodies.forms = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/forms-1.3.0.jar
-jgoodies.looks = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/looks-2.3.1.jar
+jgoodies.forms = ${ProgramFiles32}/ZeroC/Ice-${ice.version}-ThirdParty/lib/forms-1.3.0.jar
+jgoodies.looks = ${ProgramFiles32}/ZeroC/Ice-${ice.version}-ThirdParty/lib/looks-2.3.1.jar
diff --git a/java/config/common.xml b/java/config/common.xml
index 280bbd4..113874e 100644
--- a/java/config/common.xml
+++ b/java/config/common.xml
@@ -18,6 +18,14 @@
       <tstamp/>
     </target>
 
+    <condition property="ProgramFiles32" value="${env.ProgramFiles}">
+      <os family="windows" arch="x86"/>
+    </condition>
+
+    <condition property="ProgramFiles32" value="${env.ProgramFiles(x86)}">
+      <os family="windows" arch="amd64"/>
+    </condition>
+
     <!-- Load build configuration properties -->
     <property file="${top.dir}/config/build.properties"/>
 
@@ -216,12 +224,12 @@
             <available file="/opt/Ice-${ice.version}/lib/db.jar"/>
         </and>
     </condition>
-    <condition property="db.jar.file" value="C:/Program Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/db.jar">
+    <condition property="db.jar.file" value="${ProgramFiles32}/ZeroC/Ice-${ice.version}-ThirdParty/lib/db.jar">
        <and>
           <os family="windows"/>
           <not><isset property="db.jar.file"/></not>
           <not><available classname="com.sleepycat.db.Database"/></not>
-          <available file="C:/Program Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/db.jar"/>
+          <available file="${ProgramFiles32}/ZeroC/Ice-${ice.version}-ThirdParty/lib/db.jar"/>
        </and>
     </condition>
 

commit a1c2ed1d9c0be1a05538d59082199e2156b23164
Author: David M. Lee <dlee at digium.com>
Date:   Wed Sep 8 09:46:34 2010 -0500

    oops.  Don't escape paths in Ant .xml files.

diff --git a/java/config/common.xml b/java/config/common.xml
index d2a1a46..280bbd4 100644
--- a/java/config/common.xml
+++ b/java/config/common.xml
@@ -216,12 +216,12 @@
             <available file="/opt/Ice-${ice.version}/lib/db.jar"/>
         </and>
     </condition>
-    <condition property="db.jar.file" value="C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/db.jar">
+    <condition property="db.jar.file" value="C:/Program Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/db.jar">
        <and>
           <os family="windows"/>
           <not><isset property="db.jar.file"/></not>
           <not><available classname="com.sleepycat.db.Database"/></not>
-          <available file="C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/db.jar"/>
+          <available file="C:/Program Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/db.jar"/>
        </and>
     </condition>
 

commit b6f9fa6b014ad270d2f89975b7fc2da603fc504e
Author: David M. Lee <dlee at digium.com>
Date:   Wed Sep 8 08:55:32 2010 -0500

    Find db.jar on Windows.

diff --git a/java/config/common.xml b/java/config/common.xml
index fc52d84..d2a1a46 100644
--- a/java/config/common.xml
+++ b/java/config/common.xml
@@ -216,6 +216,14 @@
             <available file="/opt/Ice-${ice.version}/lib/db.jar"/>
         </and>
     </condition>
+    <condition property="db.jar.file" value="C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/db.jar">
+       <and>
+          <os family="windows"/>
+          <not><isset property="db.jar.file"/></not>
+          <not><available classname="com.sleepycat.db.Database"/></not>
+          <available file="C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/db.jar"/>
+       </and>
+    </condition>
 
     <path id="db.classpath">
         <pathelement location="${db.jar.file}"/>

commit d7e9104907da5f350bf2f0687ba9180cbb56ca7e
Author: David M. Lee <dlee at digium.com>
Date:   Wed Sep 8 08:51:06 2010 -0500

    Moved paths from build.properties to OS-family specific files.

diff --git a/java/config/build-def.properties b/java/config/build-def.properties
new file mode 100644
index 0000000..cc707aa
--- /dev/null
+++ b/java/config/build-def.properties
@@ -0,0 +1,21 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+#
+# Select an installation base directory. The directory will be created
+# if it does not exist.
+#
+prefix		= /opt/Ice-${ice.version}
+
+#
+# These properties only need to be set if you want to build the
+# standalone jar for the IceGrid GUI.
+#
+jgoodies.forms  = /usr/share/java/forms-1.3.0.jar
+jgoodies.looks  = /usr/share/java/looks-2.3.1.jar
diff --git a/java/config/build-win.properties b/java/config/build-win.properties
new file mode 100644
index 0000000..536213b
--- /dev/null
+++ b/java/config/build-win.properties
@@ -0,0 +1,21 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+#
+# Select an installation base directory. The directory will be created
+# if it does not exist.
+#
+prefix		= C:/Ice-${ice.version}
+
+#
+# These properties only need to be set if you want to build the
+# standalone jar for the IceGrid GUI.
+#
+jgoodies.forms = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/forms-1.3.0.jar
+jgoodies.looks = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/looks-2.3.1.jar
diff --git a/java/config/build.properties b/java/config/build.properties
index bd3c010..80e9c99 100644
--- a/java/config/build.properties
+++ b/java/config/build.properties
@@ -11,13 +11,6 @@ ice.version = 3.4.1
 db.version = 4.8.30
 
 #
-# Select an installation base directory. The directory will be created
-# if it does not exist.
-#
-prefix		= /opt/Ice-${ice.version}
-#prefix		= C:/Ice-${ice.version}
-
-#
 # Define debug as on if you want to build with debug information.
 #
 debug		= on
@@ -26,12 +19,3 @@ debug		= on
 # Define lint with your preferred -Xlint options.
 #
 lint = unchecked,deprecation
-
-#
-# These properties only need to be set if you want to build the
-# standalone jar for the IceGrid GUI.
-#
-jgoodies.forms  = /usr/share/java/forms-1.3.0.jar
-jgoodies.looks  = /usr/share/java/looks-2.3.1.jar
-#jgoodies.forms = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/forms-1.3.0.jar
-#jgoodies.looks = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/looks-2.3.1.jar
diff --git a/java/config/common.xml b/java/config/common.xml
index 24eaad2..fc52d84 100644
--- a/java/config/common.xml
+++ b/java/config/common.xml
@@ -21,6 +21,15 @@
     <!-- Load build configuration properties -->
     <property file="${top.dir}/config/build.properties"/>
 
+    <!-- Load configuration which vary by OS family -->
+    <condition property="config-family" value="win">
+       <os family="windows"/>
+    </condition>
+    <condition property="config-family" value="def">
+       <not><isset property="config-family"/></not>
+    </condition>
+    <property file="${top.dir}/config/build-${config-family}.properties"/>
+
     <!-- Use -Xlint when requested -->
     <condition property="javac.lint" value="-Xlint:${lint}" else="-Xlint:none">
         <isset property="lint"/>

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/ice.git



More information about the asterisk-scf-commits mailing list