From 790e8ebb46e33df1c2609afff970350886273f04 Mon Sep 17 00:00:00 2001 From: Noel Welsh Date: Sun, 31 Aug 2008 21:08:12 +0000 Subject: [PATCH] [NHW] Bug fix in make-collection. make-collection generates the names of the .zo files it expects to generate. The old method generated names like foo.zo. I believe the new convention is foo_ss.zo, and this is born out by an error message I encountered building a tool on top of make-collection. The fix is generate the names of the .zo files from the full file names of the .ss, not the file name trimmed of the .ss extension. Change is fairly trivial. This is the error message: > (sake "build.ss" 'all) building collection name: (sake.ss) make: checking zo make: checking compiled/sake.zo make: checking sake.ss make: making compiled/sake.zo because compiled/sake.zo does not exist [output to "compiled/sake_ss.zo"] make: dependancy compiled/sake.zo was not made === context === for-loop /usr/local/plt/collects/make/make-unit.ss:74:2: make-file for-loop core /usr/local/plt/collects/scheme/private/misc.ss:74:7 -------------------------- This error basically says the file sake_ss.zo is being built, but make is looking for a file called sake.zo. svn: r11500 --- collects/make/collection-unit.ss | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/collects/make/collection-unit.ss b/collects/make/collection-unit.ss index 230610a16c..bf17a2beac 100644 --- a/collects/make/collection-unit.ss +++ b/collects/make/collection-unit.ss @@ -23,13 +23,9 @@ [sses (sort collection-files (lambda (a b) (string-cistring a) (path->string b))))] - [bases (map (lambda (src) - (extract-base-filename/ss src - 'make-collection-extension)) - sses)] - [zos (map (lambda (base) - (build-path "compiled" (append-zo-suffix base))) - bases)] + [zos (map (lambda (ss) + (build-path "compiled" (append-zo-suffix ss))) + sses)] [ss->zo-list (map (lambda (ss zo) `(,zo (,ss)