35 include MakeBase.gmk
36
37 include CopyFiles.gmk
38 include JavaCompilation.gmk
39
40 ################################################################################
41 # Targets for building the test lib jars
42 ################################################################################
43
44 TARGETS :=
45
46 TEST_LIB_SOURCE_DIR := $(TOPDIR)/test/lib
47 TEST_LIB_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/lib
48
49 $(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \
50 TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
51 SRC := $(TEST_LIB_SOURCE_DIR)/jdk/test/whitebox/, \
52 BIN := $(TEST_LIB_SUPPORT)/wb_classes, \
53 JAR := $(TEST_LIB_SUPPORT)/wb.jar, \
54 DISABLED_WARNINGS := deprecation removal preview, \
55 JAVAC_FLAGS := --enable-preview, \
56 ))
57
58 TARGETS += $(BUILD_WB_JAR)
59
60 $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
61 TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
62 SRC := $(TEST_LIB_SOURCE_DIR), \
63 EXCLUDES := jdk/test/lib/containers jdk/test/lib/security, \
64 BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
65 HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
66 JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
67 JAVAC_FLAGS := --add-exports java.base/sun.security.util=ALL-UNNAMED \
68 --add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
69 --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
70 --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
71 --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
72 --enable-preview, \
73 ))
74
75 TARGETS += $(BUILD_TEST_LIB_JAR)
76
77 build-test-lib: $(TARGETS)
78
79 ################################################################################
80 # Targets for building test-image.
81 ################################################################################
82
83 # Copy the jars to the test image.
84 $(eval $(call SetupCopyFiles, COPY_LIBTEST_JARS, \
85 DEST := $(TEST_IMAGE_DIR)/lib-test, \
86 FILES := $(BUILD_WB_JAR_JAR) $(BUILD_TEST_LIB_JAR_JAR), \
87 ))
88 #
89
90 test-image-lib: $(COPY_LIBTEST_JARS)
91
|
35 include MakeBase.gmk
36
37 include CopyFiles.gmk
38 include JavaCompilation.gmk
39
40 ################################################################################
41 # Targets for building the test lib jars
42 ################################################################################
43
44 TARGETS :=
45
46 TEST_LIB_SOURCE_DIR := $(TOPDIR)/test/lib
47 TEST_LIB_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/lib
48
49 $(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \
50 TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
51 SRC := $(TEST_LIB_SOURCE_DIR)/jdk/test/whitebox/, \
52 BIN := $(TEST_LIB_SUPPORT)/wb_classes, \
53 JAR := $(TEST_LIB_SUPPORT)/wb.jar, \
54 DISABLED_WARNINGS := deprecation removal preview, \
55 ))
56
57 TARGETS += $(BUILD_WB_JAR)
58
59 $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
60 TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
61 SRC := $(TEST_LIB_SOURCE_DIR), \
62 EXCLUDES := jdk/test/lib/containers jdk/test/lib/security org, \
63 BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
64 HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
65 JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
66 DISABLED_WARNINGS := try deprecation rawtypes unchecked serial cast removal preview restricted varargs dangling-doc-comments, \
67 JAVAC_FLAGS := --add-exports java.base/sun.security.util=ALL-UNNAMED \
68 --add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
69 --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
70 --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
71 --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
72 --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
73 --add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
74 --add-exports jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
75 --add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
76 --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
77 --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
78 --enable-preview, \
79 ))
80
81 TARGETS += $(BUILD_TEST_LIB_JAR)
82
83 build-test-lib: $(TARGETS)
84
85 ################################################################################
86 # Targets for building test-image.
87 ################################################################################
88
89 # Copy the jars to the test image.
90 $(eval $(call SetupCopyFiles, COPY_LIBTEST_JARS, \
91 DEST := $(TEST_IMAGE_DIR)/lib-test, \
92 FILES := $(BUILD_WB_JAR_JAR) $(BUILD_TEST_LIB_JAR_JAR), \
93 ))
94 #
95
96 test-image-lib: $(COPY_LIBTEST_JARS)
97
|