diff options
| -rw-r--r-- | make/build-test.xml | 8 | ||||
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 55 |
2 files changed, 41 insertions, 22 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index c476ff7..7c522cf 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -245,7 +245,7 @@ export ${system.env.library.path}=${env.TARGET_ROOT}/gluegen/${rootrel.build}/ob <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/> <echo message="${line.separator} java \${line.separator} -${jvmarg.arch} +${jvmDataModel.arg}\${line.separator} -Djava.library.path=${env.TARGET_ROOT}/gluegen/${rootrel.build}/obj${path.separator}${env.TARGET_ROOT}/gluegen/${rootrel.build}/test/build/natives\${line.separator} -cp ${junit.run.remote.jars}\${line.separator} -Dgluegen.root=${gluegen.root} \${line.separator} @@ -340,7 +340,7 @@ ${line.separator} <!-- Perform the junit tests--> <junit forkmode="once" showoutput="true" fork="true" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${gluegen.lib.abs}${path.separator}${build_t.lib.abs}"/> - <jvmarg value="${jvmarg.arch}"/> + <jvmarg value="${jvmDataModel.arg}"/> <jvmarg value="-Djava.library.path=${gluegen.lib.abs}${path.separator}${build_t.lib.abs}"/> <jvmarg value="-Dgluegen.root=${gluegen.root}"/> <jvmarg value="-Drootrel.build=${rootrel.build}"/> @@ -349,7 +349,6 @@ ${line.separator} <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/> <jvmarg value="-verbose:jni"/> <jvmarg value="-client"/> - <jvmarg value="-d32"/> --> <formatter usefile="false" type="plain"/> <formatter usefile="true" type="xml"/> @@ -371,9 +370,6 @@ ${line.separator} <property name="gluegen.lib.abs" location="${gluegen.lib}" /> <property name="build_t.lib.abs" location="${build_t.lib}" /> - <condition property="jvmarg.arch" value="-d64"><isset property="is64Bit"/></condition> - <condition property="jvmarg.arch" value="-d32"><not><isset property="is64Bit"/></not></condition> - <delete quiet="true"> <fileset dir="${build}/test/results" includes="**"/> <fileset file="${build}/${test.archive.name}.7z"/> diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 7d28aef..63df45b 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -15,6 +15,7 @@ - properties appropriately. They are only set to "true" if the OS/CPU - configuration is exactly as specified. - + - is64Bit - isUnix - isX11 - isFreeBSD @@ -33,6 +34,7 @@ - isOSXPPC - isSolaris - isSolaris32Bit + - isSolaris64Bit - isSolarisAMD64 - isSolarisSparc - isSolarisSparcv9 @@ -40,7 +42,10 @@ - isWindows - isWindowsX86 - isWindowsAMD64 - - is64Bit + - jvmDataModel64Bit + - jvmDataModel32Bit + + - jvmDataModel.arg either one of [ "-d64", "-d32" or "-Djnlp.no.jvm.data.model.set=true" ] - - isX11 is set if: !isWindows && !isOSX && !noX11 - @@ -165,6 +170,15 @@ <!-- Detect OS and compiler configuration --> <target name="gluegen.cpptasks.detect.os.1" depends="gluegen.cpptasks.initialize" unless="gluegen.cpptasks.detected.os"> + <condition property="is64Bit"> + <or> + <os arch="amd64" /> + <os arch="AMD64" /> + <os arch="x86_64" /> + <os arch="IA64" /> + <os arch="sparcv9" /> + </or> + </condition> <condition property="isOSX"> <and> <os family="mac"/> @@ -278,11 +292,15 @@ <condition property="isSolaris32Bit"> <and> <istrue value="${isSolaris}" /> - <or> - <os arch="i386" /> - <os arch="x86" /> - <os arch="sparc" /> - </or> + <not> + <istrue value="${is64Bit}" /> + </not> + </and> + </condition> + <condition property="isSolaris64Bit"> + <and> + <istrue value="${isSolaris}" /> + <istrue value="${is64Bit}" /> </and> </condition> <condition property="isSolarisSparc"> @@ -336,19 +354,24 @@ <os name="SunOS" arch="amd64" /> </condition> - <condition property="is64Bit"> + <condition property="jvmDataModel32Bit"> <or> - <os arch="amd64" /> - <os arch="AMD64" /> - <os arch="sparcv9" /> - <os arch="IA64" /> - <os arch="AMD64" /> - <os arch="x86_64" /> - <os arch="AMD64" /> - <os arch="x86_64" /> + <istrue value="${isSolaris32Bit}" /> + </or> + </condition> + <condition property="jvmDataModel64Bit"> + <or> + <istrue value="${isSolaris64Bit}" /> </or> </condition> + <condition property="jvmDataModel.arg" value="-d64"><isset property="jvmDataModel64Bit"/></condition> + <condition property="jvmDataModel.arg" value="-d32"><isset property="jvmDataModel32Bit"/></condition> + <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> <!-- dummy placeholder, valid jvm arg, won't override above spec --> + <echo message="is64Bit=${is64Bit}" /> + <echo message="jvmDataModel32Bit=${jvmDataModel32Bit}" /> + <echo message="jvmDataModel64Bit=${jvmDataModel64Bit}" /> + <echo message="jvmDataModel.arg=${jvmDataModel.arg}" /> <echo message="FreeBSD=${isFreeBSD}" /> <echo message="FreeBSDX86=${isFreeBSDX86}" /> <echo message="FreeBSDAMD64=${isFreeBSDAMD64}" /> @@ -367,6 +390,7 @@ <echo message="OS X x64=${use.macosx64}" /> <echo message="Solaris=${isSolaris}" /> <echo message="Solaris32Bit=${isSolaris32Bit}" /> + <echo message="Solaris64Bit=${isSolaris64Bit}" /> <echo message="SolarisSparc=${isSolarisSparc}" /> <echo message="SolarisSparcv9=${isSolarisSparcv9}" /> <echo message="SolarisAMD64=${isSolarisAMD64}" /> @@ -374,7 +398,6 @@ <echo message="Unix=${isUnix}" /> <echo message="Windows=${isWindows}" /> <echo message="X11=${isX11}" /> - <echo message="is64Bit=${is64Bit}" /> </target> <target name="gluegen.cpptasks.detect.os.freebsd.x86" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDX86"> |