8248610: Clean up handling of Windows RC files

Reviewed-by: erikj

make/CompileDemos.gmk

@@ -52,7 +52,6 @@ TARGETS =
 # READMEs and other files.
 
 DEMO_SHARE_SRC := $(TOPDIR)/src/demo/share
-GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
 
 DEMO_MANIFEST := $(SUPPORT_OUTPUTDIR)/demos/java-main-manifest.mf
 

make/autoconf/flags-other.m4

@@ -64,39 +64,12 @@ AC_DEFUN([FLAGS_SETUP_RCFLAGS],
 [
   # On Windows, we need to set RC flags.
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    RC_FLAGS="-nologo -l0x409"
+    RCFLAGS="-nologo"
-    JVM_RCFLAGS="-nologo"
     if test "x$DEBUG_LEVEL" = xrelease; then
-      RC_FLAGS="$RC_FLAGS -DNDEBUG"
+      RCFLAGS="$RCFLAGS -DNDEBUG"
-      JVM_RCFLAGS="$JVM_RCFLAGS -DNDEBUG"
     fi
-
-    # The version variables used to create RC_FLAGS may be overridden
-    # in a custom configure script, or possibly the command line.
-    # Let those variables be expanded at make time in spec.gmk.
-    # The \$ are escaped to the shell, and the $(...) variables
-    # are evaluated by make.
-    RC_FLAGS="$RC_FLAGS \
-        -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \
-        -D\"JDK_COMPANY=\$(COMPANY_NAME)\" \
-        -D\"JDK_FILEDESC=\$(JDK_RC_NAME) binary\" \
-        -D\"JDK_VER=\$(VERSION_NUMBER)\" \
-        -D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
-        -D\"JDK_NAME=\$(JDK_RC_NAME) \$(VERSION_FEATURE)\" \
-        -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\""
-
-    JVM_RCFLAGS="$JVM_RCFLAGS \
-        -D\"HS_VERSION_STRING=\$(VERSION_STRING)\" \
-        -D\"HS_COMPANY=\$(COMPANY_NAME)\" \
-        -D\"HS_VER=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \
-        -D\"HS_INTERNAL_NAME=jvm\" \
-        -D\"HS_COPYRIGHT=Copyright $COPYRIGHT_YEAR\" \
-        -D\"HS_FNAME=jvm.dll\" \
-        -D\"HS_NAME=\$(PRODUCT_NAME) \$(VERSION_SHORT)\" \
-        -D\"HS_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\""
   fi
-  AC_SUBST(RC_FLAGS)
+  AC_SUBST(RCFLAGS)
-  AC_SUBST(JVM_RCFLAGS)
 ])
 
 ################################################################################

make/autoconf/spec.gmk.in

@@ -494,7 +494,6 @@ JVM_CFLAGS := @JVM_CFLAGS@
 JVM_LDFLAGS := @JVM_LDFLAGS@
 JVM_ASFLAGS := @JVM_ASFLAGS@
 JVM_LIBS := @JVM_LIBS@
-JVM_RCFLAGS := @JVM_RCFLAGS@
 
 # These flags might contain variables set by a custom extension that is included later.
 EXTRA_CFLAGS = @EXTRA_CFLAGS@
@@ -665,12 +664,7 @@ NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS)
 
 JLINK_KEEP_PACKAGED_MODULES:=@JLINK_KEEP_PACKAGED_MODULES@
 
-# Base flags for RC
+RCFLAGS := @RCFLAGS@
-# Guarding this against resetting value. Legacy make files include spec multiple
-# times.
-ifndef RC_FLAGS
-  RC_FLAGS:=@RC_FLAGS@
-endif
 
 # Tools adhering to a minimal and common standard of posix compliance.
 AWK:=@AWK@

make/common/JdkNativeCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, 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
@@ -92,6 +92,16 @@ ProcessDir = \
     ) \
   )
 
+GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
+
+JDK_RCFLAGS=$(RCFLAGS) \
+    -D"JDK_VERSION_STRING=$(VERSION_STRING)" \
+    -D"JDK_COMPANY=$(COMPANY_NAME)" \
+    -D"JDK_VER=$(VERSION_NUMBER_FOUR_POSITIONS)" \
+    -D"JDK_COPYRIGHT=Copyright \xA9 $(COPYRIGHT_YEAR)" \
+    -D"JDK_NAME=$(JDK_RC_NAME) $(VERSION_SHORT)" \
+    -D"JDK_FVER=$(subst .,$(COMMA),$(VERSION_NUMBER_FOUR_POSITIONS))"
+
 # Setup make rules for creating a native shared library with suitable defaults
 # for the OpenJDK project.
 #
@@ -100,7 +110,7 @@ ProcessDir = \
 #
 # Remaining parameters are named arguments. These are all passed on to
 # SetupNativeCompilation, except for
-#   EXTRA_RC_FLAGS -- additional RC_FLAGS to append.
+#   EXTRA_RCFLAGS -- additional RCFLAGS to append.
 #   EXTRA_HEADER_DIRS -- additional directories to look for headers in
 #   EXTRA_SRC -- additional directories to look for source in
 #   EXCLUDE_SRC_PATTERNS -- exclude source dirs matching these patterns from
@@ -108,6 +118,7 @@ ProcessDir = \
 #   HEADERS_FROM_SRC -- if false, does not add source dirs automatically as
 #     header include dirs. (Defaults to true.)
 #   SRC -- this is passed on, but preprocessed to accept source dir designations
