< prev index next >

make/autoconf/spec.gmk.in

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this --- 1,7 ---- # ! # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this
*** 30,48 **** # (called @OPENJDK_BUILD_AUTOCONF_NAME@ by autoconf) # using 'configure @CONFIGURE_COMMAND_LINE@' # The command line given to configure. CONFIGURE_COMMAND_LINE:=@CONFIGURE_COMMAND_LINE@ - # The current directory when configure was run - CONFIGURE_START_DIR:=@CONFIGURE_START_DIR@ # A self-referential reference to this file. SPEC:=@SPEC@ - # Path to autoconf if overriden by the user, to be used by "make reconfigure" - AUTOCONF := @AUTOCONF@ - # SPACE and COMMA are defined in MakeBase.gmk, but they are also used in # some definitions here, and are needed if MakeBase.gmk is not included before # this file. X:= SPACE:=$(X) $(X) --- 30,43 ----
*** 125,150 **** # Save the original path before replacing it with the Visual Studio tools ORIGINAL_PATH:=@ORIGINAL_PATH@ ifeq ($(OPENJDK_TARGET_OS), windows) # On Windows, the Visual Studio toolchain needs the PATH to be adjusted # to include Visual Studio tools (this needs to be in cygwin/msys style). ! ifeq ($(OPENJDK_TARGET_OS_ENV), windows.wsl) ! export FIXPATH_PATH:=@VS_PATH_WINDOWS@ ! export WSLENV:=$(WSLENV):FIXPATH_PATH:DEBUG_FIXPATH ! else ! export PATH:=@VS_PATH@ ! endif endif SYSROOT_CFLAGS := @SYSROOT_CFLAGS@ SYSROOT_LDFLAGS := @SYSROOT_LDFLAGS@ # The top-level directory of the source repository TOPDIR:=@TOPDIR@ ! # Usually the top level directory, but could be something else if a custom ! # root is defined. ! WORKSPACE_ROOT:=@WORKSPACE_ROOT@ IMPORT_MODULES_CLASSES:=@IMPORT_MODULES_CLASSES@ IMPORT_MODULES_CMDS:=@IMPORT_MODULES_CMDS@ IMPORT_MODULES_LIBS:=@IMPORT_MODULES_LIBS@ IMPORT_MODULES_CONF:=@IMPORT_MODULES_CONF@ IMPORT_MODULES_LEGAL:=@IMPORT_MODULES_LEGAL@ --- 120,139 ---- # Save the original path before replacing it with the Visual Studio tools ORIGINAL_PATH:=@ORIGINAL_PATH@ ifeq ($(OPENJDK_TARGET_OS), windows) # On Windows, the Visual Studio toolchain needs the PATH to be adjusted # to include Visual Studio tools (this needs to be in cygwin/msys style). ! export PATH:=@VS_PATH@ endif SYSROOT_CFLAGS := @SYSROOT_CFLAGS@ SYSROOT_LDFLAGS := @SYSROOT_LDFLAGS@ # The top-level directory of the source repository TOPDIR:=@TOPDIR@ ! ! IMPORT_MODULES_CLASSES:=@IMPORT_MODULES_CLASSES@ IMPORT_MODULES_CMDS:=@IMPORT_MODULES_CMDS@ IMPORT_MODULES_LIBS:=@IMPORT_MODULES_LIBS@ IMPORT_MODULES_CONF:=@IMPORT_MODULES_CONF@ IMPORT_MODULES_LEGAL:=@IMPORT_MODULES_LEGAL@
*** 157,167 **** # Platform naming variables LAUNCHER_NAME:=@LAUNCHER_NAME@ PRODUCT_NAME:=@PRODUCT_NAME@ PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@ JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@ - JDK_RC_NAME:=@JDK_RC_NAME@ COMPANY_NAME:=@COMPANY_NAME@ HOTSPOT_VM_DISTRO:=@HOTSPOT_VM_DISTRO@ MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@ MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@ USERNAME:=@USERNAME@ --- 146,155 ----
*** 210,221 **** # Class-file version VERSION_CLASSFILE_MAJOR := @VERSION_CLASSFILE_MAJOR@ VERSION_CLASSFILE_MINOR := @VERSION_CLASSFILE_MINOR@ - JDK_SOURCE_TARGET_VERSION := @JDK_SOURCE_TARGET_VERSION@ - # Convenience CFLAGS settings for passing version information into native programs. VERSION_CFLAGS := \ -DVERSION_FEATURE=$(VERSION_FEATURE) \ -DVERSION_INTERIM=$(VERSION_INTERIM) \ -DVERSION_UPDATE=$(VERSION_UPDATE) \ --- 198,207 ----
*** 240,251 **** # COMPANY_NAME is set to "N/A" in $AUTOCONF_DIR/version-numbers by default, # but can be customized with the '--with-vendor-name' configure option. # Only export "VENDOR" to the build if COMPANY_NAME contains a real value. # Otherwise the default value for VENDOR, which is used to set the "java.vendor" # and "java.vm.vendor" properties is hard-coded into the source code (i.e. in ! # VersionProps.java.template in the jdk for "vm.vendor" and ! # vm_version.cpp in the VM for "java.vm.vendor") ifneq ($(COMPANY_NAME), N/A) VERSION_CFLAGS += -DVENDOR='"$(COMPANY_NAME)"' endif endif --- 226,236 ---- # COMPANY_NAME is set to "N/A" in $AUTOCONF_DIR/version-numbers by default, # but can be customized with the '--with-vendor-name' configure option. # Only export "VENDOR" to the build if COMPANY_NAME contains a real value. # Otherwise the default value for VENDOR, which is used to set the "java.vendor" # and "java.vm.vendor" properties is hard-coded into the source code (i.e. in ! # System.c in the jdk for "vm.vendor" and vm_version.cpp in the VM for "java.vm.vendor") ifneq ($(COMPANY_NAME), N/A) VERSION_CFLAGS += -DVENDOR='"$(COMPANY_NAME)"' endif endif
*** 287,299 **** VALID_JVM_VARIANTS := @VALID_JVM_VARIANTS@ # Control wether Hotspot builds gtest tests BUILD_GTEST := @BUILD_GTEST@ - # Allow overriding the default hotspot library path - HOTSPOT_OVERRIDE_LIBPATH := @HOTSPOT_OVERRIDE_LIBPATH@ - # Control use of precompiled header in hotspot libjvm build USE_PRECOMPILED_HEADER := @USE_PRECOMPILED_HEADER@ # Only build headless support or not ENABLE_HEADLESS_ONLY := @ENABLE_HEADLESS_ONLY@ --- 272,281 ----
*** 384,403 **** # Enable unlimited crypto policy UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@ GCOV_ENABLED=@GCOV_ENABLED@ - JCOV_ENABLED=@JCOV_ENABLED@ - JCOV_HOME=@JCOV_HOME@ - JCOV_INPUT_JDK=@JCOV_INPUT_JDK@ - JCOV_FILTERS=@JCOV_FILTERS@ # AddressSanitizer export ASAN_ENABLED:=@ASAN_ENABLED@ export DEVKIT_LIB_DIR:=@DEVKIT_LIB_DIR@ ifeq ($(ASAN_ENABLED), yes) ! export ASAN_OPTIONS=handle_segv=0 detect_leaks=0 ifneq ($(DEVKIT_LIB_DIR),) export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(DEVKIT_LIB_DIR) endif endif --- 366,381 ---- # Enable unlimited crypto policy UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@ GCOV_ENABLED=@GCOV_ENABLED@ # AddressSanitizer export ASAN_ENABLED:=@ASAN_ENABLED@ export DEVKIT_LIB_DIR:=@DEVKIT_LIB_DIR@ ifeq ($(ASAN_ENABLED), yes) ! export ASAN_OPTIONS="handle_segv=0 detect_leaks=0" ifneq ($(DEVKIT_LIB_DIR),) export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(DEVKIT_LIB_DIR) endif endif
*** 495,507 **** CPP:=@FIXPATH@ @CPP@ # The linker can be gcc or ld on unix systems, or link.exe on windows systems. LD:=@FIXPATH@ @LD@ - # Linker used by the jaotc tool for AOT compilation. - LD_JAOTC:=@LD_JAOTC@ - # Xcode SDK path SDKROOT:=@SDKROOT@ # LDFLAGS used to link the jdk native libraries (C-code) LDFLAGS_JDKLIB:=@LDFLAGS_JDKLIB@ --- 473,482 ----
*** 740,750 **** UNZIP:=@UNZIP@ MT:=@FIXPATH@ @MT@ RC:=@FIXPATH@ @RC@ DUMPBIN:=@FIXPATH@ @DUMPBIN@ CYGPATH:=@CYGPATH@ - WSLPATH:=@WSLPATH@ LDD:=@LDD@ OTOOL:=@OTOOL@ READELF:=@READELF@ ELFEDIT:=@ELFEDIT@ EXPR:=@EXPR@ --- 715,724 ----
*** 778,789 **** LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@ MSVCR_DLL:=@MSVCR_DLL@ MSVCP_DLL:=@MSVCP_DLL@ UCRT_DLL_DIR:=@UCRT_DLL_DIR@ STLPORT_LIB:=@STLPORT_LIB@ - ENABLE_PANDOC:=@ENABLE_PANDOC@ - PANDOC_MARKDOWN_FLAG:=@PANDOC_MARKDOWN_FLAG@ #################################################### # # INSTALLATION # --- 752,761 ----
*** 861,876 **** OS_VERSION_MICRO:=@OS_VERSION_MICRO@ # Images directory definitions JDK_IMAGE_SUBDIR:=jdk JRE_IMAGE_SUBDIR:=jre - JCOV_IMAGE_SUBDIR := jdk-jcov # Colon left out to be able to override output dir for bootcycle-images JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR) JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR) - JCOV_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JCOV_IMAGE_SUBDIR) # Test image, as above TEST_IMAGE_SUBDIR:=test TEST_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR) --- 833,846 ----
*** 909,932 **** JDK_BUNDLE_EXTENSION := zip else JDK_BUNDLE_EXTENSION := tar.gz endif JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION) - JRE_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION) JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz - JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION) JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME) - JRE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME) JDK_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME) TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME) TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME) DOCS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME) - JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME) # This macro is called to allow inclusion of closed source counterparts. # Unless overridden in closed sources, it expands to nothing. # Usage: This function is called in an open makefile, with the following # argument: --- 879,898 ----
< prev index next >