From 6d07c8e77789d21cb04877360723d5364aee26ef Mon Sep 17 00:00:00 2001
From: sg215889 <sg215889@jordan.goethel.localnet>
Date: Tue, 28 Jul 2009 20:19:05 -0700
Subject: Verbose mac osx x64 and ppc

---
 make/gluegen-cpptasks.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'make/gluegen-cpptasks.xml')

diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml
index 32cabbc..5b961c9 100755
--- a/make/gluegen-cpptasks.xml
+++ b/make/gluegen-cpptasks.xml
@@ -286,6 +286,8 @@
     <echo message="LinuxIA64=${isLinuxIA64}" />
     <echo message="LinuxX86=${isLinuxX86}" />
     <echo message="OS X=${isOSX}" />
+    <echo message="OS X PPC=${use.macosppc}" />
+    <echo message="OS X x64=${use.macosx64}" />
     <echo message="Solaris=${isSolaris}" />
     <echo message="Solaris32Bit=${isSolaris32Bit}" />
     <echo message="SolarisSparc=${isSolarisSparc}" />
-- 
cgit v1.2.3


From 2eca2e1d82356ef3ddedd0e12cb05861beb1f513 Mon Sep 17 00:00:00 2001
From: sg215889 <sg215889@jordan.goethel.localnet>
Date: Tue, 28 Jul 2009 21:42:38 -0700
Subject: Proper gluegen.properties loading

---
 make/build.xml              | 18 ++++--------------
 make/gluegen-cpptasks.xml   |  8 ++++++--
 make/gluegen-properties.xml | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100755 make/gluegen-properties.xml

(limited to 'make/gluegen-cpptasks.xml')

diff --git a/make/build.xml b/make/build.xml
index 51aaf3d..9d56682 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -18,16 +18,7 @@
    <available property="antlr.jar" file="/usr/share/java/antlr.jar"
               value="/usr/share/java/antlr.jar"/>
 
-  <target name="load.user.properties" unless="user.properties.file">
-    <!-- Load the user specified properties file that defines various host
-      - specific paths.  The user will be notified if this is does not
-      - exist. -->
-    <property name="user.properties.file" value="${user.home}/gluegen.properties" />
-    <property file="${user.properties.file}" />
-    <echo message="Loaded ${user.properties.file}." />
-    <fail message="antlr.jar was not specified in gluegen.properties. Please see README.txt for instructions" unless="antlr.jar"/>
-    <echo message="antlr.jar=${antlr.jar}" />
-  </target>
+  <import file="gluegen-cpptasks.xml" />
 
   <condition property="rootrel.build" value="build">
     <not>
@@ -55,7 +46,7 @@
     <copy file="../src/java/com/sun/gluegen/runtime/PointerBuffer.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/gluegen/runtime/PointerBuffer.java" />
   </target>
 
-  <target name="init" depends="load.user.properties,setup-excludes-1,setup-excludes-2">
+  <target name="init" depends="gluegen.properties.load.user,setup-excludes-1,setup-excludes-2">
     <!-- Declare all paths and user defined variables. -->
 
     <property name="javac.bootclasspath-cdc.jar" value="lib/cdc_fp.jar" />
@@ -141,7 +132,6 @@
        the source tree. -->
 
   <property name="gluegen.root" value="../" />
-  <import file="gluegen-cpptasks.xml" />
   <target name="generate.nativelibrary.sources" depends="init" >
     <!-- Define the appropriate include paths -->
     <dirset id="stub.includes.fileset.windows" dir=".">
@@ -187,11 +177,11 @@
     <!-- 
        - Set up java.home.dir appropriately on all platforms.
       -->
-    <target name="setup.java.home.dir.nonmacosx" depends="load.user.properties" unless="isOSX">
+    <target name="setup.java.home.dir.nonmacosx" depends="gluegen.properties.load.user" unless="isOSX">
       <!-- java home dir is up one directory as java.home points to '<java-install-dir>/jre' -->
       <property name="java.home.dir" value="${java.home}/.." />
     </target>
-    <target name="setup.java.home.dir.macosx" depends="load.user.properties" if="isOSX">
+    <target name="setup.java.home.dir.macosx" depends="gluegen.properties.load.user" if="isOSX">
       <property name="java.home.dir" value="/System/Library/Frameworks/JavaVM.framework/Home" />
     </target>
     <target name="setup.java.home.dir" depends="setup.java.home.dir.nonmacosx,setup.java.home.dir.macosx" >
diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml
index 5b961c9..66bc549 100755
--- a/make/gluegen-cpptasks.xml
+++ b/make/gluegen-cpptasks.xml
@@ -132,6 +132,10 @@
    -   &lt;msvc.manifest objdir="${obj}" dllname="gluegen-rt" /&gt;
   -->
 <project name="GlueGen-cpptasks" basedir=".">
+
+  <!-- import properties -->
+  <import file="gluegen-properties.xml" />
+
   <!-- import cpptasks -->
   <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar"/>
 
@@ -139,7 +143,7 @@
   <import file="${user.home}/gluegen.compiler.xml" optional="true" />
 
   <!-- Detect OS and compiler configuration -->
-  <target name="gluegen.cpptasks.detect.os.1" unless="gluegen.cpptasks.detected.os">
+  <target name="gluegen.cpptasks.detect.os.1" depends="gluegen.properties.load.user" unless="gluegen.cpptasks.detected.os">
     <condition property="isOSX">
       <and>
         <os family="mac"/>