+#   RC_FILEDESC -- override the default FILEDESC for Windows version.rc
 #     such as "java.base:headers".
 SetupJdkLibrary = $(NamedParamsMacroTemplate)
 define SetupJdkLibraryBody
@@ -137,19 +148,20 @@ define SetupJdkLibraryBody
 
   ifeq ($$($1_VERSIONINFO_RESOURCE), )
     $1_VERSIONINFO_RESOURCE := $$(GLOBAL_VERSION_INFO_RESOURCE)
-  else ifeq ($$($1_VERSIONINFO_RESOURCE), DISABLE)
-    $1_VERSIONINFO_RESOURCE :=
   endif
 
-  ifeq ($$($1_RC_FLAGS), )
+  ifeq ($$($1_RC_FILEDESC), )
-    $1_RC_FLAGS :=  $(RC_FLAGS) \
+    $1_RC_FILEDESC := $(JDK_RC_NAME) binary
-        -D "JDK_FNAME=$$($1_NAME).dll" \
-        -D "JDK_INTERNAL_NAME=$$($1_NAME)" \
-        -D "JDK_FTYPE=0x2L"
-  else ifeq ($$($1_RC_FLAGS), DISABLE)
-    $1_RC_FLAGS :=
   endif
 
+  $1_RCFLAGS := $(JDK_RCFLAGS) \
+      -D"JDK_FILEDESC=$$(strip $$($1_RC_FILEDESC))" \
+      -D"JDK_FNAME=$$($1_NAME).dll" \
+      -D"JDK_INTERNAL_NAME=$$($1_NAME)" \
+      -D"JDK_FTYPE=0x2L" \
+      -I$(TOPDIR)/src/java.base/windows/native/common \
+      $$($1_EXTRA_RCFLAGS)
+
   ifneq ($$($1_HEADERS_FROM_SRC), false)
     $1_SRC_HEADER_FLAGS := $$(addprefix -I, $$(wildcard $$($1_SRC)))
   endif
@@ -171,7 +183,6 @@ define SetupJdkLibraryBody
   ifeq ($$($1_CFLAGS)$$($1_CXXFLAGS), )
     $1_CFLAGS += $$($1_SRC_HEADER_FLAGS) $$($1_EXTRA_HEADER_FLAGS)
   endif
-  $1_RC_FLAGS += $$($1_EXTRA_RC_FLAGS)
 
   # Since we reuse the rule name ($1), all our arguments will pass through.
   # We lose in transparency, but gain in brevity in this call...
@@ -186,7 +197,7 @@ endef
 #
 # Remaining parameters are named arguments. These are all passed on to
 # SetupNativeCompilation, except for
-#   EXTRA_RC_FLAGS -- additional RC_FLAGS to append.
+#   EXTRA_RCFLAGS -- additional RCFLAGS to append.
 SetupJdkExecutable = $(NamedParamsMacroTemplate)
 define SetupJdkExecutableBody
   $1_TYPE := EXECUTABLE
@@ -201,20 +212,15 @@ define SetupJdkExecutableBody
 
   ifeq ($$($1_VERSIONINFO_RESOURCE), )
     $1_VERSIONINFO_RESOURCE := $$(GLOBAL_VERSION_INFO_RESOURCE)
-  else ifeq ($$($1_VERSIONINFO_RESOURCE), DISABLE)
-    $1_VERSIONINFO_RESOURCE :=
   endif
 
-  ifeq ($$($1_RC_FLAGS), )
+  $1_RCFLAGS := $(JDK_RCFLAGS) \
-    $1_RC_FLAGS :=  $(RC_FLAGS) \
+      -D"JDK_FILEDESC=$(JDK_RC_NAME) binary" \
-        -D "JDK_FNAME=$$($1_NAME).exe" \
+      -D"JDK_FNAME=$$($1_NAME).exe" \
-        -D "JDK_INTERNAL_NAME=$$($1_NAME)" \
+      -D"JDK_INTERNAL_NAME=$$($1_NAME)" \
-        -D "JDK_FTYPE=0x01L"
+      -D"JDK_FTYPE=0x1L" \
-  else ifeq ($$($1_RC_FLAGS), DISABLE)
+      -I$(TOPDIR)/src/java.base/windows/native/common \
-    $1_RC_FLAGS :=
+      $$($1_EXTRA_RCFLAGS)
-  endif
-
-  $1_RC_FLAGS += $$($1_EXTRA_RC_FLAGS)
 
   # Since we reuse the rule name ($1), all our arguments will pass through.
   # We lose in transparency, but gain in brevity in this call...

make/common/NativeCompilation.gmk

@@ -457,7 +457,7 @@ endef
 #   EXTRA_OBJECT_FILES List of extra object files to include when linking
 #   EXTRA_DEPS List of extra dependencies to be added to each compiled file
 #   VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run
-#   RC_FLAGS flags for RC.
+#   RCFLAGS flags for RC.
 #   EMBED_MANIFEST if true, embed manifest on Windows.
 #   MAPFILE mapfile
 #   USE_MAPFILE_FOR_SYMBOLS if true and this is a STATIC_BUILD, just copy the
@@ -860,7 +860,7 @@ define SetupNativeCompilationBody
       -include $$($1_RES_DEPS_FILE)
       -include $$($1_RES_DEPS_TARGETS_FILE)
 
