equal
deleted
inserted
replaced
91 JRE_RELEASE_VERSION="\\\"$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)\\\"" |
91 JRE_RELEASE_VERSION="\\\"$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)\\\"" |
92 !endif |
92 !endif |
93 !if "$(HOTSPOT_RELEASE_VERSION)" != "" |
93 !if "$(HOTSPOT_RELEASE_VERSION)" != "" |
94 HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\"" |
94 HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\"" |
95 !else |
95 !else |
96 HOTSPOT_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\"" |
96 HOTSPOT_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
97 !endif |
97 !endif |
98 # Define HOTSPOT_VM_DISTRO if HOTSPOT_VM_DISTRO is set, |
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 |
99 # and if it is not see if we have the src/closed directory |
100 !if "$(HOTSPOT_VM_DISTRO)" != "" |
100 !if "$(HOTSPOT_VM_DISTRO)" != "" |
101 HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) |
101 HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) |
103 !if exists($(HOTSPOTWORKSPACE)\src\closed) |
103 !if exists($(HOTSPOTWORKSPACE)\src\closed) |
104 HOTSPOT_VM_DISTRO="\\\"Java HotSpot(TM)\\\"" |
104 HOTSPOT_VM_DISTRO="\\\"Java HotSpot(TM)\\\"" |
105 !else |
105 !else |
106 HOTSPOT_VM_DISTRO="\\\"OpenJDK\\\"" |
106 HOTSPOT_VM_DISTRO="\\\"OpenJDK\\\"" |
107 !endif |
107 !endif |
|
108 !if "$(JDK_BUILD_NUMBER)" != "" |
|
109 JDK_BUILD_NUMBER="\\\"$(JDK_BUILD_NUMBER)\\\"" |
|
110 !else |
|
111 JDK_BUILD_NUMBER="\\\"00\\\"" |
|
112 !endif |
108 !endif |
113 !endif |
109 |
114 |
110 ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) |
115 JDK_MAJOR_VERSION="\\\"$(JDK_MAJOR_VER)\\\"" |
|
116 JDK_MINOR_VERSION="\\\"$(JDK_MINOR_VER)\\\"" |
|
117 JDK_MICRO_VERSION="\\\"$(JDK_MICRO_VER)\\\"" |
|
118 |
|
119 ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) -define JDK_MAJOR_VERSION=$(JDK_MAJOR_VERSION) -define JDK_MINOR_VERSION=$(JDK_MINOR_VERSION) -define JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) -define JDK_BUILD_NUMBER=$(JDK_BUILD_NUMBER) |
111 ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions) |
120 ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions) |
112 |
121 |
113 $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class |
122 $(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' |
123 @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) |
124 @$(RUN_JAVA) -Djava.class.path="$(HOTSPOTBUILDSPACE)/classes" ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions) |