From 7371f086a1b4caf2f4bd94f3e39943bfbb176816 Mon Sep 17 00:00:00 2001
From: erikj <unknown>
Date: Wed, 2 Jan 2013 15:36:00 +0100
Subject: [PATCH] 8005355: build-infra: Java security signing (need a top-level
 make target). Reviewed-by: tbell, ohair

---
 common/autoconf/spec.gmk.in | 3 +++
 common/makefiles/Main.gmk   | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index c11e6d2d9b..ceb92149d4 100644
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -231,6 +231,7 @@ JAXWS_OUTPUTDIR=$(BUILD_OUTPUT)/jaxws
 HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot
 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
+JCE_OUTPUTDIR=$(BUILD_OUTPUT)/jce-release
 
 LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist
 CORBA_DIST=$(CORBA_OUTPUTDIR)/dist
@@ -431,6 +432,8 @@ RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic
 
 NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii
 
+JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner
+
 # Base flags for RC
 # Guarding this against resetting value. Legacy make files include spec multiple
 # times.
diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk
index 1bbeecac46..801c986a75 100644
--- a/common/makefiles/Main.gmk
+++ b/common/makefiles/Main.gmk
@@ -142,6 +142,12 @@ docs-only: start-make
 	@($(CD) $(SRC_ROOT)/common/makefiles/javadoc && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
 	@$(call TargetExit)
 
+sign-jars: jdk sign-jars-only
+sign-jars-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars)
+	@$(call TargetExit)
+
 bootcycle-images:
 	@$(ECHO) Boot cycle build step 1: Building the JDK image normally
 	@($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(SPEC) images)
-- 
GitLab