23 # questions. |
23 # questions. |
24 # |
24 # |
25 |
25 |
26 include JarArchive.gmk |
26 include JarArchive.gmk |
27 include JavaCompilation.gmk |
27 include JavaCompilation.gmk |
|
28 include Modules.gmk |
28 include SetupJavaCompilers.gmk |
29 include SetupJavaCompilers.gmk |
29 |
30 |
30 ################################################################################ |
31 ################################################################################ |
|
32 |
|
33 # This is needed to properly setup DOCS_MODULES. |
|
34 $(eval $(call ReadImportMetaData)) |
|
35 |
|
36 # Modules that should be visible for 9 - the documented modules: |
|
37 CT_MODULES := $(DOCS_MODULES) |
|
38 |
|
39 # Get the complete module source path: |
|
40 CT_MODULESOURCEPATH := $(call GetModuleSrcPath) |
31 |
41 |
32 CT_DATA_DESCRIPTION ?= $(LANGTOOLS_TOPDIR)/make/data/symbols/symbols |
42 CT_DATA_DESCRIPTION ?= $(LANGTOOLS_TOPDIR)/make/data/symbols/symbols |
33 |
43 |
34 $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \ |
44 $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \ |
35 SETUP := GENERATE_OLDBYTECODE, \ |
45 SETUP := GENERATE_OLDBYTECODE, \ |
39 BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols, \ |
49 BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols, \ |
40 )) |
50 )) |
41 |
51 |
42 ifeq ($(BOOT_JDK_MODULAR), true) |
52 ifeq ($(BOOT_JDK_MODULAR), true) |
43 COMPILECREATESYMBOLS_ADD_EXPORTS := \ |
53 COMPILECREATESYMBOLS_ADD_EXPORTS := \ |
|
54 --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ |
|
55 --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \ |
44 --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \ |
56 --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \ |
45 --add-exports=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \ |
57 --add-exports=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \ |
46 --add-exports=jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED |
58 --add-exports=jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED |
47 endif |
59 endif |
48 |
60 |
57 -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols \ |
69 -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols \ |
58 build.tools.symbolgenerator.CreateSymbols \ |
70 build.tools.symbolgenerator.CreateSymbols \ |
59 build-ctsym \ |
71 build-ctsym \ |
60 $(CT_DATA_DESCRIPTION) \ |
72 $(CT_DATA_DESCRIPTION) \ |
61 $(@D) |
73 $(@D) |
|
74 $(MKDIR) $(@D)/9 |
|
75 $(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \ |
|
76 $(COMPILECREATESYMBOLS_ADD_EXPORTS) \ |
|
77 -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols \ |
|
78 build.tools.symbolgenerator.TransitiveDependencies \ |
|
79 $(CT_MODULESOURCEPATH) \ |
|
80 $(CT_MODULES) \ |
|
81 >$(@D)/9/system-modules |
62 $(TOUCH) $@ |
82 $(TOUCH) $@ |
63 |
83 |
64 # Can't generate ct.sym directly into modules libs as the SetupJarArchive macro |
84 # Can't generate ct.sym directly into modules libs as the SetupJarArchive macro |
65 # creates meta data files in the output dir. |
85 # creates meta data files in the output dir. |
66 $(eval $(call SetupJarArchive, CREATE_CTSYM, \ |
86 $(eval $(call SetupJarArchive, CREATE_CTSYM, \ |
67 DEPENDENCIES := $(SUPPORT_OUTPUTDIR)/symbols/ct.sym-files/_the.symbols, \ |
87 DEPENDENCIES := $(SUPPORT_OUTPUTDIR)/symbols/ct.sym-files/_the.symbols, \ |
68 SRCS := $(SUPPORT_OUTPUTDIR)/symbols/ct.sym-files, \ |
88 SRCS := $(SUPPORT_OUTPUTDIR)/symbols/ct.sym-files, \ |
69 SUFFIXES := .sig, \ |
89 SUFFIXES := .sig system-modules, \ |
70 JAR := $(SUPPORT_OUTPUTDIR)/symbols/ct.sym, \ |
90 JAR := $(SUPPORT_OUTPUTDIR)/symbols/ct.sym, \ |
71 )) |
91 )) |
72 |
92 |
73 # Copy ct.sym to the modules libs dir |
93 # Copy ct.sym to the modules libs dir |
74 $(eval $(call SetupCopyFiles, COPY_TO_LIBS, \ |
94 $(eval $(call SetupCopyFiles, COPY_TO_LIBS, \ |