comparison make/windows/makefiles/generated.make @ 1972:f95d63e2154a

6989984: Use standard include model for Hospot Summary: Replaced MakeDeps and the includeDB files with more standardized solutions. Reviewed-by: coleenp, kvn, kamg
author stefank
date Tue, 23 Nov 2010 13:22:55 -0800
parents c18cbe5936b8
children aa6e219afbf1
comparison
equal deleted inserted replaced
1971:e33f46fc48ed 1972:f95d63e2154a
1 # 1 #
2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2005, 2010, 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.
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 !include ../local.make 25 !include ../local.make
26 !include $(WorkSpace)/make/windows/makefiles/makedeps.make 26 !include $(WorkSpace)/make/windows/makefiles/projectcreator.make
27 !include local.make 27 !include local.make
28 28
29 # Pick up rules for building JVMTI (JSR-163) 29 # Pick up rules for building JVMTI (JSR-163)
30 JvmtiOutDir=jvmtifiles 30 JvmtiOutDir=jvmtifiles
31 !include $(WorkSpace)/make/windows/makefiles/jvmti.make 31 !include $(WorkSpace)/make/windows/makefiles/jvmti.make
32 32
33 # Pick up rules for building SA 33 # Pick up rules for building SA
34 !include $(WorkSpace)/make/windows/makefiles/sa.make 34 !include $(WorkSpace)/make/windows/makefiles/sa.make
35 35
36 AdlcOutDir=adfiles
37
36 !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered") 38 !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
37 default:: includeDB.current Dependencies incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) 39 default:: $(AdlcOutDir)/ad_$(Platform_arch_model).cpp $(AdlcOutDir)/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) buildobjfiles
38 !else 40 !else
39 default:: includeDB.current Dependencies $(JvmtiGeneratedFiles) 41 default:: $(JvmtiGeneratedFiles) buildobjfiles
40 !endif 42 !endif
41 43
42 # core plus serial gc 44 buildobjfiles:
43 IncludeDBs_base=$(WorkSpace)/src/share/vm/includeDB_core \ 45 @ sh $(WorkSpace)/make/windows/create_obj_files.sh $(Variant) $(Platform_arch) $(Platform_arch_model) $(WorkSpace) . > objfiles.make
44 $(WorkSpace)/src/share/vm/includeDB_jvmti \
45 $(WorkSpace)/src/share/vm/includeDB_gc \
46 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_serial
47 46
48 # parallel gc 47 classes/ProjectCreator.class: $(ProjectCreatorSources)
49 IncludeDBs_gc= $(WorkSpace)/src/share/vm/includeDB_gc_parallel \
50 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \
51 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_shared \
52 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parNew \
53 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep \
54 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_g1
55
56 IncludeDBs_core=$(IncludeDBs_base) $(IncludeDBs_gc) \
57 $(WorkSpace)/src/share/vm/includeDB_features
58
59 !if "$(Variant)" == "core"
60 IncludeDBs=$(IncludeDBs_core)
61 !endif
62
63 !if "$(Variant)" == "kernel"
64 IncludeDBs=$(IncludeDBs_base) $(WorkSpace)/src/share/vm/includeDB_compiler1
65 !endif
66
67 !if "$(Variant)" == "compiler1"
68 IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler1
69 !endif
70
71
72 !if "$(Variant)" == "compiler2"
73 IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler2
74 !endif
75
76 !if "$(Variant)" == "tiered"
77 IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler1 \
78 $(WorkSpace)/src/share/vm/includeDB_compiler2
79 !endif
80
81 # Note we don't generate a Visual C++ project file using MakeDeps for
82 # the batch build.
83 includeDB.current Dependencies: classes/MakeDeps.class $(IncludeDBs)
84 cat $(IncludeDBs) > includeDB
85 if exist incls rmdir /s /q incls
86 mkdir incls
87 $(RUN_JAVA) -Djava.class.path=classes MakeDeps WinGammaPlatform$(VcVersion) $(WorkSpace)/make/windows/platform_$(BUILDARCH) includeDB $(MakeDepsOptions)
88 rm -f includeDB.current
89 cp includeDB includeDB.current
90
91 classes/MakeDeps.class: $(MakeDepsSources)
92 if exist classes rmdir /s /q classes 48 if exist classes rmdir /s /q classes
93 mkdir classes 49 mkdir classes
94 $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\MakeDeps -d classes $(MakeDepsSources) 50 $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\ProjectCreator -d classes $(ProjectCreatorSources)
95 51
96 !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered") 52 !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
97 53
98 !include $(WorkSpace)/make/windows/makefiles/adlc.make 54 !include $(WorkSpace)/make/windows/makefiles/adlc.make
99 55