common/autoconf/spec.gmk.in
changeset 45835 5f3f7ae12356
parent 45553 7b854640bca9
child 45875 5fa4efe2aca3
child 46231 070d55554f06
equal deleted inserted replaced
45808:0389cfac44bb 45835:5f3f7ae12356
    46 # What make to use for main processing, after bootstrapping top-level Makefile.
    46 # What make to use for main processing, after bootstrapping top-level Makefile.
    47 MAKE := @MAKE@
    47 MAKE := @MAKE@
    48 
    48 
    49 # The default make arguments
    49 # The default make arguments
    50 MAKE_ARGS = $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
    50 MAKE_ARGS = $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
    51     MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" LOG_LEVEL=$(LOG_LEVEL)
    51     MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" $(MAKE_LOG_VARS)
    52 
    52 
    53 OUTPUT_SYNC_SUPPORTED:=@OUTPUT_SYNC_SUPPORTED@
    53 OUTPUT_SYNC_SUPPORTED:=@OUTPUT_SYNC_SUPPORTED@
    54 OUTPUT_SYNC:=@OUTPUT_SYNC@
    54 OUTPUT_SYNC:=@OUTPUT_SYNC@
    55 
    55 
    56 # Override the shell with bash
    56 # Override the shell with bash
    99 OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@
    99 OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@
   100 OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
   100 OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
   101 OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
   101 OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
   102 OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
   102 OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
   103 
   103 
   104 # Legacy OS values for use in release file.
   104 # Target platform value in ModuleTarget class file attribute.
   105 REQUIRED_OS_NAME:=@REQUIRED_OS_NAME@
   105 OPENJDK_MODULE_TARGET_PLATFORM:=@OPENJDK_MODULE_TARGET_PLATFORM@
   106 REQUIRED_OS_VERSION:=@REQUIRED_OS_VERSION@
   106 
       
   107 # OS_* properties in release file
       
   108 RELEASE_FILE_OS_NAME:=@RELEASE_FILE_OS_NAME@
       
   109 RELEASE_FILE_OS_ARCH:=@RELEASE_FILE_OS_ARCH@
   107 
   110 
   108 LIBM:=@LIBM@
   111 LIBM:=@LIBM@
   109 LIBDL:=@LIBDL@
   112 LIBDL:=@LIBDL@
   110 
   113 
   111 # colon or semicolon
   114 # colon or semicolon
   242 USE_PRECOMPILED_HEADER := @USE_PRECOMPILED_HEADER@
   245 USE_PRECOMPILED_HEADER := @USE_PRECOMPILED_HEADER@
   243 
   246 
   244 # Only build headless support or not
   247 # Only build headless support or not
   245 ENABLE_HEADLESS_ONLY := @ENABLE_HEADLESS_ONLY@
   248 ENABLE_HEADLESS_ONLY := @ENABLE_HEADLESS_ONLY@
   246 
   249 
       
   250 ENABLE_FULL_DOCS := @ENABLE_FULL_DOCS@
       
   251 
   247 # JDK_OUTPUTDIR specifies where a working jvm is built.
   252 # JDK_OUTPUTDIR specifies where a working jvm is built.
   248 # You can run $(JDK_OUTPUTDIR)/bin/java
   253 # You can run $(JDK_OUTPUTDIR)/bin/java
   249 # Though the layout of the contents of $(JDK_OUTPUTDIR) is not
   254 # Though the layout of the contents of $(JDK_OUTPUTDIR) is not
   250 # yet the same as a default installation.
   255 # yet the same as a default installation.
   251 #
   256 #
   263 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
   268 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
   264 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
   269 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
   265 BUNDLES_OUTPUTDIR=$(BUILD_OUTPUT)/bundles
   270 BUNDLES_OUTPUTDIR=$(BUILD_OUTPUT)/bundles
   266 TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/test-make
   271 TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/test-make
   267 MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support
   272 MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support
   268 
       
   269 # By default, output javadoc directly into image
       
   270 JAVADOC_OUTPUTDIR = $(DOCS_IMAGE_DIR)
       
   271 
   273 
   272 # This does not get overridden in a bootcycle build
   274 # This does not get overridden in a bootcycle build
   273 CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@
   275 CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@
   274 BUILDJDK_OUTPUTDIR=$(BUILD_OUTPUT)/buildjdk
   276 BUILDJDK_OUTPUTDIR=$(BUILD_OUTPUT)/buildjdk
   275 
   277 
   308 DEFAULT_MAKE_TARGET:=@DEFAULT_MAKE_TARGET@
   310 DEFAULT_MAKE_TARGET:=@DEFAULT_MAKE_TARGET@
   309 
   311 
   310 FREETYPE_LIBS:=@FREETYPE_LIBS@
   312 FREETYPE_LIBS:=@FREETYPE_LIBS@
   311 FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
   313 FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
   312 FREETYPE_BUNDLE_LIB_PATH=@FREETYPE_BUNDLE_LIB_PATH@
   314 FREETYPE_BUNDLE_LIB_PATH=@FREETYPE_BUNDLE_LIB_PATH@
       
   315 FREETYPE_LICENSE=@FREETYPE_LICENSE@
   313 CUPS_CFLAGS:=@CUPS_CFLAGS@
   316 CUPS_CFLAGS:=@CUPS_CFLAGS@
   314 ALSA_LIBS:=@ALSA_LIBS@
   317 ALSA_LIBS:=@ALSA_LIBS@
   315 ALSA_CFLAGS:=@ALSA_CFLAGS@
   318 ALSA_CFLAGS:=@ALSA_CFLAGS@
   316 LIBFFI_LIBS:=@LIBFFI_LIBS@
   319 LIBFFI_LIBS:=@LIBFFI_LIBS@
   317 LIBFFI_CFLAGS:=@LIBFFI_CFLAGS@
   320 LIBFFI_CFLAGS:=@LIBFFI_CFLAGS@
   572 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
   575 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
   573 
   576 
   574 # Use ?= as this can be overridden from bootcycle-spec.gmk
   577 # Use ?= as this can be overridden from bootcycle-spec.gmk
   575 BOOT_JDK_MODULAR ?= @BOOT_JDK_MODULAR@
   578 BOOT_JDK_MODULAR ?= @BOOT_JDK_MODULAR@
   576 
   579 
   577 INTERIM_OVERRIDE_MODULES := java.compiler jdk.compiler \
   580 INTERIM_LANGTOOLS_OVERRIDE_MODULES := java.compiler jdk.compiler \
   578     jdk.jdeps jdk.javadoc jdk.rmic
   581     jdk.jdeps jdk.javadoc
       
   582 INTERIM_RMIC_OVERRIDE_MODULES := jdk.rmic
   579 ifeq ($(BOOT_JDK_MODULAR), true)
   583 ifeq ($(BOOT_JDK_MODULAR), true)
   580   INTERIM_OVERRIDE_MODULES_ARGS = $(foreach m, $(INTERIM_OVERRIDE_MODULES), \
   584   INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS = $(foreach m, \
       
   585       $(INTERIM_LANGTOOLS_OVERRIDE_MODULES), \
   581       --patch-module $m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m)
   586       --patch-module $m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m)
   582   INTERIM_LANGTOOLS_ARGS = $(INTERIM_OVERRIDE_MODULES_ARGS)
   587   INTERIM_RMIC_OVERRIDE_MODULES_ARGS = $(foreach m, \
       
   588       $(INTERIM_LANGTOOLS_OVERRIDE_MODULES) \
       
   589       $(INTERIM_RMIC_OVERRIDE_MODULES), \
       
   590       --patch-module $m=$(BUILDTOOLS_OUTPUTDIR)/override_modules/$m)
       
   591   INTERIM_LANGTOOLS_ARGS = $(INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS)
   583   JAVAC_MAIN_CLASS = -m jdk.compiler/com.sun.tools.javac.Main
   592   JAVAC_MAIN_CLASS = -m jdk.compiler/com.sun.tools.javac.Main
   584   JAVADOC_MAIN_CLASS = -m jdk.javadoc/jdk.javadoc.internal.tool.Main
   593   JAVADOC_MAIN_CLASS = -m jdk.javadoc/jdk.javadoc.internal.tool.Main
   585 else
   594 else
   586   INTERIM_OVERRIDE_MODULES_ARGS = \
   595   INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS = \
   587       -Xbootclasspath/p:$(call PathList, \
   596       -Xbootclasspath/p:$(call PathList, \
   588           $(addprefix $(BUILDTOOLS_OUTPUTDIR)/override_modules/, \
   597           $(addprefix $(BUILDTOOLS_OUTPUTDIR)/override_modules/, \
   589               $(INTERIM_OVERRIDE_MODULES)))
   598               $(INTERIM_LANGTOOLS_OVERRIDE_MODULES)))
   590   INTERIM_LANGTOOLS_ARGS = $(INTERIM_OVERRIDE_MODULES_ARGS) \
   599   INTERIM_RMIC_OVERRIDE_MODULES_ARGS = \
       
   600       -Xbootclasspath/p:$(call PathList, \
       
   601           $(addprefix $(BUILDTOOLS_OUTPUTDIR)/override_modules/, \
       
   602               $(INTERIM_LANGTOOLS_OVERRIDE_MODULES) \
       
   603               $(INTERIM_RMIC_OVERRIDE_MODULES)))
       
   604   INTERIM_LANGTOOLS_ARGS = $(INTERIM_LANGTOOLS_OVERRIDE_MODULES_ARGS) \
   591       -cp $(BUILDTOOLS_OUTPUTDIR)/override_modules/jdk.compiler
   605       -cp $(BUILDTOOLS_OUTPUTDIR)/override_modules/jdk.compiler
   592   JAVAC_MAIN_CLASS = com.sun.tools.javac.Main
   606   JAVAC_MAIN_CLASS = com.sun.tools.javac.Main
   593   JAVADOC_MAIN_CLASS = jdk.javadoc.internal.tool.Main
   607   JAVADOC_MAIN_CLASS = jdk.javadoc.internal.tool.Main
   594 endif
   608 endif
   595 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
   609 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
   623 DIFF:=@DIFF@
   637 DIFF:=@DIFF@
   624 DIRNAME:=@DIRNAME@
   638 DIRNAME:=@DIRNAME@
   625 DSYMUTIL:=@DSYMUTIL@
   639 DSYMUTIL:=@DSYMUTIL@
   626 FIND:=@FIND@
   640 FIND:=@FIND@
   627 FIND_DELETE:=@FIND_DELETE@
   641 FIND_DELETE:=@FIND_DELETE@
       
   642 FLOCK:=@FLOCK@
   628 ECHO:=@ECHO@
   643 ECHO:=@ECHO@
   629 EGREP:=@EGREP@
   644 EGREP:=@EGREP@
   630 FGREP:=@FGREP@
   645 FGREP:=@FGREP@
   631 GREP:=@GREP@
   646 GREP:=@GREP@
   632 GZIP:=@GZIP@
   647 GZIP:=@GZIP@
   635 LN:=@LN@
   650 LN:=@LN@
   636 MKDIR:=@MKDIR@
   651 MKDIR:=@MKDIR@
   637 MV:=@MV@
   652 MV:=@MV@
   638 NAWK:=@NAWK@
   653 NAWK:=@NAWK@
   639 NICE:=@NICE@
   654 NICE:=@NICE@
       
   655 PANDOC:=@FIXPATH@ @PANDOC@
   640 PATCH:=@PATCH@
   656 PATCH:=@PATCH@
   641 PRINTF:=@PRINTF@
   657 PRINTF:=@PRINTF@
   642 RM:=@RM@
   658 RM:=@RM@
   643 RMDIR:=@RMDIR@
   659 RMDIR:=@RMDIR@
   644 SED:=@SED@
   660 SED:=@SED@
   663 LDD:=@LDD@
   679 LDD:=@LDD@
   664 OTOOL:=@OTOOL@
   680 OTOOL:=@OTOOL@
   665 READELF:=@READELF@
   681 READELF:=@READELF@
   666 EXPR:=@EXPR@
   682 EXPR:=@EXPR@
   667 FILE:=@FILE@
   683 FILE:=@FILE@
       
   684 DOT:=@DOT@
   668 HG:=@HG@
   685 HG:=@HG@
   669 OBJCOPY:=@OBJCOPY@
   686 OBJCOPY:=@OBJCOPY@
   670 SETFILE:=@SETFILE@
   687 SETFILE:=@SETFILE@
   671 XATTR:=@XATTR@
   688 XATTR:=@XATTR@
   672 JT_HOME:=@JT_HOME@
   689 JT_HOME:=@JT_HOME@
   798 INTERIM_IMAGE_DIR := $(SUPPORT_OUTPUTDIR)/interim-image
   815 INTERIM_IMAGE_DIR := $(SUPPORT_OUTPUTDIR)/interim-image
   799 
   816 
   800 # Docs image
   817 # Docs image
   801 DOCS_IMAGE_SUBDIR := docs
   818 DOCS_IMAGE_SUBDIR := docs
   802 DOCS_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_IMAGE_SUBDIR)
   819 DOCS_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_IMAGE_SUBDIR)
       
   820 # Output docs directly into image
       
   821 DOCS_OUTPUTDIR := $(DOCS_IMAGE_DIR)
   803 
   822 
   804 # Macosx bundles directory definitions
   823 # Macosx bundles directory definitions
   805 JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle
   824 JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle
   806 JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle
   825 JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle
   807 JDK_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
   826 JDK_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
   826     jre-$(VERSION_SHORT)+$(VERSION_BUILD)-compact2_$(OPENJDK_TARGET_BUNDLE_PLATFORM)_bin$(DEBUG_PART).tar.gz
   845     jre-$(VERSION_SHORT)+$(VERSION_BUILD)-compact2_$(OPENJDK_TARGET_BUNDLE_PLATFORM)_bin$(DEBUG_PART).tar.gz
   827 JRE_COMPACT3_BUNDLE_NAME := \
   846 JRE_COMPACT3_BUNDLE_NAME := \
   828     jre-$(VERSION_SHORT)+$(VERSION_BUILD)-compact3_$(OPENJDK_TARGET_BUNDLE_PLATFORM)_bin$(DEBUG_PART).tar.gz
   847     jre-$(VERSION_SHORT)+$(VERSION_BUILD)-compact3_$(OPENJDK_TARGET_BUNDLE_PLATFORM)_bin$(DEBUG_PART).tar.gz
   829 JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
   848 JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
   830 JRE_SYMBOLS_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
   849 JRE_SYMBOLS_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
   831 ifeq ($(OPENJDK_TARGET_OS), windows)
       
   832   DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_demo$(DEBUG_PART).zip
       
   833 else
       
   834   DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_demo$(DEBUG_PART).tar.gz
       
   835 endif
       
   836 TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
   850 TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
   837 DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
   851 DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
   838 
   852 
   839 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
   853 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
   840 JRE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
   854 JRE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
   841 JDK_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
   855 JDK_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
   842 JRE_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_SYMBOLS_BUNDLE_NAME)
   856 JRE_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_SYMBOLS_BUNDLE_NAME)
   843 DEMOS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DEMOS_BUNDLE_NAME)
       
   844 TEST_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
   857 TEST_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
   845 DOCS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME)
   858 DOCS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME)
   846 
   859 
   847 # This macro is called to allow inclusion of closed source counterparts.
   860 # This macro is called to allow inclusion of closed source counterparts.
   848 # Unless overridden in closed sources, it expands to nothing.
   861 # Unless overridden in closed sources, it expands to nothing.