Wed, 02 Jan 2013 15:36:00 +0100
8005355: build-infra: Java security signing (need a top-level make target).
Reviewed-by: tbell, ohair
common/autoconf/spec.gmk.in | file | annotate | diff | comparison | revisions | |
common/makefiles/Main.gmk | file | annotate | diff | comparison | revisions |
1.1 --- a/common/autoconf/spec.gmk.in Wed Jan 02 11:29:29 2013 +0100 1.2 +++ b/common/autoconf/spec.gmk.in Wed Jan 02 15:36:00 2013 +0100 1.3 @@ -231,6 +231,7 @@ 1.4 HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot 1.5 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk 1.6 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images 1.7 +JCE_OUTPUTDIR=$(BUILD_OUTPUT)/jce-release 1.8 1.9 LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist 1.10 CORBA_DIST=$(CORBA_OUTPUTDIR)/dist 1.11 @@ -431,6 +432,8 @@ 1.12 1.13 NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii 1.14 1.15 +JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner 1.16 + 1.17 # Base flags for RC 1.18 # Guarding this against resetting value. Legacy make files include spec multiple 1.19 # times.
2.1 --- a/common/makefiles/Main.gmk Wed Jan 02 11:29:29 2013 +0100 2.2 +++ b/common/makefiles/Main.gmk Wed Jan 02 15:36:00 2013 +0100 2.3 @@ -142,6 +142,12 @@ 2.4 @($(CD) $(SRC_ROOT)/common/makefiles/javadoc && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs) 2.5 @$(call TargetExit) 2.6 2.7 +sign-jars: jdk sign-jars-only 2.8 +sign-jars-only: start-make 2.9 + @$(call TargetEnter) 2.10 + @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars) 2.11 + @$(call TargetExit) 2.12 + 2.13 bootcycle-images: 2.14 @$(ECHO) Boot cycle build step 1: Building the JDK image normally 2.15 @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(SPEC) images)