1.1 --- a/common/makefiles/Jprt.gmk Wed Oct 09 18:51:32 2013 -0700
1.2 +++ b/common/makefiles/Jprt.gmk Thu Oct 10 14:58:19 2013 +0200
1.3 @@ -23,7 +23,7 @@
1.4 # questions.
1.5 #
1.6
1.7 -# This file is included by the root NewerMakefile and contains targets
1.8 +# This file is included by the root NewerMakefile and contains targets
1.9 # and utilities needed by JPRT.
1.10
1.11 # Utilities used in this Makefile. Most of this makefile executes without
1.12 @@ -36,7 +36,7 @@
1.13 PRINTF=printf
1.14 PWD=pwd
1.15 # Insure we have a path that looks like it came from pwd
1.16 -# (This is mostly for Windows sake and drive letters)
1.17 +# (This is mostly for Windows sake and drive letters)
1.18 define UnixPath # path
1.19 $(shell (cd "$1" && $(PWD)))
1.20 endef
1.21 @@ -47,19 +47,19 @@
1.22 OPEN_BUILD=true
1.23 else
1.24 OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \
1.25 - $(wildcard $(root_dir)/jdk/make/closed), \
1.26 - $(wildcard $(root_dir)/jdk/test/closed), \
1.27 - $(wildcard $(root_dir)/hotspot/src/closed), \
1.28 - $(wildcard $(root_dir)/hotspot/make/closed), \
1.29 - $(wildcard $(root_dir)/hotspot/test/closed)), \
1.30 - false,true)
1.31 + $(wildcard $(root_dir)/jdk/make/closed), \
1.32 + $(wildcard $(root_dir)/jdk/test/closed), \
1.33 + $(wildcard $(root_dir)/hotspot/src/closed), \
1.34 + $(wildcard $(root_dir)/hotspot/make/closed), \
1.35 + $(wildcard $(root_dir)/hotspot/test/closed)), \
1.36 + false,true)
1.37 endif
1.38
1.39 HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false)
1.40
1.41 ###########################################################################
1.42 # To help in adoption of the new configure&&make build process, a bridge
1.43 -# build will use the old settings to run configure and do the build.
1.44 +# build will use the old settings to run configure and do the build.
1.45
1.46 # Build with the configure bridge. After running configure, restart make
1.47 # to parse the new spec file.
1.48 @@ -85,80 +85,80 @@
1.49 $(RM) $@.tmp
1.50 $(MKDIR) -p $(BUILD_DIR_ROOT)
1.51 @$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp
1.52 -ifdef ARCH_DATA_MODEL
1.53 - @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
1.54 -endif
1.55 -ifeq ($(ARCH_DATA_MODEL),32)
1.56 - @$(ECHO) " --with-jvm-variants=client,server " >> $@.tmp
1.57 -endif
1.58 -ifdef ALT_PARALLEL_COMPILE_JOBS
1.59 - @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp
1.60 -endif
1.61 -ifdef ALT_BOOTDIR
1.62 - @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp
1.63 -endif
1.64 -ifdef ALT_CUPS_HEADERS_PATH
1.65 - @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
1.66 -endif
1.67 -ifdef ALT_FREETYPE_HEADERS_PATH
1.68 - @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
1.69 -endif
1.70 -ifdef ENABLE_SJAVAC
1.71 - @$(ECHO) " --enable-sjavac" >> $@.tmp
1.72 -endif
1.73 -ifeq ($(HOTSPOT_AVAILABLE),false)
1.74 - ifdef ALT_JDK_IMPORT_PATH
1.75 - @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
1.76 - endif
1.77 -endif
1.78 -ifeq ($(OPEN_BUILD),true)
1.79 - @$(ECHO) " --enable-openjdk-only " >> $@.tmp
1.80 -else
1.81 - # Todo: move to closed?
1.82 - ifdef ALT_MOZILLA_HEADERS_PATH
1.83 - @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp
1.84 - endif
1.85 - ifdef ALT_JUNIT_DIR
1.86 - @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp
1.87 - endif
1.88 - ifdef ANT_HOME
1.89 - @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp
1.90 - endif
1.91 - ifdef ALT_JAVAFX_ZIP_DIR
1.92 - @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp
1.93 - endif
1.94 - ifdef ALT_JMC_ZIP_DIR
1.95 - @$(ECHO) " --with-jmc-zip-dir=$(call UnixPath,$(ALT_JMC_ZIP_DIR)) " >> $@.tmp
1.96 - endif
1.97 - ifdef ALT_WIXDIR
1.98 - @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
1.99 - endif
1.100 - ifdef ALT_INSTALL_LZMA_PATH
1.101 - @$(ECHO) " --with-lzma-path=$(call UnixPath,$(ALT_INSTALL_LZMA_PATH)) " >> $@.tmp
1.102 - endif
1.103 - ifdef ALT_INSTALL_UPX_PATH
1.104 - @$(ECHO) " --with-upx-path=$(call UnixPath,$(ALT_INSTALL_UPX_PATH)) " >> $@.tmp
1.105 - endif
1.106 - ifdef ALT_INSTALL_UPX_FILENAME
1.107 - @$(ECHO) " --with-upx-filename=$(call UnixPath,$(ALT_INSTALL_UPX_FILENAME)) " >> $@.tmp
1.108 - endif
1.109 - ifdef ALT_CCSS_SIGNING_DIR
1.110 - @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
1.111 - endif
1.112 - ifdef ALT_SLASH_JAVA
1.113 - @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
1.114 - endif
1.115 - ifdef ALT_SPARKLE_FRAMEWORK_DIR
1.116 - @$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
1.117 - endif
1.118 -endif
1.119 + ifdef ARCH_DATA_MODEL
1.120 + @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
1.121 + endif
1.122 + ifeq ($(ARCH_DATA_MODEL),32)
1.123 + @$(ECHO) " --with-jvm-variants=client,server " >> $@.tmp
1.124 + endif
1.125 + ifdef ALT_PARALLEL_COMPILE_JOBS
1.126 + @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp
1.127 + endif
1.128 + ifdef ALT_BOOTDIR
1.129 + @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp
1.130 + endif
1.131 + ifdef ALT_CUPS_HEADERS_PATH
1.132 + @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
1.133 + endif
1.134 + ifdef ALT_FREETYPE_HEADERS_PATH
1.135 + @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
1.136 + endif
1.137 + ifdef ENABLE_SJAVAC
1.138 + @$(ECHO) " --enable-sjavac" >> $@.tmp
1.139 + endif
1.140 + ifeq ($(HOTSPOT_AVAILABLE),false)
1.141 + ifdef ALT_JDK_IMPORT_PATH
1.142 + @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
1.143 + endif
1.144 + endif
1.145 + ifeq ($(OPEN_BUILD),true)
1.146 + @$(ECHO) " --enable-openjdk-only " >> $@.tmp
1.147 + else
1.148 +# Todo: move to closed?
1.149 + ifdef ALT_MOZILLA_HEADERS_PATH
1.150 + @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp
1.151 + endif
1.152 + ifdef ALT_JUNIT_DIR
1.153 + @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp
1.154 + endif
1.155 + ifdef ANT_HOME
1.156 + @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp
1.157 + endif
1.158 + ifdef ALT_JAVAFX_ZIP_DIR
1.159 + @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp
1.160 + endif
1.161 + ifdef ALT_JMC_ZIP_DIR
1.162 + @$(ECHO) " --with-jmc-zip-dir=$(call UnixPath,$(ALT_JMC_ZIP_DIR)) " >> $@.tmp
1.163 + endif
1.164 + ifdef ALT_WIXDIR
1.165 + @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
1.166 + endif
1.167 + ifdef ALT_INSTALL_LZMA_PATH
1.168 + @$(ECHO) " --with-lzma-path=$(call UnixPath,$(ALT_INSTALL_LZMA_PATH)) " >> $@.tmp
1.169 + endif
1.170 + ifdef ALT_INSTALL_UPX_PATH
1.171 + @$(ECHO) " --with-upx-path=$(call UnixPath,$(ALT_INSTALL_UPX_PATH)) " >> $@.tmp
1.172 + endif
1.173 + ifdef ALT_INSTALL_UPX_FILENAME
1.174 + @$(ECHO) " --with-upx-filename=$(call UnixPath,$(ALT_INSTALL_UPX_FILENAME)) " >> $@.tmp
1.175 + endif
1.176 + ifdef ALT_CCSS_SIGNING_DIR
1.177 + @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
1.178 + endif
1.179 + ifdef ALT_SLASH_JAVA
1.180 + @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
1.181 + endif
1.182 + ifdef ALT_SPARKLE_FRAMEWORK_DIR
1.183 + @$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
1.184 + endif
1.185 + endif
1.186 @if [ -f $@ ] ; then \
1.187 - if ! $(CMP) $@ $@.tmp > /dev/null ; then \
1.188 - $(CP) $@.tmp $@ ; \
1.189 - fi ; \
1.190 - else \
1.191 - $(CP) $@.tmp $@ ; \
1.192 - fi
1.193 + if ! $(CMP) $@ $@.tmp > /dev/null ; then \
1.194 + $(CP) $@.tmp $@ ; \
1.195 + fi ; \
1.196 + else \
1.197 + $(CP) $@.tmp $@ ; \
1.198 + fi
1.199 $(RM) $@.tmp
1.200
1.201 PHONY_LIST += bridge2configure bridgeBuild
1.202 @@ -170,7 +170,7 @@
1.203 JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
1.204 endif
1.205 ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
1.206 - JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
1.207 + JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
1.208 endif
1.209
1.210 # These targets execute in a SPEC free context, before calling bridgeBuild
1.211 @@ -212,9 +212,9 @@
1.212 $(MKDIR) -p $(BUILD_OUTPUT)/bundles
1.213 $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
1.214 $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
1.215 - if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
1.216 - $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
1.217 - fi
1.218 + if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
1.219 + $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
1.220 + fi
1.221 @$(call TargetExit)
1.222
1.223 # Copy images to one unified location regardless of platform etc.
1.224 @@ -226,19 +226,19 @@
1.225 $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
1.226 $(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/
1.227 $(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/
1.228 -ifeq ($(OPENJDK_TARGET_OS),macosx)
1.229 - $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)
1.230 - $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)
1.231 - $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/
1.232 - $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/
1.233 -endif
1.234 + ifeq ($(OPENJDK_TARGET_OS),macosx)
1.235 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)
1.236 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)
1.237 + $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/
1.238 + $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/
1.239 + endif
1.240 @$(call TargetExit)
1.241
1.242
1.243 # Keep track of phony targets
1.244 PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
1.245 - jprt_build_generic bundles jprt_bundle \
1.246 - final-images final-images-only
1.247 + jprt_build_generic bundles jprt_bundle \
1.248 + final-images final-images-only
1.249
1.250 ###########################################################################
1.251 # Phony targets
