[Xquartz-changes] [636] trunk/mk_x11_dist.sh

[source_changes at macosforge.org]

Revision: 636
          http://trac.macosforge.org/projects/xquartz/changeset/636
Author:   jeremyhu at freedesktop.org
Date:     2012-06-01 10:55:39 -0700 (Fri, 01 Jun 2012)
Log Message:
-----------
Fix codesigning (again)

Modified Paths:
--------------
    trunk/mk_x11_dist.sh

Modified: trunk/mk_x11_dist.sh
===================================================================
--- trunk/mk_x11_dist.sh	2012-06-01 17:53:41 UTC (rev 635)
+++ trunk/mk_x11_dist.sh	2012-06-01 17:55:39 UTC (rev 636)
@@ -74,11 +74,8 @@
 fi
 
 if [[ ${MACOSFORGE_RELEASE} == "YES" ]] ; then
-	BUILDIT="${BUILDIT} -noverify -noverifydstroot -nocortex"
-# -nopathChanges"
+	BUILDIT="${BUILDIT} -noverify -noverifydstroot -nocortex -nopathChanges"
 
-	export MACOSFORGE_XQUARTZ_CODESIGN_IDENTITY="Developer ID Application: Apple Inc. - XQuartz"
-
 	export MACOSFORGE_BUILD_DOCS
 
 	if [[ ${MACOSFORGE_BUILD_DOCS} == "YES" ]] ; then
@@ -203,6 +200,13 @@
 	fi
 
 	cd $(eval echo ~jeremy)/src/freedesktop/pkg
+
+	find X11 -type f | while read file ; do
+		if /usr/bin/file "${file}" | grep -q "Mach-O" ; then
+			codesign -s "Developer ID Application: Apple Inc. - XQuartz" "${file}"
+		fi
+	done
+
 	./mkpmdoc.sh
 	chown -R jeremy XQuartz-${VERSION_TXT}.pmdoc
 	echo "Browse to the components tab and check the box to make XQuartz.app downgradeable"
@@ -211,6 +215,7 @@
 	sudo -u jeremy open XQuartz-${VERSION_TXT}.pmdoc
 	read IGNORE
 	sudo -u jeremy /Applications/PackageMaker.app/Contents/MacOS/PackageMaker --verbose --doc XQuartz-${VERSION_TXT}.pmdoc --out XQuartz-${VERSION_TXT}.pkg
-	sudo -u jeremy productsign --sign "Developer ID Installer: Apple Inc. - XQuartz" XQuartz-${VERSION_TXT}.pkg
+	sudo -u jeremy productsign --sign "Developer ID Installer: Apple Inc. - XQuartz" XQuartz-${VERSION_TXT}.pkg{,.s}
+	mv XQuartz-${VERSION_TXT}.pkg{.s,}
 	sudo -u jeremy ./mkdmg.sh XQuartz-${VERSION_TXT}.pkg ${VERSION} > XQuartz-${VERSION_TXT}.sparkle.xml
 fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20120601/c6d095aa/attachment-0001.html>