comparison make/windows/projectfiles/common/Makefile @ 2027:aa6e219afbf1

7006354: Updates to Visual Studio project creation and development launcher Summary: Updates to Visual Studio project creation and development launcher Reviewed-by: stefank, coleenp
author sla
date Wed, 15 Dec 2010 07:11:31 -0800
parents 2ca799d83d3c
children 15d6977f04b0
comparison
equal deleted inserted replaced
2025:b03e6b4c7c75 2027:aa6e219afbf1
20 # or visit www.oracle.com if you need additional information or have any 20 # or visit www.oracle.com if you need additional information or have any
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 !include local.make 25 !ifdef LOCAL_MAKE
26 !include $(LOCAL_MAKE)
27 !endif
28
26 29
27 WorkSpace=$(HOTSPOTWORKSPACE) 30 WorkSpace=$(HOTSPOTWORKSPACE)
28 31
29 !ifdef ALT_BOOTDIR 32 !ifdef ALT_BOOTDIR
30 BootStrapDir=$(ALT_BOOTDIR) 33 BootStrapDir=$(ALT_BOOTDIR)
32 !ifdef BOOTDIR 35 !ifdef BOOTDIR
33 BootStrapDir=$(BOOTDIR) 36 BootStrapDir=$(BOOTDIR)
34 !else 37 !else
35 !ifdef JAVA_HOME 38 !ifdef JAVA_HOME
36 BootStrapDir=$(JAVA_HOME) 39 BootStrapDir=$(JAVA_HOME)
40 !else
41 !ifdef HOTSPOTJDKDIST
42 BootStrapDir=$(HOTSPOTJDKDIST)
43 !endif
37 !endif 44 !endif
38 !endif 45 !endif
39 !endif 46 !endif
40 47
48
49
41 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/projectcreator.make 50 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/projectcreator.make
51 !include $(WorkSpace)/make/windows/makefiles/compile.make
42 52
43 # Pick up rules for building JVMTI (JSR-163) 53 # Pick up rules for building JVMTI (JSR-163)
44 JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles 54 JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles
45 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make 55 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make
46 56
53 63
54 !if "$(Variant)" == "tiered" 64 !if "$(Variant)" == "tiered"
55 # Pick up rules for building adlc 65 # Pick up rules for building adlc
56 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make 66 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
57 !endif 67 !endif
68
69 HS_INTERNAL_NAME=jvm
70 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/launcher.make
58 71
59 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) 72 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles)
60 73
61 !include $(HOTSPOTWORKSPACE)/make/hotspot_version 74 !include $(HOTSPOTWORKSPACE)/make/hotspot_version
62 75
95 -platform $(Platform) \ 108 -platform $(Platform) \
96 -define HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \ 109 -define HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \
97 -define JRE_RELEASE_VERSION=\\\"$(JRE_RELEASE_VERSION)\\\" \ 110 -define JRE_RELEASE_VERSION=\\\"$(JRE_RELEASE_VERSION)\\\" \
98 -define HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\" 111 -define HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\"
99 112
100 $(HOTSPOTBUILDSPACE)/$(ProjectFile): local.make $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class 113 $(HOTSPOTBUILDROOT)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
101 @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions) 114 @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)
102 115
103 clean: 116 clean:
104 @rm -rf $(HOTSPOTBUILDSPACE)/classes 117 @rm -rf $(HOTSPOTBUILDSPACE)/classes
105 @rm -r ../$(ProjectFile) 118 @rm -r ../$(ProjectFile)