-      $1_RES_VARDEPS := $$($1_RC) $$($1_RC_FLAGS)
+      $1_RES_VARDEPS := $$($1_RC) $$($1_RCFLAGS)
       $1_RES_VARDEPS_FILE := $$(call DependOnVariable, $1_RES_VARDEPS, \
           $$($1_RES).vardeps)
 
@@ -868,7 +868,7 @@ define SetupNativeCompilationBody
 		$$(call LogInfo, Compiling resource $$(notdir $$($1_VERSIONINFO_RESOURCE)) (for $$($1_BASENAME)))
 		$$(call MakeDir, $$(@D) $$($1_OBJECT_DIR))
 		$$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-		    $$($1_RC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \
+		    $$($1_RC) $$($1_RCFLAGS) $$($1_SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \
 		    $$($1_VERSIONINFO_RESOURCE) 2>&1 ))
                 # Windows RC compiler does not support -showIncludes, so we mis-use CL
                 # for this. Filter out RC specific arguments that are unknown to CL.
@@ -876,7 +876,7 @@ define SetupNativeCompilationBody
                 # includes to stderr so need to redirect it to hide the output from the
                 # main log.
 		$$(call ExecuteWithLog, $$($1_RES_DEPS_FILE).obj, \
-		    $$($1_CC) $$(filter-out -l%, $$($1_RC_FLAGS)) \
+		    $$($1_CC) $$(filter-out -l%, $$($1_RCFLAGS)) \
 		        $$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \
 		        $(CC_OUT_OPTION)$$($1_RES_DEPS_FILE).obj -P -Fi$$($1_RES_DEPS_FILE).pp \
 		        $$($1_VERSIONINFO_RESOURCE)) 2>&1 \

make/common/modules/LauncherCommon.gmk

@@ -48,7 +48,6 @@ LAUNCHER_CFLAGS += -I$(TOPDIR)/src/java.base/share/native/launcher \
     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \
     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \
     #
-GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
 MACOSX_PLIST_DIR := $(TOPDIR)/src/java.base/macosx/native/launcher
 JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest
 
@@ -71,7 +70,7 @@ JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest
 #     compile time defines exceeding Visual Studio 2013 limitations.
 # CFLAGS   Additional CFLAGS
 # CFLAGS_windows   Additional CFLAGS_windows
-# EXTRA_RC_FLAGS   Additional EXTRA_RC_FLAGS
+# EXTRA_RCFLAGS   Additional EXTRA_RCFLAGS
 # MACOSX_PRIVILEGED   On macosx, allow to access other processes
 # OPTIMIZATION   Override default optimization level (LOW)
 # OUTPUT_DIR   Override default output directory
@@ -160,7 +159,7 @@ define SetupBuildLauncherBody
           $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib, \
       OUTPUT_DIR := $$($1_OUTPUT_DIR), \
       VERSIONINFO_RESOURCE := $$($1_VERSION_INFO_RESOURCE), \
-      EXTRA_RC_FLAGS := $$($1_EXTRA_RC_FLAGS), \
+      EXTRA_RCFLAGS := $$($1_EXTRA_RCFLAGS), \
       MANIFEST := $(JAVA_MANIFEST), \
       MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
   ))

make/common/modules/LibCommon.gmk

@@ -27,8 +27,6 @@ include JdkNativeCompilation.gmk
 
 ################################################################################
 
-GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
-
 # Absolute paths to lib files on windows for use in LIBS. Should figure out a more
 # elegant solution to this.
 WIN_JAVA_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib

make/hotspot/lib/CompileJvm.gmk

@@ -124,13 +124,6 @@ else ifeq ($(call isTargetCpu, x86_64), true)
   JVM_EXCLUDE_PATTERNS += x86_32
 endif
 
-ifeq ($(call isTargetOs, windows), true)
-  ifeq ($(call isTargetCpuBits, 64), true)
-    RC_DESC := 64-Bit$(SPACE)
-  endif
-  JVM_RCFLAGS += -D"HS_FILEDESC=$(HOTSPOT_VM_DISTRO) $(RC_DESC)$(JVM_VARIANT) VM"
-endif
-
 JVM_OPTIMIZATION ?= HIGHEST_JVM
 
 # Need to set JVM_STRIPFLAGS to the default value from SPEC since the STRIPFLAGS
@@ -168,8 +161,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
     USE_MAPFILE_FOR_SYMBOLS := true, \
     STRIPFLAGS := $(JVM_STRIPFLAGS), \
     EMBED_MANIFEST := true, \
-    RC_FLAGS := $(JVM_RCFLAGS), \
+    RC_FILEDESC := $(HOTSPOT_VM_DISTRO) $(OPENJDK_TARGET_CPU_BITS)-Bit $(JVM_VARIANT) VM, \
-    VERSIONINFO_RESOURCE := $(TOPDIR)/src/hotspot/os/windows/version.rc, \
     PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
     PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
 ))

make/modules/java.base/Launcher.gmk

@@ -30,14 +30,13 @@ $(eval $(call IncludeCustomExtension, modules/java.base/Launcher.gmk))
 
 JAVA_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/launcher/java.rc
 
-JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/common
+JAVA_RCFLAGS ?= -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
-JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
 
 ################################################################################
 
 $(eval $(call SetupBuildLauncher, java, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
-    EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \
+    EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
     VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
     OPTIMIZATION := HIGH, \
 ))
