From 9b579f598d2f376c70fb16ecffeb87f3e315fe69 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 10 Mar 2014 16:57:16 -0600 Subject: [PATCH] Makefile: refine support for building an installer from a site original commit: 1260dd6b2ecdb90789c8e347f94249be8acbe564 --- pkgs/distro-build-pkgs/distro-build-client/installer.rkt | 8 +++++--- .../distro-build-server/drive-clients.rkt | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/distro-build-pkgs/distro-build-client/installer.rkt b/pkgs/distro-build-pkgs/distro-build-client/installer.rkt index 1b87b6a..b984257 100644 --- a/pkgs/distro-build-pkgs/distro-build-client/installer.rkt +++ b/pkgs/distro-build-pkgs/distro-build-client/installer.rkt @@ -30,11 +30,13 @@ [("--mac-pkg") "Create a \".pkg\" installer on Mac OS X" (set! mac-pkg? #t)] [("--upload") url "Upload installer" - (set! upload-to url)] + (unless (string=? url "") + (set! upload-to url))] [("--desc") desc "Description to accompany upload" (set! upload-desc desc)] [("--readme") readme "URL for README.txt to include" - (set! download-readme readme)] + (unless (string=? readme "") + (set! download-readme readme))] #:args (human-name base-name dir-name dist-suffix sign-identity) (values human-name @@ -81,7 +83,7 @@ (printf "Upload ~a to ~a\n" installer-file upload-to) (define i (put-pure-port - (string->url (format "~aupload/~a" + (string->url (format "~a~a" upload-to (path->string (file-name-from-path installer-file)))) (file->bytes installer-file) diff --git a/pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt b/pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt index 1faf831..c3bcc80 100644 --- a/pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt +++ b/pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt @@ -338,7 +338,8 @@ (q "--source --no-setup") (q "")) " MAC_PKG_MODE=" (if mac-pkg? "--mac-pkg" (q "")) - " README=" (q (file-name-from-path readme)))) + " UPLOAD=http://" server ":" server-port "/upload/" + " README=http://" server ":" server-port "/" (q (file-name-from-path readme)))) (define (unix-build c platform host port user server server-port repo clean? pull? readme) (define dir (get-path-opt c '#:dir "build/plt" #:localhost (current-directory)))