86 HOTSPOT_TARGET_OS_TYPE := @HOTSPOT_TARGET_OS_TYPE@ |
86 HOTSPOT_TARGET_OS_TYPE := @HOTSPOT_TARGET_OS_TYPE@ |
87 |
87 |
88 HOTSPOT_TARGET_CPU := @HOTSPOT_TARGET_CPU@ |
88 HOTSPOT_TARGET_CPU := @HOTSPOT_TARGET_CPU@ |
89 HOTSPOT_TARGET_CPU_ARCH := @HOTSPOT_TARGET_CPU_ARCH@ |
89 HOTSPOT_TARGET_CPU_ARCH := @HOTSPOT_TARGET_CPU_ARCH@ |
90 HOTSPOT_TARGET_CPU_DEFINE := @HOTSPOT_TARGET_CPU_DEFINE@ |
90 HOTSPOT_TARGET_CPU_DEFINE := @HOTSPOT_TARGET_CPU_DEFINE@ |
|
91 |
|
92 OPENJDK_TARGET_CPU_BUNDLE:=@OPENJDK_TARGET_CPU_BUNDLE@ |
|
93 OPENJDK_TARGET_OS_BUNDLE:=@OPENJDK_TARGET_OS_BUNDLE@ |
|
94 OPENJDK_TARGET_BUNDLE_PLATFORM:=@OPENJDK_TARGET_BUNDLE_PLATFORM@ |
91 |
95 |
92 # We are building on this build system. |
96 # We are building on this build system. |
93 # When not cross-compiling, it is the same as the target. |
97 # When not cross-compiling, it is the same as the target. |
94 OPENJDK_BUILD_OS:=@OPENJDK_BUILD_OS@ |
98 OPENJDK_BUILD_OS:=@OPENJDK_BUILD_OS@ |
95 OPENJDK_BUILD_OS_TYPE:=@OPENJDK_BUILD_OS_TYPE@ |
99 OPENJDK_BUILD_OS_TYPE:=@OPENJDK_BUILD_OS_TYPE@ |
266 BUILDTOOLS_OUTPUTDIR=$(BUILD_OUTPUT)/buildtools |
270 BUILDTOOLS_OUTPUTDIR=$(BUILD_OUTPUT)/buildtools |
267 |
271 |
268 HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot |
272 HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot |
269 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk |
273 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk |
270 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images |
274 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images |
|
275 BUNDLES_OUTPUTDIR=$(BUILD_OUTPUT)/bundles |
271 TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/test-make |
276 TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/test-make |
272 MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support |
277 MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support |
273 # This does not get overridden in a bootcycle build |
278 # This does not get overridden in a bootcycle build |
274 CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@ |
279 CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@ |
275 BUILDJDK_OUTPUTDIR=$(BUILD_OUTPUT)/buildjdk |
280 BUILDJDK_OUTPUTDIR=$(BUILD_OUTPUT)/buildjdk |
677 JTREGEXE:=@JTREGEXE@ |
683 JTREGEXE:=@JTREGEXE@ |
678 XCODEBUILD=@XCODEBUILD@ |
684 XCODEBUILD=@XCODEBUILD@ |
679 DTRACE := @DTRACE@ |
685 DTRACE := @DTRACE@ |
680 FIXPATH:=@FIXPATH@ |
686 FIXPATH:=@FIXPATH@ |
681 |
687 |
|
688 TAR_INCLUDE_PARAM:=@TAR_INCLUDE_PARAM@ |
|
689 TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@ |
|
690 |
682 # Build setup |
691 # Build setup |
683 ENABLE_JFR=@ENABLE_JFR@ |
692 ENABLE_JFR=@ENABLE_JFR@ |
684 ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ |
693 ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ |
685 USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ |
694 USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ |
686 USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@ |
695 USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@ |
783 SYMBOLS_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(SYMBOLS_IMAGE_SUBDIR) |
792 SYMBOLS_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(SYMBOLS_IMAGE_SUBDIR) |
784 |
793 |
785 # Interim image |
794 # Interim image |
786 INTERIM_IMAGE_DIR := $(SUPPORT_OUTPUTDIR)/interim-image |
795 INTERIM_IMAGE_DIR := $(SUPPORT_OUTPUTDIR)/interim-image |
787 |
796 |
|
797 # Docs image |
|
798 DOCS_IMAGE_SUBDIR := docs |
|
799 DOCS_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(DOCS_IMAGE_SUBDIR) |
|
800 |
788 # Macosx bundles directory definitions |
801 # Macosx bundles directory definitions |
789 JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle/jdk-$(VERSION_NUMBER).jdk/Contents |
802 JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle |
790 JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle/jre-$(VERSION_NUMBER).jre/Contents |
803 JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle |
791 JDK_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR) |
804 JDK_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR) |
792 JRE_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR) |
805 JRE_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR) |
|
806 JDK_MACOSX_CONTENTS_SUBDIR=jdk-$(VERSION_NUMBER).jdk/Contents |
|
807 JRE_MACOSX_CONTENTS_SUBDIR=jre-$(VERSION_NUMBER).jre/Contents |
|
808 JDK_MACOSX_CONTENTS_DIR=$(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR) |
|
809 JRE_MACOSX_CONTENTS_DIR=$(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_CONTENTS_SUBDIR) |
|
810 |
|
811 # Bundle names |
|
812 BASE_NAME := $(VERSION_SHORT)+$(VERSION_BUILD)_$(OPENJDK_TARGET_BUNDLE_PLATFORM) |
|
813 ifeq ($(DEBUG_LEVEL), fastdebug) |
|
814 DEBUG_PART := -debug |
|
815 else ifneq ($(DEBUG_LEVEL), release) |
|
816 DEBUG_PART := -$(DEBUG_LEVEL) |
|
817 endif |
|
818 JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).tar.gz |
|
819 JRE_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART).tar.gz |
|
820 JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz |
|
821 JRE_SYMBOLS_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz |
|
822 ifeq ($(OPENJDK_TARGET_OS), windows) |
|
823 DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_demo$(DEBUG_PART).zip |
|
824 else |
|
825 DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_demo$(DEBUG_PART).tar.gz |
|
826 endif |
|
827 TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz |
|
828 DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz |
|
829 |
|
830 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME) |
|
831 JRE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME) |
|
832 JDK_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME) |
|
833 JRE_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JRE_SYMBOLS_BUNDLE_NAME) |
|
834 DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DEMOS_BUNDLE_NAME) |
|
835 TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME) |
|
836 DOCS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME) |
793 |
837 |
794 # This macro is called to allow inclusion of closed source counterparts. |
838 # This macro is called to allow inclusion of closed source counterparts. |
795 # Unless overridden in closed sources, it expands to nothing. |
839 # Unless overridden in closed sources, it expands to nothing. |
796 # Usage: This function is called in an open makefile, with the following |
840 # Usage: This function is called in an open makefile, with the following |
797 # arguments: |
841 # arguments: |