@@ -45,7 +44,7 @@ $(eval $(call SetupBuildLauncher, java, \
 ifeq ($(call isTargetOs, windows), true)
   $(eval $(call SetupBuildLauncher, javaw, \
       CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
-      EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \
+      EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
       VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
   ))
 endif

make/modules/java.desktop/lib/Awt2dLibraries.gmk

@@ -116,7 +116,7 @@ ifeq ($(call isTargetOs, windows), true)
     LIBAWT_CFLAGS += -DMLIB_OS64BIT
   endif
 
-  LIBAWT_RC_FLAGS ?= -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
+  LIBAWT_RCFLAGS ?= -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
   LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc
 endif
 
@@ -169,10 +169,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
         comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
         delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib, \
     VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
-    RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
+    EXTRA_RCFLAGS := $(LIBAWT_RCFLAGS), \
-        -D "JDK_FNAME=awt.dll" \
-        -D "JDK_INTERNAL_NAME=awt" \
-        -D "JDK_FTYPE=0x2L", \
 ))
 
 $(BUILD_LIBAWT): $(call FindLib, java.base, java)

make/modules/jdk.accessibility/Launcher.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, 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
@@ -25,17 +25,20 @@
 
 include LauncherCommon.gmk
 
-################################################################################
-# jabswitch
-
 ifeq ($(call isTargetOs, windows), true)
 
-  JABSWITCH_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/jabswitch
+  ACCESSIBILITY_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
-  ACCESSBRIDGE_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/common
+  TOOLS_CFLAGS := $(addprefix -I, \
+      $(ACCESSIBILITY_SRCDIR)/include/bridge \
+      $(ACCESSIBILITY_SRCDIR)/common \
+      $(ACCESSIBILITY_SRCDIR)/toolscommon)
+
+  ##############################################################################
+  # jabswitch
 
   $(eval $(call SetupJdkExecutable, BUILD_JABSWITCH, \
       NAME := jabswitch, \
-      SRC := $(JABSWITCH_SRC), \
+      SRC := $(ACCESSIBILITY_SRCDIR)/jabswitch, \
       INCLUDE_FILES := jabswitch.cpp, \
       CFLAGS := $(filter-out -Zc:wchar_t-, $(CFLAGS_JDKEXE)) -Zc:wchar_t \
           -analyze- -Od -Gd -D_WINDOWS \
@@ -43,21 +46,15 @@ ifeq ($(call isTargetOs, windows), true)
       DISABLED_WARNINGS_microsoft := 4267 4996, \
       LDFLAGS := $(LDFLAGS_JDKEXE), \
       LIBS := advapi32.lib version.lib user32.lib, \
-      VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRC)/AccessBridgeStatusWindow.rc, \
+      VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
-      MANIFEST := $(JABSWITCH_SRC)/jabswitch.manifest, \
+      MANIFEST := $(ACCESSIBILITY_SRCDIR)/jabswitch/jabswitch.manifest, \
       MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
   ))
 
   TARGETS += $(BUILD_JABSWITCH)
 
-################################################################################
+  ##############################################################################
-# jaccessinspector
+  # jaccessinspector
-
-  TOPDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
-  TOOLS_CFLAGS := $(addprefix -I, \
-      $(TOPDIR)/include/bridge \
-      $(TOPDIR)/common \
-      $(TOPDIR)/toolscommon)
 
   define SetupInspector
   # Parameter 1 File name suffix
@@ -65,20 +62,20 @@ ifeq ($(call isTargetOs, windows), true)
 
     $$(eval $$(call SetupJdkExecutable, BUILD_JACCESSINSPECTOR$1, \
       NAME := jaccessinspector$1, \
-      SRC := $(TOPDIR)/jaccessinspector $(TOPDIR)/common \
+      SRC := $(ACCESSIBILITY_SRCDIR)/jaccessinspector $(ACCESSIBILITY_SRCDIR)/common \
-          $(TOPDIR)/toolscommon $(TOPDIR)/bridge, \
+          $(ACCESSIBILITY_SRCDIR)/toolscommon $(ACCESSIBILITY_SRCDIR)/bridge, \
       CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
       LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
       LIBS := advapi32.lib user32.lib, \
-      VERSIONINFO_RESOURCE := $(TOPDIR)/jaccessinspector/jaccessinspectorWindow.rc, \
+      VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/jaccessinspector/jaccessinspectorWindow.rc, \
     ))
 
     TARGETS += $$(BUILD_JACCESSINSPECTOR$1)
 
   endef
 
-################################################################################
+  ##############################################################################
-# jaccesswalker
+  # jaccesswalker
 
   define SetupWalker
   # Parameter 1 File name suffix
@@ -86,12 +83,12 @@ ifeq ($(call isTargetOs, windows), true)
 
     $$(eval $$(call SetupJdkExecutable, BUILD_JACCESSWALKER$1, \
       NAME := jaccesswalker$1, \
-      SRC := $(TOPDIR)/jaccesswalker $(TOPDIR)/common \
+      SRC := $(ACCESSIBILITY_SRCDIR)/jaccesswalker $(ACCESSIBILITY_SRCDIR)/common \
-          $(TOPDIR)/toolscommon $(TOPDIR)/bridge, \
+          $(ACCESSIBILITY_SRCDIR)/toolscommon $(ACCESSIBILITY_SRCDIR)/bridge, \
       CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
       LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
       LIBS := advapi32.lib comctl32.lib gdi32.lib user32.lib, \
-      VERSIONINFO_RESOURCE := $(TOPDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
+      VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
    ))
 
     TARGETS += $$(BUILD_JACCESSWALKER$1)

make/modules/jdk.accessibility/Lib.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, 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
@@ -29,7 +29,7 @@ include LibCommon.gmk
 
 ifeq ($(call isTargetOs, windows), true)
 
-  ROOT_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
+  ACCESSIBILITY_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
 
   define SetupJavaDLL
     # Parameter 1 Suffix
@@ -52,7 +52,7 @@ ifeq ($(call isTargetOs, windows), true)
             winspool.lib comdlg32.lib advapi32.lib shell32.lib \
             $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \
             ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \
-        VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
+        VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
     )
 
     $$(BUILD_JAVAACCESSBRIDGE$1): $(call FindStaticLib, java.desktop, jawt, /libjawt)
