Use 'gluegen-clang.properties' for generic clang and 'gluegen-xcode_clang.properties' for OSX xcode-clang ; Add GNU/Linux LLVM/clang build scripts

Use 'gluegen-clang.properties' for generic clang and 'gluegen-xcode_clang.properties' for OSX xcode-clang.

Add GNU/Linux LLVM/clang build scripts

6 files changed, 72 insertions, 5 deletions

diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index 41b46fa..8b8b82e 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1241,14 +1241,14 @@
     <!--linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.Gcc64Linker"-->
     <linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker">
       <linkerarg value="-m64"/>
-      <linkerarg value="-static-libgcc"/>
+      <linkerarg value="-static-libgcc" if="isGCC"/>
     </linker>
     
     <!--linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32Linker"-->
     <linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker">
       <linkerarg value="-m32"/>
       <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names, ie no __stdcall @nn -->
-      <linkerarg value="-static-libgcc"/>
+      <linkerarg value="-static-libgcc" if="isGCC"/>
     </linker>
 
     <linker id="linker.cfg.win32.mingw" name="${gcc.compat.compiler}" incremental="false">
diff --git a/make/lib/gluegen-clang.properties b/make/lib/gluegen-clang.properties
index 7526552..bbb77ae 100755
--- a/make/lib/gluegen-clang.properties
+++ b/make/lib/gluegen-clang.properties
@@ -1 +1 @@
-gcc.compat.compiler=xcode.clang
+gcc.compat.compiler=clang
diff --git a/make/lib/gluegen-xcode_clang.properties b/make/lib/gluegen-xcode_clang.properties
new file mode 100755
index 0000000..7526552
--- /dev/null
+++ b/make/lib/gluegen-xcode_clang.properties
@@ -0,0 +1 @@
+gcc.compat.compiler=xcode.clang
diff --git a/make/scripts/make.gluegen.all.linux-x86-clang.sh b/make/scripts/make.gluegen.all.linux-x86-clang.sh
new file mode 100755
index 0000000..2e56da1
--- /dev/null
+++ b/make/scripts/make.gluegen.all.linux-x86-clang.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/setenv-build-jogl-x86.sh ] ; then
+    . $SDIR/setenv-build-jogl-x86.sh
+fi
+
+#    -Dc.compiler.debug=true 
+#    -Dgluegen.cpptasks.detected.os=true \
+#    -DisUnix=true \
+#    -DisLinux=true \
+#    -DisLinuxX86=true \
+#    -DisX11=true \
+#    -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml \
+#
+
+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-clang.properties"
+# or -Dgcc.compat.compiler=clang
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
+ant \
+    -Drootrel.build=build-x86-clang \
+    $* 2>&1 | tee make.gluegen.all.linux-x86-clang.log
diff --git a/make/scripts/make.gluegen.all.linux-x86_64-clang.sh b/make/scripts/make.gluegen.all.linux-x86_64-clang.sh
new file mode 100755
index 0000000..99aec47
--- /dev/null
+++ b/make/scripts/make.gluegen.all.linux-x86_64-clang.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/setenv-build-jogl-x86_64.sh
+fi
+
+#    -Dc.compiler.debug=true 
+#    -Dgluegen.cpptasks.detected.os=true \
+#    -DisUnix=true \
+#    -DisLinux=true \
+#    -DisLinuxAMD64=true \
+#    -DisX11=true \
+#
+#    -Dtarget.sourcelevel=1.6 \
+#    -Dtarget.targetlevel=1.6 \
+#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
+#
+#    -Dc.compiler.debug=true  \
+#    -Djavacdebuglevel="source,lines,vars" \
+
+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-clang.properties"
+# or -Dgcc.compat.compiler=clang
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
+# BUILD_ARCHIVE=true \
+ant \
+    -Drootrel.build=build-x86_64-clang \
+    $* 2>&1 | tee make.gluegen.all.linux-x86_64-clang.log
diff --git a/make/scripts/make.gluegen.all.macosx-clang.sh b/make/scripts/make.gluegen.all.macosx-clang.sh
index 4f84d39..f66c153 100755
--- a/make/scripts/make.gluegen.all.macosx-clang.sh
+++ b/make/scripts/make.gluegen.all.macosx-clang.sh
@@ -18,8 +18,8 @@ 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-clang.properties"
-# or -Dgcc.compat.compiler=clang
+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"