326 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f JrtfsJar.gmk) |
326 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f JrtfsJar.gmk) |
327 |
327 |
328 jdk-image: |
328 jdk-image: |
329 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jdk) |
329 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jdk) |
330 |
330 |
331 jre-image: |
331 legacy-jre-image: |
332 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre) |
332 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre) |
333 |
333 |
334 symbols-image: |
334 symbols-image: |
335 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols) |
335 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols) |
336 |
336 |
337 mac-bundles-jdk: |
337 mac-jdk-bundle: |
338 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk) |
338 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk jdk-bundle) |
|
339 |
|
340 mac-legacy-jre-bundle: |
|
341 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk jre-bundle) |
339 |
342 |
340 release-file: |
343 release-file: |
341 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ReleaseFile.gmk) |
344 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ReleaseFile.gmk) |
342 |
345 |
343 exploded-image-optimize: |
346 exploded-image-optimize: |
344 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk) |
347 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk) |
345 |
348 |
346 ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \ |
349 ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \ |
347 zip-source jrtfs-jar jdk-image jre-image \ |
350 zip-source jrtfs-jar jdk-image legacy-jre-image \ |
348 symbols-image mac-bundles-jdk \ |
351 symbols-image mac-jdk-bundle mac-legacy-jre-bundle \ |
349 release-file exploded-image-optimize |
352 release-file exploded-image-optimize |
350 |
353 |
351 ################################################################################ |
354 ################################################################################ |
352 # Docs targets |
355 # Docs targets |
353 |
356 |
774 generate-link-opt-data: interim-image |
777 generate-link-opt-data: interim-image |
775 endif |
778 endif |
776 generate-link-opt-data: buildtools-jdk |
779 generate-link-opt-data: buildtools-jdk |
777 |
780 |
778 # The generated classlist needs to go into java.base-jmod. |
781 # The generated classlist needs to go into java.base-jmod. |
779 java.base-jmod jdk.jlink-jmod jdk-image jre-image: generate-link-opt-data |
782 java.base-jmod jdk.jlink-jmod jdk-image legacy-jre-image: generate-link-opt-data |
780 endif |
783 endif |
781 |
784 |
782 release-file: create-source-revision-tracker |
785 release-file: create-source-revision-tracker |
783 |
786 |
784 jdk-image: jmods zip-source demos release-file |
787 jdk-image: jmods zip-source demos release-file |
785 jre-image: jmods release-file |
788 legacy-jre-image: jmods release-file |
786 symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS) |
789 symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS) |
787 |
790 |
788 mac-bundles-jdk: jdk-image jre-image |
791 mac-jdk-bundle: jdk-image |
|
792 mac-legacy-jre-bundle: legacy-jre-image |
789 |
793 |
790 # The optimize target can run as soon as the modules dir has been completely |
794 # The optimize target can run as soon as the modules dir has been completely |
791 # populated (java, copy and gendata targets) and the basic libs and launchers |
795 # populated (java, copy and gendata targets) and the basic libs and launchers |
792 # have been built. |
796 # have been built. |
793 exploded-image-optimize: java copy gendata java.base-libs java.base-launchers \ |
797 exploded-image-optimize: java copy gendata java.base-libs java.base-launchers \ |
954 docs-reference: docs-reference-api |
958 docs-reference: docs-reference-api |
955 |
959 |
956 # alias for backwards compatibility |
960 # alias for backwards compatibility |
957 docs-javadoc: docs-jdk-api |
961 docs-javadoc: docs-jdk-api |
958 |
962 |
959 mac-bundles: mac-bundles-jdk |
963 mac-bundles: mac-jdk-bundle |
960 |
964 |
961 # The $(OUTPUTDIR)/images directory contain the resulting deliverables, |
965 # The $(OUTPUTDIR)/images directory contain the resulting deliverables, |
962 # and in line with this, our targets for creating these are named *-image[s]. |
966 # and in line with this, our targets for creating these are named *-image[s]. |
963 |
967 |
964 # This target builds the product images, e.g. the JRE and JDK image |
968 # This target builds the product images, e.g. the JDK image |
965 # (and possibly other, more specific versions) |
969 # (and possibly other, more specific versions) |
966 product-images: jdk-image jre-image symbols-image exploded-image |
970 product-images: jdk-image symbols-image exploded-image |
967 |
971 |
968 # zip-security is actually a bundle, but for now it needs to be considered |
972 # zip-security is actually a bundle, but for now it needs to be considered |
969 # an image until this can be cleaned up properly. |
973 # an image until this can be cleaned up properly. |
970 product-images: zip-security |
974 product-images: zip-security |
971 |
975 |