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

Windows cross-build: fix over-agressive pruning of DLLs

Browse Source 
The `setup/winstrip` step was run too late. As an extra measure,
make make `setup/winstrip` more precise about the files it
will discard.

Merge to v6.3
This commit is contained in:
Matthew Flatt 2015-10-21 18:12:05 -06:00
parent 876708c100
commit 91d825ba61
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -488,12 +488,12 @@ bundle-from-server:
rm -rf bundle
mkdir -p bundle/racket
$(RACKET) -l setup/unixstyle-install bundle racket bundle/racket
$(RACKET) -l setup/winstrip bundle/racket
$(RACKET) -l setup/winvers-change bundle/racket
$(RACKET) -l distro-build/unpack-collects http://$(SVR_PRT)/$(SERVER_COLLECTS_PATH)
$(BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(REQUIRED_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/winstrip bundle/racket
$(RACKET) -l setup/winvers-change bundle/racket
UPLOAD_q = --readme "$(README)" --upload "$(UPLOAD)" --desc "$(DIST_DESC)"
DIST_ARGS_q = $(UPLOAD_q) $(RELEASE_MODE) $(SOURCE_MODE) $(VERSIONLESS_MODE) $(MAC_PKG_MODE) \

1
racket/collects/setup/winstrip.rkt
View File

@ -39,6 +39,7 @@
(or (regexp-match? #rx#"[.](?i:pdb|ilk|manifest)$" b)
(regexp-match? #rx#"(?i:CGC[.](?:dll|exe))$" b)
(and (regexp-match? #rx#"(?i:[.](?:dll|exp|obj|lib|def))$" b)
(regexp-match? #rx#"(?i:racket|mzgc)$" b)
(not (regexp-match? #rx#"3m" b))))))
(delete-file* f)))