@@ -75,11 +75,11 @@ ifeq ($(call isTargetOs, windows), true)
             include/bridge \
             java.base:include, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
-            -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
+            -def:$(ACCESSIBILITY_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
         LIBS := kernel32.lib user32.lib gdi32.lib \
             winspool.lib comdlg32.lib advapi32.lib shell32.lib \
             ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \
-        VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
+        VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
     )
 
     TARGETS += $$(BUILD_WINDOWSACCESSBRIDGE$1)
@@ -93,7 +93,7 @@ ifeq ($(call isTargetOs, windows), true)
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB), \
         LDFLAGS := $(LDFLAGS_JDKLIB), \
-        VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
+        VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
     )
 
     TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO)

src/hotspot/os/windows/version.rc

@@ -1,72 +0,0 @@
-//
-// Copyright (c) 2004, 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.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-//
-
-#include "winresrc.h"
-
-// Need 2 defines so macro argument to XSTR will get expanded before quoting.
-#define XSTR(x) STR(x)
-#define STR(x)  #x
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION    HS_FVER
- PRODUCTVERSION HS_FVER
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- // FILEOS 0x4 is Win32, 0x40004 is Win32 NT only
- FILEOS 0x4L
- // FILETYPE should be 0x1 for .exe and 0x2 for .dll
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000004b0"
-        BEGIN
-            VALUE "CompanyName",      XSTR(HS_COMPANY)        "\0"
-            VALUE "FileDescription",  XSTR(HS_FILEDESC)       "\0"
-            VALUE "FileVersion",      XSTR(HS_VER)            "\0"
-            VALUE "Full Version",     XSTR(HS_VERSION_STRING) "\0"
-            VALUE "InternalName",     XSTR(HS_INTERNAL_NAME)  "\0"
-            VALUE "LegalCopyright",   XSTR(HS_COPYRIGHT)      "\0"
-            VALUE "OriginalFilename", XSTR(HS_FNAME)          "\0"
-            VALUE "ProductName",      XSTR(HS_NAME)           "\0"
-            VALUE "ProductVersion",   XSTR(HS_VER)            "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0, 1200
-    END
-END

src/java.base/windows/native/common/version.rc

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2004, 2020, 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
@@ -23,38 +23,43 @@
 // questions.
 //
 
-#include "windows.h"
+#include <windows.h>
 
 // Need 2 defines so macro argument to XSTR will get expanded before quoting.
 #define XSTR(x) STR(x)
 #define STR(x)  #x
 
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 
+#ifndef JDK_FILEOS
+#define JDK_FILEOS VOS__WINDOWS32
+#endif
+
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION    JDK_FVER
  PRODUCTVERSION JDK_FVER
- FILEFLAGSMASK 0x3fL
+ FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
 #ifdef _DEBUG
- FILEFLAGS 0x1L
+ FILEFLAGS VS_FF_DEBUG
 #else
  FILEFLAGS 0x0L
 #endif
- // FILEOS 0x4 is Win32, 0x40004 is Win32 NT only
+ FILEOS JDK_FILEOS
- FILEOS 0x4L
- // FILETYPE should be 0x1 for .exe and 0x2 for .dll
  FILETYPE JDK_FTYPE
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "000004b0"
+        BLOCK "040904b0"
         BEGIN
+#ifdef JDK_COMMENTS
+            VALUE "Comments",         XSTR(JDK_COMMENTS)       "\0"
+#endif
             VALUE "CompanyName",      XSTR(JDK_COMPANY)        "\0"
             VALUE "FileDescription",  XSTR(JDK_FILEDESC)       "\0"
             VALUE "FileVersion",      XSTR(JDK_VER)            "\0"
@@ -68,6 +73,6 @@ BEGIN
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x0, 1200
+        VALUE "Translation", 0x409, 1200
     END
 END

src/java.desktop/windows/native/libawt/windows/awt.rc

@@ -1,5 +1,5 @@
 // 
-// Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 1997, 2020, 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
@@ -23,13 +23,7 @@
 // questions.
 //
 
-#include "windows.h"
+#include "version.rc"
-
-// Need 2 defines so macro argument to XSTR will get expanded before quoting.
-#define XSTR(x) STR(x)
-#define STR(x)  #x
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 AWT_ICON     ICON    DISCARDABLE "awt.ico"
 CHECK_BITMAP BITMAP  DISCARDABLE "check.bmp"
