~ chicken-core (chicken-5) c65524865c285dd84c0a27d7eb2b108822ff98e3
commit c65524865c285dd84c0a27d7eb2b108822ff98e3
Author: Kooda <kooda@upyum.com>
AuthorDate: Sat Oct 21 13:50:45 2017 +0200
Commit: Peter Bex <peter@more-magic.net>
CommitDate: Fri Oct 27 21:37:59 2017 +0200
Remove the build tag completely.
Signed-off-by: Peter Bex <peter@more-magic.net>
diff --git a/build-version.scm b/build-version.scm
index ff2565b4..c113a7d8 100644
--- a/build-version.scm
+++ b/build-version.scm
@@ -27,8 +27,6 @@
(declare
(unit build-version))
-(foreign-declare "#include \"buildtag.h\"")
-
;; (read-version filename): Read line from FILENAME and return
;; as a string; return #f if non-existent file or blank line.
(define-syntax read-version
@@ -43,7 +41,6 @@
#f
ver)))))))))
-(define (##sys#build-tag) (foreign-value "C_BUILD_TAG" c-string))
(define ##sys#build-id (read-version "buildid"))
(define ##sys#build-branch (read-version "buildbranch"))
(define ##sys#build-version (read-version "buildversion"))
diff --git a/defaults.make b/defaults.make
index 741bb6a9..813806c5 100644
--- a/defaults.make
+++ b/defaults.make
@@ -201,7 +201,6 @@ SCRIPT_EXT = .bat
COPY_COMMAND = copy /Y
HOSTNAME ?= $(shell hostname)
UNAME_SYS ?= Windows
-BUILD_TAG ?= compiled $(BUILD_TIME) on $(HOSTNAME) ($(UNAME_SYS))
# This is a poor man's version of $(file ...) in GNU Make 4.0
# We should consider replacing it when it becomes so widespread
# that systems (Debian, OS X, Haiku, Mingw, Cygwin) are shipping it
diff --git a/distribution/manifest b/distribution/manifest
index 29bf2aff..802a9a07 100644
--- a/distribution/manifest
+++ b/distribution/manifest
@@ -113,7 +113,6 @@ user-pass.scm
build-version.scm
build-version.c
buildid
-buildtag.h
tests/clustering-tests.scm
tests/c-id-valid.scm
tests/data-structures-tests.scm
diff --git a/identify.sh b/identify.sh
index 0a398d12..23912a29 100755
--- a/identify.sh
+++ b/identify.sh
@@ -12,7 +12,6 @@ fi
rev0=`cat buildid || echo ""`
branchname0=`cat buildbranch || echo ""`
-tag0=`cat buildtag.h || echo ""`
buildtime=`date +%Y-%m-%d`
host=`hostname`
usys=`uname`
@@ -20,14 +19,12 @@ usys=`uname`
if test -d "$1/.git"; then
rev=`GIT_DIR="$1/.git" git rev-parse --short HEAD 2>/dev/null`
branchname=`GIT_DIR="$1/.git" git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
- tag="#define C_BUILD_TAG \"compiled ${buildtime} on ${host} (${usys})\""
elif test -d "$1/manual-html"; then
# Assume this is a snapshot or release build; don't touch
# identifying files to avoid a rebuild which needs chicken
exit
else
branchname=${branchname:-"custom"}
- tag=${tag:-"#define C_BUILD_TAG \"compiled ${buildtime} on ${host} (${usys})\""}
fi
case "${branchname}" in
@@ -42,6 +39,3 @@ fi
if test "x${branchname0}" \!= "x${branchname}"; then
echo ${branchname} >buildbranch
fi
-if test "x${tag0}" \!= "x${tag}"; then
- echo ${tag} >buildtag.h
-fi
diff --git a/library.scm b/library.scm
index d7c9387e..a95bd195 100644
--- a/library.scm
+++ b/library.scm
@@ -6093,9 +6093,7 @@ EOF
(get-config)
(if (zero? (##sys#size spec))
""
- (string-append " [" spec " ]"))
- "\n"
- (or (##sys#build-tag) "")))
+ (string-append " [" spec " ]"))))
##sys#build-version))
;;; Installation locations
diff --git a/rules.make b/rules.make
index 1bfccfc3..b3799667 100644
--- a/rules.make
+++ b/rules.make
@@ -457,8 +457,6 @@ endif
# build versioning
ifdef WINDOWS_SHELL
-buildtag.h:
- echo #define C_BUILD_TAG "$(BUILD_TAG)" >$@
buildbranch:
echo.$(BRANCHNAME)>buildbranch
buildid:
@@ -469,7 +467,6 @@ else
identify-me:
@sh $(SRCDIR)identify.sh $(SRCDIR)
-buildtag.h: identify-me
buildbranch: identify-me
buildid: identify-me
endif
@@ -883,7 +880,7 @@ stub.c: $(SRCDIR)stub.scm $(SRCDIR)common-declarations.scm
$(bootstrap-lib)
debugger-client.c: $(SRCDIR)debugger-client.scm $(SRCDIR)common-declarations.scm dbg-stub.c
$(bootstrap-lib)
-build-version.c: $(SRCDIR)build-version.scm $(SRCDIR)buildversion buildbranch buildid buildtag.h
+build-version.c: $(SRCDIR)build-version.scm $(SRCDIR)buildversion buildbranch buildid
$(bootstrap-lib)
define declare-bootstrap-import-lib
@@ -965,7 +962,7 @@ confclean:
spotless: distclean testclean
-$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DISTFILES) \
- buildtag.h buildid buildbranch
+ buildid buildbranch
distclean: clean confclean
Trap