Changeset 15921 in project for chicken


Ignore:
Timestamp:
09/16/09 13:41:23 (10 years ago)
Author:
iraikov
Message:

merged -setup-mode support into prerelease branch

Location:
chicken/branches/prerelease
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • chicken/branches/prerelease/csc.scm

    r15844 r15921  
    131131    -no-symbol-escape -no-parentheses-synonyms -r5rs-syntax
    132132    -no-argc-checks -no-bound-checks -no-procedure-checks -no-compiler-syntax
     133    -emit-all-import-libraries -setup-mode
    133134    -no-procedure-checks-for-usual-bindings))
    134135
     
    153154    (|-X| "-extend")
    154155    (|-N| "-no-usual-integrations")
     156    (|-J| "-emit-all-import-libraries")
    155157    (-x "-explicit-use")
    156158    (-u "-unsafe")
     
    315317    -j -emit-import-library MODULE write compile-time module information into
    316318                                    separate file
     319    -J -emit-all-import-libraries  emit import-libraries for all defined modules
    317320    -no-compiler-syntax            disable expansion of compiler-macros
    318321
  • chicken/branches/prerelease/csi.scm

    r15229 r15921  
    2727
    2828(declare
    29   (uses chicken-syntax srfi-69 ports) ; is here because a bootstrap from an older chicken may not make
    30   (usual-integrations)                  ;  this used automatically
     29  (uses chicken-syntax srfi-69 ports extras)
     30  (usual-integrations)
    3131  (disable-interrupts)
    3232  (disable-warning var)
     
    109109        -sx PATHNAME              same as `-s', but print each expression
    110110                                   as it is evaluated
     111        -setup-mode               prefer the current directory when locating extensions
    111112    -R  -require-extension NAME   require extension and import before
    112113                                   executing code
     
    836837  '("-ss" "-sx" "-script" "-version" "-help" "--help" "-feature" "-eval"
    837838    "-case-insensitive" "-keyword-style" "-no-parentheses-synonyms" "-no-symbol-escape"
    838     "-r5rs-syntax"
     839    "-r5rs-syntax" "-setup-mode"
    839840    "-require-extension" "-batch" "-quiet" "-no-warnings" "-no-init"
    840841    "-include-path" "-release" "-print" "-pretty-print" "--") )
     
    865866(define-constant simple-options
    866867  '("--" "-b" "-batch" "-q" "-quiet" "-n" "-no-init" "-w" "-no-warnings" "-i" "-case-insensitive"
    867     "-no-parentheses-synonyms" "-no-symbol-escape" "-r5rs-syntax"
     868    "-no-parentheses-synonyms" "-no-symbol-escape" "-r5rs-syntax" "-setup-mode"
    868869    ; Not "simple" but processed early
    869870    "-ss" "-sx" "-s" "-script") )
     
    927928        (print-banner)
    928929        (exit 0) )
     930      (when (member "-setup-mode" args)
     931        (set! ##sys#setup-mode #t))
    929932      (when (member "-release" args)
    930933        (print (chicken-version))
     
    976979             (repl)
    977980             (##sys#write-char-0 #\newline ##sys#standard-output) ) )
    978         (let* ([arg (car args)]
    979                #;[len (string-length arg)] )
     981        (let* ((arg (car args)))
    980982          (cond ((member arg simple-options) )
    981983                ((member arg complex-options)
  • chicken/branches/prerelease/eval.scm

    r15229 r15921  
    10961096(define repository-path ##sys#repository-path)
    10971097
     1098(define ##sys#setup-mode #f)
     1099
    10981100(define ##sys#find-extension
    10991101  (let ((file-exists? file-exists?)
     
    11101112                 p0) ) )
    11111113          (let loop ((paths (##sys#append
     1114                             (if ##sys#setup-mode '(".") '())
    11121115                             (if rp (list rp) '())
    11131116                             (if inc? ##sys#include-pathnames '())
    1114                              '("."))) )
     1117                             (if ##sys#setup-mode '() '("."))) ))
    11151118            (and (pair? paths)
    11161119                 (let ((pa (##sys#slot paths 0)))
     
    11971200      (define (add-req id syntax?)
    11981201        (when comp?
    1199           (##sys#hash-table-update! ; assumes compiler has extras available - will break in the interpreter
     1202          (##sys#hash-table-update!
    12001203           ##compiler#file-requirements
    12011204           (if syntax? 'dynamic/syntax 'dynamic)
    1202            (cut lset-adjoin eq? <> id) 
     1205           (cut lset-adjoin eq? <> id)  ;XXX assumes compiler has srfi-1 loaded
    12031206           (lambda () (list id)))))
    12041207      (define (impform x id builtin?)
  • chicken/branches/prerelease/setup-api.scm

    r15229 r15921  
    242242                   *chicken-bin-path*
    243243                   (cdr (assoc prg *installed-executables*))))
    244                  "-feature" "compiling-extension"
     244                 "-feature" "compiling-extension" "-setup-mode"
    245245                 (if (keep-intermediates) "-k" "")
    246246                 (if (host-extension) "-host" "")
     
    438438  (make-parameter (or (get-environment-variable "CHICKEN_INSTALL_PREFIX") #f)))
    439439
     440(define create-directory/parents
     441  (let ()
     442    (define (verb dir)
     443      (when (setup-verbose-mode) (printf "  creating directory `~a'~%~!" dir)) )
     444    (if *windows*
     445        (lambda (dir)
     446          (verb dir)
     447          (create-directory dir #t) )
     448        (lambda (dir)
     449          (verb dir)
     450          (run (,*mkdir-command* -p ,(shellpath dir)) ) ) ) ) )
     451
    440452(define (write-info id files info)
    441453  (let ((info `((files ,@files)
  • chicken/branches/prerelease/support.scm

    r15920 r15921  
    11901190    -emit-import-library MODULE  write compile-time module information into
    11911191                                  separate file
     1192    -emit-all-import-libraries   emit import-libraries for all defined modules
    11921193    -no-compiler-syntax          disable expansion of compiler-macros
    11931194
     
    12721273                                  declarations
    12731274    -ignore-repository           do not refer to repository for extensions
     1275    -setup-mode                  prefer the current directory when locating extensions
    12741276
    12751277EOF
Note: See TracChangeset for help on using the changeset viewer.