1 # |
1 # |
2 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2011, 2017, 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. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
28 include $(SPEC) |
28 include $(SPEC) |
29 include MakeBase.gmk |
29 include MakeBase.gmk |
30 include JavaCompilation.gmk |
30 include JavaCompilation.gmk |
31 include SetupJavaCompilers.gmk |
31 include SetupJavaCompilers.gmk |
32 |
32 |
33 ########################################################################################## |
33 ################################################################################ |
|
34 # Generate interim versions of the module-info.java files for the interim |
|
35 # langtools modules. Each interim module has ".interim" added as suffix to the |
|
36 # original module name. |
|
37 |
|
38 INTERIM_MODULEINFO_PATTERN := \ |
|
39 $(foreach m, $(INTERIM_RMIC_BASE_MODULES), -e 's/$m\([,; ]\)/$m.interim\1/g') \ |
|
40 -e '/ToolProvider[,; ]/d' |
|
41 |
|
42 $(BUILDTOOLS_OUTPUTDIR)/gensrc/%.interim/module-info.java: \ |
|
43 $(TOPDIR)/src/%/share/classes/module-info.java |
|
44 $(call LogInfo, Generating module-info.java for $*.interim) |
|
45 $(call MakeDir, $(@D)) |
|
46 $(SED) $(INTERIM_MODULEINFO_PATTERN) $< > $@ |
|
47 |
|
48 TARGETS += $(patsubst %, $(BUILDTOOLS_OUTPUTDIR)/gensrc/%/module-info.java, \ |
|
49 $(INTERIM_RMIC_MODULES)) |
|
50 |
|
51 ################################################################################ |
34 |
52 |
35 RMIC_PKGS := \ |
53 RMIC_PKGS := \ |
36 sun/rmi/rmic \ |
54 sun/rmi/rmic \ |
37 sun/tools/asm \ |
55 sun/tools/asm \ |
38 sun/tools/java \ |
56 sun/tools/java \ |
39 sun/tools/javac \ |
57 sun/tools/javac \ |
40 sun/tools/tree \ |
58 sun/tools/tree \ |
41 sun/tools/util \ |
59 sun/tools/util \ |
42 # |
60 # |
43 |
61 |
44 $(eval $(call SetupJavaCompilation,BUILD_INTERIM_RMIC, \ |
62 $(eval $(call SetupJavaCompilation, BUILD_jdk.rmic.interim, \ |
45 SETUP := GENERATE_OLDBYTECODE, \ |
63 SETUP := GENERATE_OLDBYTECODE, \ |
46 SRC := $(TOPDIR)/src/jdk.rmic/share/classes, \ |
64 SRC := $(TOPDIR)/src/jdk.rmic/share/classes, \ |
47 EXCLUDE_FILES := module-info.java, \ |
65 EXCLUDE_FILES := $(TOPDIR)/src/jdk.rmic/share/classes/module-info.java, \ |
|
66 EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/jdk.rmic.interim/module-info.java, \ |
48 INCLUDES := $(RMIC_PKGS), \ |
67 INCLUDES := $(RMIC_PKGS), \ |
49 BIN := $(BUILDTOOLS_OUTPUTDIR)/override_modules/jdk.rmic, \ |
68 BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_modules/jdk.rmic.interim, \ |
50 COPY := .properties)) |
69 COPY := .properties, \ |
|
70 ADD_JAVAC_FLAGS := \ |
|
71 --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_modules \ |
|
72 --add-modules java.corba \ |
|
73 --add-exports java.corba/com.sun.corba.se.impl.util=jdk.rmic.interim \ |
|
74 $(INTERIM_RMIC_ADD_EXPORTS), \ |
|
75 )) |
|
76 |
|
77 TARGETS += $(BUILD_jdk.rmic.interim) |
51 |
78 |
52 ########################################################################################## |
79 ########################################################################################## |
53 |
80 |
54 all: $(BUILD_INTERIM_RMIC) |
81 all: $(TARGETS) |