Mercurial > hg > icedtea8-forest > jdk
changeset 9710:37392f2f5d59 jdk8u20-b11
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
author | ptbrunet |
---|---|
date | Thu, 27 Feb 2014 16:11:08 -0600 |
parents | ae7e7c69b3b6 |
children | e323c74edabd 7143d147afc4 |
files | make/CompileLaunchers.gmk make/lib/PlatformLibraries.gmk |
diffstat | 2 files changed, 18 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CompileLaunchers.gmk Thu Apr 17 22:50:04 2014 +0400 +++ b/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 @@ -676,7 +676,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/make/lib/PlatformLibraries.gmk Thu Apr 17 22:50:04 2014 +0400 +++ b/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 @@ -161,7 +161,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) @@ -184,7 +187,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) @@ -206,7 +212,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)