make/windows/projectfiles/common/Makefile

Print this page 
rev 6314 : 8030011: Update Hotspot version string output
Reviewed-by: dholmes, jcoomes, kvn


  61 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make
  62 
  63 # Pick up rules for building trace
  64 TraceOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\tracefiles
  65 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/trace.make
  66 
  67 !if "$(Variant)" == "compiler2"
  68 # Pick up rules for building adlc
  69 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
  70 !endif
  71 
  72 !if "$(Variant)" == "tiered"
  73 # Pick up rules for building adlc
  74 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
  75 !endif
  76 
  77 HS_INTERNAL_NAME=jvm
  78 
  79 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) $(TraceGeneratedFiles)
  80 
  81 !include $(HOTSPOTWORKSPACE)/make/hotspot_version
  82 
  83 !if "$(USER_RELEASE_SUFFIX)" != ""
  84 HOTSPOT_BUILD_VERSION = internal-$(USER_RELEASE_SUFFIX)
  85 !else
  86 HOTSPOT_BUILD_VERSION = internal
  87 !endif
  88 !if "$(HOTSPOT_RELEASE_VERSION)" != ""
  89 HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\""
  90 !else
  91 HOTSPOT_RELEASE_VERSION="\\\"$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)-$(HOTSPOT_BUILD_VERSION)\\\""
  92 !endif
  93 !if "$(JRE_RELEASE_VERSION)" != ""
  94 JRE_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\""
  95 !else
  96 JRE_RELEASE_VERSION="\\\"$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)\\\""
  97 !endif
  98 




  99 # Define HOTSPOT_VM_DISTRO if HOTSPOT_VM_DISTRO is set,
 100 # and if it is not see if we have the src/closed directory
 101 !if "$(HOTSPOT_VM_DISTRO)" != ""
 102 HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO)
 103 !else
 104 !if exists($(HOTSPOTWORKSPACE)\src\closed)
 105 HOTSPOT_VM_DISTRO="\\\"Java HotSpot(TM)\\\""
 106 !else
 107 HOTSPOT_VM_DISTRO="\\\"OpenJDK\\\""
 108 !endif
 109 !endif
 110 
 111 ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO)
 112 ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions)
 113 
 114 $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
 115         @if "$(MSC_VER)"=="1500" echo Make sure you have VS2008 SP1 or later, or you may see 'expanded command line too long'
 116         @$(RUN_JAVA) -Djava.class.path="$(HOTSPOTBUILDSPACE)/classes" ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)
 117 
 118 clean:



  61 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make
  62 
  63 # Pick up rules for building trace
  64 TraceOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\tracefiles
  65 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/trace.make
  66 
  67 !if "$(Variant)" == "compiler2"
  68 # Pick up rules for building adlc
  69 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
  70 !endif
  71 
  72 !if "$(Variant)" == "tiered"
  73 # Pick up rules for building adlc
  74 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
  75 !endif
  76 
  77 HS_INTERNAL_NAME=jvm
  78 
  79 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) $(TraceGeneratedFiles)
  80 
  81 !include $(HOTSPOTWORKSPACE)/make/jdk_version
  82 
  83 !if "$(USER_RELEASE_SUFFIX)" != ""
  84 HOTSPOT_BUILD_VERSION = internal-$(USER_RELEASE_SUFFIX)
  85 !else
  86 HOTSPOT_BUILD_VERSION = internal
  87 !endif





  88 !if "$(JRE_RELEASE_VERSION)" != ""
  89 JRE_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\""
  90 !else
  91 JRE_RELEASE_VERSION="\\\"$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)\\\""
  92 !endif
  93 !if "$(HOTSPOT_RELEASE_VERSION)" != ""
  94 HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\""
  95 !else
  96 HOTSPOT_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\""
  97 !endif
  98 # Define HOTSPOT_VM_DISTRO if HOTSPOT_VM_DISTRO is set,
  99 # and if it is not see if we have the src/closed directory
 100 !if "$(HOTSPOT_VM_DISTRO)" != ""
 101 HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO)
 102 !else
 103 !if exists($(HOTSPOTWORKSPACE)\src\closed)
 104 HOTSPOT_VM_DISTRO="\\\"Java HotSpot(TM)\\\""
 105 !else
 106 HOTSPOT_VM_DISTRO="\\\"OpenJDK\\\""
 107 !endif
 108 !endif
 109 
 110 ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO)
 111 ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions)
 112 
 113 $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
 114         @if "$(MSC_VER)"=="1500" echo Make sure you have VS2008 SP1 or later, or you may see 'expanded command line too long'
 115         @$(RUN_JAVA) -Djava.class.path="$(HOTSPOTBUILDSPACE)/classes" ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)
 116 
 117 clean: