apply signature in productbuild, not pkgbuild

Merge to release branch.

original commit: 6f94215f92ccbc67e321b86544abbde109a23a4f
This commit is contained in:
Ryan Culpepper 2013-12-18 23:45:30 -05:00
parent 93c6f4d0ab
commit cfcbab2719

View File

@ -71,18 +71,13 @@
(copy-file (build-path dest-dir "README.txt") (copy-file (build-path dest-dir "README.txt")
(build-path resources-dir "README.txt")) (build-path resources-dir "README.txt"))
(apply system*/show (system*/show pkgbuild
pkgbuild "--root" dest-dir
(append
(list "--root" dest-dir
"--install-location" install-dest "--install-location" install-dest
"--scripts" scripts-dir "--scripts" scripts-dir
"--identifier" id "--identifier" id
"--version" (version)) "--version" (version)
(if (string=? sign-identity "") (make-rel "racket.pkg"))
null
(list "--sign" sign-identity))
(list (make-rel "racket.pkg"))))
(define pkg-xml (make-rel "racket.xml")) (define pkg-xml (make-rel "racket.xml"))
(system*/show productbuild (system*/show productbuild
"--synthesize" "--synthesize"
@ -117,13 +112,18 @@
#:exists 'truncate #:exists 'truncate
(lambda (o) (lambda (o)
(write-xml updated o))) (write-xml updated o)))
(system*/show productbuild (apply system*/show
"--distribution" pkg-xml productbuild
(append
(list "--distribution" pkg-xml
"--package-path" (make-rel 'same) "--package-path" (make-rel 'same)
"--resources" resources-dir "--resources" resources-dir
"--identifier" id "--identifier" id
"--version" (version) "--version" (version))
pkg-name)) (if (string=? sign-identity "")
null
(list "--sign" sign-identity))
(list pkg-name))))
(define (installer-pkg human-name base-name dist-suffix readme sign-identity) (define (installer-pkg human-name base-name dist-suffix readme sign-identity)
(define pkg-name (format "bundle/~a-~a~a.pkg" (define pkg-name (format "bundle/~a-~a~a.pkg"