From 41b53b0d3cae4584f8e61af2a42b14d7a6ed947a Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Thu, 16 Apr 2015 14:48:11 +0200
Subject: [PATCH] 8077847: Better handling of Windows executable manifest
 version

Reviewed-by: erikj, tbell
---
 jdk/make/CompileDemos.gmk                             |  4 ++--
 jdk/make/launcher/Launcher-jdk.accessibility.gmk      |  4 +++-
 jdk/make/launcher/Launcher-jdk.pack200.gmk            |  4 +++-
 jdk/make/launcher/LauncherCommon.gmk                  |  6 ++++--
 .../java.base/windows/native/launcher/java.manifest   |  6 +++---
 jdk/src/java.base/windows/native/launcher/java.rc     |  6 ------
 .../windows/native/jabswitch/jabswitch_manifest.rc    |  4 ----
 .../native/unpack200/unpack200_proto.exe.manifest     | 11 ++++++-----
 8 files changed, 21 insertions(+), 24 deletions(-)
 delete mode 100644 jdk/src/jdk.accessibility/windows/native/jabswitch/jabswitch_manifest.rc

diff --git a/jdk/make/CompileDemos.gmk b/jdk/make/CompileDemos.gmk
index 2d10867948f..65780ea5e6d 100644
--- a/jdk/make/CompileDemos.gmk
+++ b/jdk/make/CompileDemos.gmk
@@ -45,7 +45,7 @@ DEMO_SHARE_SRC := $(JDK_TOPDIR)/src/demo/share
 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 @@ define SetupJVMTIDemo
       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" \
diff --git a/jdk/make/launcher/Launcher-jdk.accessibility.gmk b/jdk/make/launcher/Launcher-jdk.accessibility.gmk
index 5dfd6e999b3..f56d5c03c23 100644
--- a/jdk/make/launcher/Launcher-jdk.accessibility.gmk
+++ b/jdk/make/launcher/Launcher-jdk.accessibility.gmk
@@ -52,7 +52,9 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
           -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
diff --git a/jdk/make/launcher/Launcher-jdk.pack200.gmk b/jdk/make/launcher/Launcher-jdk.pack200.gmk
index dbc135bc76d..54ad412e84c 100644
--- a/jdk/make/launcher/Launcher-jdk.pack200.gmk
+++ b/jdk/make/launcher/Launcher-jdk.pack200.gmk
@@ -102,7 +102,9 @@ $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \
         -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)
 
diff --git a/jdk/make/launcher/LauncherCommon.gmk b/jdk/make/launcher/LauncherCommon.gmk
index 09ffcffdb34..fbb8e8d9b0f 100644
--- a/jdk/make/launcher/LauncherCommon.gmk
+++ b/jdk/make/launcher/LauncherCommon.gmk
@@ -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 @@ define SetupLauncher
           -D "JDK_FTYPE=0x1L" \
           $7, \
       MANIFEST := $(JAVA_MANIFEST), \
-      CODESIGN := $$($1_CODESIGN))
+      MANIFEST_VERSION := $(JDK_VERSION_FOR_MANIFEST), \
+      CODESIGN := $$($1_CODESIGN), \
+  )
 
   TARGETS += $$(BUILD_LAUNCHER_$1)
 
diff --git a/jdk/src/java.base/windows/native/launcher/java.manifest b/jdk/src/java.base/windows/native/launcher/java.manifest
index 52f997e8b39..906624bd6fa 100644
--- a/jdk/src/java.base/windows/native/launcher/java.manifest
+++ b/jdk/src/java.base/windows/native/launcher/java.manifest
@@ -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
diff --git a/jdk/src/java.base/windows/native/launcher/java.rc b/jdk/src/java.base/windows/native/launcher/java.rc
index b60ba3310af..27c6465de21 100644
--- a/jdk/src/java.base/windows/native/launcher/java.rc
+++ b/jdk/src/java.base/windows/native/launcher/java.rc
@@ -7,9 +7,3 @@
 // Icon
 //
 IDI_ICON           ICON    DISCARDABLE     "awt.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// RT_MANIFEST
-//
-1                  RT_MANIFEST             "java.manifest"
diff --git a/jdk/src/jdk.accessibility/windows/native/jabswitch/jabswitch_manifest.rc b/jdk/src/jdk.accessibility/windows/native/jabswitch/jabswitch_manifest.rc
deleted file mode 100644
index 31fd14c8cf2..00000000000
--- a/jdk/src/jdk.accessibility/windows/native/jabswitch/jabswitch_manifest.rc
+++ /dev/null
@@ -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)
diff --git a/jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest b/jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest
index 739f9b994fa..b2583b5b744 100644
--- a/jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest
+++ b/jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest
@@ -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>