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