equal
deleted
inserted
replaced
579 # Bundles |
579 # Bundles |
580 |
580 |
581 product-bundles: |
581 product-bundles: |
582 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk product-bundles) |
582 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk product-bundles) |
583 |
583 |
|
584 legacy-bundles: |
|
585 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk legacy-bundles) |
|
586 |
584 test-bundles: |
587 test-bundles: |
585 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk test-bundles) |
588 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk test-bundles) |
586 |
589 |
587 docs-bundles: |
590 docs-bundles: |
588 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk docs-bundles) |
591 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk docs-bundles) |
590 ifeq ($(JCOV_ENABLED), true) |
593 ifeq ($(JCOV_ENABLED), true) |
591 jcov-bundles: |
594 jcov-bundles: |
592 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk jcov-bundles) |
595 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk jcov-bundles) |
593 endif |
596 endif |
594 |
597 |
595 ALL_TARGETS += product-bundles test-bundles docs-bundles jcov-bundles |
598 ALL_TARGETS += product-bundles legacy-bundles test-bundles docs-bundles jcov-bundles |
596 |
599 |
597 ################################################################################ |
600 ################################################################################ |
598 # Install targets |
601 # Install targets |
599 |
602 |
600 install: |
603 install: |
916 |
919 |
917 install: product-images |
920 install: product-images |
918 |
921 |
919 product-bundles: product-images |
922 product-bundles: product-images |
920 |
923 |
|
924 legacy-bundles: legacy-images |
|
925 |
921 test-bundles: test-image |
926 test-bundles: test-image |
922 |
927 |
923 docs-bundles: docs-image |
928 docs-bundles: docs-image |
924 |
929 |
925 jcov-bundles: jcov-image |
930 jcov-bundles: jcov-image |
1018 |
1023 |
1019 # This target builds the product images, e.g. the JDK image |
1024 # This target builds the product images, e.g. the JDK image |
1020 # (and possibly other, more specific versions) |
1025 # (and possibly other, more specific versions) |
1021 product-images: jdk-image symbols-image exploded-image |
1026 product-images: jdk-image symbols-image exploded-image |
1022 |
1027 |
|
1028 # This target builds the legacy images, e.g. the legacy JRE image |
|
1029 legacy-images: legacy-jre-image |
|
1030 |
1023 # zip-security is actually a bundle, but for now it needs to be considered |
1031 # zip-security is actually a bundle, but for now it needs to be considered |
1024 # an image until this can be cleaned up properly. |
1032 # an image until this can be cleaned up properly. |
1025 product-images: zip-security |
1033 product-images: zip-security |
1026 |
1034 |
1027 # The module summary cannot be run when: |
1035 # The module summary cannot be run when: |
1034 endif |
1042 endif |
1035 endif |
1043 endif |
1036 |
1044 |
1037 ifeq ($(call isTargetOs, macosx), true) |
1045 ifeq ($(call isTargetOs, macosx), true) |
1038 product-images: mac-jdk-bundle |
1046 product-images: mac-jdk-bundle |
|
1047 |
|
1048 legacy-images: mac-legacy-jre-bundle |
1039 endif |
1049 endif |
1040 |
1050 |
1041 # This target builds the documentation image |
1051 # This target builds the documentation image |
1042 docs-image: docs-jdk |
1052 docs-image: docs-jdk |
1043 |
1053 |
1068 ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \ |
1078 ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \ |
1069 copy java rmic libs launchers jmods \ |
1079 copy java rmic libs launchers jmods \ |
1070 jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \ |
1080 jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \ |
1071 exploded-image-base exploded-image \ |
1081 exploded-image-base exploded-image \ |
1072 create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \ |
1082 create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \ |
1073 docs-javase docs-reference docs-javadoc mac-bundles product-images \ |
1083 docs-javase docs-reference docs-javadoc mac-bundles product-images legacy-images \ |
1074 docs-image test-image all-images \ |
1084 docs-image test-image all-images \ |
1075 all-bundles |
1085 all-bundles |
1076 |
1086 |
1077 ################################################################################ |
1087 ################################################################################ |
1078 |
1088 |