619 JAVAC_CMD:=@JAVAC@
620 JAVADOC_CMD:=@JAVADOC@
621 JAR_CMD:=@JAR@
622 JLINK_CMD := @JLINK@
623 JMOD_CMD := @JMOD@
624 JARSIGNER_CMD:=@JARSIGNER@
625 # These variables are meant to be used. They are defined with = instead of := to make
626 # it possible to override only the *_CMD variables.
627 JAVA=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
628 JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
629 JAVA_DETACH =@FIXPATH@ @FIXPATH_DETACH_FLAG@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
630 JAVAC=@FIXPATH@ $(JAVAC_CMD)
631 JAVADOC=@FIXPATH@ $(JAVADOC_CMD)
632 JAR=@FIXPATH@ $(JAR_CMD)
633 JLINK = @FIXPATH@ $(JLINK_CMD)
634 JMOD = @FIXPATH@ $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL)
635 JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD)
636
637 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
638 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
639 BUILD_JAR=@FIXPATH@ $(BUILD_JDK)/bin/jar
640
641 # Interim langtools modules and arguments
642 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
643 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
644 INTERIM_LANGTOOLS_ADD_EXPORTS := \
645 --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \
646 --add-exports java.base/jdk.internal.jmod=jdk.compiler.interim \
647 --add-exports java.base/jdk.internal.misc=jdk.compiler.interim \
648 --add-exports java.base/sun.invoke.util=jdk.compiler.interim \
649 #
650 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
651 $(INTERIM_LANGTOOLS_MODULES))))
652 INTERIM_LANGTOOLS_ARGS := \
653 --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \
654 --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \
655 --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
656 $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
657 #
658 JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main
851 JCOV_IMAGE_SUBDIR := jdk-jcov
852
853 # Colon left out to be able to override output dir for bootcycle-images
854 JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
855 JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
856 JCOV_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JCOV_IMAGE_SUBDIR)
857
858 # Test image, as above
859 TEST_IMAGE_SUBDIR:=test
860 TEST_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR)
861
862 # Symbols image
863 SYMBOLS_IMAGE_SUBDIR:=symbols
864 SYMBOLS_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(SYMBOLS_IMAGE_SUBDIR)
865
866 # Interim image
867 INTERIM_JMODS_DIR := $(SUPPORT_OUTPUTDIR)/interim-jmods
868 INTERIM_IMAGE_DIR := $(SUPPORT_OUTPUTDIR)/interim-image
869
870 # Docs image
871 DOCS_IMAGE_SUBDIR := docs
872 DOCS_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_IMAGE_SUBDIR)
873 # Output docs directly into image
874 DOCS_OUTPUTDIR := $(DOCS_IMAGE_DIR)
875
876 # Static libs image
877 STATIC_LIBS_IMAGE_SUBDIR := static-libs
878 STATIC_LIBS_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(STATIC_LIBS_IMAGE_SUBDIR)
879
880 # Graal builder image
881 GRAAL_BUILDER_IMAGE_SUBDIR := graal-builder-jdk
882 GRAAL_BUILDER_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(GRAAL_BUILDER_IMAGE_SUBDIR)
883
884 # Macosx bundles directory definitions
885 JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle
886 JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle
887 JDK_MACOSX_BUNDLE_SUBDIR_SIGNED=jdk-bundle-signed
888 JRE_MACOSX_BUNDLE_SUBDIR_SIGNED=jre-bundle-signed
889 JDK_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
890 JRE_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR)
891 JDK_MACOSX_BUNDLE_DIR_SIGNED=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR_SIGNED)
892 JRE_MACOSX_BUNDLE_DIR_SIGNED=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR_SIGNED)
893 JDK_MACOSX_BUNDLE_TOP_DIR=jdk-$(VERSION_NUMBER).jdk
894 JRE_MACOSX_BUNDLE_TOP_DIR=jre-$(VERSION_NUMBER).jre
897 JDK_MACOSX_CONTENTS_DIR=$(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR)
898 JRE_MACOSX_CONTENTS_DIR=$(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_CONTENTS_SUBDIR)
899
900 # Bundle names
901 BASE_NAME := $(VERSION_SHORT)+$(VERSION_BUILD)_$(OPENJDK_TARGET_BUNDLE_PLATFORM)
902 ifeq ($(DEBUG_LEVEL), fastdebug)
903 DEBUG_PART := -debug
904 else ifneq ($(DEBUG_LEVEL), release)
905 DEBUG_PART := -$(DEBUG_LEVEL)
906 endif
907 ifeq ($(OPENJDK_TARGET_OS), windows)
908 JDK_BUNDLE_EXTENSION := zip
909 else
910 JDK_BUNDLE_EXTENSION := tar.gz
911 endif
912 JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
913 JRE_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
914 JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
915 TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz
916 TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
917 DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
918 STATIC_LIBS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs$(DEBUG_PART).tar.gz
919 JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
920
921 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
922 JRE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
923 JDK_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
924 TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME)
925 TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
926 DOCS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME)
927 JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME)
928
929 # This macro is called to allow inclusion of closed source counterparts.
930 # Unless overridden in closed sources, it expands to nothing.
931 # Usage: This function is called in an open makefile, with the following
932 # argument:
933 # $1 the name of the makefile
934 define IncludeCustomExtension
935 endef
936
937 # Include the custom-spec.gmk file if it exists
938 -include $(dir @SPEC@)/custom-spec.gmk
|
619 JAVAC_CMD:=@JAVAC@
620 JAVADOC_CMD:=@JAVADOC@
621 JAR_CMD:=@JAR@
622 JLINK_CMD := @JLINK@
623 JMOD_CMD := @JMOD@
624 JARSIGNER_CMD:=@JARSIGNER@
625 # These variables are meant to be used. They are defined with = instead of := to make
626 # it possible to override only the *_CMD variables.
627 JAVA=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
628 JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
629 JAVA_DETACH =@FIXPATH@ @FIXPATH_DETACH_FLAG@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
630 JAVAC=@FIXPATH@ $(JAVAC_CMD)
631 JAVADOC=@FIXPATH@ $(JAVADOC_CMD)
632 JAR=@FIXPATH@ $(JAR_CMD)
633 JLINK = @FIXPATH@ $(JLINK_CMD)
634 JMOD = @FIXPATH@ $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL)
635 JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD)
636
637 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
638 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
639 BUILD_JAVAC=@FIXPATH@ $(BUILD_JDK)/bin/javac
640 BUILD_JAR=@FIXPATH@ $(BUILD_JDK)/bin/jar
641
642 # Interim langtools modules and arguments
643 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
644 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
645 INTERIM_LANGTOOLS_ADD_EXPORTS := \
646 --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \
647 --add-exports java.base/jdk.internal.jmod=jdk.compiler.interim \
648 --add-exports java.base/jdk.internal.misc=jdk.compiler.interim \
649 --add-exports java.base/sun.invoke.util=jdk.compiler.interim \
650 #
651 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
652 $(INTERIM_LANGTOOLS_MODULES))))
653 INTERIM_LANGTOOLS_ARGS := \
654 --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \
655 --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \
656 --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
657 $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
658 #
659 JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main
852 JCOV_IMAGE_SUBDIR := jdk-jcov
853
854 # Colon left out to be able to override output dir for bootcycle-images
855 JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
856 JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
857 JCOV_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JCOV_IMAGE_SUBDIR)
858
859 # Test image, as above
860 TEST_IMAGE_SUBDIR:=test
861 TEST_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR)
862
863 # Symbols image
864 SYMBOLS_IMAGE_SUBDIR:=symbols
865 SYMBOLS_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(SYMBOLS_IMAGE_SUBDIR)
866
867 # Interim image
868 INTERIM_JMODS_DIR := $(SUPPORT_OUTPUTDIR)/interim-jmods
869 INTERIM_IMAGE_DIR := $(SUPPORT_OUTPUTDIR)/interim-image
870
871 # Docs image
872 DOCS_JDK_IMAGE_SUBDIR := docs
873 DOCS_JDK_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_JDK_IMAGE_SUBDIR)
874 DOCS_JAVASE_IMAGE_SUBDIR := docs-javase
875 DOCS_JAVASE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_JAVASE_IMAGE_SUBDIR)
876 DOCS_REFERENCE_IMAGE_SUBDIR := docs-reference
877 DOCS_REFERENCE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_REFERENCE_IMAGE_SUBDIR)
878 # Output docs directly into image
879 DOCS_OUTPUTDIR := $(DOCS_JDK_IMAGE_DIR)
880
881 # Static libs image
882 STATIC_LIBS_IMAGE_SUBDIR := static-libs
883 STATIC_LIBS_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(STATIC_LIBS_IMAGE_SUBDIR)
884
885 # Graal builder image
886 GRAAL_BUILDER_IMAGE_SUBDIR := graal-builder-jdk
887 GRAAL_BUILDER_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(GRAAL_BUILDER_IMAGE_SUBDIR)
888
889 # Macosx bundles directory definitions
890 JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle
891 JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle
892 JDK_MACOSX_BUNDLE_SUBDIR_SIGNED=jdk-bundle-signed
893 JRE_MACOSX_BUNDLE_SUBDIR_SIGNED=jre-bundle-signed
894 JDK_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
895 JRE_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR)
896 JDK_MACOSX_BUNDLE_DIR_SIGNED=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR_SIGNED)
897 JRE_MACOSX_BUNDLE_DIR_SIGNED=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR_SIGNED)
898 JDK_MACOSX_BUNDLE_TOP_DIR=jdk-$(VERSION_NUMBER).jdk
899 JRE_MACOSX_BUNDLE_TOP_DIR=jre-$(VERSION_NUMBER).jre
902 JDK_MACOSX_CONTENTS_DIR=$(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR)
903 JRE_MACOSX_CONTENTS_DIR=$(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_CONTENTS_SUBDIR)
904
905 # Bundle names
906 BASE_NAME := $(VERSION_SHORT)+$(VERSION_BUILD)_$(OPENJDK_TARGET_BUNDLE_PLATFORM)
907 ifeq ($(DEBUG_LEVEL), fastdebug)
908 DEBUG_PART := -debug
909 else ifneq ($(DEBUG_LEVEL), release)
910 DEBUG_PART := -$(DEBUG_LEVEL)
911 endif
912 ifeq ($(OPENJDK_TARGET_OS), windows)
913 JDK_BUNDLE_EXTENSION := zip
914 else
915 JDK_BUNDLE_EXTENSION := tar.gz
916 endif
917 JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
918 JRE_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
919 JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
920 TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz
921 TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
922 DOCS_JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
923 DOCS_JAVASE_BUNDLE_NAME := javase-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
924 DOCS_REFERENCE_BUNDLE_NAME := jdk-reference-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
925 STATIC_LIBS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs$(DEBUG_PART).tar.gz
926 JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
927
928 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
929 JRE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
930 JDK_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
931 TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME)
932 TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
933 DOCS_JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_JDK_BUNDLE_NAME)
934 DOCS_JAVASE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_JAVASE_BUNDLE_NAME)
935 DOCS_REFERENCE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_REFERENCE_BUNDLE_NAME)
936 JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME)
937
938 # This macro is called to allow inclusion of closed source counterparts.
939 # Unless overridden in closed sources, it expands to nothing.
940 # Usage: This function is called in an open makefile, with the following
941 # argument:
942 # $1 the name of the makefile
943 define IncludeCustomExtension
944 endef
945
946 # Include the custom-spec.gmk file if it exists
947 -include $(dir @SPEC@)/custom-spec.gmk
|