Mercurial > mxe-octave

changeset 3516:3b5b776331f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only download java .h files if not already available * src/stable-octave.mk, src/octave.mk: download java .h files if not already available. Dont set both java home dir and include dir.
author John Donoghue <john.donoghue@ieee.org>
date Sun, 16 Feb 2014 07:21:51 -0500
parents a551b373abc4
children 6a6f257372b7
files src/octave.mk src/stable-octave.mk
diffstat 2 files changed, 22 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.mk	Wed Feb 12 18:23:02 2014 -0500
+++ b/src/octave.mk	Sun Feb 16 07:21:51 2014 -0500
@@ -25,8 +25,7 @@
   ifeq ($(MXE_SYSTEM),mingw)
     ifeq ($(MXE_NATIVE_BUILD),no)
       $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \
-       --with-java-homedir="$(HOST_INCDIR)/java" \
-       --with-java-includedir="$(HOST_INCDIR)/java"
+       --with-java-homedir="$(HOST_INCDIR)/java" 
      endif
   endif
 endif
@@ -85,12 +84,16 @@
 
     # jni install
     if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" && "$(ENABLE_JAVA)" == "yes" ]]; then \
-      mkdir -p '$(HOST_INCDIR)/java/include'; \
-      $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \
-        -O $(HOST_INCDIR)/java/include/jni.h; \
-      mkdir -p '$(HOST_INCDIR)/java/include/win32'; \
-      $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \
-        -O $(HOST_INCDIR)/java/include/win32/jni_md.h; \
+      if [ ! -f $(HOST_INCDIR)/java/include/jni.h ]; then \
+        mkdir -p '$(HOST_INCDIR)/java/include'; \
+        $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \
+          -O $(HOST_INCDIR)/java/include/jni.h; \
+      fi; \
+      if [ ! -f $(HOST_INCDIR)/java/include/win32/jni_md.h ]; then \
+        mkdir -p '$(HOST_INCDIR)/java/include/win32'; \
+        $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \
+          -O $(HOST_INCDIR)/java/include/win32/jni_md.h; \
+      fi; \
     fi
 
     mkdir '$(1)/.build'
--- a/src/stable-octave.mk	Wed Feb 12 18:23:02 2014 -0500
+++ b/src/stable-octave.mk	Sun Feb 16 07:21:51 2014 -0500
@@ -25,8 +25,7 @@
   ifeq ($(MXE_SYSTEM),mingw)
     ifeq ($(MXE_NATIVE_BUILD),no)
       $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \
-       --with-java-homedir="$(HOST_INCDIR)/java" \
-       --with-java-includedir="$(HOST_INCDIR)/java"
+       --with-java-homedir="$(HOST_INCDIR)/java" 
      endif
   endif
 endif
@@ -85,12 +84,16 @@
 define $(PKG)_BUILD
     # jni install
     if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" && "$(ENABLE_JAVA)" == "yes" ]]; then \
-      mkdir -p '$(HOST_INCDIR)/java/include'; \
-      $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \
-        -O $(HOST_INCDIR)/java/include/jni.h; \
-      mkdir -p '$(HOST_INCDIR)/java/include/win32'; \
-      $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \
-        -O $(HOST_INCDIR)/java/include/win32/jni_md.h; \
+      if [ ! -f $(HOST_INCDIR)/java/include/jni.h ]; then \
+        mkdir -p '$(HOST_INCDIR)/java/include'; \
+        $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \
+          -O $(HOST_INCDIR)/java/include/jni.h; \
+      fi; \
+      if [ ! -f $(HOST_INCDIR)/java/include/win32/jni_md.h ]; then \
+        mkdir -p '$(HOST_INCDIR)/java/include/win32'; \
+        $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \
+          -O $(HOST_INCDIR)/java/include/win32/jni_md.h; \
+      fi; \
     fi
 
     mkdir '$(1)/.build'