diff options
| author | Sven Gothel <[email protected]> | 2011-07-21 11:06:52 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-07-21 11:06:52 +0200 |
| commit | dc4b259b6651bdc0cec0895bc74e26e504870c8e (patch) | |
| tree | afd356aa28e4091ce12c8c6bc5e3a6b9edf48a58 /make/scripts | |
| parent | 8e0d7f00c69d79bcdac4be508e5b5999b423e904 (diff) | |
GlueGen proper size / alignment of primitive and compound types usage [2/2] - Fin
MachineDesction == MD
MD.StaticConfig:
- enum for all supported static configs (ID -> MD)
- verified at runtime: test runtime queried-MD versus static-MD,
hard fail if not compatible (size/alignment)
SizeThunk primitive sizes:
- Add notion of fixed native size (eg. int64_t) and otherwise (eg. long)
java struct 'wrappers' code generation:
- single class using size/offset arrays of all MachineDescription configurations
- at runtime the array idx is queried in static block
- type aligment for not fixed-native-size types (SizeThunk, undef long/int) via StructAccessor
junit test:
- add float test
- fix native code
- add java (create, write) -> native (verify) test
works (tested) on: linux 32/64 and windows 32/64
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/java-win32.bat | 16 | ||||
| -rwxr-xr-x | make/scripts/java-win64.bat | 17 | ||||
| -rwxr-xr-x | make/scripts/runtest-x32.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/runtest-x64.bat | 4 |
4 files changed, 41 insertions, 0 deletions
diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat new file mode 100755 index 0000000..1e2c0f2 --- /dev/null +++ b/make/scripts/java-win32.bat @@ -0,0 +1,16 @@ +
+set BLD_SUB=build-win32
+set J2RE_HOME=c:\jre1.6.0_26_x32
+set JAVA_HOME=c:\jdk1.6.0_26_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
+
+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
+
+echo CP_ALL %CP_ALL%
+
+%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1
diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat new file mode 100755 index 0000000..d518073 --- /dev/null +++ b/make/scripts/java-win64.bat @@ -0,0 +1,17 @@ +
+set BLD_SUB=build-win64
+set J2RE_HOME=c:\jre1.6.0_26_x64
+set JAVA_HOME=c:\jdk1.6.0_26_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
+
+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
+
+echo CP_ALL %CP_ALL%
+
+%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win64.log 2>&1
+
diff --git a/make/scripts/runtest-x32.bat b/make/scripts/runtest-x32.bat new file mode 100755 index 0000000..b09ce73 --- /dev/null +++ b/make/scripts/runtest-x32.bat @@ -0,0 +1,4 @@ +REM scripts\java-win32.bat com.jogamp.common.GlueGenVersion +REM scripts\java-win32.bat com.jogamp.common.util.TestVersionInfo +scripts\java-win32.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter + diff --git a/make/scripts/runtest-x64.bat b/make/scripts/runtest-x64.bat new file mode 100755 index 0000000..f437ef7 --- /dev/null +++ b/make/scripts/runtest-x64.bat @@ -0,0 +1,4 @@ +REM scripts\java-win64.bat com.jogamp.common.GlueGenVersion +REM scripts\java-win64.bat com.jogamp.common.util.TestVersionInfo +scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter + |