From 24656787c0030c9852075830fb3b149be750cccc Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Fri, 12 Feb 2016 11:07:46 +0100
Subject: [PATCH] 8149647: Incremental enhancements from build-infra
Reviewed-by: erikj
---
hotspot/make/lib/Lib-jdk.hotspot.agent.gmk | 6 +++++-
hotspot/src/os/windows/vm/version.rc | 8 ++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk b/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
index 51ff9691c84..64e70355346 100644
--- a/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
+++ b/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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,6 +29,10 @@ $(eval $(call IncludeCustomExtension, hotspot, lib/Lib-jdk.hotspot.agent.gmk))
################################################################################
+ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx windows), )
+ DISABLE_MAPFILES := true
+endif
+
SA_TOPDIR := $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent
# Defaults for most platforms
diff --git a/hotspot/src/os/windows/vm/version.rc b/hotspot/src/os/windows/vm/version.rc
index 1ec8e8dc466..9f4ae512a1a 100644
--- a/hotspot/src/os/windows/vm/version.rc
+++ b/hotspot/src/os/windows/vm/version.rc
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2004, 2016, 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
@@ -19,7 +19,7 @@
// 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"
@@ -36,7 +36,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION HS_VER
+ FILEVERSION JDK_VER
PRODUCTVERSION JDK_VER
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
@@ -56,7 +56,7 @@ BEGIN
BEGIN
VALUE "CompanyName", XSTR(HS_COMPANY) "\0"
VALUE "FileDescription", XSTR(HS_FILEDESC) "\0"
- VALUE "FileVersion", XSTR(HS_DOTVER) "\0"
+ VALUE "FileVersion", XSTR(JDK_DOTVER) "\0"
VALUE "Full Version", XSTR(HS_BUILD_ID) "\0"
VALUE "InternalName", XSTR(HS_INTERNAL_NAME) "\0"
VALUE "LegalCopyright", XSTR(HS_COPYRIGHT) "\0"