stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8174823: Module system implementation refresh (3/2017)

Browse Source 
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: erikj, mchung, alanb
This commit is contained in:
Alan Bateman 2017-03-22 16:25:58 +00:00
parent d3465478c8
commit bf0510a2f6
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/autoconf/generated-configure.sh
View File

@ -994,6 +994,7 @@ OPENJDK_TARGET_CPU_ISADIR
OPENJDK_TARGET_CPU_LEGACY_LIB OPENJDK_TARGET_CPU_LEGACY_LIB
OPENJDK_TARGET_CPU_LEGACY OPENJDK_TARGET_CPU_LEGACY
REQUIRED_OS_VERSION REQUIRED_OS_VERSION
REQUIRED_OS_ARCH
REQUIRED_OS_NAME REQUIRED_OS_NAME
COMPILE_TYPE COMPILE_TYPE
OPENJDK_TARGET_CPU_ENDIAN OPENJDK_TARGET_CPU_ENDIAN
@ -5173,7 +5174,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1489410066 DATE_WHEN_GENERATED=1489754785
############################################################################### ###############################################################################
# #
@ -16038,13 +16039,15 @@ $as_echo "$COMPILE_TYPE" >&6; }
fi fi
fi fi
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
REQUIRED_OS_NAME=Darwin REQUIRED_OS_NAME="Mac OS X"
REQUIRED_OS_VERSION=11.2 REQUIRED_OS_VERSION=11.2
fi fi
if test "x$OPENJDK_TARGET_OS" = "xaix"; then if test "x$OPENJDK_TARGET_OS" = "xaix"; then
REQUIRED_OS_NAME=AIX REQUIRED_OS_NAME=AIX
REQUIRED_OS_VERSION=7.1 REQUIRED_OS_VERSION=7.1
fi fi
REQUIRED_OS_ARCH=${OPENJDK_TARGET_CPU}

4
common/autoconf/platform.m4
View File

@ -452,15 +452,17 @@ AC_DEFUN([PLATFORM_SET_RELEASE_FILE_OS_VALUES],
fi fi
fi fi
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
REQUIRED_OS_NAME=Darwin REQUIRED_OS_NAME="Mac OS X"
REQUIRED_OS_VERSION=11.2 REQUIRED_OS_VERSION=11.2
fi fi
if test "x$OPENJDK_TARGET_OS" = "xaix"; then if test "x$OPENJDK_TARGET_OS" = "xaix"; then
REQUIRED_OS_NAME=AIX REQUIRED_OS_NAME=AIX
REQUIRED_OS_VERSION=7.1 REQUIRED_OS_VERSION=7.1
fi fi
REQUIRED_OS_ARCH=${OPENJDK_TARGET_CPU}
AC_SUBST(REQUIRED_OS_NAME) AC_SUBST(REQUIRED_OS_NAME)
AC_SUBST(REQUIRED_OS_ARCH)
AC_SUBST(REQUIRED_OS_VERSION) AC_SUBST(REQUIRED_OS_VERSION)
]) ])

3
common/autoconf/spec.gmk.in
View File

@ -101,8 +101,9 @@ OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@ OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@ OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
# Legacy OS values for use in release file. # OS values for use in release file.
REQUIRED_OS_NAME:=@REQUIRED_OS_NAME@ REQUIRED_OS_NAME:=@REQUIRED_OS_NAME@
REQUIRED_OS_ARCH:=@REQUIRED_OS_ARCH@
REQUIRED_OS_VERSION:=@REQUIRED_OS_VERSION@ REQUIRED_OS_VERSION:=@REQUIRED_OS_VERSION@
LIBM:=@LIBM@ LIBM:=@LIBM@

5
make/CreateJmods.gmk
View File

@ -135,9 +135,8 @@ $(JMODS_DIR)/$(MODULE).jmod: $(DEPS)
$(RM) $@ $(JMODS_TEMPDIR)/$(notdir $@) $(RM) $@ $(JMODS_TEMPDIR)/$(notdir $@)
$(JMOD) create \ $(JMOD) create \
--module-version $(VERSION_SHORT) \ --module-version $(VERSION_SHORT) \
--os-name $(REQUIRED_OS_NAME) \ --os-name '$(REQUIRED_OS_NAME)' \
--os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ --os-arch '$(REQUIRED_OS_ARCH)' \
--os-version $(REQUIRED_OS_VERSION) \
--module-path $(JMODS_DIR) \ --module-path $(JMODS_DIR) \
--exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \ --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \
$(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@) $(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@)

1
make/Images.gmk
View File

@ -119,6 +119,7 @@ JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
--module-path $(IMAGES_OUTPUTDIR)/jmods \ --module-path $(IMAGES_OUTPUTDIR)/jmods \
--endian $(OPENJDK_BUILD_CPU_ENDIAN) \ --endian $(OPENJDK_BUILD_CPU_ENDIAN) \
--release-info $(BASE_RELEASE_FILE) \ --release-info $(BASE_RELEASE_FILE) \
--release-info add:OS_VERSION=\"$(REQUIRED_OS_VERSION)\" \
--order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \ --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
--dedup-legal-notices=error-if-not-same-content \ --dedup-legal-notices=error-if-not-same-content \
$(JLINK_JLI_CLASSES) \ $(JLINK_JLI_CLASSES) \