diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 4 | ||||
| -rwxr-xr-x | make/scripts/java-win32.bat | 5 | ||||
| -rwxr-xr-x | make/scripts/java-win64.bat | 5 | ||||
| -rwxr-xr-x | make/scripts/runtest-x32.bat | 3 | ||||
| -rwxr-xr-x | make/scripts/runtest-x64.bat | 3 |
5 files changed, 14 insertions, 6 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index bb36243..f9092d0 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -601,6 +601,8 @@ chmod 644 ${results}/* \${line.separator} <include name="${build_t.gen.rootrel}/native/Bindingtest1p1Impl_JNI.c"/> <include name="${build_t.gen.rootrel}/native/TK_Engine_JNI.c"/> <include name="${build_t.gen.rootrel}/native/TK_Surface_JNI.c"/> + <include name="${build_t.gen.rootrel}/native/TK_ModelConst_JNI.c"/> + <include name="${build_t.gen.rootrel}/native/TK_ModelMutable_JNI.c"/> </patternset> <c.build c.compiler.src.files="junit.test1p1.c.src.files" @@ -625,6 +627,8 @@ chmod 644 ${results}/* \${line.separator} <include name="${build_t.gen.rootrel}/native/Bindingtest1p2Impl_JNI.c"/> <include name="${build_t.gen.rootrel}/native/TK_Engine_JNI.c"/> <include name="${build_t.gen.rootrel}/native/TK_Surface_JNI.c"/> + <include name="${build_t.gen.rootrel}/native/TK_ModelConst_JNI.c"/> + <include name="${build_t.gen.rootrel}/native/TK_ModelMutable_JNI.c"/> </patternset> <c.build c.compiler.src.files="junit.test1p2.c.src.files" diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat index b59a0cf..9b12e4c 100755 --- a/make/scripts/java-win32.bat +++ b/make/scripts/java-win32.bat @@ -5,11 +5,12 @@ set JAVA_HOME=c:\jdk1.7.0_45_x32 set ANT_PATH=C:\apache-ant-1.8.2
set BLD_DIR=..\%BLD_SUB%
-set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives
+REM set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives
+set LIB_DIR=..\%BLD_SUB%\test\build\natives
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%LIB_DIR%;%PATH%
-set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\test\build\gluegen-test.jar;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar
+set CP_ALL=.;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;lib/semantic-versioning/semver.jar;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\gluegen.jar;%BLD_DIR%\gluegen-test-util.jar;%BLD_DIR%\test\build\gluegen-test.jar
echo CP_ALL %CP_ALL%
diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat index cb610e0..904acff 100755 --- a/make/scripts/java-win64.bat +++ b/make/scripts/java-win64.bat @@ -5,11 +5,12 @@ set JAVA_HOME=c:\jdk1.7.0_45_x64 set ANT_PATH=C:\apache-ant-1.8.2
set BLD_DIR=..\%BLD_SUB%
-set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives
+REM set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives
+set LIB_DIR=..\%BLD_SUB%\test\build\natives
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%LIB_DIR%;%PATH%
-set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\test\build\gluegen-test.jar;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar
+set CP_ALL=.;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;lib/semantic-versioning/semver.jar;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\gluegen.jar;%BLD_DIR%\gluegen-test-util.jar;%BLD_DIR%\test\build\gluegen-test.jar
echo CP_ALL %CP_ALL%
diff --git a/make/scripts/runtest-x32.bat b/make/scripts/runtest-x32.bat index 5e358a8..2c5e8e2 100755 --- a/make/scripts/runtest-x32.bat +++ b/make/scripts/runtest-x32.bat @@ -1,6 +1,7 @@ -scripts\java-win32.bat com.jogamp.common.GlueGenVersion +REM scripts\java-win32.bat com.jogamp.common.GlueGenVersion REM scripts\java-win32.bat com.jogamp.common.util.TestVersionInfo REM scripts\java-win32.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter +scripts\java-win32.bat com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter REM scripts\java-win32.bat com.jogamp.common.os.TestElfReader01 REM scripts\java-win32.bat com.jogamp.common.util.TestIOUtilURIHandling diff --git a/make/scripts/runtest-x64.bat b/make/scripts/runtest-x64.bat index 6451e5d..6b42c28 100755 --- a/make/scripts/runtest-x64.bat +++ b/make/scripts/runtest-x64.bat @@ -1,6 +1,7 @@ -scripts\java-win64.bat com.jogamp.common.GlueGenVersion +REM scripts\java-win64.bat com.jogamp.common.GlueGenVersion REM scripts\java-win64.bat com.jogamp.common.util.TestVersionInfo REM scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter +scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter REM scripts\java-win64.bat com.jogamp.common.os.TestElfReader01 REM scripts\java-win64.bat com.jogamp.common.util.TestIOUtil01 |