diff options
| -rw-r--r-- | LICENSE.txt | 20 | ||||
| -rw-r--r-- | make/scripts/cpp-gluegen-test.sh | 23 | ||||
| -rw-r--r-- | src/jogl/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java | 56 |
3 files changed, 69 insertions, 30 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index 5584bf389..1b3300d21 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,11 @@ JOGL as a whole may be used under the terms of the New BSD 3-clause license, -which is the common denominator of the following used 5 BSD licenses. +which is the common denominator of the following used 5 BSD licenses L.1 - L.5. + ++++ + +Additional licenses compatible with the BSD 3-clause license are listed below A.1 - A... + ++++ L.1) The JOGL source tree contains code from the JogAmp Community which is covered by the Simplified BSD 2-clause license: @@ -163,3 +169,15 @@ L.5) The JOGL source tree also contains a Java port of Brian Paul's Tile INABILITY TO USE THIS SOFTWARE, EVEN IF THE COPYRIGHT HOLDERS OR CONTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +A.1) The JOGL source tree also contains header files from Khronos, + reflecting OpenKODE, EGL, OpenGL ES1, OpenGL ES2 and OpenGL. + The Khronos license, actually a 'non license' states: + + Using a Khronos API Word or Logo Trademark + ------------------------------------------ + Any developer or company can freely download the available Khronos API Specifications + and implement and ship products using the specification completely free of charge, royalty or licensing. + Use of the related Khronos API Word or Logo Trademark however has certain requirements. + + http://www.khronos.org/legal/license/ + diff --git a/make/scripts/cpp-gluegen-test.sh b/make/scripts/cpp-gluegen-test.sh new file mode 100644 index 000000000..2baa57729 --- /dev/null +++ b/make/scripts/cpp-gluegen-test.sh @@ -0,0 +1,23 @@ +#! /bin/bash +cpp \ +-undef \ +-DGL_GLEXT_PROTOTYPES \ +-DGL_GL3EXT_PROTOTYPES \ +-Istub_includes/gluegen \ +-Istub_includes/khr \ +-Istub_includes/jni \ +-Istub_includes/jni/macosx \ +-Istub_includes/jni/win32 \ +-Istub_includes/jni/x11 \ +-Istub_includes/macosx \ +-Istub_includes/macosx/AppKit \ +-Istub_includes/macosx/OpenGL \ +-Istub_includes/opengl \ +-Istub_includes/opengl/GL \ +-Istub_includes/opengl/GL3 \ +-Istub_includes/opengl/GLES \ +-Istub_includes/opengl/GLES2 \ +-Istub_includes/win32 \ +-Istub_includes/x11 \ +-Istub_includes/x11/X11 \ +$1 `basename $1`-out diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java b/src/jogl/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java index e7a7e1d1c..e3e7cb970 100644 --- a/src/jogl/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java @@ -1,43 +1,41 @@ package com.jogamp.gluegen.opengl.ant; /* - * StaticGLGenTask.java * Copyright (C) 2003 Rob Grzywinski ([email protected]) + * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved. * Copyright (c) 2010 JogAmp Community. All rights reserved. * - * Copying, distribution and use of this software in source and binary - * forms, with or without modification, is permitted provided that the - * following conditions are met: + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: * - * Distributions of source code must reproduce the copyright notice, - * this list of conditions and the following disclaimer in the source - * code header files; and Distributions of binary code must reproduce - * the copyright notice, this list of conditions and the following - * disclaimer in the documentation, Read me file, license file and/or - * other materials provided with the software distribution. + * - Redistribution of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * The names of Sun Microsystems, Inc. ("Sun") and/or the copyright - * holder may not be used to endorse or promote products derived from + * - Redistribution 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 Sun Microsystems, Inc. or the names of + * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED "AS IS," WITHOUT A WARRANTY OF ANY - * KIND. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND - * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, NON-INTERFERENCE, ACCURACY OF - * INFORMATIONAL CONTENT OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. THE - * COPYRIGHT HOLDER, SUN AND SUN'S LICENSORS SHALL NOT BE LIABLE FOR + * This software is provided "AS IS," without a warranty of any kind. ALL + * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, + * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN + * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR - * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL THE - * COPYRIGHT HOLDER, SUN OR SUN'S LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, - * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND - * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR - * INABILITY TO USE THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGES. YOU ACKNOWLEDGE THAT THIS SOFTWARE IS NOT - * DESIGNED, LICENSED OR INTENDED FOR USE IN THE DESIGN, CONSTRUCTION, - * OPERATION OR MAINTENANCE OF ANY NUCLEAR FACILITY. THE COPYRIGHT - * HOLDER, SUN AND SUN'S LICENSORS DISCLAIM ANY EXPRESS OR IMPLIED - * WARRANTY OF FITNESS FOR SUCH USES. + * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR + * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR + * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE + * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, + * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF + * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * + * You acknowledge that this software is not designed or intended for use + * in the design, construction, operation or maintenance of any nuclear + * facility. */ import java.io.IOException; |