~ chicken-core (chicken-5) de4d03ed60567dc28fa25fb72359dbd88470103f

commit de4d03ed60567dc28fa25fb72359dbd88470103f
Author:     Jim Ursetto <zbigniewsz@gmail.com>
AuthorDate: Fri Jul 1 18:16:02 2011 -0500
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sun Jul 17 23:37:35 2011 +0200

    Remove version.scm and references to C_BRANCH_NAME and C_BUILD_TAG

diff --git a/Makefile.cygwin b/Makefile.cygwin
index 4863975c..6f8d09fc 100644
--- a/Makefile.cygwin
+++ b/Makefile.cygwin
@@ -128,7 +128,6 @@ endif
 
 chicken-defaults.h:
 	echo "/* generated */" >$@
-	echo "#define C_BUILD_TAG \"$(BUILD_TAG)\"" >>$@
 	echo "#define C_CHICKEN_PROGRAM \"$(CHICKEN_PROGRAM)$(EXE)\"" >>$@
 	echo "#ifndef C_INSTALL_CC" >>$@
 	echo "# define C_INSTALL_CC \"$(C_COMPILER)\"" >>$@
@@ -259,9 +258,6 @@ chicken-defaults.h:
 	echo "#ifndef C_BINARY_VERSION" >>$@
 	echo "# define C_BINARY_VERSION $(BINARYVERSION)" >>$@
 	echo "#endif" >>$@
-	echo "#ifndef C_BRANCH_NAME" >>$@
-	echo "# define C_BRANCH_NAME \"$(BRANCHNAME)\"" >>$@
-	echo "#endif" >>$@
 	echo "/* END OF FILE */" >>$@
 
 include $(SRCDIR)/rules.make
diff --git a/Makefile.mingw b/Makefile.mingw
index b153b583..56a159ae 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -133,7 +133,6 @@ chicken-defaults.h:
 ifdef OPTIMIZE_FOR_SPEED
 	echo /* (this build was optimized for speed) */ >>$@
 endif
-	echo #define C_BUILD_TAG "$(BUILD_TAG)" >>$@
 	echo #define C_CHICKEN_PROGRAM "$(CHICKEN_PROGRAM)$(EXE)" >>$@
 	echo #define C_WINDOWS_SHELL 1 >>$@
 	echo #ifndef C_INSTALL_CC >>$@
@@ -262,9 +261,6 @@ endif
 	echo #ifndef C_BINARY_VERSION >>$@
 	echo # define C_BINARY_VERSION $(BINARYVERSION) >>$@
 	echo #endif >>$@
-	echo #ifndef C_BRANCH_NAME >>$@
-	echo # define C_BRANCH_NAME "" >>$@
-	echo #endif >>$@
 	echo /* END OF FILE */ >>$@
 
 chicken-install.rc:
diff --git a/defaults.make b/defaults.make
index 01f7c165..9b3e0ef5 100644
--- a/defaults.make
+++ b/defaults.make
@@ -351,7 +351,6 @@ chicken-defaults.h:
 ifdef OPTIMIZE_FOR_SPEED
 	echo "/* (this build was optimized for speed) */" >$@
 endif
-	echo "#define C_BUILD_TAG \"$(BUILD_TAG)\"" >>$@
 	echo "#define C_CHICKEN_PROGRAM \"$(CHICKEN_PROGRAM)$(EXE)\"" >>$@
 	echo "#ifndef C_INSTALL_CC" >>$@
 	echo "# define C_INSTALL_CC \"$(C_COMPILER)\"" >>$@
@@ -489,9 +488,6 @@ endif
 	echo "#ifndef C_BINARY_VERSION" >>$@
 	echo "# define C_BINARY_VERSION $(BINARYVERSION)" >>$@
 	echo "#endif" >>$@
-	echo "#ifndef C_BRANCH_NAME" >>$@
-	echo "# define C_BRANCH_NAME \"$(BRANCHNAME)\"" >>$@
-	echo "#endif" >>$@
 	echo "/* END OF FILE */" >>$@
 endif
 
diff --git a/distribution/manifest b/distribution/manifest
index 0d48b71b..32a20544 100644
--- a/distribution/manifest
+++ b/distribution/manifest
@@ -45,7 +45,6 @@ support.c
 tcp.c
 utils.c
 build.scm
-version.scm
 buildversion
 c-backend.scm
 c-platform.scm
diff --git a/library.scm b/library.scm
index 113d2cc2..f5590526 100644
--- a/library.scm
+++ b/library.scm
@@ -54,14 +54,6 @@
 # define EX_SOFTWARE	70
 #endif
 
-#ifndef C_BUILD_TAG
-# define C_BUILD_TAG	""
-#endif
-
-#ifndef C_BRANCH_NAME
-# define C_BRANCH_NAME   ""
-#endif
-
 #define C_close_file(p)	      (C_fclose((C_FILEPTR)(C_port_file(p))), C_SCHEME_UNDEFINED)
 #define C_a_f64peek(ptr, c, b, i)  C_flonum(ptr, ((double *)C_data_pointer(b))[ C_unfix(i) ])
 #define C_fetch_c_strlen(b, i) C_fix(strlen((C_char *)C_block_item(b, C_unfix(i))))
@@ -140,7 +132,6 @@ EOF
 
 
 (include "common-declarations.scm")
-(include "version.scm")
 (include "banner.scm")
 
 
@@ -151,9 +142,6 @@ EOF
 (define-constant default-parameter-vector-size 16)
 (define-constant maximal-string-length #x00ffffff)
 
-(define-foreign-variable +build-tag+ c-string "C_BUILD_TAG")
-(define-foreign-variable +branch-name+ c-string "C_BRANCH_NAME")
-
 
 ;;; System routines:
 
diff --git a/rules.make b/rules.make
index bca0358f..8ba36a6d 100644
--- a/rules.make
+++ b/rules.make
@@ -493,7 +493,7 @@ $(foreach lib, $(SETUP_API_OBJECTS_1),\
 
 bootstrap-lib = $(CHICKEN) $< $(CHICKEN_LIBRARY_OPTIONS) -output-file $@
 
-library.c: $(SRCDIR)library.scm $(SRCDIR)version.scm $(SRCDIR)banner.scm $(SRCDIR)common-declarations.scm
+library.c: $(SRCDIR)library.scm $(SRCDIR)banner.scm $(SRCDIR)common-declarations.scm
 	$(bootstrap-lib)
 eval.c: $(SRCDIR)eval.scm $(SRCDIR)common-declarations.scm
 	$(bootstrap-lib)
diff --git a/scripts/setversion b/scripts/setversion
index 61023772..c292c3c5 100644
--- a/scripts/setversion
+++ b/scripts/setversion
@@ -58,12 +58,7 @@ exec csi -s "$0" "$@"
 	     (set! buildversion
 	       (conc maj "." min "." (add1 (string->number pl)) huh)) ) ) )
     (with-output-to-file "buildversion" (cut display buildversion) binary:)
-    (with-output-to-file "version.scm" 
-      (lambda ()
-	(write `(define-constant +build-version+ ,buildversion))
-	(newline) )
-      binary:)
-    (system* "cat version.scm")
+    (system* "cat buildversion")
     (let ([vstr (sprintf "version ~A" buildversion)])
       (for-each (cut patch <> (irregex "version [0-9][-.0-9a-zA-Z]+") vstr) files) )
     (patch 
diff --git a/version.scm b/version.scm
deleted file mode 100644
index a3442ccf..00000000
--- a/version.scm
+++ /dev/null
@@ -1 +0,0 @@
-(define-constant +build-version+ "4.7.3")