diff options
| author | Sven Gothel <[email protected]> | 2010-11-23 06:38:00 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-11-23 06:38:00 +0100 |
| commit | c478652d19b25ebf645534b8636c3127267af233 (patch) | |
| tree | 005062986d5c70229b1e8be9c442d820c0e5a8f0 /make | |
| parent | eb9d3dffe8ed0c94bacb6876d98795f1247eab7a (diff) | |
Fix Version test while using the JAR files in classpath; Cleanup Manifest order
Diffstat (limited to 'make')
| -rwxr-xr-x | make/Manifest | 1 | ||||
| -rwxr-xr-x | make/Manifest-rt | 2 | ||||
| -rwxr-xr-x | make/Manifest-rt.cdc | 2 | ||||
| -rw-r--r-- | make/build.xml | 2 | ||||
| -rw-r--r-- | make/scripts/runtest.sh | 4 |
5 files changed, 6 insertions, 5 deletions
diff --git a/make/Manifest b/make/Manifest index 575043b..0cca8b6 100755 --- a/make/Manifest +++ b/make/Manifest @@ -9,5 +9,6 @@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community Implementation-Vendor-Id: com.jogamp Implementation-URL: http://jogamp.org/ +Extension-Name: com.jogamp.common Main-Class: com.jogamp.gluegen.GlueGen Class-Path: antlr.jar diff --git a/make/Manifest-rt b/make/Manifest-rt index 4e71ae7..f0ec2c5 100755 --- a/make/Manifest-rt +++ b/make/Manifest-rt @@ -7,7 +7,7 @@ Implementation-Version: @VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community +Implementation-Vendor-Id: com.jogamp Implementation-URL: http://jogamp.org/ Extension-Name: com.jogamp.common -Implementation-Vendor-Id: com.jogamp Trusted-Library: true diff --git a/make/Manifest-rt.cdc b/make/Manifest-rt.cdc index ac51fdc..6cd204f 100755 --- a/make/Manifest-rt.cdc +++ b/make/Manifest-rt.cdc @@ -7,7 +7,7 @@ Implementation-Version: @VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community +Implementation-Vendor-Id: com.jogamp Implementation-URL: http://jogamp.org/ Extension-Name: com.jogamp.common -Implementation-Vendor-Id: com.jogamp Trusted-Library: true diff --git a/make/build.xml b/make/build.xml index a1d339b..2241ef2 100644 --- a/make/build.xml +++ b/make/build.xml @@ -748,7 +748,7 @@ <formatter usefile="true" type="xml"/> </batchtest> <classpath> - <path path="${build}/test/build/classes:${build}/test/gensrc/java:${build}/classes:${antlr.jar}:${junit.jar}:${tools.jar}:${ant.core.lib}"/> + <path path="${build}/test/build/classes:${build}/test/gensrc/java:${build}/gluegen-rt.jar:${build}/gluegen.jar:${antlr.jar}:${junit.jar}:${tools.jar}:${ant.core.lib}"/> </classpath> </junit> diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index b494397..21602d5 100644 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -39,11 +39,11 @@ function onetest() { } #onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG -#onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG +onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG -onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG +#onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.PCPPTest 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.test.TestPointerBufferEndian 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.test.TestStructAccessorEndian 2>&1 | tee -a $LOG |