diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 11 | ||||
| -rw-r--r-- | make/build-jogl.xml | 9 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 9 | ||||
| -rw-r--r-- | make/build-newt.xml | 9 | ||||
| -rw-r--r-- | make/build-test.xml | 14 | ||||
| -rw-r--r-- | make/build.xml | 13 | ||||
| -rw-r--r-- | make/joglversion | 1 | ||||
| -rw-r--r-- | make/joglversion-test | 3 | ||||
| -rw-r--r-- | make/joglversion-test-android | 3 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 12 | ||||
| -rw-r--r-- | make/versions.xml | 47 |
11 files changed, 41 insertions, 90 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index f68cc43be..dd33b1683 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -27,8 +27,6 @@ </not> </condition> - <import file="versions.xml" /> - <!-- ================================================================== --> <!-- - Base initialization of properties and detection of operating system. @@ -63,10 +61,6 @@ <property name="stub.includes.gluegen.gg" value="${gluegen.root}/make/stub_includes/gluegen" /> <property name="stub.includes.gluegen.cc" value="${gluegen.root}/make/stub_includes/platform" /> - <tstamp> - <format property="version.timestamp" pattern="yyyyMMdd"/> - </tstamp> - <property name="jogl.build.number" value="manual"/> <property name="jogl.build.id" value="${version.timestamp}"/> <mkdir dir="${tempdir}" /> @@ -85,10 +79,7 @@ </exec> <property name="jogl.build.commit" value="manual"/> <!-- fallback --> - <property name="nativewindow.version" value="${nativewindow_base_version}-b${jogl.build.number}-${version.timestamp}" /> - <property name="jogl.version" value="${jogl_base_version}-b${jogl.build.number}-${version.timestamp}" /> - <property name="newt.version" value="${newt_base_version}-b${jogl.build.number}-${version.timestamp}" /> - <property name="jogl.version.plus" value="${jogl_base_version}-${jogl.build.branch}-b${jogl.build.number}-${version.timestamp}" /> + <property name="jogl.version" value="${jogamp.version.base}-b${jogl.build.number}-${version.timestamp}" /> <property name="archive.name" value="jogl-${jogl.version}-${os.and.arch}" /> <property name="archive" value="${build}/${archive.name}" /> diff --git a/make/build-jogl.xml b/make/build-jogl.xml index c481eb0f5..ce532c2b4 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -150,7 +150,7 @@ value="com/jogamp/opengl/**/swt/**"/> <property name="java.part.util" - value="com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/av/* com/jogamp/opengl/util/packrect/** jogamp/opengl/util/av/** jogamp/opengl/util/pngj/**"/> + value="com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/av/* com/jogamp/opengl/util/packrect/** jogamp/opengl/util/av/** jogamp/opengl/util/jpeg/** jogamp/opengl/util/pngj/**"/> <property name="java.part.util.awt" value="com/jogamp/opengl/util/**/awt/**"/> @@ -298,7 +298,7 @@ <property name="javadoc" value="${project.root}/javadoc_jogl_public" /> <property name="javadoc.spec" value="${project.root}/javadoc_jogl_spec" /> <property name="javadoc.dev" value="${project.root}/javadoc_jogl_dev" /> - <property name="javadoc.windowtitle" value="JOGL API -- JSR-231 ${jogl_base_version} Specification" /> + <property name="javadoc.windowtitle" value="JOGL API -- JSR-231 ${jogamp.version.base} Specification" /> <property name="javadoc.overview" value="doc/jogl/spec-overview.html" /> <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" /> @@ -1551,10 +1551,11 @@ tofile="${build.jogl}/manifest.mf" overwrite="true"> <filterset> - <filter token="VERSION" value="${jogl.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${jogl.version}"/> <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> - <filter token="BASEVERSION" value="${jogl_base_version}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> </target> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index d7ef73a46..6a42d72d4 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -149,7 +149,7 @@ <property name="javadoc" value="${project.root}/javadoc_nativewindow_public" /> <property name="javadoc.spec" value="${project.root}/javadoc_nativewindow_spec" /> <property name="javadoc.dev" value="${project.root}/javadoc_nativewindow_dev" /> - <property name="javadoc.windowtitle" value="Native Windowing Interface (NativeWindow) API -- ${nativewindow_base_version} Specification" /> + <property name="javadoc.windowtitle" value="Native Windowing Interface (NativeWindow) API -- ${jogamp.version.base} Specification" /> <property name="javadoc.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" /> <property name="javadoc.spec.packagenames" value="javax.media.nativewindow.*" /> @@ -794,10 +794,11 @@ tofile="${build.nativewindow}/manifest.mf" overwrite="true"> <filterset> - <filter token="VERSION" value="${nativewindow.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${jogl.version}"/> <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> - <filter token="BASEVERSION" value="${nativewindow_base_version}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> </target> @@ -934,7 +935,7 @@ <target name="generate.version.txt" depends="init"> <!-- Create a version.txt file indicating which version we just built --> - <echo message="${nativewindow.version}" file="${build.nativewindow}/version.txt" /> + <echo message="${jogl.version}" file="${build.nativewindow}/version.txt" /> </target> </project> diff --git a/make/build-newt.xml b/make/build-newt.xml index c3b51141f..864e0f93e 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -188,7 +188,7 @@ <property name="javadoc" value="${project.root}/javadoc_newt_public" /> <property name="javadoc.spec" value="${project.root}/javadoc_newt_spec" /> <property name="javadoc.dev" value="${project.root}/javadoc_newt_dev" /> - <property name="javadoc.windowtitle" value="NEWT API -- ${newt_base_version} Specification" /> + <property name="javadoc.windowtitle" value="NEWT API -- ${jogamp.version.base} Specification" /> <property name="javadoc.overview" value="spec-overview.html" /> <property name="javadoc.spec.packagenames" value="com.jogamp.newt, com.jogamp.newt.event, com.jogamp.newt.opengl, com.jogamp.newt.util" /> @@ -733,10 +733,11 @@ tofile="${build.newt}/manifest.mf" overwrite="true"> <filterset> - <filter token="VERSION" value="${newt.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${jogl.version}"/> <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> - <filter token="BASEVERSION" value="${newt_base_version}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> </target> @@ -907,7 +908,7 @@ <target name="generate.version.txt" depends="init"> <!-- Create a version.txt file indicating which version we just built --> - <echo message="${newt.version}" file="${build.newt}/version.txt" /> + <echo message="${jogl.version}" file="${build.newt}/version.txt" /> </target> </project> diff --git a/make/build-test.xml b/make/build-test.xml index da6e3ec29..dd072bddb 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -78,10 +78,11 @@ tofile="${build.test}/manifest-test.mf" overwrite="true"> <filterset> - <filter token="VERSION" value="${jogl.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${jogl.version}"/> <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> - <filter token="BASEVERSION" value="${jogl_base_version}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> @@ -114,10 +115,11 @@ tofile="${build.test}/manifest-test-android.mf" overwrite="true"> <filterset> - <filter token="VERSION" value="${jogl.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${jogl.version}"/> <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> - <filter token="BASEVERSION" value="${jogl_base_version}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> @@ -142,8 +144,8 @@ androidmanifest.path="resources/android/AndroidManifest-test.xml" androidresources.path="resources/android/res-test" jarmanifest.path="${build.test}/manifest-test-android.mf" - version.code="${jogl_int_version}" - version.name="${jogl.version.plus}" /> + version.code="${jogamp.version.int}" + version.name="${jogamp.version}" /> </target> <target name="test.compile.check" depends="declare.common"> diff --git a/make/build.xml b/make/build.xml index 44adf805f..0c6c97d34 100644 --- a/make/build.xml +++ b/make/build.xml @@ -165,8 +165,8 @@ androidmanifest.path="resources/android/AndroidManifest-jogl.xml" androidresources.path="resources/android/res-jogl" jarmanifest.path="${build.jogl}/manifest.mf" - version.code="${jogl_int_version}" - version.name="${jogl.version.plus}" /> + version.code="${jogamp.version.int}" + version.name="${jogamp.version}" /> </target> <target name="one.dir.skip.check" depends="init,gluegen.cpptasks.detect.os"> @@ -241,10 +241,11 @@ tofile="${archive}/README.txt" overwrite="true"> <filterset> - <filter token="VERSION" value="${jogl.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${jogl.version}"/> <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> - <filter token="BASEVERSION" value="${jogl_base_version}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> <mkdir dir="${archive}/jar" /> @@ -343,10 +344,10 @@ <property name="javadoc.overview" value="doc/jogl/spec-overview.html" /> <property name="javadoc.nw.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" /> - <property name="javadoc.nw.spec.windowtitle" value="NativeWindow API -- ${nativewindow_base_version} Specification" /> + <property name="javadoc.nw.spec.windowtitle" value="NativeWindow API -- ${jogamp.version.base} Specification" /> <property name="javadoc.nw.spec.packagenames" value="javax.media.nativewindow.*" /> - <property name="javadoc.spec.windowtitle" value="JOGL API -- JSR-231 ${jogl_base_version} Specification" /> + <property name="javadoc.spec.windowtitle" value="JOGL API -- JSR-231 ${jogamp.version.base} Specification" /> <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" /> <property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" /> diff --git a/make/joglversion b/make/joglversion index bf0220fa0..3dc57cf32 100644 --- a/make/joglversion +++ b/make/joglversion @@ -4,6 +4,7 @@ Specification-Version: @BASEVERSION@ Specification-Vendor: JogAmp Community Implementation-Title: Java Bindings for OpenGL Runtime Environment Implementation-Version: @VERSION@ +Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community diff --git a/make/joglversion-test b/make/joglversion-test index cee93dbb4..b130bb279 100644 --- a/make/joglversion-test +++ b/make/joglversion-test @@ -2,8 +2,9 @@ Manifest-Version: 1.0 Specification-Title: Test Java Bindings for OpenGL API Specification Specification-Version: @BASEVERSION@ Specification-Vendor: JogAmp Community -Implementation-Title: Test Java Bindings for OpenGL Runtime Environment +Implementation-Title: Test JOGL Runtime Environment Implementation-Version: @VERSION@ +Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community diff --git a/make/joglversion-test-android b/make/joglversion-test-android index 88c35bed1..153b3c3b9 100644 --- a/make/joglversion-test-android +++ b/make/joglversion-test-android @@ -2,8 +2,9 @@ Manifest-Version: 1.0 Specification-Title: Test Java Bindings for OpenGL API Specification Specification-Version: @BASEVERSION@ Specification-Vendor: JogAmp Community -Implementation-Title: Test Java Bindings for OpenGL Runtime Environment on Android +Implementation-Title: Test JOGL Android Runtime Environment Implementation-Version: @VERSION@ +Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index c5d00fb97..41a06ea90 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -170,7 +170,7 @@ function jrun() { #D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT -Djogl.debug.GLContext" #D_ARGS="-Dnewt.debug.Window -Djogl.debug.Animator -Dnewt.debug.Screen" #D_ARGS="-Dnativewindow.debug.JAWT -Dnewt.debug.Window" - D_ARGS="-Dnewt.debug.Window.KeyEvent" + #D_ARGS="-Dnewt.debug.Window.KeyEvent" #D_ARGS="-Dnewt.debug.Window.MouseEvent" #D_ARGS="-Dnewt.debug.Window -Dnativewindow.debug=all" #D_ARGS="-Dnewt.debug.Window -Dnativewindow.debug.JAWT -Djogl.debug.Animator" @@ -294,7 +294,7 @@ function testawtswt() { # #testnoawt com.jogamp.nativewindow.NativeWindowVersion $* #testnoawt com.jogamp.opengl.JoglVersion $* -#testnoawt com.jogamp.newt.NewtVersion $* +testnoawt com.jogamp.newt.NewtVersion $* #testnoawt com.jogamp.newt.opengl.GLWindow $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestFloatUtil01MatrixMatrixMultNOUI $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestPMVMatrix01NEWT $* @@ -433,7 +433,7 @@ function testawtswt() { # #testawt com.jogamp.opengl.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 $* #testawt com.jogamp.opengl.test.junit.newt.TestEventSourceNotAWTBug -testawt com.jogamp.opengl.test.junit.newt.TestFocus01SwingAWTRobot $* +#testawt com.jogamp.opengl.test.junit.newt.TestFocus01SwingAWTRobot $* #testawt com.jogamp.opengl.test.junit.newt.TestFocus02SwingAWTRobot $* #testawt com.jogamp.opengl.test.junit.newt.event.TestNewtKeyEventOrderAWT $* #testawt com.jogamp.opengl.test.junit.newt.event.TestNewtKeyEventAutoRepeatAWT $* @@ -494,8 +494,9 @@ testawt com.jogamp.opengl.test.junit.newt.TestFocus01SwingAWTRobot $* # # Texture / TextureUtils # -#testnoawt com.jogamp.opengl.test.junit.jogl.util.TestPNGImage01NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestTexture01AWT +#testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestJPEGImage01NEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGImage01NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGTextureFromFileAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGTextureFromFileNEWT $* #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite01AWT $* @@ -544,9 +545,6 @@ testawt com.jogamp.opengl.test.junit.newt.TestFocus01SwingAWTRobot $* # # regressions # -#Windows -#testawt com.jogamp.opengl.test.junit.newt.TestFocus01SwingAWTRobot $* -#testawt com.jogamp.opengl.test.junit.newt.TestFocus02SwingAWTRobot $* # osx: #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLDrawable02NEWT $* diff --git a/make/versions.xml b/make/versions.xml deleted file mode 100644 index 6256831d3..000000000 --- a/make/versions.xml +++ /dev/null @@ -1,47 +0,0 @@ -<!-- This file is the one canonical location containing the version - numbers for the various components such as JOGL and Newt. --> - -<project name="versions"> - - <!-- This is the base version of JOGL. For official release builds, - and nightly builds, this should be in the form "x.y{.z}", for - example, "2.0" or "2.1.1". Nightly builds will have a "-pre-" - and a timestamp automatically added to this version number. For - intermediate release builds, this should be in the form, for - example, "2.0-beta1" or "2.0-rc1". For large releases, push - betas before release candidates to give the Community time to - react.--> - <property name="jogl_base_version" value="2.0" /> - <property name="jogl_int_version" value="0914011" /> <!-- xxyyzzz, xx=API yy screen-from-to zzz app-version--> - - <!-- Uncomment this property in order to produce a JOGL release - build without running the "RI" (Reference Implementation) - target in build-jogl.xml. This should be uncommented for - official release builds and intermediate release builds, but - commented out for nightly builds. --> - <!-- <property name="jogl.ri" value="true" /> --> - - <!-- Base version of the NativeWindow interface, following the same - rules as above --> - <property name="nativewindow_base_version" value="2.0" /> - - <!-- Uncomment this property in order to produce a NativeWindow - build without running the "RI" (Reference Implementation) - target in build-nativewindow.xml. This should be uncommented for - official release builds and intermediate release builds, but - commented out for nightly builds. --> - <!-- <property name="nativewindow.ri" value="true" /> --> - - <!-- Base version of the Newt library, following the same - rules as above --> - <property name="newt_base_version" value="2.0" /> - - <!-- Newt isn't covered by a JSR at the moment, so there is little - value in having a different reference implementation - vs. intermediate build numbering scheme, but for the moment - let's keep things symmetric. This should be uncommented for - official release builds and intermediate release builds, but - commented out for nightly builds. --> - <!-- <property name="newt.ri" value="true" /> --> - -</project> |