diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 2 | ||||
| -rw-r--r-- | make/elf-header.cfg | 12 | ||||
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 2 | ||||
| -rwxr-xr-x | make/scripts/runtest.sh | 4 |
4 files changed, 11 insertions, 9 deletions
diff --git a/make/build.xml b/make/build.xml index ae44851..3559721 100644 --- a/make/build.xml +++ b/make/build.xml @@ -428,7 +428,7 @@ <fail message="Requires '${compiler.cfg.id}'" unless="compiler.cfg.id"/> <fail message="Requires '${linker.cfg.id}'" unless="linker.cfg.id"/> - <javah destdir="${src.generated.c}" classpath="${classes}" class="com.jogamp.common.os.Platform, com.jogamp.common.nio.PointerBuffer, jogamp.common.jvm.JVMUtil, com.jogamp.common.util.JarUtil, jogamp.common.os.MachineDescriptionRuntime" /> + <javah destdir="${src.generated.c}" classpath="${classes}" class="com.jogamp.common.os.Platform, com.jogamp.common.nio.PointerBuffer, jogamp.common.jvm.JVMUtil, com.jogamp.common.util.JarUtil, jogamp.common.os.MachineDataInfoRuntime" /> <javah destdir="${src.generated.c}/Unix" classpath="${classes}" class="jogamp.common.os.UnixDynamicLinkerImpl" /> <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="jogamp.common.os.WindowsDynamicLinkerImpl"/> diff --git a/make/elf-header.cfg b/make/elf-header.cfg index 53da3f6..c9c8be4 100644 --- a/make/elf-header.cfg +++ b/make/elf-header.cfg @@ -7,14 +7,14 @@ HierarchicalNativeOutput false #Implements Sym64 Sym # ELF-1 (part-1) is independent of CPUType/ABI -# hence can use an arbitrary MachineDescriptor index +# hence can use an arbitrary MachineDataInfo index # for reading the struct Ehdr_p1 ! -StructMachineDescriptorIndex Ehdr_p1 private static final int mdIdx = 0; +StructMachineDataInfoIndex Ehdr_p1 private static final int mdIdx = 0; # The following sub structures shall use an mdIdx # defined by ELF-1 header code, set w/ ctor! -StructMachineDescriptorIndex Ehdr_p2 private final int mdIdx; -StructMachineDescriptorIndex Shdr private final int mdIdx; +StructMachineDataInfoIndex Ehdr_p2 private final int mdIdx; +StructMachineDataInfoIndex Shdr private final int mdIdx; ManuallyImplement Ehdr_p2.size ManuallyImplement Ehdr_p2.create @@ -37,7 +37,7 @@ CustomJavaCode Ehdr_p2 } CustomJavaCode Ehdr_p2 CustomJavaCode Ehdr_p2 Ehdr_p2(final int mdIdx, final java.nio.ByteBuffer buf) { CustomJavaCode Ehdr_p2 this.mdIdx = mdIdx; -CustomJavaCode Ehdr_p2 this.md = MachineDescription.StaticConfig.values()[mdIdx].md; +CustomJavaCode Ehdr_p2 this.md = MachineDataInfo.StaticConfig.values()[mdIdx].md; CustomJavaCode Ehdr_p2 this.accessor = new StructAccessor(buf); CustomJavaCode Ehdr_p2 } @@ -55,7 +55,7 @@ CustomJavaCode Shdr } CustomJavaCode Shdr CustomJavaCode Shdr Shdr(final int mdIdx, final java.nio.ByteBuffer buf) { CustomJavaCode Shdr this.mdIdx = mdIdx; -CustomJavaCode Shdr this.md = MachineDescription.StaticConfig.values()[mdIdx].md; +CustomJavaCode Shdr this.md = MachineDataInfo.StaticConfig.values()[mdIdx].md; CustomJavaCode Shdr this.accessor = new StructAccessor(buf); CustomJavaCode Shdr } diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 58c539c..db45b29 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -623,6 +623,8 @@ <echo message="arch=${os.arch}" /> </target> + <!-- Consult jogamp.common.os.PlatformPropsImpl.getOSAndArch(..) to complete/sync mapping! --> + <target name="gluegen.cpptasks.detect.os.freebsd.x86" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDX86"> <property name="os.and.arch" value="freebsd-i586" /> </target> diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index d353987..125c163 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -81,7 +81,7 @@ function onetest() { echo } # -#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG +onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG @@ -126,7 +126,7 @@ function onetest() { #onetest com.jogamp.common.nio.TestByteBufferInputStream 2>&1 | tee -a $LOG #onetest com.jogamp.common.nio.TestByteBufferOutputStream 2>&1 | tee -a $LOG #onetest com.jogamp.common.nio.TestByteBufferCopyStream 2>&1 | tee -a $LOG -onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG +#onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.PCPPTest 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG |