comparison make/Main.gmk @ 58689:4e41f62dfddb

include records in list of nested classes
author jjg
date Wed, 13 Nov 2019 15:42:59 -0800
parents 7a8de392f9e1
children 66f7d2494d4e
comparison
equal deleted inserted replaced
204:7afe431844a2 206:410b5281fa9e
214 MAKE_SUBDIR := lib, \ 214 MAKE_SUBDIR := lib, \
215 CHECK_MODULES := $(ALL_MODULES), \ 215 CHECK_MODULES := $(ALL_MODULES), \
216 USE_WRAPPER := true)) 216 USE_WRAPPER := true))
217 217
218 ALL_TARGETS += $(LIBS_TARGETS) 218 ALL_TARGETS += $(LIBS_TARGETS)
219
220 ################################################################################
221 # Targets for compiling static versions of certain native libraries. These do
222 # not end up in the jmods or the normal JDK image, but are instead bundled into
223 # a special deliverable.
224 $(eval $(call DeclareRecipesForPhase, STATIC_LIBS, \
225 TARGET_SUFFIX := static-libs, \
226 FILE_PREFIX := Lib, \
227 MAKE_SUBDIR := lib, \
228 CHECK_MODULES := $(STATIC_LIBS_MODULES), \
229 USE_WRAPPER := true, \
230 EXTRA_ARGS := STATIC_LIBS=true, \
231 ))
232
233 ALL_TARGETS += $(STATIC_LIBS_TARGETS)
219 234
220 ################################################################################ 235 ################################################################################
221 # Targets for compiling native executables 236 # Targets for compiling native executables
222 $(eval $(call DeclareRecipesForPhase, LAUNCHER, \ 237 $(eval $(call DeclareRecipesForPhase, LAUNCHER, \
223 TARGET_SUFFIX := launchers, \ 238 TARGET_SUFFIX := launchers, \
375 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre) 390 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre)
376 391
377 symbols-image: 392 symbols-image:
378 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols) 393 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols)
379 394
395 static-libs-image:
396 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f StaticLibsImage.gmk)
397
380 mac-jdk-bundle: 398 mac-jdk-bundle:
381 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk jdk-bundle) 399 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk jdk-bundle)
382 400
383 mac-legacy-jre-bundle: 401 mac-legacy-jre-bundle:
384 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk jre-bundle) 402 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk jre-bundle)
394 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Coverage.gmk jcov-image) 412 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Coverage.gmk jcov-image)
395 endif 413 endif
396 414
397 ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \ 415 ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \
398 zip-source jrtfs-jar jdk-image legacy-jre-image \ 416 zip-source jrtfs-jar jdk-image legacy-jre-image \
399 symbols-image mac-jdk-bundle mac-legacy-jre-bundle \ 417 symbols-image static-libs-image mac-jdk-bundle mac-legacy-jre-bundle \
400 release-file exploded-image-optimize jcov-image 418 release-file exploded-image-optimize jcov-image
401 419
402 ################################################################################ 420 ################################################################################
403 # Docs targets 421 # Docs targets
404 422
612 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk test-bundles) 630 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk test-bundles)
613 631
614 docs-bundles: 632 docs-bundles:
615 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk docs-bundles) 633 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk docs-bundles)
616 634
635 static-libs-bundles:
636 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk static-libs-bundles)
637
617 ifeq ($(JCOV_ENABLED), true) 638 ifeq ($(JCOV_ENABLED), true)
618 jcov-bundles: 639 jcov-bundles:
619 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk jcov-bundles) 640 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk jcov-bundles)
620 endif 641 endif
621 642
622 ALL_TARGETS += product-bundles legacy-bundles test-bundles docs-bundles jcov-bundles 643 ALL_TARGETS += product-bundles legacy-bundles test-bundles docs-bundles \
644 static-libs-bundles jcov-bundles
623 645
624 ################################################################################ 646 ################################################################################
625 # Install targets 647 # Install targets
626 648
627 install: 649 install:
793 815
794 vscode-project: compile-commands 816 vscode-project: compile-commands
795 vscode-project-clangd: compile-commands 817 vscode-project-clangd: compile-commands
796 vscode-project-rtags: compile-commands 818 vscode-project-rtags: compile-commands
797 vscode-project-ccls: compile-commands 819 vscode-project-ccls: compile-commands
820
821 # The -static-libs targets depend on -java as well as java.base-copy.
822 $(foreach m, $(filter $(JAVA_MODULES), $(STATIC_LIBS_MODULES)), \
823 $(eval $m-static-libs: $m-java java.base-copy))
798 824
799 # Jmods cannot be created until we have the jmod tool ready to run. During 825 # Jmods cannot be created until we have the jmod tool ready to run. During
800 # a normal build we run it from the exploded image, but when cross compiling 826 # a normal build we run it from the exploded image, but when cross compiling
801 # it's run from the buildjdk, which is either created at build time or user 827 # it's run from the buildjdk, which is either created at build time or user
802 # supplied. 828 # supplied.
856 882
857 jdk-image: jmods zip-source demos release-file 883 jdk-image: jmods zip-source demos release-file
858 legacy-jre-image: jmods release-file 884 legacy-jre-image: jmods release-file
859 symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS) 885 symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS)
860 886
887 static-libs-image: $(STATIC_LIBS_TARGETS)
888
861 mac-jdk-bundle: jdk-image 889 mac-jdk-bundle: jdk-image
862 mac-legacy-jre-bundle: legacy-jre-image 890 mac-legacy-jre-bundle: legacy-jre-image
863 891
864 ifeq ($(JCOV_INPUT_JDK), ) 892 ifeq ($(JCOV_INPUT_JDK), )
865 jcov-image: jdk-image 893 jcov-image: jdk-image
944 972
945 docs-bundles: docs-image 973 docs-bundles: docs-image
946 974
947 jcov-bundles: jcov-image 975 jcov-bundles: jcov-image
948 976
977 static-libs-bundles: static-libs-image
978
949 generate-summary: jmods buildtools-modules 979 generate-summary: jmods buildtools-modules
950 980
951 update-x11wrappers: java.base-copy buildtools-jdk 981 update-x11wrappers: java.base-copy buildtools-jdk
952 982
953 endif 983 endif
981 java: $(JAVA_TARGETS) 1011 java: $(JAVA_TARGETS)
982 1012
983 rmic: $(RMIC_TARGETS) 1013 rmic: $(RMIC_TARGETS)
984 1014
985 libs: $(LIBS_TARGETS) 1015 libs: $(LIBS_TARGETS)
1016
1017 static-libs: $(STATIC_LIBS_TARGETS)
986 1018
987 launchers: $(LAUNCHER_TARGETS) 1019 launchers: $(LAUNCHER_TARGETS)
988 1020
989 jmods: $(JMOD_TARGETS) 1021 jmods: $(JMOD_TARGETS)
990 1022
1092 1124
1093 # all-images builds all our deliverables as images. 1125 # all-images builds all our deliverables as images.
1094 all-images: product-images test-image docs-image 1126 all-images: product-images test-image docs-image
1095 1127
1096 # all-bundles packages all our deliverables as tar.gz bundles. 1128 # all-bundles packages all our deliverables as tar.gz bundles.
1097 all-bundles: product-bundles test-bundles docs-bundles 1129 all-bundles: product-bundles test-bundles docs-bundles static-libs-bundles
1098 1130
1099 ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \ 1131 ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
1100 copy java rmic libs launchers jmods \ 1132 copy java rmic libs static-libs launchers jmods \
1101 jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \ 1133 jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
1102 exploded-image-base exploded-image \ 1134 exploded-image-base exploded-image \
1103 create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \ 1135 create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \
1104 docs-javase docs-reference docs-javadoc mac-bundles product-images legacy-images \ 1136 docs-javase docs-reference docs-javadoc mac-bundles product-images legacy-images \
1105 docs-image test-image all-images \ 1137 docs-image test-image all-images \