diff options
| author | ohair <none@none> | 2008-08-06 14:57:13 -0700 |
|---|---|---|
| committer | ohair <none@none> | 2008-08-06 14:57:13 -0700 |
| commit | 6ffa068fce1cb1f2c24e0cafb384c76fefd60880 (patch) | |
| tree | a1436b9716367b38366f5d23178556b545059771 /make | |
| parent | 849def4a5b13da4cbea6832cf4bb76941afccb8c (diff) | |
6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build
Reviewed-by: tbell
Diffstat (limited to 'make')
| -rw-r--r-- | make/Defs-internal.gmk | 3 | ||||
| -rw-r--r-- | make/jprt.config | 8 | ||||
| -rw-r--r-- | make/jprt.gmk | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk index bd0ecb7..aae0ab7 100644 --- a/make/Defs-internal.gmk +++ b/make/Defs-internal.gmk @@ -159,6 +159,9 @@ else SKIP_OPENJDK_BUILD = true endif endif +ifndef SKIP_PRODUCT_BUILD + SKIP_PRODUCT_BUILD = false +endif # Solaris 64 bit builds are not complete enough to ever do this ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64) diff --git a/make/jprt.config b/make/jprt.config index d9b57f0..2a8f543 100644 --- a/make/jprt.config +++ b/make/jprt.config @@ -115,13 +115,13 @@ dirMustExist "${jdk_import}" ALT_JDK_IMPORT_PATH dirMustExist "${ANT_HOME}" ANT_HOME dirMustExist "${FINDBUGS_HOME}" FINDBUGS_HOME -# If ALT_PREVIOUS_JDK_IMAGE not defined, set it to the bootdir area for +# If ALT_PREVIOUS_RELEASE_IMAGE not defined, set it to the bootdir area for # any possible image comparisons. # We assume bootdir is a previous jdk release image, valid for comparison # reasons. -if [ "${ALT_PREVIOUS_JDK_IMAGE}" = "" ] ; then - ALT_PREVIOUS_JDK_IMAGE="${bootdir}" - export ALT_PREVIOUS_JDK_IMAGE +if [ "${ALT_PREVIOUS_RELEASE_IMAGE}" = "" ] ; then + ALT_PREVIOUS_RELEASE_IMAGE="${bootdir}" + export ALT_PREVIOUS_RELEASE_IMAGE fi # Use the JDK import for now (FIXME: use the binary plugs?) diff --git a/make/jprt.gmk b/make/jprt.gmk index 0ecdf7d..d1764e1 100644 --- a/make/jprt.gmk +++ b/make/jprt.gmk @@ -36,7 +36,7 @@ DEFAULT_BUILD_FLAVOR=product JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip -jprt_build_product: product_build +jprt_build_product: all_product_build ( $(CD) $(OUTPUTDIR)/j2sdk-image && \ $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) ifdef HAVE_JPRT_SAVE_BUNDLES |