Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8032443: Java Access Bridge version strings need to be fixed
authorptbrunet
Thu, 27 Feb 2014 16:11:08 -0600
changeset 23607 e019220f8ee8
parent 23330 31ee1f289ead
child 23608 be16345d1cec
8032443: Java Access Bridge version strings need to be fixed Summary: Use build version info in RC file and in getVersionInfo function Reviewed-by: prr, ihse, serb Contributed-by: peter.brunet@oracle.com
jdk/make/CompileLaunchers.gmk file | annotate | diff | comparison | revisions
jdk/make/lib/PlatformLibraries.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/CompileLaunchers.gmk	Fri Feb 28 15:01:19 2014 +0400
+++ b/jdk/make/CompileLaunchers.gmk	Thu Feb 27 16:11:08 2014 -0600
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -679,7 +679,10 @@
         PROGRAM := jabswitch, \
         DEBUG_SYMBOLS := true, \
         VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/AccessBridgeStatusWindow.rc, \
-        RC_FLAGS := $(RC_FLAGS), \
+        RC_FLAGS := $(RC_FLAGS) \
+            -D "JDK_FNAME=jabswitch.exe" \
+            -D "JDK_INTERNAL_NAME=jabswitch" \
+            -D "JDK_FTYPE=0x01L", \
         MANIFEST := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/jabswitch.manifest))
 
     BUILD_LAUNCHERS += $(BUILD_JABSWITCH)
--- a/jdk/make/lib/PlatformLibraries.gmk	Fri Feb 28 15:01:19 2014 +0400
+++ b/jdk/make/lib/PlatformLibraries.gmk	Thu Feb 27 16:11:08 2014 -0600
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -160,7 +160,10 @@
               -subsystem:windows -machine:$2 \
               -def:$(ACCESSBRIDGE_SRCDIR)/JAWTAccessBridge.DEF, \
           VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
-          RC_FLAGS := $(RC_FLAGS), \
+          RC_FLAGS := $(RC_FLAGS) \
+              -D "JDK_FNAME=JAWTAccessBridge$1.dll" \
+              -D "JDK_INTERNAL_NAME=JAWTAccessBridge$1" \
+              -D "JDK_FTYPE=0x02L", \
           OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawtaccessbridge$1, \
           DEBUG_SYMBOLS := true)
 
@@ -183,7 +186,10 @@
               -subsystem:windows -machine:$2 \
               -def:$(ACCESSBRIDGE_SRCDIR)/JavaAccessBridge.DEF, \
           VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
-          RC_FLAGS := $(RC_FLAGS), \
+          RC_FLAGS := $(RC_FLAGS) \
+              -D "JDK_FNAME=JavaAccessBridge$1.dll" \
+              -D "JDK_INTERNAL_NAME=JavaAccessBridge$1" \
+              -D "JDK_FTYPE=0x02L", \
           OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavaaccessbridge$1, \
           DEBUG_SYMBOLS := true)
 
@@ -205,7 +211,10 @@
               -subsystem:windows -machine:$2 \
               -def:$(ACCESSBRIDGE_SRCDIR)/WinAccessBridge.DEF, \
           VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
-          RC_FLAGS := $(RC_FLAGS), \
+          RC_FLAGS := $(RC_FLAGS) \
+              -D "JDK_FNAME=WindowsAccessBridge$1.dll" \
+              -D "JDK_INTERNAL_NAME=WindowsAccessBridge$1" \
+              -D "JDK_FTYPE=0x02L", \
           OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libwindowsaccessbridge$1, \
           DEBUG_SYMBOLS := true)
jdk-sandbox