comparison make/windows/projectfiles/common/Makefile @ 10405:f2110083203d

8005849: JEP 167: Event-Based JVM Tracing Reviewed-by: acorn, coleenp, sla Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
author sla
date Mon, 10 Jun 2013 11:30:51 +0200
parents aabf54ccedb1
children bd0e82136b03
comparison
equal deleted inserted replaced
10404:d0add7016434 10405:f2110083203d
1 # 1 #
2 # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1999, 2013, 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.
43 !endif 43 !endif
44 !endif 44 !endif
45 !endif 45 !endif
46 !endif 46 !endif
47 47
48 # if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK
49 !ifndef OPENJDK
50 !if !exists($(WorkSpace)\src\closed)
51 OPENJDK=true
52 !endif
53 !endif
48 54
49 55
50 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/projectcreator.make 56 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/projectcreator.make
51 !include $(WorkSpace)/make/windows/makefiles/compile.make 57 !include $(WorkSpace)/make/windows/makefiles/compile.make
52 58
53 # Pick up rules for building JVMTI (JSR-163) 59 # Pick up rules for building JVMTI (JSR-163)
54 JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles 60 JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles
55 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make 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
56 66
57 !if "$(Variant)" == "compiler2" 67 !if "$(Variant)" == "compiler2"
58 # Pick up rules for building adlc 68 # Pick up rules for building adlc
59 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make 69 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
60 !endif 70 !endif
64 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make 74 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
65 !endif 75 !endif
66 76
67 HS_INTERNAL_NAME=jvm 77 HS_INTERNAL_NAME=jvm
68 78
69 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) 79 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) $(TraceGeneratedFiles)
70 80
71 !include $(HOTSPOTWORKSPACE)/make/hotspot_version 81 !include $(HOTSPOTWORKSPACE)/make/hotspot_version
72 82
73 !if "$(USER_RELEASE_SUFFIX)" != "" 83 !if "$(USER_RELEASE_SUFFIX)" != ""
74 HOTSPOT_BUILD_VERSION = internal-$(USER_RELEASE_SUFFIX) 84 HOTSPOT_BUILD_VERSION = internal-$(USER_RELEASE_SUFFIX)