Mercurial > hg > graal-jvmci-8

comparison make/windows/projectfiles/common/Makefile @ 1978:2ca799d83d3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author ohair
date Tue, 30 Nov 2010 18:10:20 -0800
parents f95d63e2154a c7db7adb83b4
children aa6e219afbf1
comparison
equal deleted inserted replaced
1976:0fc262af204f 1978:2ca799d83d3c
63 !if "$(HOTSPOT_RELEASE_VERSION)" != "" 63 !if "$(HOTSPOT_RELEASE_VERSION)" != ""
64 HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)" 64 HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)"
65 !else 65 !else
66 HOTSPOT_RELEASE_VERSION="$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)" 66 HOTSPOT_RELEASE_VERSION="$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)"
67 !endif 67 !endif
68 !if "$(USER_RELEASE_SUFFIX)" != ""
69 HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal-$(USER_RELEASE_SUFFIX)
70 !else
68 HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal 71 HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal
72 !endif
69 !if "$(HOTSPOT_BUILD_VERSION)" != "" 73 !if "$(HOTSPOT_BUILD_VERSION)" != ""
70 HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)" 74 HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)"
71 !endif 75 !endif
72 !if "$(JRE_RELEASE_VERSION)" != "" 76 !if "$(JRE_RELEASE_VERSION)" != ""
73 JRE_RELEASE_VERSION="$(JRE_RELEASE_VERSION)" 77 JRE_RELEASE_VERSION="$(JRE_RELEASE_VERSION)"