@@ -366,7 +370,7 @@
   <target name="gluegen.cpptasks.detect.os.2" depends="gluegen.cpptasks.detect.os.freebsd,gluegen.cpptasks.detect.os.hpux,gluegen.cpptasks.detect.os.linux,gluegen.cpptasks.detect.os.osx,gluegen.cpptasks.detect.os.solaris,gluegen.cpptasks.detect.os.unix,gluegen.cpptasks.detect.os.windows"  unless="gluegen.cpptasks.detected.os.2">
   </target>
 
-  <target name="gluegen.cpptasks.detect.os" depends="gluegen.cpptasks.detect.os.1,gluegen.cpptasks.detect.os.2">
+  <target name="gluegen.cpptasks.detect.os" depends="gluegen.properties.load.user,gluegen.cpptasks.detect.os.1,gluegen.cpptasks.detect.os.2">
     <property name="gluegen.cpptasks.detected.os" value="true" />
     <property name="gluegen.cpptasks.detected.os.2" value="true" />
   </target>
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
new file mode 100755
index 0000000..084ce7e
--- /dev/null
+++ b/make/gluegen-properties.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   - This Ant project file depends on the following properties being set
+   - externally:
+   - 
+   -   win32.c.compiler (required to be set on Windows):
+   -       one of "vc6", "vc7", "vc8", or "mingw".
+   -   c.compiler.debug:
+   -       set to "true" if debug version of the compiled
+   -       C code is desired.
+   -   macosppc:
+   -       set to "true" if ppc universal / fat binaries are desired
+   -       on Mac OS X. Requires support for cross-compilation from the
+   -       underlying C compiler. Note: Unsupported on Snow Leopard!
+   -   macosx64:
+   -       set to "true" if 64-bit universal / fat binaries are desired
+   -       on Mac OS X. Requires support for cross-compilation from the
+   -       underlying C compiler.
+   - 
+  -->
+<project name="GlueGen-properties" basedir=".">
+
+  <target name="gluegen.properties.load.user" unless="user.properties.file">
+    <!-- Load the user specified properties file that defines various host
+      - specific paths.  The user will be notified if this is does not
+      - exist. -->
+    <property name="user.properties.file" value="${user.home}/gluegen.properties" />
+    <property file="${user.properties.file}" />
+    <echo message="Loaded ${user.properties.file}." />
+    <fail message="antlr.jar was not specified in gluegen.properties. Please see README.txt for instructions" unless="antlr.jar"/>
+    <echo message="antlr.jar=${antlr.jar}" />
+  </target>
+
+</project>
-- 
cgit v1.2.3


From 13da2583621ed3c803e8625aa85b474276966ef3 Mon Sep 17 00:00:00 2001
From: sg215889 <sg215889@jordan.goethel.localnet>
Date: Tue, 28 Jul 2009 21:44:01 -0700
Subject: Proper gluegen.properties loading (2)

---
 make/gluegen-cpptasks.xml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'make/gluegen-cpptasks.xml')

diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml
index 66bc549..b2cefef 100755
--- a/make/gluegen-cpptasks.xml
+++ b/make/gluegen-cpptasks.xml
@@ -11,22 +11,8 @@
    - directory (e.g., from which the parent project's build.xml is being
    - executed) to the top of the checked-out GlueGen workspace.
    - 
-   - This Ant project file depends on the following properties being set
-   - externally:
-   - 
-   -   win32.c.compiler (required to be set on Windows):
-   -       one of "vc6", "vc7", "vc8", or "mingw".
-   -   c.compiler.debug:
-   -       set to "true" if debug version of the compiled
-   -       C code is desired.
-   -   macosppc:
-   -       set to "true" if ppc universal / fat binaries are desired
-   -       on Mac OS X. Requires support for cross-compilation from the
-   -       underlying C compiler. Note: Unsupported on Snow Leopard!
-   -   macosx64:
-   -       set to "true" if 64-bit universal / fat binaries are desired
-   -       on Mac OS X. Requires support for cross-compilation from the
-   -       underlying C compiler.
+   - This Ant project file depends on properties being set
+   - via gluegen.properties, see: gluegen-properties.xml !
    - 
    - The gluegen.cpptasks.detect.os target sets the following
    - properties appropriately. They are only set to "true" if the OS/CPU
-- 
cgit v1.2.3


From 556b3ef655af70239793975f61b7ec6c0a4abbe7 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 31 Jul 2009 13:11:58 -0700
Subject: MingW: Refince CC flags

---
 make/gluegen-cpptasks.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'make/gluegen-cpptasks.xml')

diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml
index b2cefef..d3f24b6 100755
--- a/make/gluegen-cpptasks.xml
+++ b/make/gluegen-cpptasks.xml
@@ -509,6 +509,9 @@
     </compiler>
 
     <compiler id="compiler.cfg.win32.mingw" name="gcc">
+      <compilerarg value="-g" if="c.compiler.use-debug"/> 
+      <compilerarg value="-O0" if="c.compiler.use-debug"/> 
+      <compilerarg value="-O2" unless="c.compiler.use-debug"/>
       <defineset>
         <define name="_DEBUG"   if="c.compiler.use-debug"/>        
         <define name="DEBUG"    if="c.compiler.use-debug"/>        
-- 
cgit v1.2.3