Changeset 12053 in project

Timestamp:

10/01/08 01:23:34 (12 years ago)

Author:

Ivan Raikov

Message:

Some procedures renamed to have meaningful names.

File:

• chicken/trunk/scripts/chicken-bundle.scm (modified) (8 diffs)

chicken/trunk/scripts/chicken-bundle.scm

@@ -21 +21 @@
 (define (sl\ p lst)   (string-intersperse (map ->string lst) p))
 
+
+(define *default-cc-options* "-Os -fomit-frame-pointer -g -DHAVE_GRP_H")
+
 (define opts
   `(
@@ -26 +29 @@
                        (s+ "build eggs in directory DIR"))
     ,(args:make-option (cc-options)       (required: "STRING")    
-                       (s+ "C compiler options to be used in the makefile"))
+                       (s+ "C compiler options to be used in the makefile (default is " *default-cc-options* ")"))
     ,(args:make-option (chicken-dir)       (required: "DIR")    
                        (s+ "directory where Chicken C files can be found"))
@@ -49 +52 @@
 ;; suitable for embedding into help text.
 (define (usage)
-  (print "Usage: " (car (argv)) " options... [list of eggs to be built] ")
+  (print "Usage: " (car (argv)) " options... [list of eggs to be bundled] ")
   (newline)
   (print "The following options are recognized: ")
@@ -93 +96 @@
       (if (file-exists? path) (loop (random 10000)) path))))
 
-(define (chxp flst)
+(define (make-paths-c+h flst)
   (concatenate (map (lambda (p) (append (map (lambda (f) (s+ (second p) dirsep f)) (third p))
                                         (map (lambda (f) (s+ (second p) dirsep f)) (fourth p))))
                     flst)))
 
-(define (cxp flst)
+(define (make-paths-c flst)
   (concatenate (map (lambda (p) (map (lambda (f) (s+ (second p) dirsep f)) (fourth p))) flst)))
 
 (define (build-makefile egg-name flst units cc-options)
+  (let ((units-c-files (map (lambda (u) (s+ u ".c")) units))
+        (libs-c-files  (make-paths-c flst)))
   (message "Creating Makefile" )
   (call-with-output-file "Makefile"
@@ -108 +113 @@
 ## This file was generated by chicken-bundle
 ##
-#(s+ egg-name ": ") runtime.c library.c #(sl\ " " (map (lambda (u) (s+ u ".c")) units)) #(sl\ " " (cxp flst))
+#(s+ egg-name ": ") runtime.c library.c #(sl\ " " units-c-files) #(sl\ " " libs-c-files)
 #(list->string (list #\tab)) $(CC) #(identity cc-options) -o $@ $^
 EOF
 ))
-        (display text out)))))
+        (display text out))))))
 
 (define (build-bundle egg-name suffix repo-dir build-dir chicken-dir 
@@ -120 +125 @@
         (bundle-name  (s+ egg-name suffix ".tar.gz") ))
     (run (rm -rf ,(s+ build-dir dirsep "*")))
-    (run (rm -rf ,(s+ repo-dir dirsep "*")))
+    (run (rm -rf ,(s+ repo-dir  dirsep "*")))
     (run (chicken-setup ,(if *verbose* "-v" "") -d -k -build-prefix ,build-dir -repository ,repo-dir ,egg-name))
     (let ((flst
@@ -152 +157 @@
       (for-each (lambda (p) (run (mv ,(first p) ,(s+ bundle-dir dirsep (second p))))) flst)
       (let* ((bundle-dir-name (pathname-strip-directory bundle-dir))
-             (mkbp  (lambda (x) (s+ bundle-dir-name dirsep x)))
-             (mkbpu (lambda (x) (s+ bundle-dir-name dirsep x ".c"))))
+             (make-bundle-path   (lambda (x) (s+ bundle-dir-name dirsep x)))
+             (make-bundle-path+c (lambda (x) (s+ bundle-dir-name dirsep x ".c"))))
         (run (tar zcf ,bundle-name 
-                  ,@(map mkbp `(Makefile chicken.h runtime.c library.c ))
-                  ,@(map mkbp (chxp flst)) ,@(map mkbpu chicken-units))))
+                  ,@(map make-bundle-path `(Makefile chicken.h runtime.c library.c ))
+                  ,@(map make-bundle-path  (make-paths-c+h flst)) 
+                  ,@(map make-bundle-path+c chicken-units))))
       (run (mv ,(s+ build-dir dirsep bundle-name) ,cwd))
       (change-directory cwd)
@@ -167 +173 @@
                                (list)))
         (opt_suffix        (or (alist-ref 'suffix options) "-bundle"))
-        (opt_cc-options    (or (alist-ref 'cc-options options) "-g -O2"))
+        (opt_cc-options    (or (alist-ref 'cc-options options) *default-cc-options*))
         (opt_chicken-dir   (or (alist-ref 'chicken-dir options) "."))
         (opt_chicken-units (or ((lambda (x) (and x (string-split x ","))) (alist-ref 'chicken-units options))