suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cross-build for Windows to use setup/winvers-change

Browse Source 
Merge to v6.3
This commit is contained in:
Matthew Flatt 2015-10-19 17:24:34 -06:00
parent 836316f5ed
commit 079183eb6a
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -492,6 +492,7 @@ bundle-from-server:
$(BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(REQUIRED_PKGS) $(BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(REQUIRED_PKGS)
$(BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(PKGS) $(BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(PKGS)
$(RACKET) -l setup/unixstyle-install post-adjust "$(SOURCE_MODE)" "$(PKG_SOURCE_MODE)" racket bundle/racket $(RACKET) -l setup/unixstyle-install post-adjust "$(SOURCE_MODE)" "$(PKG_SOURCE_MODE)" racket bundle/racket
$(RACKET) -l setup/winvers-change bundle/racket
UPLOAD_q = --readme "$(README)" --upload "$(UPLOAD)" --desc "$(DIST_DESC)" UPLOAD_q = --readme "$(README)" --upload "$(UPLOAD)" --desc "$(DIST_DESC)"
DIST_ARGS_q = $(UPLOAD_q) $(RELEASE_MODE) $(SOURCE_MODE) $(VERSIONLESS_MODE) $(MAC_PKG_MODE) \ DIST_ARGS_q = $(UPLOAD_q) $(RELEASE_MODE) $(SOURCE_MODE) $(VERSIONLESS_MODE) $(MAC_PKG_MODE) \

20
racket/collects/setup/winvers-change.rkt
View File

@ -9,6 +9,7 @@
;; of the binary and restarting that copy for the actual change. ;; of the binary and restarting that copy for the actual change.
#lang racket/base #lang racket/base
(require setup/cross-system)
(define verbose? #t) (define verbose? #t)
(define binary-extensions '("exe" "dll" "lib" "so" "def" "exp" #|"obj" "o"|#)) (define binary-extensions '("exe" "dll" "lib" "so" "def" "exp" #|"obj" "o"|#))
@ -69,12 +70,13 @@
(close-input-port i) (close-input-port i)
(close-output-port o))) (close-output-port o)))
(let loop ([paths (if (zero? (vector-length (current-command-line-arguments))) (when (eq? 'windows (cross-system-type))
'(".") (let loop ([paths (if (zero? (vector-length (current-command-line-arguments)))
(vector->list (current-command-line-arguments)))]) '(".")
(for ([path (in-list paths)]) (vector->list (current-command-line-arguments)))])
(cond [(file-exists? path) (for ([path (in-list paths)])
(when (binary-file? path) (do-file path))] (cond [(file-exists? path)
[(directory-exists? path) (when (binary-file? path) (do-file path))]
(parameterize ([current-directory path]) [(directory-exists? path)
(loop (map path->string (directory-list))))]))) (parameterize ([current-directory path])
(loop (map path->string (directory-list))))]))))