common/makefiles/Jprt.gmk

*** 41,68 ****
  $(shell (cd "$1" && $(PWD)))
  endef
  
  BUILD_DIR_ROOT:=$(root_dir)/build
  
- # Appears to be an open build
- OPEN_BUILD := \
- $(shell \
-   if [    -d $(root_dir)/jdk/src/closed      \
-        -o -d $(root_dir)/jdk/make/closed     \
-        -o -d $(root_dir)/jdk/test/closed     \
-        -o -d $(root_dir)/hotspot/src/closed  \
-        -o -d $(root_dir)/hotspot/make/closed \
-        -o -d $(root_dir)/hotspot/test/closed ] ; then \
-     echo "false"; \
-   else \
-     echo "true"; \
-   fi \
-  )
  ifdef OPENJDK
    OPEN_BUILD=true
  endif
  
  ###########################################################################
  # To help in adoption of the new configure&&make build process, a bridge
  #   build will use the old settings to run configure and do the build.
  
  # Build with the configure bridge. After running configure, restart make
--- 41,64 ----
  $(shell (cd "$1" && $(PWD)))
  endef
  
  BUILD_DIR_ROOT:=$(root_dir)/build
  
  ifdef OPENJDK
    OPEN_BUILD=true
+ else
+   OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \
+                           $(wildcard $(root_dir)/jdk/make/closed), \
+                           $(wildcard $(root_dir)/jdk/test/closed), \
+                           $(wildcard $(root_dir)/hotspot/src/closed), \
+                           $(wildcard $(root_dir)/hotspot/make/closed), \
+                           $(wildcard $(root_dir)/hotspot/test/closed)), \
+                      false,true)
  endif
  
+ HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false)
+ 
  ###########################################################################
  # To help in adoption of the new configure&&make build process, a bridge
  #   build will use the old settings to run configure and do the build.
  
  # Build with the configure bridge. After running configure, restart make
*** 101,110 ****
--- 97,111 ----
          @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
  endif
  ifdef ALT_FREETYPE_HEADERS_PATH
          @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
  endif
+ ifeq ($(HOTSPOT_AVAILABLE),false)
+   ifdef ALT_JDK_IMPORT_PATH
+         @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
+   endif
+ endif
  ifeq ($(OPEN_BUILD),true)
          @$(ECHO) " --enable-openjdk-only " >> $@.tmp
  else
    # Todo: move to closed?
    ifdef ALT_MOZILLA_HEADERS_PATH