stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6548261: Use of SE in make/common/Defs-windows.gmk

Browse Source 
Reviewed-by: darcy
This commit is contained in:
Kelly O'Hair 2008-07-16 09:51:43 -07:00
parent 575988272e
commit c65bf79ac2
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
jdk/make/common/Defs-windows.gmk
View File

@ -404,7 +404,6 @@ ifdef JDK_UPDATE_VERSION
else else
JDK_UPDATE_VER := 0 JDK_UPDATE_VER := 0
endif endif
JDK_VER = $(JDK_MINOR_VERSION),$(JDK_MICRO_VERSION),$(JDK_UPDATE_VER),$(COOKED_BUILD_NUMBER)
RC_FLAGS = /l 0x409 /r RC_FLAGS = /l 0x409 /r
@ -414,15 +413,23 @@ else
RC_FLAGS += $(MS_RC_DEBUG_OPTION) RC_FLAGS += $(MS_RC_DEBUG_OPTION)
endif endif
ifndef COPYRIGHT_YEAR # Values for the RC variables defined in RC_FLAGS
COPYRIGHT_YEAR = 2007 JDK_RC_BUILD_ID = $(FULL_VERSION)
endif JDK_RC_COMPANY = $(COMPANY_NAME)
JDK_RC_COMPONENT = $(PRODUCT_NAME) $(JDK_RC_PLATFORM_NAME) binary
JDK_RC_VER = \
$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)
JDK_RC_COPYRIGHT = Copyright \xA9 $(COPYRIGHT_YEAR)
JDK_RC_NAME = \
$(PRODUCT_NAME) $(JDK_RC_PLATFORM_NAME) $(JDK_MINOR_VERSION) $(JDK_UPDATE_META_TAG)
JDK_RC_FVER = \
$(JDK_MINOR_VERSION),$(JDK_MICRO_VERSION),$(JDK_UPDATE_VER),$(COOKED_BUILD_NUMBER)
# J2SE name required here # J2SE name required here
RC_FLAGS += -d "J2SE_BUILD_ID=$(FULL_VERSION)" \ RC_FLAGS += -d "J2SE_BUILD_ID=$(JDK_RC_BUILD_ID)" \
-d "J2SE_COMPANY=$(COMPANY_NAME)" \ -d "J2SE_COMPANY=$(JDK_RC_COMPANY)" \
-d "J2SE_COMPONENT=$(PRODUCT_NAME) Platform SE binary" \ -d "J2SE_COMPONENT=$(JDK_RC_COMPONENT)" \
-d "J2SE_VER=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)" \ -d "J2SE_VER=$(JDK_RC_VER)" \
-d "J2SE_COPYRIGHT=Copyright \xA9 $(COPYRIGHT_YEAR)" \ -d "J2SE_COPYRIGHT=$(JDK_RC_COPYRIGHT)" \
-d "J2SE_NAME=$(PRODUCT_NAME) Platform SE $(JDK_MINOR_VERSION) $(JDK_UPDATE_META_TAG)" \ -d "J2SE_NAME=$(JDK_RC_NAME)" \
-d "J2SE_FVER=$(JDK_VER)" -d "J2SE_FVER=$(JDK_RC_FVER)"

2
jdk/make/common/Defs.gmk
View File

@ -703,7 +703,7 @@ endif
ifdef ALT_COPYRIGHT_YEAR ifdef ALT_COPYRIGHT_YEAR
COPYRIGHT_YEAR = $(ALT_COPYRIGHT_YEAR) COPYRIGHT_YEAR = $(ALT_COPYRIGHT_YEAR)
else else
COPYRIGHT_YEAR = $(shell $(DATE) '+%Y') COPYRIGHT_YEAR := $(shell $(DATE) '+%Y')
endif endif
# Install of imported file (JDK_IMPORT_PATH, or some other external location) # Install of imported file (JDK_IMPORT_PATH, or some other external location)

14
jdk/make/common/shared/Defs.gmk
View File

@ -188,16 +188,18 @@ ifndef MILESTONE
endif endif
# Default names # Default names
LAUNCHER_NAME = java
PRODUCT_NAME = Java(TM)
PRODUCT_SUFFIX = SE Runtime Environment
COMPANY_NAME = Sun Microsystems, Inc.
ifdef OPENJDK ifdef OPENJDK
LAUNCHER_NAME = openjdk LAUNCHER_NAME = openjdk
PRODUCT_NAME = OpenJDK PRODUCT_NAME = OpenJDK
PRODUCT_SUFFIX = Runtime Environment PRODUCT_SUFFIX = Runtime Environment
COMPANY_NAME = JDK_RC_PLATFORM_NAME = Platform
COMPANY_NAME = N/A
else
LAUNCHER_NAME = java
PRODUCT_NAME = Java(TM)
PRODUCT_SUFFIX = SE Runtime Environment
JDK_RC_PLATFORM_NAME = Platform SE
COMPANY_NAME = Sun Microsystems, Inc.
endif endif
RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX) RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX)