OpenJDK / jdk / jdk
changeset 29925:6d47adfc6b47
8077847: Better handling of Windows executable manifest version
Reviewed-by: erikj, tbell
| author | ihse |
|---|---|
| date | Thu, 16 Apr 2015 14:48:11 +0200 |
| parents | d5d717f0a455 |
| children | 2eceae3716d9 |
| files | jdk/make/CompileDemos.gmk jdk/make/launcher/Launcher-jdk.accessibility.gmk jdk/make/launcher/Launcher-jdk.pack200.gmk jdk/make/launcher/LauncherCommon.gmk jdk/src/java.base/windows/native/launcher/java.manifest jdk/src/java.base/windows/native/launcher/java.rc jdk/src/jdk.accessibility/windows/native/jabswitch/jabswitch_manifest.rc jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest |
| diffstat | 8 files changed, 21 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/CompileDemos.gmk Wed Apr 15 07:33:34 2015 -0700 +++ b/jdk/make/CompileDemos.gmk Thu Apr 16 14:48:11 2015 +0200 @@ -45,7 +45,7 @@ DEMO_CLOSED_SHARE_SRC := $(JDK_TOPDIR)/src/closed/demo/share DEMO_SOLARIS_SRC := $(JDK_TOPDIR)/src/demo/solaris DEMO_OS_TYPE_SRC := $(JDK_TOPDIR)/src/demo/$(OPENJDK_TARGET_OS_TYPE) -VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc +GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc ################################################################################################## @@ -267,7 +267,7 @@ LDFLAGS_SUFFIX_windows := $6, \ LDFLAGS_SUFFIX_solaris := $7 -lc, \ LDFLAGS_SUFFIX_linux := $8, \ - VERSIONINFO_RESOURCE := $(VERSION_INFO_RESOURCE), \ + VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $$(RC_FLAGS) \ -D "JDK_FNAME=$1.dll" \ -D "JDK_INTERNAL_NAME=$1" \
--- a/jdk/make/launcher/Launcher-jdk.accessibility.gmk Wed Apr 15 07:33:34 2015 -0700 +++ b/jdk/make/launcher/Launcher-jdk.accessibility.gmk Thu Apr 16 14:48:11 2015 +0200 @@ -52,7 +52,9 @@ -D "JDK_FNAME=jabswitch.exe" \ -D "JDK_INTERNAL_NAME=jabswitch" \ -D "JDK_FTYPE=0x01L", \ - MANIFEST := $(JABSWITCH_SRC)/jabswitch.manifest)) + MANIFEST := $(JABSWITCH_SRC)/jabswitch.manifest, \ + MANIFEST_VERSION := $(JDK_VERSION_FOR_MANIFEST), \ + )) TARGETS += $(BUILD_JABSWITCH) endif
--- a/jdk/make/launcher/Launcher-jdk.pack200.gmk Wed Apr 15 07:33:34 2015 -0700 +++ b/jdk/make/launcher/Launcher-jdk.pack200.gmk Thu Apr 16 14:48:11 2015 +0200 @@ -102,7 +102,9 @@ -D "JDK_INTERNAL_NAME=unpack200" \ -D "JDK_FTYPE=0x1L", \ DEBUG_SYMBOLS := true, \ - MANIFEST := $(JDK_TOPDIR)/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest)) + MANIFEST := $(JDK_TOPDIR)/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest, \ + MANIFEST_VERSION := $(JDK_VERSION_FOR_MANIFEST), \ +)) ifneq ($(USE_EXTERNAL_LIBZ), true)
--- a/jdk/make/launcher/LauncherCommon.gmk Wed Apr 15 07:33:34 2015 -0700 +++ b/jdk/make/launcher/LauncherCommon.gmk Thu Apr 16 14:48:11 2015 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, 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 @@ -199,7 +199,9 @@ -D "JDK_FTYPE=0x1L" \ $7, \ MANIFEST := $(JAVA_MANIFEST), \ - CODESIGN := $$($1_CODESIGN)) + MANIFEST_VERSION := $(JDK_VERSION_FOR_MANIFEST), \ + CODESIGN := $$($1_CODESIGN), \ + ) TARGETS += $$(BUILD_LAUNCHER_$1)
--- a/jdk/src/java.base/windows/native/launcher/java.manifest Wed Apr 15 07:33:34 2015 -0700 +++ b/jdk/src/java.base/windows/native/launcher/java.manifest Thu Apr 16 14:48:11 2015 +0200 @@ -4,12 +4,12 @@ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" > <assemblyIdentity - version="IMVERSION" + name="" + version="" processorArchitecture="X86" - name="Oracle Corporation, Java(tm) 2 Standard Edition" type="win32" /> -<description>Java(TM) SE PROGRAM process</description> +<description>Java(TM) SE process</description> <dependency> <dependentAssembly> <assemblyIdentity
--- a/jdk/src/java.base/windows/native/launcher/java.rc Wed Apr 15 07:33:34 2015 -0700 +++ b/jdk/src/java.base/windows/native/launcher/java.rc Thu Apr 16 14:48:11 2015 +0200 @@ -7,9 +7,3 @@ // Icon // IDI_ICON ICON DISCARDABLE "awt.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// RT_MANIFEST -// -1 RT_MANIFEST "java.manifest"
--- a/jdk/src/jdk.accessibility/windows/native/jabswitch/jabswitch_manifest.rc Wed Apr 15 07:33:34 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -#define XSTR(x) STR(x) -#define STR(x) #x - -1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ XSTR(JAB_MANIFEST_EMBED)
--- a/jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest Wed Apr 15 07:33:34 2015 -0700 +++ b/jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest Thu Apr 16 14:48:11 2015 +0200 @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity version="IMVERSION" +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + name="" + version="" processorArchitecture="X86" - name="unpack200.exe" - type="win32"/> + type="win32"/> - <description>Java(TM) SE Runtime Environment unpack200 Process.</description> + <description>Java(TM) SE Runtime Environment unpack200 Process.</description> <!-- Identify the application security requirements. --> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <security>