comparison make/windows/projectfiles/common/Makefile @ 2233:15d6977f04b0

7017824: Add support for creating 64-bit Visual Studio projects Summary: Updated create.bat and ProjectCreator Reviewed-by: brutisso, stefank, ohair
author sla
date Thu, 10 Feb 2011 13:03:22 +0100
parents aa6e219afbf1
children 98625323d3a3
comparison
equal deleted inserted replaced
2205:b83527d0482d 2233:15d6977f04b0
1 # 1 #
2 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
52 52
53 # Pick up rules for building JVMTI (JSR-163) 53 # Pick up rules for building JVMTI (JSR-163)
54 JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles 54 JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles
55 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make 55 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make
56 56
57 Platform=$(HOTSPOTWORKSPACE)/make/windows/platform_$(BUILDARCH)
58
59 !if "$(Variant)" == "compiler2" 57 !if "$(Variant)" == "compiler2"
60 # Pick up rules for building adlc 58 # Pick up rules for building adlc
61 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make 59 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
62 !endif 60 !endif
63 61
103 HOTSPOT_VM_DISTRO="OpenJDK" 101 HOTSPOT_VM_DISTRO="OpenJDK"
104 !endif 102 !endif
105 !endif 103 !endif
106 104
107 ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) \ 105 ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) \
108 -platform $(Platform) \
109 -define HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \ 106 -define HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \
110 -define JRE_RELEASE_VERSION=\\\"$(JRE_RELEASE_VERSION)\\\" \ 107 -define JRE_RELEASE_VERSION=\\\"$(JRE_RELEASE_VERSION)\\\" \
111 -define HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\" 108 -define HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\"
112 109
113 $(HOTSPOTBUILDROOT)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class 110 $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
114 @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions) 111 @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)
115 112
116 clean: 113 clean:
117 @rm -rf $(HOTSPOTBUILDSPACE)/classes 114 @rm -rf $(HOTSPOTBUILDSPACE)/classes
118 @rm -r ../$(ProjectFile) 115 @rm -r $(HOTSPOTBUILDSPACE)/$(ProjectFile)
119 116
120 $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class: $(ProjectCreatorSources) 117 $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class: $(ProjectCreatorSources)
121 @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes 118 @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes
122 @mkdir $(HOTSPOTBUILDSPACE)\classes 119 @mkdir $(HOTSPOTBUILDSPACE)\classes
123 @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\ProjectCreator -d $(HOTSPOTBUILDSPACE)/classes $(ProjectCreatorSources) 120 @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\ProjectCreator -d $(HOTSPOTBUILDSPACE)/classes $(ProjectCreatorSources)