Changeset 9257 in project


Ignore:
Timestamp:
03/07/08 06:18:25 (12 years ago)
Author:
Ivan Raikov
Message:

Committed fixes to installing from local repository.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • chicken/trunk/chicken-setup.scm

    r9174 r9257  
    475475         (filter-map
    476476          (lambda (d)
    477             (and-let* ((mf (or (file-exists? (make-pathname d d "meta"))
    478                                (file-exists? (make-pathname (list d "trunk") d "meta")))))
     477            (and-let* ((mf (or (file-exists? (make-pathname (list eggdir d) d "meta"))
     478                               (file-exists? (make-pathname (list eggdir d "trunk") d "meta")))))
    479479              (display mf (current-error-port))
    480480              (newline (current-error-port))
     
    614614          (values '() oinfo) ) ) ) )
    615615
    616 (define (compute-builddir fname)
    617   (if (equal? "egg-dir" (pathname-extension fname)) fname
    618       (let loop ((num (random 10000)))
    619         (let* ((buildname (string-append "build." (number->string num)))
    620                (path  (make-pathname (setup-build-prefix) buildname (string-append fname "-dir") )))
    621           (if (file-exists? path) (loop (random 10000))
    622               path)))))
     616(define (compute-builddir fpath)
     617  (if (equal? "egg-dir" (pathname-extension fpath)) fpath
     618      (let ((fname (pathname-strip-directory fpath)))
     619        (let loop ((num (random 10000)))
     620          (let* ((buildname (string-append "build." (number->string num)))
     621                 (path  (make-pathname (setup-build-prefix) buildname (string-append fname "-dir") )))
     622            (if (file-exists? path) (loop (random 10000))
     623                path))))))
    623624
    624625
     
    651652           (chdir tmpdir)
    652653           (setup-build-directory (current-directory))
    653            (let ((fn2 (make-pathname (setup-download-directory) filename))
     654           (let ((fn2 (if (and *local-repository* (not (string-prefix? (setup-download-directory) filename)))
     655                          (make-pathname (setup-download-directory) filename)
     656                          filename))
    654657                 (v (setup-verbose-flag)) )
    655658             (if (testgz fn2)
     
    10151018                            (with-output-to-file fpath
    10161019                              (cut display data)
    1017                               binary:) 
     1020                              binary:)
    10181021                            fpath))
    10191022                        (loop) ) ) ) ) ) )
Note: See TracChangeset for help on using the changeset viewer.