@@ -40,44 +34,3 @@ SECURITY_WARNING_0  ICON    DISCARDABLE "security_warning_bw.ico"
 SECURITY_WARNING_1  ICON    DISCARDABLE "security_warning_int.ico"
 SECURITY_WARNING_2  ICON    DISCARDABLE "security_warning.ico"
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION    JDK_FVER
- PRODUCTVERSION JDK_FVER
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- // FILEOS 0x4 is Win32, 0x40004 is Win32 NT only
- FILEOS 0x4L
- // FILETYPE should be 0x1 for .exe and 0x2 for .dll
- FILETYPE JDK_FTYPE
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName",      XSTR(JDK_COMPANY)        "\0"
-            VALUE "FileDescription",  XSTR(JDK_FILEDESC)       "\0"
-            VALUE "FileVersion",      XSTR(JDK_VER)            "\0"
-            VALUE "Full Version",     XSTR(JDK_VERSION_STRING) "\0"
-            VALUE "InternalName",     XSTR(JDK_INTERNAL_NAME)  "\0"
-            VALUE "LegalCopyright",   XSTR(JDK_COPYRIGHT)      "\0"
-            VALUE "OriginalFilename", XSTR(JDK_FNAME)          "\0"
-            VALUE "ProductName",      XSTR(JDK_NAME)           "\0"
-            VALUE "ProductVersion",   XSTR(JDK_VER)            "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.rc

