diff options
| author | Sven Gothel <[email protected]> | 2011-04-20 21:35:49 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-04-20 21:35:49 +0200 |
| commit | 3a8676f56850304c782c0121dcaad2d44ef2baec (patch) | |
| tree | f5b4f28c43e83b4fd9a66a8bd8cd275c696b09e6 | |
| parent | e3b734483a32490140988824215585a1277022d4 (diff) | |
Remove redundant setup.java.home.dir, use proper gluegen-cpptasks-base.xml target gluegen.cpptasks.setup.compiler (instead of gluegen.cpptasks.detect.compiler)
| -rw-r--r-- | make/build.xml | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/make/build.xml b/make/build.xml index 99b9e2b..78f7cdc 100644 --- a/make/build.xml +++ b/make/build.xml @@ -204,21 +204,6 @@ <!-- ================================================================== --> <!-- - - Set up java.home.dir appropriately on all platforms. - --> - <target name="setup.java.home.dir.nonmacosx" depends="gluegen.properties.load.user" 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" depends="gluegen.properties.load.user" if="isOSX"> - <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" > - <property name="java.includes.dir" value="${java.home.dir}/include" /> - </target> - - <!-- ================================================================== --> - <!-- - Compile the native C code for GlueGen's dynamic linker interface. --> @@ -349,7 +334,7 @@ <property name="java.includes.dir.hpux" value="${java.includes.dir}/hp-ux" /> </target> - <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.detect.compiler,setup.java.home.dir,declare.win32,declare.linux,declare.solaris,declare.macosx,declare.freebsd,declare.hpux,gluegen.cpptasks.configure.compiler" unless="build.javaonly" > + <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler,declare.win32,declare.linux,declare.solaris,declare.macosx,declare.freebsd,declare.hpux,gluegen.cpptasks.configure.compiler" unless="build.javaonly" > <!-- Common properties --> <property name="java.includes.dir" value="${java.home.dir}/include" /> <!-- NOTE: this MUST be relative for FileSet --> |