OSX Build: Default gcc.compat.compiler=xcode.clang ; Remove explicit xcode.clang property files

4 files changed, 11 insertions, 32 deletions

diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 7e51e0a..8038de3 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -7,7 +7,7 @@
    - externally:
    - 
    -   gcc.compat.compiler
-   -       either "gcc" (default) or "clang"
+   -       either "gcc" (default), "clang" or "xcode.clang" (default for OSX)
    -
    -   win32.c.compiler (required to be set on Windows):
    -       one of "vc6", "vc7", "vc8", "mingw32" (default) or "mingw64".
@@ -49,6 +49,7 @@
     <property name="gluegen.user.properties.file.set" value="${gluegen.user.properties.file}"/>
     <property file="${gluegen.user.properties.file.set}" />
     <echo message="Loaded ${gluegen.user.properties.file.set}." />
+    <echo message="Setting defaults:" />
     <property name="antlr.jar" value="${gluegen.root}/make/lib/antlr.jar" />
     <property name="junit.jar" value="${gluegen.root}/make/lib/junit.jar" />
     <property name="ant.jar"       value="${ant.home}/lib/ant.jar" />
@@ -85,7 +86,14 @@
     <property name="ant-junit-all.apk" value="${gluegen.root}/make/lib/ant-junit-all.apk" />
 
     <!-- maybe overriden, e.g. with "clang" -->
-    <property name="gcc.compat.compiler" value="gcc"/>
+    <echo message="Setting default gcc.compat.compiler" />
+    <condition property="gcc.compat.compiler" value="xcode.clang"> <!-- default for OSX -->
+      <and>
+        <os family="mac"/>
+        <os family="unix"/>
+      </and>
+    </condition>
+    <property name="gcc.compat.compiler" value="gcc"/>             <!-- default for all others .. -->
     <echo message="gcc.compat.compiler=${gcc.compat.compiler}" />
 
     <condition property="win32.c.compiler" value="mingw64">
diff --git a/make/gluegen.properties b/make/gluegen.properties
index 62bb84d..b33c7e3 100755
--- a/make/gluegen.properties
+++ b/make/gluegen.properties
@@ -33,6 +33,7 @@
 # You can set the gcc compatible compiler to either gcc or clang:
 #gcc.compat.compiler=gcc
 #gcc.compat.compiler=clang
+#gcc.compat.compiler=xcode.clang
 
 #   MacOsX libraries can be universal / fat binaries.
 #   The following switches enables/disables a target platform.
diff --git a/make/lib/gluegen-xcode_clang.properties b/make/lib/gluegen-xcode_clang.properties
deleted file mode 100755
index 7526552..0000000
--- a/make/lib/gluegen-xcode_clang.properties
+++ /dev/null
@@ -1 +0,0 @@
-gcc.compat.compiler=xcode.clang
diff --git a/make/scripts/make.gluegen.all.macosx-clang.sh b/make/scripts/make.gluegen.all.macosx-clang.sh
deleted file mode 100755
index f66c153..0000000
--- a/make/scripts/make.gluegen.all.macosx-clang.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-
-if [ -e /opt-share/etc/profile.ant ] ; then
-    . /opt-share/etc/profile.ant
-fi
-
-#    -Dc.compiler.debug=true 
-#
-#    -Dtarget.sourcelevel=1.6 \
-#    -Dtarget.targetlevel=1.6 \
-#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-
-JAVA_HOME=`/usr/libexec/java_home -version 1.7`
-PATH=$JAVA_HOME/bin:$PATH
-export JAVA_HOME PATH
-
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
-
-export GLUEGEN_PROPERTIES_FILE="lib/gluegen-xcode_clang.properties"
-# or -Dgcc.compat.compiler=xcode.clang
-
-#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
-export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
-
-ant \
-    -Drootrel.build=build-macosx \
-    $* 2>&1 | tee make.gluegen.all.macosx.log