Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8013489: New build system does not run codesign on SA-related launchers on OS X
authorerikj
Wed, 29 May 2013 14:01:24 +0200
changeset 17732 79c019dd5279
parent 17637 9367be329f29
child 17733 7f6dc52818a5
8013489: New build system does not run codesign on SA-related launchers on OS X Reviewed-by: sla, tbell
jdk/makefiles/CompileLaunchers.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/makefiles/CompileLaunchers.gmk	Thu May 23 10:47:50 2013 -0700
+++ b/jdk/makefiles/CompileLaunchers.gmk	Wed May 29 14:01:24 2013 +0200
@@ -95,6 +95,9 @@
         $1_PLIST_FILE:=Info-cmdline.plist
         ifneq ($(11),)
             $1_PLIST_FILE:=$(11)
+            ifneq ($$(findstring privileged,$$($1_PLIST_FILE)),)
+                $1_CODESIGN:=true
+            endif
         endif
 
         $1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
@@ -174,7 +177,8 @@
 		  -D "JDK_INTERNAL_NAME=$1" \
 		  -D "JDK_FTYPE=0x1L" \
 		  $7,\
-	MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/java.manifest)
+	MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/java.manifest,\
+	CODESIGN:=$$($1_CODESIGN))
 
     BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
jdk-sandbox