From a041ddc983ca1bb5b080229a90714e007a0779e1 Mon Sep 17 00:00:00 2001 From: felix Date: Fri, 22 Jun 2018 11:21:36 +0200 Subject: [PATCH] ensure version from egg download is injected into egg-info file --- chicken-install.scm | 7 ++++++- egg-compile.scm | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/chicken-install.scm b/chicken-install.scm index cc7bb33..80c990b 100644 --- a/chicken-install.scm +++ b/chicken-install.scm @@ -800,12 +800,16 @@ (let* ((name (car egg)) (dir (cadr egg)) (eggfile (make-pathname dir name +egg-extension+)) - (info (load-egg-info eggfile))) + (info (load-egg-info eggfile)) + (vfile (make-pathname dir +version-file+)) + (ver (and (file-exists? vfile) + (with-input-from-file vfile read)))) (when (or host-extension (and (not target-extension) (not host-extension))) (let-values (((build install info) (compile-egg-info eggfile info + ver platform 'host))) (check-installed-files name info) @@ -835,6 +839,7 @@ (when target-extension (let-values (((build install info) (compile-egg-info eggfile info + ver platform 'target))) (let ((bscript (make-pathname dir name diff --git a/egg-compile.scm b/egg-compile.scm index f5996a6..06b715b 100644 --- a/egg-compile.scm +++ b/egg-compile.scm @@ -120,7 +120,7 @@ ;;; compile an egg-information tree into abstract build/install operations -(define (compile-egg-info eggfile info platform mode) +(define (compile-egg-info eggfile info version platform mode) (let ((exts '()) (prgs '()) (data '()) @@ -448,7 +448,9 @@ (map (lambda (cinc) (apply install-c-include cinc)) cinc) (map (lambda (scminc) (apply install-data scminc)) scminc)) ;; augmented egg-info - (cons `(installed-files ,@ifiles) info))))) + (cons* `(installed-files ,@ifiles) + `(version ,version) + info))))) ;;; shell code generation - build operations -- 1.7.9.5