From 7ad7bb528218f011729fe0820c829af8cd22f4de Mon Sep 17 00:00:00 2001 From: felix Date: Thu, 15 Mar 2018 12:51:32 +0100 Subject: [PATCH 1/3] moved egg-file and version-file information into egg-environment.scm --- chicken-install.scm | 14 -------------- egg-environment.scm | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/chicken-install.scm b/chicken-install.scm index a34de3d..a4c9e81 100644 --- a/chicken-install.scm +++ b/chicken-install.scm @@ -53,10 +53,6 @@ (define +defaults-file+ "setup.defaults") (define +short-options+ '(#\h #\k #\s #\r #\n #\u #\v)) (define +one-hour+ (* 60 60)) -(define +timestamp-file+ "TIMESTAMP") -(define +status-file+ "STATUS") -(define +egg-extension+ "egg") -(define +version-file+ "VERSION") (define +internal-modules+ '(chicken.internal chicken.internal.syntax)) (include "mini-srfi-1.scm") @@ -110,16 +106,6 @@ (get-environment-variable "CHICKEN_INCLUDE_PATH") (get-environment-variable "DYLD_LIBRARY_PATH"))) -(define (probe-dir dir) - (and dir (directory-exists? dir) dir)) - -(define cache-directory - (or (get-environment-variable "CHICKEN_EGG_CACHE") - (make-pathname (or (probe-dir (get-environment-variable "HOME")) - (probe-dir (get-environment-variable "USERPROFILE")) - (current-directory)) - ".chicken-install/cache"))) - (define (repo-path) (if (and cross-chicken (not host-extension)) (destination-repository 'target) diff --git a/egg-environment.scm b/egg-environment.scm index 8138fcb..1e37b9f 100644 --- a/egg-environment.scm +++ b/egg-environment.scm @@ -92,9 +92,23 @@ EOF (string-append default-runlibdir "/chicken/" (number->string binary-version))) (define +egg-info-extension+ "egg-info") +(define +version-file+ "VERSION") +(define +timestamp-file+ "TIMESTAMP") +(define +status-file+ "STATUS") +(define +egg-extension+ "egg") (define (destination-repository mode #!optional run) (if (eq? 'target mode) (if run target-run-repo target-repo) (or (get-environment-variable "CHICKEN_INSTALL_REPOSITORY") host-repo))) + +(define (probe-dir dir) + (and dir (directory-exists? dir) dir)) + +(define cache-directory + (or (get-environment-variable "CHICKEN_EGG_CACHE") + (make-pathname (or (probe-dir (get-environment-variable "HOME")) + (probe-dir (get-environment-variable "USERPROFILE")) + (current-directory)) + ".chicken-install/cache"))) -- 1.7.9.5