diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 2 | ||||
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 27 |
2 files changed, 9 insertions, 20 deletions
diff --git a/make/build.xml b/make/build.xml index 3304ec4..73616fa 100644 --- a/make/build.xml +++ b/make/build.xml @@ -138,8 +138,6 @@ <property name="c.grammar.out.dir" value="${src.generated.java}/com/jogamp/gluegen/cgram" /> <property name="j.grammar.out.dir" value="${src.generated.java}/com/jogamp/gluegen/jgram" /> - <property name="tools.jar" value="${java.home}/../lib/tools.jar"/> - <property name="archive.name" value="gluegen-${gluegen.version}-${os.and.arch}" /> <property name="archive" value="${build}/${archive.name}" /> diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 7aee9c9..83e80cb 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -1008,22 +1008,13 @@ <!-- ================================================================== --> <!-- - - Set up java.home.dir appropriately on all platforms. + - Set up java.home.dir appropriately on all platforms. Used to differ + - across platforms, and used to be the directory above java.home, + - but is now the same in JDK 9 and later since there is no more '<java-install-dir>/jre' + - directory and the directory layout is the same across platforms. --> - <target name="setup.java.home.dir.nonmacosx" unless="isOSX"> - <!-- java home dir is up one directory as java.home points to '<java-install-dir>/jre' --> - <property name="java.home.dir" value="${java.home}/.." /> - </target> - <target name="setup.java.home.dir.macosx" if="isOSX"> - <!-- Java7 std location --> - <condition property="java.home.dir" - value="${java.home}/.."> - <available file="${java.home}/../include/jni.h"/> - </condition> - <!-- Fallback value Java6 --> - <property name="java.home.dir" value="/System/Library/Frameworks/JavaVM.framework/Home" /> - </target> - <target name="setup.java.home.dir" depends="setup.java.home.dir.nonmacosx,setup.java.home.dir.macosx"> + <target name="setup.java.home.dir"> + <property name="java.home.dir" value="${java.home}" /> <property name="java.includes.dir" value="${gluegen.root.abs-path}/make/stub_includes/jni" /> <echo message="java.home.dir ${java.home.dir}" /> <echo message="java.includes.dir ${java.includes.dir}" /> @@ -1579,7 +1570,7 @@ <echo message="Win64.MingW" /> <property name="compiler.cfg.id.base" value="compiler.cfg.win64.mingw" /> <property name="linker.cfg.id.base" value="linker.cfg.win64.mingw" /> - <property name="java.lib.dir.platform" value="${java.home.dir}/jre/bin" /> <!-- link against dll directly (not lib)--> + <property name="java.lib.dir.platform" value="${java.home.dir}/bin" /> <!-- link against dll directly (not lib)--> </target> <target name="gluegen.cpptasks.declare.compiler.win32" depends="gluegen.cpptasks.declare.compiler.win32.vc6,gluegen.cpptasks.declare.compiler.win32.vc7,gluegen.cpptasks.declare.compiler.win32.vc8,gluegen.cpptasks.declare.compiler.win32.vc8_x64,gluegen.cpptasks.declare.compiler.win32.vc9,gluegen.cpptasks.declare.compiler.win32.mingw,gluegen.cpptasks.declare.compiler.win64.mingw" if="isWindows"> @@ -1725,8 +1716,8 @@ <property name="linker.cfg.id.base" value="linker.cfg.macosx" /> <property name="java.includes.dir.platform" value="${java.includes.dir}/macosx" /> <condition property="java.lib.dir.platform" - value="${java.home.dir}/jre/lib"> - <available file="${java.home.dir}/jre/lib/libjawt.dylib"/> + value="${java.home.dir}/lib"> + <available file="${java.home.dir}/lib/libjawt.dylib"/> </condition> <!-- Fallback value Java6 --> <property name="java.lib.dir.platform" value="/System/Library/Frameworks/JavaVM.framework/Libraries" /> |