equal
deleted
inserted
replaced
342 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre) |
342 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre) |
343 |
343 |
344 symbols-image: |
344 symbols-image: |
345 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols) |
345 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols) |
346 |
346 |
347 profiles-image: |
|
348 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles) |
|
349 |
|
350 mac-bundles-jdk: |
347 mac-bundles-jdk: |
351 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk) |
348 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk) |
352 |
349 |
353 release-file: |
350 release-file: |
354 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ReleaseFile.gmk) |
351 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ReleaseFile.gmk) |
356 exploded-image-optimize: |
353 exploded-image-optimize: |
357 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk) |
354 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk) |
358 |
355 |
359 ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \ |
356 ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \ |
360 zip-source jrtfs-jar jdk-image jre-image \ |
357 zip-source jrtfs-jar jdk-image jre-image \ |
361 symbols-image profiles-image mac-bundles-jdk \ |
358 symbols-image mac-bundles-jdk \ |
362 release-file exploded-image-optimize |
359 release-file exploded-image-optimize |
363 |
360 |
364 ################################################################################ |
361 ################################################################################ |
365 # Docs targets |
362 # Docs targets |
366 |
363 |
567 # Bundles |
564 # Bundles |
568 |
565 |
569 product-bundles: |
566 product-bundles: |
570 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk product-bundles) |
567 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk product-bundles) |
571 |
568 |
572 profiles-bundles: |
|
573 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk profiles-bundles) |
|
574 |
|
575 test-bundles: |
569 test-bundles: |
576 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk test-bundles) |
570 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk test-bundles) |
577 |
571 |
578 docs-bundles: |
572 docs-bundles: |
579 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk docs-bundles) |
573 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk docs-bundles) |
580 |
574 |
581 ALL_TARGETS += product-bundles profiles-bundles test-bundles docs-bundles |
575 ALL_TARGETS += product-bundles test-bundles docs-bundles |
582 |
576 |
583 ################################################################################ |
577 ################################################################################ |
584 # Install targets |
578 # Install targets |
585 |
579 |
586 install: |
580 install: |
802 |
796 |
803 jdk-image: jmods zip-source demos release-file |
797 jdk-image: jmods zip-source demos release-file |
804 jre-image: jmods release-file |
798 jre-image: jmods release-file |
805 symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS) |
799 symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS) |
806 |
800 |
807 profiles-image: jmods release-file |
|
808 |
|
809 mac-bundles-jdk: jdk-image jre-image |
801 mac-bundles-jdk: jdk-image jre-image |
810 |
802 |
811 # The optimize target can run as soon as the modules dir has been completely |
803 # The optimize target can run as soon as the modules dir has been completely |
812 # populated (java, copy and gendata targets) and the basic libs and launchers |
804 # populated (java, copy and gendata targets) and the basic libs and launchers |
813 # have been built. |
805 # have been built. |
883 test-hotspot-gtest: exploded-image test-image-hotspot-gtest |
875 test-hotspot-gtest: exploded-image test-image-hotspot-gtest |
884 |
876 |
885 install: product-images |
877 install: product-images |
886 |
878 |
887 product-bundles: product-images |
879 product-bundles: product-images |
888 |
|
889 profiles-bundles: profiles-images |
|
890 |
880 |
891 test-bundles: test-image |
881 test-bundles: test-image |
892 |
882 |
893 docs-bundles: docs-image |
883 docs-bundles: docs-image |
894 |
884 |
990 |
980 |
991 # zip-security is actually a bundle, but for now it needs to be considered |
981 # zip-security is actually a bundle, but for now it needs to be considered |
992 # an image until this can be cleaned up properly. |
982 # an image until this can be cleaned up properly. |
993 product-images: zip-security |
983 product-images: zip-security |
994 |
984 |
995 # Declare these for backwards compatiblity and convenience. |
|
996 profiles profiles-images: profiles-image |
|
997 |
|
998 # The module summary cannot be run when: |
985 # The module summary cannot be run when: |
999 # * Cross compiling and building a partial BUILDJDK for the build host |
986 # * Cross compiling and building a partial BUILDJDK for the build host |
1000 # * An external buildjdk has been supplied since it may not match the |
987 # * An external buildjdk has been supplied since it may not match the |
1001 # module selection of the target jdk |
988 # module selection of the target jdk |
1002 ifneq ($(CREATE_BUILDJDK), true) |
989 ifneq ($(CREATE_BUILDJDK), true) |
1032 copy java rmic libs launchers jmods \ |
1019 copy java rmic libs launchers jmods \ |
1033 jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \ |
1020 jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \ |
1034 exploded-image-base exploded-image \ |
1021 exploded-image-base exploded-image \ |
1035 create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \ |
1022 create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \ |
1036 docs-javase docs-reference docs-javadoc mac-bundles product-images \ |
1023 docs-javase docs-reference docs-javadoc mac-bundles product-images \ |
1037 profiles profiles-images \ |
|
1038 docs-image test-image all-images \ |
1024 docs-image test-image all-images \ |
1039 all-bundles |
1025 all-bundles |
1040 |
1026 |
1041 ################################################################################ |
1027 ################################################################################ |
1042 |
1028 |