commit cfcbab2719b46dbb3fff373ee52f5cb30b993062
parent 93c6f4d0ab4e533f733f9bd7696ac1113a451e3a
Author: Ryan Culpepper <ryanc@racket-lang.org>
Date: Wed, 18 Dec 2013 23:45:30 -0500
apply signature in productbuild, not pkgbuild
Merge to release branch.
original commit: 6f94215f92ccbc67e321b86544abbde109a23a4f
Diffstat:
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/pkgs/distro-build/installer-pkg.rkt b/pkgs/distro-build/installer-pkg.rkt
@@ -71,18 +71,13 @@
(copy-file (build-path dest-dir "README.txt")
(build-path resources-dir "README.txt"))
- (apply system*/show
- pkgbuild
- (append
- (list "--root" dest-dir
+ (system*/show pkgbuild
+ "--root" dest-dir
"--install-location" install-dest
"--scripts" scripts-dir
"--identifier" id
- "--version" (version))
- (if (string=? sign-identity "")
- null
- (list "--sign" sign-identity))
- (list (make-rel "racket.pkg"))))
+ "--version" (version)
+ (make-rel "racket.pkg"))
(define pkg-xml (make-rel "racket.xml"))
(system*/show productbuild
"--synthesize"
@@ -117,13 +112,18 @@
#:exists 'truncate
(lambda (o)
(write-xml updated o)))
- (system*/show productbuild
- "--distribution" pkg-xml
+ (apply system*/show
+ productbuild
+ (append
+ (list "--distribution" pkg-xml
"--package-path" (make-rel 'same)
"--resources" resources-dir
"--identifier" id
- "--version" (version)
- pkg-name))
+ "--version" (version))
+ (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 pkg-name (format "bundle/~a-~a~a.pkg"