From 8bc65de8e906cd10e3911a091d4bcc67358a0ff8 Mon Sep 17 00:00:00 2001
From: asaha <unknown>
Date: Wed, 9 Mar 2011 16:44:27 -0800
Subject: [PATCH] 6908562: JFB Custom Revision Version Build/Makefile changes
 Reviewed-by: ohair, ksrini, katleman

---
 make/common/Release.gmk     | 13 ++++++++++---
 make/common/shared/Defs.gmk |  6 +++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/make/common/Release.gmk b/make/common/Release.gmk
index d9872bcc7..a64bdacfe 100644
--- a/make/common/Release.gmk
+++ b/make/common/Release.gmk
@@ -62,7 +62,8 @@ EXCLUDE_PROPWARN_PKGS += sun.dyn
 # This is an interim solution until the ct.sym is replaced
 # with a new module system (being discussed for JDK 7).
 #
-EXPORTED_PRIVATE_PKGS = com.sun.servicetag
+EXPORTED_PRIVATE_PKGS = com.sun.servicetag \
+                        com.oracle.net
 
 # 64-bit solaris has a few special cases. We define the variable
 # SOLARIS64 for use in this Makefile to easily test those cases
@@ -86,8 +87,14 @@ ifdef OPENJDK
   IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
 else
   # Where to find these files
-  SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdk
-  SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jre
+  ifeq ($(J4B), true)
+      SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdkfb
+      SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jrefb
+  else
+      SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdk
+      SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jre
+  endif
+
   IMAGE_DOCLIST_JDK = COPYRIGHT README.html  THIRDPARTYLICENSEREADME.txt
   IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html THIRDPARTYLICENSEREADME.txt
   ifeq ($(PLATFORM), windows)
diff --git a/make/common/shared/Defs.gmk b/make/common/shared/Defs.gmk
index 587f1ad19..cfc889a01 100644
--- a/make/common/shared/Defs.gmk
+++ b/make/common/shared/Defs.gmk
@@ -218,7 +218,11 @@ ifdef OPENJDK
 else
   LAUNCHER_NAME = java
   PRODUCT_NAME = Java(TM)
-  PRODUCT_SUFFIX = SE Runtime Environment
+  ifeq ($(J4B), true)
+    PRODUCT_SUFFIX = SE Runtime Environment for Business
+  else
+    PRODUCT_SUFFIX = SE Runtime Environment
+  endif
   JDK_RC_PLATFORM_NAME = Platform SE
   COMPANY_NAME = Oracle Corporation
 endif
-- 
GitLab