@@ -1,174 +1,126 @@
-//Microsoft Developer Studio generated resource script.
+//
-//
+// Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
-#include "resource.h"
+// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#include "accessBridgeResource.h"
+//
-
+// This code is free software; you can redistribute it and/or modify it
-#define XSTR(x) STR(x)
+// under the terms of the GNU General Public License version 2 only, as
-#define STR(x)  #x
+// published by the Free Software Foundation.  Oracle designates this
-
+// particular file as subject to the "Classpath" exception as provided
-#define APSTUDIO_READONLY_SYMBOLS
+// by Oracle in the LICENSE file that accompanied this code.
-/////////////////////////////////////////////////////////////////////////////
+//
-//
+// This code is distributed in the hope that it will be useful, but WITHOUT
-// Generated from the TEXTINCLUDE 2 resource.
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#define APSTUDIO_HIDDEN_SYMBOLS
+// version 2 for more details (a copy is included in the LICENSE file that
-#include "windows.h"
+// accompanied this code).
-#undef APSTUDIO_HIDDEN_SYMBOLS
+//
-
+// You should have received a copy of the GNU General Public License version
-/////////////////////////////////////////////////////////////////////////////
+// 2 along with this work; if not, write to the Free Software Foundation,
-#undef APSTUDIO_READONLY_SYMBOLS
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
+//
-/////////////////////////////////////////////////////////////////////////////
+// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// English (U.S.) resources
+// or visit www.oracle.com if you need additional information or have any
-
+// questions.
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+//
-#ifdef _WIN32
+
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#define JDK_COMMENTS Java Access Bridge
-#pragma code_page(1252)
+#define JDK_FILEOS 0x40004L
-#endif //_WIN32
+
-
+#include "version.rc"
-/////////////////////////////////////////////////////////////////////////////
+
-//
+#include "resource.h"
-// Dialog
+#include "accessBridgeResource.h"
-//
+
-
+/////////////////////////////////////////////////////////////////////////////
-ACCESSBRIDGESTATUSWINDOW DIALOGEX 160, 78, 209, 163
+//
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+// Generated from the TEXTINCLUDE 2 resource.
-EXSTYLE WS_EX_CLIENTEDGE
+//
-CAPTION "Access Bridge status"
+#define APSTUDIO_READONLY_SYMBOLS
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+#define APSTUDIO_HIDDEN_SYMBOLS
-BEGIN
+#include "windows.h"
-    EDITTEXT        cVMID,67,23,121,13,ES_READONLY
+#undef APSTUDIO_HIDDEN_SYMBOLS
-    EDITTEXT        cStatusText,40,147,162,13,ES_READONLY
+#undef APSTUDIO_READONLY_SYMBOLS
-    LTEXT           "Java VM ID:",IDC_STATIC,23,25,40,8
+
-    LTEXT           "Status:",IDC_STATIC,11,149,23,8
+/////////////////////////////////////////////////////////////////////////////
-    EDITTEXT        cWindowsID,67,39,121,13,ES_READONLY
+//
-    LTEXT           "Windows ID:",IDC_STATIC,21,41,42,8
+// Dialog
-    EDITTEXT        cCallInfo,12,65,184,75,ES_MULTILINE | ES_AUTOVSCROLL |
+//
-                    ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
+
-    GROUPBOX        "Call info",IDC_STATIC,4,55,197,90
+ACCESSBRIDGESTATUSWINDOW DIALOGEX 160, 78, 209, 163
-    EDITTEXT        cInvokedByText,67,1,121,13,ES_READONLY
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-    LTEXT           "Invoked by:",IDC_STATIC,25,3,38,8
+EXSTYLE WS_EX_CLIENTEDGE
-END
+CAPTION "Access Bridge status"
-
+FONT 8, "MS Sans Serif", 0, 0, 0x1
-IDD_DIALOG1 DIALOG DISCARDABLE  0, 0, 186, 95
+BEGIN
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+    EDITTEXT        cVMID,67,23,121,13,ES_READONLY
-CAPTION "Dialog"
+    EDITTEXT        cStatusText,40,147,162,13,ES_READONLY
-FONT 8, "MS Sans Serif"
+    LTEXT           "Java VM ID:",IDC_STATIC,23,25,40,8
-BEGIN
+    LTEXT           "Status:",IDC_STATIC,11,149,23,8
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
+    EDITTEXT        cWindowsID,67,39,121,13,ES_READONLY
-    PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
+    LTEXT           "Windows ID:",IDC_STATIC,21,41,42,8
-END
+    EDITTEXT        cCallInfo,12,65,184,75,ES_MULTILINE | ES_AUTOVSCROLL |
-
+                    ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
-
+    GROUPBOX        "Call info",IDC_STATIC,4,55,197,90
-#ifdef APSTUDIO_INVOKED
+    EDITTEXT        cInvokedByText,67,1,121,13,ES_READONLY
-/////////////////////////////////////////////////////////////////////////////
+    LTEXT           "Invoked by:",IDC_STATIC,25,3,38,8
-//
+END
-// TEXTINCLUDE
+
-//
+IDD_DIALOG1 DIALOG DISCARDABLE  0, 0, 186, 95
-
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-1 TEXTINCLUDE DISCARDABLE
+CAPTION "Dialog"
-BEGIN
+FONT 8, "MS Sans Serif"
-    "resource.h\0"
+BEGIN
-END
+    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-
+    PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
-2 TEXTINCLUDE DISCARDABLE
+END
-BEGIN
+
-    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+#ifdef APSTUDIO_INVOKED
-    "#include ""windows.h""\r\n"
+
-    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+/////////////////////////////////////////////////////////////////////////////
-    "\0"
+//
-END
+// TEXTINCLUDE
-
+//
-3 TEXTINCLUDE DISCARDABLE
+
-BEGIN
+1 TEXTINCLUDE DISCARDABLE
-    "\r\n"
+BEGIN
-    "\0"
+    "resource.h\0"
-END
+END
-
+
-#endif    // APSTUDIO_INVOKED
+2 TEXTINCLUDE DISCARDABLE
-
+BEGIN
-
+    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
-/////////////////////////////////////////////////////////////////////////////
+    "#include ""windows.h""\r\n"
-//
+    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
-// DESIGNINFO
+    "\0"
-//
+END
-
+
-#ifdef APSTUDIO_INVOKED
+3 TEXTINCLUDE DISCARDABLE
-GUIDELINES DESIGNINFO DISCARDABLE
+BEGIN
-BEGIN
+    "\r\n"
-    "ACCESSBRIDGESTATUSWINDOW", DIALOG
+    "\0"
-    BEGIN
+END
-        LEFTMARGIN, 4
+
-        RIGHTMARGIN, 202
+/////////////////////////////////////////////////////////////////////////////
-        BOTTOMMARGIN, 160
+//
-    END
+// DESIGNINFO
-
+//
-    "IDD_DIALOG1", DIALOG
+
-    BEGIN
+GUIDELINES DESIGNINFO DISCARDABLE
-        LEFTMARGIN, 7
+BEGIN
-        RIGHTMARGIN, 179
+    "ACCESSBRIDGESTATUSWINDOW", DIALOG
-        TOPMARGIN, 7
+    BEGIN
-        BOTTOMMARGIN, 88
+        LEFTMARGIN, 4
-    END
+        RIGHTMARGIN, 202
-END
+        BOTTOMMARGIN, 160
-#endif    // APSTUDIO_INVOKED
+    END
-
+
-
+    "IDD_DIALOG1", DIALOG
-#ifndef _MAC
+    BEGIN
-/////////////////////////////////////////////////////////////////////////////
+        LEFTMARGIN, 7
-//
+        RIGHTMARGIN, 179
-// Version
+        TOPMARGIN, 7
-//
+        BOTTOMMARGIN, 88
-
+    END
-VS_VERSION_INFO VERSIONINFO
+END
- FILEVERSION    JDK_FVER
+
- PRODUCTVERSION JDK_FVER
+#endif    // APSTUDIO_INVOKED
- FILEFLAGSMASK 0x3fL
-#ifdef DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE JDK_FTYPE
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments",         "Java Access Bridge"     "\0"
-            VALUE "CompanyName",      XSTR(JDK_COMPANY)        "\0"
-            VALUE "FileDescription",  XSTR(JDK_FILEDESC)       "\0"
-            VALUE "FileVersion",      XSTR(JDK_VER)            "\0"
-            VALUE "Full Version",     XSTR(JDK_VERSION_STRING) "\0"
-            VALUE "InternalName",     XSTR(JDK_INTERNAL_NAME)  "\0"
-            VALUE "LegalCopyright",   XSTR(JDK_COPYRIGHT)      "\0"
-            VALUE "OriginalFilename", XSTR(JDK_FNAME)          "\0"
-            VALUE "ProductName",      XSTR(JDK_NAME)           "\0"
-            VALUE "ProductVersion",   XSTR(JDK_VER)            "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED

src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorWindow.rc

@@ -1,28 +1,41 @@
-// Microsoft Visual C++ generated resource script.
 //
+// Copyright (c) 2013, 2020, 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
+// particular file as subject to the "Classpath" exception as provided
+// by Oracle in the LICENSE file that accompanied this code.
+//
+// This code is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// version 2 for more details (a copy is included in the LICENSE file that
+// accompanied this code).
+//
+// You should have received a copy of the GNU General Public License version
+// 2 along with this work; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+// or visit www.oracle.com if you need additional information or have any
+// questions.
+//
+
+#include "version.rc"
 #include "jaccessinspectorResource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
