comparison make/windows/makefiles/trace.make @ 12937:ffb471203842

8026792: HOTSPOT: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated. Reviewed-by: dholmes, sla
author erikj
date Thu, 17 Oct 2013 16:11:26 +0200
parents 31f3b1e1c5e5
children
comparison
equal deleted inserted replaced
12935:9e0ef3f02648 12937:ffb471203842
38 TraceGeneratedNames = \ 38 TraceGeneratedNames = \
39 traceEventClasses.hpp \ 39 traceEventClasses.hpp \
40 traceEventIds.hpp \ 40 traceEventIds.hpp \
41 traceTypes.hpp 41 traceTypes.hpp
42 42
43 43 !if EXISTS($(TraceAltSrcDir))
44 !if "$(OPENJDK)" != "true"
45 TraceGeneratedNames = $(TraceGeneratedNames) \ 44 TraceGeneratedNames = $(TraceGeneratedNames) \
46 traceRequestables.hpp \ 45 traceRequestables.hpp \
47 traceEventControl.hpp \ 46 traceEventControl.hpp \
48 traceProducer.cpp 47 traceProducer.cpp
49 !endif 48 !endif
54 TraceGeneratedFiles = \ 53 TraceGeneratedFiles = \
55 $(TraceOutDir)/traceEventClasses.hpp \ 54 $(TraceOutDir)/traceEventClasses.hpp \
56 $(TraceOutDir)/traceEventIds.hpp \ 55 $(TraceOutDir)/traceEventIds.hpp \
57 $(TraceOutDir)/traceTypes.hpp 56 $(TraceOutDir)/traceTypes.hpp
58 57
59 !if "$(OPENJDK)" != "true" 58 !if EXISTS($(TraceAltSrcDir))
60 TraceGeneratedFiles = $(TraceGeneratedFiles) \ 59 TraceGeneratedFiles = $(TraceGeneratedFiles) \
61 $(TraceOutDir)/traceRequestables.hpp \ 60 $(TraceOutDir)/traceRequestables.hpp \
62 $(TraceOutDir)/traceEventControl.hpp \ 61 $(TraceOutDir)/traceEventControl.hpp \
63 $(TraceOutDir)/traceProducer.cpp 62 $(TraceOutDir)/traceProducer.cpp
64 !endif 63 !endif
66 XSLT = $(QUIETLY) $(REMOTE) $(RUN_JAVA) -classpath $(JvmtiOutDir) jvmtiGen 65 XSLT = $(QUIETLY) $(REMOTE) $(RUN_JAVA) -classpath $(JvmtiOutDir) jvmtiGen
67 66
68 XML_DEPS = $(TraceSrcDir)/trace.xml $(TraceSrcDir)/tracetypes.xml \ 67 XML_DEPS = $(TraceSrcDir)/trace.xml $(TraceSrcDir)/tracetypes.xml \
69 $(TraceSrcDir)/trace.dtd $(TraceSrcDir)/xinclude.mod 68 $(TraceSrcDir)/trace.dtd $(TraceSrcDir)/xinclude.mod
70 69
71 !if "$(OPENJDK)" != "true" 70 !if EXISTS($(TraceAltSrcDir))
72 XML_DEPS = $(XML_DEPS) $(TraceAltSrcDir)/traceevents.xml 71 XML_DEPS = $(XML_DEPS) $(TraceAltSrcDir)/traceevents.xml
73 !endif 72 !endif
74 73
75 .PHONY: all clean cleanall 74 .PHONY: all clean cleanall
76 75
85 84
86 $(TraceOutDir)/traceTypes.hpp: $(TraceSrcDir)/trace.xml $(TraceSrcDir)/traceTypes.xsl $(XML_DEPS) 85 $(TraceOutDir)/traceTypes.hpp: $(TraceSrcDir)/trace.xml $(TraceSrcDir)/traceTypes.xsl $(XML_DEPS)
87 @echo Generating $@ 86 @echo Generating $@
88 @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceSrcDir)/traceTypes.xsl -OUT $(TraceOutDir)/traceTypes.hpp 87 @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceSrcDir)/traceTypes.xsl -OUT $(TraceOutDir)/traceTypes.hpp
89 88
90 !if "$(OPENJDK)" == "true" 89 !if !EXISTS($(TraceAltSrcDir))
91 90
92 $(TraceOutDir)/traceEventClasses.hpp: $(TraceSrcDir)/trace.xml $(TraceSrcDir)/traceEventClasses.xsl $(XML_DEPS) 91 $(TraceOutDir)/traceEventClasses.hpp: $(TraceSrcDir)/trace.xml $(TraceSrcDir)/traceEventClasses.xsl $(XML_DEPS)
93 @echo Generating OpenJDK $@ 92 @echo Generating OpenJDK $@
94 @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceSrcDir)/traceEventClasses.xsl -OUT $(TraceOutDir)/traceEventClasses.hpp 93 @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceSrcDir)/traceEventClasses.xsl -OUT $(TraceOutDir)/traceEventClasses.hpp
95 94