From 1bd2935e2b32f97eec083cdfbf2216ff4ac20779 Mon Sep 17 00:00:00 2001 From: Abdulaziz Ghuloum Date: Sun, 18 Nov 2007 20:22:11 -0500 Subject: [PATCH] Fixes bug 163690: ikarus should display version number instead of build date in the banner. --- scheme/Makefile.am | 7 +++++-- scheme/Makefile.in | 7 +++++-- scheme/ikarus.main.ss | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/scheme/Makefile.am b/scheme/Makefile.am index 3bca41d..5e1de12 100644 --- a/scheme/Makefile.am +++ b/scheme/Makefile.am @@ -4,9 +4,12 @@ EXTRA_DIST=ikarus.boot.orig ikarus.enumerations.ss ikarus.exceptions.ss ikarus.a all: $(nodist_pkglib_DATA) -CLEANFILES=$(nodist_pkglib_DATA) +ikarus.version.ss: Makefile + echo '(define ikarus-version "$(PACKAGE_VERSION)")' >$@ -ikarus.boot: $(EXTRA_DIST) +CLEANFILES=$(nodist_pkglib_DATA) ikarus.version.ss + +ikarus.boot: $(EXTRA_DIST) ikarus.version.ss ../src/ikarus -b ./ikarus.boot.orig --r6rs-script makefile.ss # pkglibdir diff --git a/scheme/Makefile.in b/scheme/Makefile.in index c196edf..ec211f5 100644 --- a/scheme/Makefile.in +++ b/scheme/Makefile.in @@ -183,7 +183,7 @@ EXTRA_DIST = ikarus.boot.orig ikarus.enumerations.ss \ ikarus/code-objects.ss ikarus/compiler.ss \ ikarus/intel-assembler.ss ikarus/fasl/write.ss \ unicode/unicode-char-cases.ss unicode/unicode-charinfo.ss -CLEANFILES = $(nodist_pkglib_DATA) +CLEANFILES = $(nodist_pkglib_DATA) ikarus.version.ss all: all-am .SUFFIXES: @@ -369,7 +369,10 @@ uninstall-am: uninstall-nodist_pkglibDATA all: $(nodist_pkglib_DATA) -ikarus.boot: $(EXTRA_DIST) +ikarus.version.ss: Makefile + echo '(define ikarus-version "$(PACKAGE_VERSION)")' >$@ + +ikarus.boot: $(EXTRA_DIST) ikarus.version.ss ../src/ikarus -b ./ikarus.boot.orig --r6rs-script makefile.ss # pkglibdir diff --git a/scheme/ikarus.main.ss b/scheme/ikarus.main.ss index a835015..bb830db 100644 --- a/scheme/ikarus.main.ss +++ b/scheme/ikarus.main.ss @@ -21,9 +21,12 @@ (library (ikarus greeting) (export print-greeting) (import (ikarus)) - (letrec-syntax ([compile-time-string (lambda (x) (date-string))]) + (letrec-syntax ([compile-time-string + (lambda (x) + (include "ikarus.version.ss") + ikarus-version)]) (define (print-greeting) - (printf "Ikarus Scheme (Build ~a)\n" (compile-time-string)) + (printf "Ikarus Scheme version ~a\n" (compile-time-string)) (display "Copyright (c) 2006-2007 Abdulaziz Ghuloum\n\n"))))