+#define APSTUDIO_READONLY_SYMBOLS
 #define APSTUDIO_HIDDEN_SYMBOLS
 #include "windows.h"
 #undef APSTUDIO_HIDDEN_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -55,6 +68,7 @@ END
 
 
 #ifdef APSTUDIO_INVOKED
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // TEXTINCLUDE
@@ -79,15 +93,11 @@ BEGIN
     "\0"
 END
 
-#endif    // APSTUDIO_INVOKED
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
 //
 
-#ifdef APSTUDIO_INVOKED
 GUIDELINES DESIGNINFO
 BEGIN
     "JACCESSINSPECTORWINDOW", DIALOG
@@ -170,53 +180,6 @@ BEGIN
     END
 END
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-// Need 2 defines so macro argument to XSTR will get expanded before quoting.
-#define XSTR(x) STR(x)
-#define STR(x)  #x
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION    JDK_FVER
- PRODUCTVERSION JDK_FVER
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- // FILEOS 0x4 is Win32, 0x40004 is Win32 NT only
- FILEOS 0x4L
- // FILETYPE should be 0x1 for .exe and 0x2 for .dll
- FILETYPE JDK_FTYPE
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000004b0"
-        BEGIN
-            VALUE "CompanyName",      XSTR(JDK_COMPANY)        "\0"
-            VALUE "FileDescription",  XSTR(JDK_FILEDESC)       "\0"
-            VALUE "FileVersion",      XSTR(JDK_VER)            "\0"
-            VALUE "Full Version",     XSTR(JDK_VERSION_STRING) "\0"
-            VALUE "InternalName",     XSTR(JDK_INTERNAL_NAME)  "\0"
-            VALUE "LegalCopyright",   XSTR(JDK_COPYRIGHT)      "\0"
-            VALUE "OriginalFilename", XSTR(JDK_FNAME)          "\0"
-            VALUE "ProductName",      XSTR(JDK_NAME)           "\0"
-            VALUE "ProductVersion",   XSTR(JDK_VER)            "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0, 1200
-    END
-END
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Accelerator
@@ -231,19 +194,3 @@ BEGIN
     VK_PRIOR,       cPreviousMessage,       VIRTKEY, CONTROL, NOINVERT
     "X",            cClearMessageHistory,   VIRTKEY, CONTROL, NOINVERT
 END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerWindow.rc

@@ -1,28 +1,41 @@
-//Microsoft Developer Studio generated resource script.
 //
+// Copyright (c) 2013, 2020, 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
+// particular file as subject to the "Classpath" exception as provided
+// by Oracle in the LICENSE file that accompanied this code.
+//
+// This code is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// version 2 for more details (a copy is included in the LICENSE file that
+// accompanied this code).
+//
+// You should have received a copy of the GNU General Public License version
+// 2 along with this work; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+// or visit www.oracle.com if you need additional information or have any
+// questions.
+//
+
+#include "version.rc"
 #include "jaccesswalkerResource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
+#define APSTUDIO_READONLY_SYMBOLS
 #define APSTUDIO_HIDDEN_SYMBOLS
 #include "windows.h"
 #undef APSTUDIO_HIDDEN_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -51,8 +64,8 @@ BEGIN
                     ES_READONLY | WS_VSCROLL
 END
 
-
 #ifdef APSTUDIO_INVOKED
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // TEXTINCLUDE
@@ -77,15 +90,11 @@ BEGIN
     "\0"
 END
 
-#endif    // APSTUDIO_INVOKED
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
 //
 
-#ifdef APSTUDIO_INVOKED
 GUIDELINES DESIGNINFO DISCARDABLE
 BEGIN
     "JACCESSWALKERWINDOW", DIALOG
@@ -100,8 +109,8 @@ BEGIN
         RIGHTMARGIN, 287
     END
 END
-#endif    // APSTUDIO_INVOKED
 
+#endif    // APSTUDIO_INVOKED
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -122,7 +131,6 @@ BEGIN
     END
 END
 
-
 PopupMenu MENU
     {
     POPUP ""
@@ -130,53 +138,3 @@ PopupMenu MENU
         MENUITEM "Display Accessibility Information",     cAPIPopupItem
         }
     }
-
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-// Need 2 defines so macro argument to XSTR will get expanded before quoting.
-#define XSTR(x) STR(x)
-#define STR(x)  #x
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION    JDK_FVER
- PRODUCTVERSION JDK_FVER
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- // FILEOS 0x4 is Win32, 0x40004 is Win32 NT only
- FILEOS 0x4L
- // FILETYPE should be 0x1 for .exe and 0x2 for .dll
- FILETYPE JDK_FTYPE
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000004b0"
-        BEGIN
-            VALUE "CompanyName",      XSTR(JDK_COMPANY)        "\0"
-            VALUE "FileDescription",  XSTR(JDK_FILEDESC)       "\0"
-            VALUE "FileVersion",      XSTR(JDK_VER)            "\0"
-            VALUE "Full Version",     XSTR(JDK_VERSION_STRING) "\0"
-            VALUE "InternalName",     XSTR(JDK_INTERNAL_NAME)  "\0"
-            VALUE "LegalCopyright",   XSTR(JDK_COPYRIGHT)      "\0"
-            VALUE "OriginalFilename", XSTR(JDK_FNAME)          "\0"
-            VALUE "ProductName",      XSTR(JDK_NAME)           "\0"
-            VALUE "ProductVersion",   XSTR(JDK_VER)            "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0, 1200
-    END
-END