equal
deleted
inserted
replaced
36 |
36 |
37 # JDK_MACOSX_BUNDLE_DIR and JRE_MACOSX_BUNDLE_DIR are defined in SPEC. |
37 # JDK_MACOSX_BUNDLE_DIR and JRE_MACOSX_BUNDLE_DIR are defined in SPEC. |
38 |
38 |
39 MACOSX_PLIST_SRC := $(JDK_TOPDIR)/make/data/bundle |
39 MACOSX_PLIST_SRC := $(JDK_TOPDIR)/make/data/bundle |
40 |
40 |
41 BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(JDK_MINOR_VERSION)u$(JDK_UPDATE_VERSION) |
41 BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(VERSION_SHORT) |
42 BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_MINOR_VERSION) |
42 BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(VERSION_SHORT) |
43 BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_VERSION) |
43 BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) $(VERSION_STRING) |
44 BUNDLE_PLATFORM_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION) |
44 BUNDLE_PLATFORM_VERSION := $(VERSION_MAJOR).$(VERSION_MINOR) |
45 BUNDLE_VERSION := $(JDK_VERSION) |
45 BUNDLE_VERSION := $(VERSION_NUMBER) |
46 ifeq ($(COMPANY_NAME), N/A) |
46 ifeq ($(COMPANY_NAME), N/A) |
47 BUNDLE_VENDOR := UNDEFINED |
47 BUNDLE_VENDOR := UNDEFINED |
48 else |
48 else |
49 BUNDLE_VENDOR := $(COMPANY_NAME) |
49 BUNDLE_VENDOR := $(COMPANY_NAME) |
50 endif |
50 endif |