diff options
Diffstat (limited to 'make')
31 files changed, 368 insertions, 299 deletions
diff --git a/make/build.xml b/make/build.xml index 2fe2d69..554ba43 100644 --- a/make/build.xml +++ b/make/build.xml @@ -704,7 +704,7 @@ <!-- Build GlueGen using the generated Java files along with the - original source. --> - <!--compile gluegen-rt first--> + <!-- Compile gluegen-rt first --> <javac destdir="${classes}" includeAntRuntime="false" includes="${gluegen-rt.classes} ${jogamp.common.classes}" @@ -720,14 +720,20 @@ <classpath refid="cc_gluegen.classpath" /> </javac> - <!--compile gluegen (compile time) --> + <!-- Compile gluegen (compile time). + + Uses host.rt.jar, since we require 'com.sun.tools.doclets.Taglet', + w/o it breaks build on OSX w/ Java6 compiler. + Surprisingly it works on other platforms, which seems to pick classes + outside of the 'bootclasspath'. + --> <javac destdir="${classes}" includeAntRuntime="true" excludes="${gluegen.excludes.all} ${gluegen-rt.classes} ${java.part.android}" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" - source="${host.sourcelevel}" - target="${host.targetlevel}" + source="${target.sourcelevel}" + target="${target.targetlevel}" bootclasspath="${host.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.java}" /> @@ -975,7 +981,8 @@ </target> <target name="tag.build" depends="init"> - <echo message='gluegen.build.number=${gluegen.build.number}${line.separator}' file="${build}/artifact.properties"/> + <echo message='gluegen.build.version=${jogamp.version}${line.separator}' file="${build}/artifact.properties"/> + <echo message='gluegen.build.number=${gluegen.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/> <echo message='gluegen.build.id=${gluegen.build.id}${line.separator}' file="${build}/artifact.properties" append="true"/> <echo message='gluegen.build.branch=${gluegen.build.branch}${line.separator}' file="${build}/artifact.properties" append="true"/> <echo message='gluegen.build.commit=${gluegen.build.commit}${line.separator}' file="${build}/artifact.properties" append="true"/> diff --git a/make/doc/javadoc/stylesheet.css b/make/doc/javadoc/stylesheet.css index 2c05854..9f63956 100644 --- a/make/doc/javadoc/stylesheet.css +++ b/make/doc/javadoc/stylesheet.css @@ -22,14 +22,14 @@ a:hover, a:focus { } a:active { text-decoration:none; - color:#4444ff; + color:#4444cc; } a[name] { - color:#4444ff; + color:#4444cc; } a[name]:hover { text-decoration:none; - color:#4444ff; + color:#4444cc; } pre { font-size:1.3em; diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index f8455e8..cae62c0 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -99,6 +99,8 @@ - properties appropriately. They are only set to "true" if the OS/compiler - configuration is exactly as specified. - + - isGCC + - isCLANG - isVCFamily - isVC6 - isVC7 @@ -737,6 +739,15 @@ - out because this must sometimes be called late in the setup process --> <target name="gluegen.cpptasks.detect.compiler"> + <condition property="isGCC"> + <equals arg1="${gcc.compat.compiler}" arg2="gcc" /> + </condition> + <condition property="isCLANG"> + <equals arg1="${gcc.compat.compiler}" arg2="clang" /> + </condition> + <echo message="GCC=${isGCC}" /> + <echo message="CLANG=${isCLANG}" /> + <!-- Set up compiler selection on Windows --> <condition property="isVCFamily"> <and> @@ -878,7 +889,7 @@ <!-- UNIX compiler configuration --> - <compiler id="compiler.cfg.freebsd" name="gcc"> + <compiler id="compiler.cfg.freebsd" name="${gcc.compat.compiler}"> <defineset> <define name="__unix__"/> <define name="__X11__" if="isX11"/> @@ -890,7 +901,7 @@ </defineset> </compiler> - <compiler id="compiler.cfg.linux" name="gcc"> + <compiler id="compiler.cfg.linux" name="${gcc.compat.compiler}"> <defineset> <define name="__unix__"/> <define name="__X11__" if="isX11"/> @@ -900,7 +911,7 @@ </defineset> </compiler> - <compiler id="compiler.cfg.linux.x86" name="gcc"> + <compiler id="compiler.cfg.linux.x86" name="${gcc.compat.compiler}"> <compilerarg value="-m32"/> <defineset> <define name="__unix__"/> @@ -911,7 +922,7 @@ </defineset> </compiler> - <compiler id="compiler.cfg.linux.amd64" name="gcc"> + <compiler id="compiler.cfg.linux.amd64" name="${gcc.compat.compiler}"> <compilerarg value="-fPIC"/> <compilerarg value="-m64"/> <defineset> @@ -927,7 +938,7 @@ - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp) for official JogAmp builds! --> - <compiler id="compiler.cfg.linux.armv6" name="gcc"> + <compiler id="compiler.cfg.linux.armv6" name="${gcc.compat.compiler}"> <defineset> <define name="__unix__"/> <define name="__X11__" if="isX11"/> @@ -938,11 +949,11 @@ <compilerarg value="-fpic" /> </compiler> - <compiler id="compiler.cfg.android" name="gcc"> + <compiler id="compiler.cfg.android" name="${gcc.compat.compiler}"> <!-- shall be defined in custom ${gluegen-cpptasks.file} ! --> </compiler> - <compiler id="compiler.cfg.freebsd" name="gcc"> + <compiler id="compiler.cfg.freebsd" name="${gcc.compat.compiler}"> <defineset> <define name="__unix__"/> <define name="__X11__" if="isX11"/> @@ -982,7 +993,7 @@ <!-- SOLARIS compiler configuration --> - <compiler id="compiler.cfg.solaris" name="gcc"> + <compiler id="compiler.cfg.solaris" name="${gcc.compat.compiler}"> <compilerarg value="-m32"/> <defineset> <define name="__unix__"/> @@ -994,7 +1005,7 @@ </defineset> </compiler> - <compiler id="compiler.cfg.solaris.sparcv9" name="gcc"> + <compiler id="compiler.cfg.solaris.sparcv9" name="${gcc.compat.compiler}"> <compilerarg value="-fast" /> <compilerarg value="-xchip=ultra" /> <compilerarg value="-xarch=v9a" /> @@ -1008,7 +1019,7 @@ </defineset> </compiler> - <compiler id="compiler.cfg.solaris.amd64" name="gcc"> + <compiler id="compiler.cfg.solaris.amd64" name="${gcc.compat.compiler}"> <compilerarg value="-fPIC"/> <compilerarg value="-m64"/> <!-- compilerarg value="-fast" /--> @@ -1027,7 +1038,7 @@ <!-- MacOSX compiler configuration --> - <compiler id="compiler.cfg.macosx" name="gcc"> + <compiler id="compiler.cfg.macosx" name="${gcc.compat.compiler}"> <!-- Note: Apple doesn't seem to provide ppc binaries on Snow Leopard --> <compilerarg value="-arch" if="use.macosppc"/> <compilerarg value="ppc" if="use.macosppc"/> @@ -1040,7 +1051,6 @@ <compilerarg value="-ObjC" /> <compilerarg value="-mmacosx-version-min=10.5"/> <defineset> - <define name="macosx" /> <define name="_DEBUG" if="c.compiler.use-debug"/> <define name="DEBUG" if="c.compiler.use-debug"/> <define name="NDEBUG" unless="c.compiler.use-debug"/> @@ -1060,7 +1070,7 @@ <compilerarg value="-m32"/> </compiler> - <compiler id="compiler.cfg.win32.mingw" name="gcc"> + <compiler id="compiler.cfg.win32.mingw" name="${gcc.compat.compiler}"> <compilerarg value="-g" if="c.compiler.use-debug"/> <compilerarg value="-O0" if="c.compiler.use-debug"/> <compilerarg value="-O2" unless="c.compiler.use-debug"/> @@ -1077,7 +1087,7 @@ </defineset> </compiler> - <compiler id="compiler.cfg.win64.mingw" name="gcc"> + <compiler id="compiler.cfg.win64.mingw" name="${gcc.compat.compiler}"> <compilerarg value="-g" if="c.compiler.use-debug"/> <compilerarg value="-O0" if="c.compiler.use-debug"/> <compilerarg value="-O2" unless="c.compiler.use-debug"/> @@ -1124,91 +1134,91 @@ <!-- Unix linker configuration --> - <linker id="linker.cfg.linux" name="gcc"> - <linkerarg value="-static-libgcc"/> + <linker id="linker.cfg.linux" name="${gcc.compat.compiler}"> + <linkerarg value="-static-libgcc" if="isGCC"/> </linker> - <linker id="linker.cfg.linux.x86" name="gcc"> + <linker id="linker.cfg.linux.x86" name="${gcc.compat.compiler}"> <linkerarg value="-m32"/> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> </linker> - <linker id="linker.cfg.linux.amd64" name="gcc"> + <linker id="linker.cfg.linux.amd64" name="${gcc.compat.compiler}"> <linkerarg value="-m64"/> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> </linker> <!-- Using default compiler settings - utilize: - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp) for official JogAmp builds! --> - <linker id="linker.cfg.linux.armv6" name="gcc"> + <linker id="linker.cfg.linux.armv6" name="${gcc.compat.compiler}"> <linkerarg value="-fpic" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> </linker> - <linker id="linker.cfg.linux.alpha" name="gcc"> + <linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}"> </linker> - <linker id="linker.cfg.linux.hppa" name="gcc"> + <linker id="linker.cfg.linux.hppa" name="${gcc.compat.compiler}"> </linker> - <linker id="linker.cfg.linux.mips" name="gcc"> + <linker id="linker.cfg.linux.mips" name="${gcc.compat.compiler}"> </linker> - <linker id="linker.cfg.linux.mipsel" name="gcc"> + <linker id="linker.cfg.linux.mipsel" name="${gcc.compat.compiler}"> </linker> - <linker id="linker.cfg.linux.ppc" name="gcc"> + <linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}"> </linker> - <linker id="linker.cfg.linux.s390" name="gcc"> + <linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}"> </linker> - <linker id="linker.cfg.linux.s390x" name="gcc"> + <linker id="linker.cfg.linux.s390x" name="${gcc.compat.compiler}"> </linker> - <linker id="linker.cfg.linux.sparc" name="gcc"> + <linker id="linker.cfg.linux.sparc" name="${gcc.compat.compiler}"> </linker> - <compiler id="linker.cfg.android" name="gcc"> + <compiler id="linker.cfg.android" name="${gcc.compat.compiler}"> <!-- shall be defined in custom ${gluegen-cpptasks.file} ! --> </compiler> <linker id="linker.cfg.hpux" name="aCC"> </linker> - <linker id="linker.cfg.freebsd.x86" name="gcc"> + <linker id="linker.cfg.freebsd.x86" name="${gcc.compat.compiler}"> <linkerarg value="-m32"/> </linker> - <linker id="linker.cfg.freebsd.amd64" name="gcc"> + <linker id="linker.cfg.freebsd.amd64" name="${gcc.compat.compiler}"> <linkerarg value="-m64"/> </linker> <!-- SOLARIS linker configuration --> - <linker id="linker.cfg.solaris" name="gcc"> + <linker id="linker.cfg.solaris" name="${gcc.compat.compiler}"> <linkerarg value="-m32"/> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> </linker> - <linker id="linker.cfg.solaris.sparcv9" name="gcc"> + <linker id="linker.cfg.solaris.sparcv9" name="${gcc.compat.compiler}"> <linkerarg value="-xarch=v9a" /> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> </linker> - <linker id="linker.cfg.solaris.amd64" name="gcc"> + <linker id="linker.cfg.solaris.amd64" name="${gcc.compat.compiler}"> <linkerarg value="-m64"/> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> <!-- linkerarg value="-xarch=amd64" / --> </linker> <!-- MacOSX linker configuration --> - <linker id="linker.cfg.macosx" name="gcc"> + <linker id="linker.cfg.macosx" name="${gcc.compat.compiler}"> <!-- Note: Apple doesn't seem to provide ppc binaries on Snow Leopard --> <linkerarg value="-arch" if="use.macosppc"/> <linkerarg value="ppc" if="use.macosppc"/> @@ -1217,7 +1227,7 @@ <linkerarg value="-arch" if="use.macosx64"/> <linkerarg value="x86_64" if="use.macosx64"/> <linkerarg value="-mmacosx-version-min=10.5"/> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> <!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard --> </linker> @@ -1236,20 +1246,20 @@ <linkerarg value="-static-libgcc"/> </linker> - <linker id="linker.cfg.win32.mingw" name="gcc" incremental="false"> + <linker id="linker.cfg.win32.mingw" name="${gcc.compat.compiler}" incremental="false"> <linkerarg value="-m32"/> <linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly --> <linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly --> <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.win64.mingw" name="gcc" incremental="false"> + <linker id="linker.cfg.win64.mingw" name="${gcc.compat.compiler}" incremental="false"> <linkerarg value="-m64"/> <linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly --> <linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly --> <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.msvc" name="msvc" incremental="false"> diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml index 7efc4c1..cac32bb 100755 --- a/make/gluegen-properties.xml +++ b/make/gluegen-properties.xml @@ -6,6 +6,9 @@ - This Ant project file depends on the following properties being set - externally: - + - gcc.compat.compiler + - either "gcc" (default) or "clang" + - - win32.c.compiler (required to be set on Windows): - one of "vc6", "vc7", "vc8", "mingw32" (default) or "mingw64". - c.compiler.debug: @@ -79,6 +82,9 @@ <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"/> + <condition property="win32.c.compiler" value="mingw64"> <and> <os family="windows" /> diff --git a/make/gluegen.properties b/make/gluegen.properties index 03aec9c..62bb84d 100755 --- a/make/gluegen.properties +++ b/make/gluegen.properties @@ -30,6 +30,10 @@ # MinGW is used per default, hence the default value "mingw32". # win32.c.compiler=mingw32 +# You can set the gcc compatible compiler to either gcc or clang: +#gcc.compat.compiler=gcc +#gcc.compat.compiler=clang + # MacOsX libraries can be universal / fat binaries. # The following switches enables/disables a target platform. # If non of them is enabled, the default diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index b6d427c..d312061 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -77,8 +77,8 @@ <echo message="jogamp.jar.codebase ${jogamp.jar.codebase}"/> <property name="jogamp.version.major" value="2"/> - <property name="jogamp.version.minor" value="0"/> - <property name="jogamp.version.submi" value="3"/> + <property name="jogamp.version.minor" value="1"/> + <property name="jogamp.version.submi" value="1"/> <property name="jogamp.version.devel" value="-rc-${version.timestamp}"/> <!-- Devel tag --> <!-- property name="jogamp.version.devel" value="-rc12"/--> <!-- RC tag --> <!-- property name="jogamp.version.devel" value=""/--> <!-- Release tag --> @@ -87,7 +87,7 @@ <echo message="jogamp.version ${jogamp.version}"/> <!-- This is the Android version: xxyyzzz, xx=API yy screen-from-to zzz app-version--> - <property name="jogamp.version.int" value="0914013"/> + <property name="jogamp.version.int" value="0914015"/> <echo message="jogamp.version.int ${jogamp.version.int}"/> <!-- only set 'junit.is.disabled' if set in environment as 'true' to disable JUNIT tests --> diff --git a/make/lib/archive/cpptasks/cpptasks-1.0b5-accumulated.patch b/make/lib/archive/cpptasks/cpptasks-1.0b5-accumulated.patch deleted file mode 100644 index 4965a22..0000000 --- a/make/lib/archive/cpptasks/cpptasks-1.0b5-accumulated.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Nur cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java cpptasks-1.0b5-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java ---- cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java 2008-04-02 19:26:44.000000000 +0200 -+++ cpptasks-1.0b5-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java 2012-03-06 19:39:46.739351056 +0100 -@@ -59,7 +59,7 @@ - args.addElement("-bundle"); - } else { - if (linkType.isSharedLibrary()) { -- args.addElement("-prebind"); -+ // args.addElement("-prebind"); // Only required for OSX 10.3 and earlier, no auto-add (can add manually though) - args.addElement("-dynamiclib"); - } - } -diff -Nur cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java cpptasks-1.0b5-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java ---- cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java 2008-04-02 19:26:44.000000000 +0200 -+++ cpptasks-1.0b5-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java 2012-03-06 19:42:21.241385093 +0100 -@@ -17,6 +17,8 @@ - package net.sf.antcontrib.cpptasks.gcc; - import java.io.File; - import java.util.Vector; -+import java.util.HashSet; -+import java.util.Arrays; - - import net.sf.antcontrib.cpptasks.CUtil; - import net.sf.antcontrib.cpptasks.compiler.LinkType; -@@ -33,9 +35,10 @@ - private static final String[] libtoolObjFiles = new String[]{".fo", ".a", - ".lib", ".dll", ".so", ".sl"}; - private static String[] linkerOptions = new String[]{"-bundle", -- "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-s", -+ "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-noprebind", "-s", - "-static", "-shared", "-symbolic", "-Xlinker", - "--export-all-symbols", "-static-libgcc",}; -+ private static String[] darwinLinkerOptions = new String[]{"-arch", "-weak_framework", "-lazy_framework", "-weak_library" }; - private static final GccLinker dllLinker = new GccLinker("gcc", objFiles, - discardFiles, "lib", ".so", false, new GccLinker("gcc", objFiles, - discardFiles, "lib", ".so", true, null)); -@@ -78,6 +81,9 @@ - */ - public String decorateLinkerOption(StringBuffer buf, String arg) { - String decoratedArg = arg; -+ if (arg.startsWith("--sysroot")) { -+ return arg; -+ } - if (arg.length() > 1 && arg.charAt(0) == '-') { - switch (arg.charAt(1)) { - // -@@ -97,12 +103,13 @@ - break; - default : - boolean known = false; -- for (int i = 0; i < linkerOptions.length; i++) { -- if (linkerOptions[i].equals(arg)) { -- known = true; -- break; -- } -+ HashSet allLinkerOptions = new HashSet(); -+ allLinkerOptions.addAll(Arrays.asList(linkerOptions)); -+ if (isDarwin()) { -+ allLinkerOptions.addAll(Arrays.asList(darwinLinkerOptions)); - } -+ known = allLinkerOptions.contains(arg); -+ - if (!known) { - buf.setLength(0); - buf.append("-Wl,"); -diff -Nur cpptasks-1.0b5/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java cpptasks-1.0b5-patched/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java ---- cpptasks-1.0b5/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java 2008-04-02 19:26:44.000000000 +0200 -+++ cpptasks-1.0b5-patched/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java 2012-03-06 19:39:46.891349119 +0100 -@@ -73,9 +73,8 @@ - pluginOutType.setValue("shared"); - pluginType.setOutputType(pluginOutType); - linker.addImpliedArgs(false, pluginType, args); -- assertEquals(2, args.size()); -- assertEquals("-prebind", args.elementAt(0)); -- assertEquals("-dynamiclib", args.elementAt(1)); -+ assertEquals(1, args.size()); -+ assertEquals("-dynamiclib", args.elementAt(0)); - } - /** - * Checks for proper arguments for plugin generation on Darwin diff --git a/make/lib/archive/cpptasks/cpptasks-1.0b5.patches.txt b/make/lib/archive/cpptasks/cpptasks-1.0b5.patches.txt deleted file mode 100644 index c8136b1..0000000 --- a/make/lib/archive/cpptasks/cpptasks-1.0b5.patches.txt +++ /dev/null @@ -1,6 +0,0 @@ -cpptasks-1.0b5-accumulated.patch - The accumulated patch, you only need to apply this one! - -The single original patches: - -obsolete/cpptasks-1.0b5-darwin.patch - Make OSX/Darwin work (linker options etc) -obsolete/cpptasks-1.0b5-gcclinker.patch - Make crosscompilation work (--sysroot .. etc) diff --git a/make/lib/archive/cpptasks/cpptasks-1.0b5.zip b/make/lib/archive/cpptasks/cpptasks-1.0b5.zip Binary files differdeleted file mode 100644 index 21f8c07..0000000 --- a/make/lib/archive/cpptasks/cpptasks-1.0b5.zip +++ /dev/null diff --git a/make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-darwin.patch b/make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-darwin.patch deleted file mode 100644 index 8af11be..0000000 --- a/make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-darwin.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nur cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java cpptasks-1.0b5-osx-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java ---- cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java 2008-04-02 19:26:44.000000000 +0200 -+++ cpptasks-1.0b5-osx-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java 2012-01-09 14:40:36.277639850 +0100 -@@ -59,7 +59,7 @@ - args.addElement("-bundle"); - } else { - if (linkType.isSharedLibrary()) { -- args.addElement("-prebind"); -+ // args.addElement("-prebind"); // Only required for OSX 10.3 and earlier, no auto-add (can add manually though) - args.addElement("-dynamiclib"); - } - } -diff -Nur cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java cpptasks-1.0b5-osx-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java ---- cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java 2008-04-02 19:26:44.000000000 +0200 -+++ cpptasks-1.0b5-osx-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java 2012-01-09 15:25:12.994904288 +0100 -@@ -17,6 +17,8 @@ - package net.sf.antcontrib.cpptasks.gcc; - import java.io.File; - import java.util.Vector; -+import java.util.HashSet; -+import java.util.Arrays; - - import net.sf.antcontrib.cpptasks.CUtil; - import net.sf.antcontrib.cpptasks.compiler.LinkType; -@@ -33,9 +35,10 @@ - private static final String[] libtoolObjFiles = new String[]{".fo", ".a", - ".lib", ".dll", ".so", ".sl"}; - private static String[] linkerOptions = new String[]{"-bundle", -- "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-s", -+ "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-noprebind", "-s", - "-static", "-shared", "-symbolic", "-Xlinker", - "--export-all-symbols", "-static-libgcc",}; -+ private static String[] darwinLinkerOptions = new String[]{"-arch", "-weak_framework", "-lazy_framework", "-weak_library" }; - private static final GccLinker dllLinker = new GccLinker("gcc", objFiles, - discardFiles, "lib", ".so", false, new GccLinker("gcc", objFiles, - discardFiles, "lib", ".so", true, null)); -@@ -97,12 +100,13 @@ - break; - default : - boolean known = false; -- for (int i = 0; i < linkerOptions.length; i++) { -- if (linkerOptions[i].equals(arg)) { -- known = true; -- break; -- } -+ HashSet allLinkerOptions = new HashSet(); -+ allLinkerOptions.addAll(Arrays.asList(linkerOptions)); -+ if (isDarwin()) { -+ allLinkerOptions.addAll(Arrays.asList(darwinLinkerOptions)); - } -+ known = allLinkerOptions.contains(arg); -+ - if (!known) { - buf.setLength(0); - buf.append("-Wl,"); -diff -Nur cpptasks-1.0b5/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java cpptasks-1.0b5-osx-patched/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java ---- cpptasks-1.0b5/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java 2008-04-02 19:26:44.000000000 +0200 -+++ cpptasks-1.0b5-osx-patched/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java 2012-01-09 15:29:42.379687367 +0100 -@@ -73,9 +73,8 @@ - pluginOutType.setValue("shared"); - pluginType.setOutputType(pluginOutType); - linker.addImpliedArgs(false, pluginType, args); -- assertEquals(2, args.size()); -- assertEquals("-prebind", args.elementAt(0)); -- assertEquals("-dynamiclib", args.elementAt(1)); -+ assertEquals(1, args.size()); -+ assertEquals("-dynamiclib", args.elementAt(0)); - } - /** - * Checks for proper arguments for plugin generation on Darwin diff --git a/make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-gcclinker.patch b/make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-gcclinker.patch deleted file mode 100644 index 0eb4c76..0000000 --- a/make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-gcclinker.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java -=================================================================== ---- src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java (revision 177) -+++ src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java (working copy) -@@ -78,6 +78,12 @@ - */ - public String decorateLinkerOption(StringBuffer buf, String arg) { - String decoratedArg = arg; -+ if (arg.startsWith("--sysroot")) { -+ return arg; -+ } -+ if (arg.startsWith("-nostdlib")) { -+ return arg; -+ } - if (arg.length() > 1 && arg.charAt(0) == '-') { - switch (arg.charAt(1)) { - // diff --git a/make/lib/archive/cpptasks/obsolete/cpptasks-patch-suncc-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz b/make/lib/archive/cpptasks/obsolete/cpptasks-patch-suncc-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz Binary files differdeleted file mode 100644 index 22f1cde..0000000 --- a/make/lib/archive/cpptasks/obsolete/cpptasks-patch-suncc-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz +++ /dev/null diff --git a/make/lib/cpptasks-version.txt b/make/lib/cpptasks-version.txt index 8c746d6..339d395 100755 --- a/make/lib/cpptasks-version.txt +++ b/make/lib/cpptasks-version.txt @@ -1,13 +1,5 @@ Current cpptasks is from - <http://ant-contrib.sourceforge.net/cpptasks/index.html> - -Version '1.0 beta 5' / r175: - <http://ant-contrib.svn.sourceforge.net/viewvc/ant-contrib/cpptasks/trunk/> - <http://sourceforge.net/projects/ant-contrib/files/ant-contrib/cpptasks-1.0-beta5/> + <http://jogamp.org/git/?p=ant-cpptasks.git;a=summary> -Plus the accumulated patches: - - cpptasks-1.0b5-darwin.patch - Make OSX/Darwin work (linker options etc) - - cpptasks-1.0b5-gcclinker.patch - Make crosscompilation work (--sysroot .. etc) - -See archive/cpptasks/ -and archive/cpptasks/cpptasks-1.0b5.patches.txt +Original cpptasks is from + <http://ant-contrib.sourceforge.net/cpptasks/index.html> diff --git a/make/lib/cpptasks.jar b/make/lib/cpptasks.jar Binary files differindex a97e636..046a01c 100644 --- a/make/lib/cpptasks.jar +++ b/make/lib/cpptasks.jar diff --git a/make/lib/gluegen-clang.properties b/make/lib/gluegen-clang.properties new file mode 100755 index 0000000..bbb77ae --- /dev/null +++ b/make/lib/gluegen-clang.properties @@ -0,0 +1 @@ +gcc.compat.compiler=clang diff --git a/make/lib/junit-sources.jar b/make/lib/junit-sources.jar Binary files differnew file mode 100644 index 0000000..11c221b --- /dev/null +++ b/make/lib/junit-sources.jar diff --git a/make/lib/junit.LICENSE.txt b/make/lib/junit.LICENSE.txt index 3bdeeb7..78e1d6e 100644 --- a/make/lib/junit.LICENSE.txt +++ b/make/lib/junit.LICENSE.txt @@ -1,88 +1,267 @@ -Project Website incl source code: http://www.junit.org/ +junit.jar + junit-source.zip contains: + - junit version version 4.11 + - hamcrest-core version 1.3 -Common Public License - v 1.0 +It is bundled for JogAmp builds allowing as a drop-in +replacement of junit 4.8.2! -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. +Below follows both project locations and licenses. + +++++ + +Project Website incl source code: + http://hamcrest.org/ + https://github.com/hamcrest/JavaHamcrest + +LICENSE: BSD-3-Clause + http://opensource.org/licenses/BSD-3-Clause + +BSD License + +Copyright (c) 2000-2006, www.hamcrest.org +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. Redistributions in binary form must reproduce +the above copyright notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the distribution. + +Neither the name of Hamcrest nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. + +++++ + +Project Website incl source code: + http://www.junit.org/ + https://github.com/junit-team/junit/ + +JUnit + +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS "Contribution" means: - a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and + a) in the case of the initial Contributor, the initial code and + documentation distributed under this Agreement, and b) in the case of each subsequent Contributor: i) changes to the Program, and ii) additions to the Program; - where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. + where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are +not derivative works of the Program. "Contributor" means any person or entity that distributes the Program. -"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. +"Licensed Patents " mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. "Program" means the Contributions distributed in accordance with this Agreement. -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. 2. GRANT OF RIGHTS - a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. - - b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - - c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. - - d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. + a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and +such derivative works, in source code and object code form. + + b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under +Licensed Patents to make, use, sell, offer to sell, import and otherwise +transfer the Contribution of such Contributor, if any, in source code and +object code form. This patent license shall apply to the combination of the +Contribution and the Program if, at the time the Contribution is added by the +Contributor, such addition of the Contribution causes such combination to be +covered by the Licensed Patents. The patent license shall not apply to any +other combinations which include the Contribution. No hardware per se is +licensed hereunder. + + c) Recipient understands that although each Contributor grants the +licenses to its Contributions set forth herein, no assurances are provided by +any Contributor that the Program does not infringe the patent or other +intellectual property rights of any other entity. Each Contributor disclaims +any liability to Recipient for claims brought by any other entity based on +infringement of intellectual property rights or otherwise. As a condition to +exercising the rights and licenses granted hereunder, each Recipient hereby +assumes sole responsibility to secure any other intellectual property rights +needed, if any. For example, if a third party patent license is required to +allow Recipient to distribute the Program, it is Recipient's responsibility to +acquire that license before distributing the Program. + + d) Each Contributor represents that to its knowledge it has sufficient +copyright rights in its Contribution, if any, to grant the copyright license +set forth in this Agreement. 3. REQUIREMENTS -A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: a) it complies with the terms and conditions of this Agreement; and b) its license agreement: - i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; + i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title +and non-infringement, and implied warranties or conditions of merchantability +and fitness for a particular purpose; - ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; + ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; - iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and + iii) states that any provisions which differ from this Agreement are +offered by that Contributor alone and not by any other party; and - iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. + iv) states that source code for the Program is available from such +Contributor, and informs licensees how to obtain it in a reasonable manner on +or through a medium customarily used for software exchange. When the Program is made available in source code form: - a) it must be made available under this Agreement; and + a) it must be made available under this Agreement; and - b) a copy of this Agreement must be included with each copy of the Program. + b) a copy of this Agreement must be included with each copy of the +Program. -Contributors may not remove or alter any copyright notices contained within the Program. +Contributors may not remove or alter any copyright notices contained within the +Program. -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. 4. COMMERCIAL DISTRIBUTION -Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor +to control, and cooperate with the Commercial Contributor in, the defense and +any related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. 5. NO WARRANTY -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using +and distributing the Program and assumes all risks associated with its exercise +of rights under this Agreement, including but not limited to the risks and +costs of program errors, compliance with applicable laws, damage to or loss of +data, programs or equipment, and unavailability or interruption of operations. 6. DISCLAIMER OF LIABILITY -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 7. GENERAL -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against any +entity (including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software or +hardware) infringes such Recipient's patent(s), then such Recipient's rights +granted under Section 2(b) shall terminate as of the date such litigation is +filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue +and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to time. +No one other than the Agreement Steward has the right to modify this Agreement. +The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to +serve as the Agreement Steward to a suitable separate entity. Each new version +of the Agreement will be given a distinguishing version number. The Program +(including Contributions) may always be distributed subject to the version of +the Agreement under which it was received. In addition, after a new version of +the Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly stated +in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to +the intellectual property of any Contributor under this Agreement, whether +expressly, by implication, estoppel or otherwise. All rights in the Program not +expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial +in any resulting litigation. -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. diff --git a/make/lib/junit.jar b/make/lib/junit.jar Binary files differindex 5b4bb84..af8b312 100644 --- a/make/lib/junit.jar +++ b/make/lib/junit.jar diff --git a/make/lib/junit.txt b/make/lib/junit.txt deleted file mode 100644 index c7b67bc..0000000 --- a/make/lib/junit.txt +++ /dev/null @@ -1 +0,0 @@ -version 4.8.2 diff --git a/make/resources/android/AndroidManifest-Launcher.xml b/make/resources/android/AndroidManifest-Launcher.xml index 1805496..b554267 100644 --- a/make/resources/android/AndroidManifest-Launcher.xml +++ b/make/resources/android/AndroidManifest-Launcher.xml @@ -4,12 +4,14 @@ package="jogamp.android.launcher"> <uses-feature android:name="android.hardware.touchscreen" android:required="false" /> - <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet --> + <uses-feature android:name="android.hardware.camera" android:required="false" /> + <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" /> <uses-permission android:name="android.permission.INTERNET" /> <!-- required for NV's PerfHud and I-Net data streaming --> <!-- uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" / --> <!-- required for Android-Trace --> + <uses-permission android:name="android.permission.CAMERA" /> - <uses-sdk android:minSdkVersion="9" /> + <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> <application android:icon="@drawable/icon" android:label="@string/app_launcher_name" diff --git a/make/resources/android/AndroidManifest-Runtime.xml b/make/resources/android/AndroidManifest-Runtime.xml index dc306b9..7c9d867 100644 --- a/make/resources/android/AndroidManifest-Runtime.xml +++ b/make/resources/android/AndroidManifest-Runtime.xml @@ -6,7 +6,7 @@ <uses-feature android:name="android.hardware.touchscreen" android:required="false" /> <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet --> - <uses-sdk android:minSdkVersion="9" /> + <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> <application android:icon="@drawable/icon" android:label="@string/app_runtime_name" diff --git a/make/resources/android/AndroidManifest-Test.xml b/make/resources/android/AndroidManifest-Test.xml index 962eeb9..41bee09 100644 --- a/make/resources/android/AndroidManifest-Test.xml +++ b/make/resources/android/AndroidManifest-Test.xml @@ -4,11 +4,12 @@ package="com.jogamp.gluegen.test"> <uses-feature android:name="android.hardware.touchscreen" android:required="false" /> - <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet --> + <uses-feature android:name="android.hardware.camera" android:required="false" /> + <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" /> <uses-library android:name="com.jogamp.common" android:required="true" /> - <uses-sdk android:minSdkVersion="9" /> + <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> <application android:icon="@drawable/icon" android:label="@string/app_test_name" diff --git a/make/scripts/check-java-major-version.sh b/make/scripts/check-java-major-version.sh index 0e4424d..6b1711c 100755 --- a/make/scripts/check-java-major-version.sh +++ b/make/scripts/check-java-major-version.sh @@ -22,4 +22,8 @@ function do_it() { } do_it $1 2>&1 | tee check-java-major-version.log +echo +echo VERSIONS found: +echo +grep 'major version' check-java-major-version.log | sort -u diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat index 616c9dd..7a66de0 100755 --- a/make/scripts/java-win32.bat +++ b/make/scripts/java-win32.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win32
-set J2RE_HOME=c:\jre1.7.0_25_x32
-set JAVA_HOME=c:\jdk1.7.0_25_x32
+set J2RE_HOME=c:\jre1.7.0_40_x32
+set JAVA_HOME=c:\jdk1.7.0_40_x32
set ANT_PATH=C:\apache-ant-1.8.2
set BLD_DIR=..\%BLD_SUB%
diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat index 17f389c..c0142eb 100755 --- a/make/scripts/java-win64.bat +++ b/make/scripts/java-win64.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win64
-set J2RE_HOME=c:\jre1.7.0_25_x64
-set JAVA_HOME=c:\jdk1.7.0_25_x64
+set J2RE_HOME=c:\jre1.7.0_40_x64
+set JAVA_HOME=c:\jdk1.7.0_40_x64
set ANT_PATH=C:\apache-ant-1.8.2
set BLD_DIR=..\%BLD_SUB%
diff --git a/make/scripts/make.gluegen.all.macosx-clang.sh b/make/scripts/make.gluegen.all.macosx-clang.sh new file mode 100755 index 0000000..4f84d39 --- /dev/null +++ b/make/scripts/make.gluegen.all.macosx-clang.sh @@ -0,0 +1,29 @@ +#! /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-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-macosx \ + $* 2>&1 | tee make.gluegen.all.macosx.log diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat index 29da9db..62a2214 100755 --- a/make/scripts/make.gluegen.all.win32.bat +++ b/make/scripts/make.gluegen.all.win32.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.7.0_25_x32
-set JAVA_HOME=c:\jdk1.7.0_25_x32
+set J2RE_HOME=c:\jre1.7.0_40_x32
+set JAVA_HOME=c:\jdk1.7.0_40_x32
set ANT_PATH=C:\apache-ant-1.8.2
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat index d46e740..aeec4f2 100755 --- a/make/scripts/make.gluegen.all.win64.bat +++ b/make/scripts/make.gluegen.all.win64.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.7.0_25_x64
-set JAVA_HOME=c:\jdk1.7.0_25_x64
+set J2RE_HOME=c:\jre1.7.0_40_x64
+set JAVA_HOME=c:\jdk1.7.0_40_x64
set ANT_PATH=C:\apache-ant-1.8.2
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index ac33ece..2681b84 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -75,7 +75,7 @@ function onetest() { echo } # -#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG +onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG @@ -97,8 +97,8 @@ function onetest() { #onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG -onetest com.jogamp.common.util.TestSyncRingBuffer01 $* -onetest com.jogamp.common.util.TestLFRingBuffer01 $* +#onetest com.jogamp.common.util.TestSyncRingBuffer01 $* +#onetest com.jogamp.common.util.TestLFRingBuffer01 $* #onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.URLCompositionTest 2>&1 | tee -a $LOG diff --git a/make/stub_includes/jni/macosx/jawt_md.h b/make/stub_includes/jni/macosx/jawt_md.h index e65474b..3b019dd 100644 --- a/make/stub_includes/jni/macosx/jawt_md.h +++ b/make/stub_includes/jni/macosx/jawt_md.h @@ -59,7 +59,7 @@ JAWT_MacOSXDrawingSurfaceInfo; @property (readonly) CALayer *windowLayer; @end -#endif __GLUEGEN__ +#endif /* __GLUEGEN__ */ #ifdef __cplusplus } diff --git a/make/stub_includes/platform/glibc-compat-symbols.h b/make/stub_includes/platform/glibc-compat-symbols.h index 135a8d6..5dc1a18 100644 --- a/make/stub_includes/platform/glibc-compat-symbols.h +++ b/make/stub_includes/platform/glibc-compat-symbols.h @@ -3,6 +3,9 @@ /** * + * Note: Patching a specific glibc symbol version is only required if *not* statically linking glibc, + * which should be preferred. + * * Note: JogAmp's minimum GLIBC is 2.4 due to '__stack_chk_fail' (stack overflow checking) * * GLIBC 2.4 - March 2006 - Standard for LSB 4.0, Used in SLES 10 @@ -12,13 +15,18 @@ * * Check build-in macro definitions via 'gcc -dM -E - < /dev/null' */ -#if defined(__arm__) - #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4"); -#elif defined(__amd64__) - #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5"); +#if defined(__GNUC__) && !defined(__clang__) + #if defined(__arm__) + #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4"); + #elif defined(__amd64__) + #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5"); + #else + #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5"); + #endif /*__amd64__*/ #else - #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5"); -#endif /*__amd64__*/ + #warning GLIBC_COMPAT_SYMBOL not supported with current compiler + #define GLIBC_COMPAT_SYMBOL(FFF) +#endif GLIBC_COMPAT_SYMBOL(memcpy) |