~ chicken-core (chicken-5) 4ac0c1b207e88f4dca7b19c1e4e25155fa36ef5b
commit 4ac0c1b207e88f4dca7b19c1e4e25155fa36ef5b
Author: Felix <bunny351@gmail.com>
AuthorDate: Sat Oct 10 22:54:08 2009 +0200
Commit: Felix <bunny351@gmail.com>
CommitDate: Sat Oct 10 22:54:08 2009 +0200
removed svn revision from banner and build stuff that generates it
diff --git a/defaults.make b/defaults.make
index 36a4b0aa..b439a184 100644
--- a/defaults.make
+++ b/defaults.make
@@ -344,23 +344,15 @@ endif
.PHONY: all
-all: buildsvnrevision $(TARGETS)
-
-buildsvnrevision:
-ifdef WINDOWS_SHELL
- echo 0 >buildsvnrevision
-else
- sh $(SRCDIR)svnrevision.sh
-endif
+all: $(TARGETS)
# generic part of chicken-config.h
ifndef CUSTOM_CHICKEN_DEFAULTS
-chicken-defaults.h: buildsvnrevision
+chicken-defaults.h:
echo "/* generated */" >$@
echo "#define C_BUILD_TAG \"$(BUILD_TAG)\"" >>$@
echo "#define C_CHICKEN_PROGRAM \"$(CHICKEN_PROGRAM)$(EXE)\"" >>$@
- echo "#define C_SVN_REVISION $(shell cat buildsvnrevision)" >>$@
echo "#ifndef C_INSTALL_CC" >>$@
echo "# define C_INSTALL_CC \"$(C_COMPILER)\"" >>$@
echo "#endif" >>$@
diff --git a/distribution/manifest b/distribution/manifest
index 10c91bf9..97505e2e 100644
--- a/distribution/manifest
+++ b/distribution/manifest
@@ -104,7 +104,6 @@ uutils.c
build.scm
version.scm
buildversion
-buildsvnrevision
c-backend.scm
c-platform.scm
chicken-ffi-syntax.scm
@@ -276,7 +275,6 @@ scripts/makedist.scm
scripts/README
scripts/henrietta.scm
scripts/henrietta.cgi
-svnrevision.sh
synrules.scm
expand.scm
expand.c
diff --git a/library.scm b/library.scm
index c364a87c..7a79f736 100644
--- a/library.scm
+++ b/library.scm
@@ -3355,12 +3355,7 @@ EOF
(if (##sys#fudge 32) " gchooks" "")
(if (##sys#fudge 35) " applyhook" "")
(if (##sys#fudge 39) " cross" "") ) ) )
- (string-append
- "Version " +build-version+
- (if (not (zero? rev))
- (string-append
- " - SVN rev. " (number->string rev) "\n")
- "\n")
+ (string-append "Version " +build-version+ "\n")
(get-config)
(if (zero? (##sys#size spec))
""
diff --git a/rules.make b/rules.make
index a5cfc255..dbf64bcb 100644
--- a/rules.make
+++ b/rules.make
@@ -1230,7 +1230,7 @@ setup-download.c: $(SRCDIR)setup-download.scm setup-api.c
.PHONY: distfiles dist html
-distfiles: buildsvnrevision library.c eval.c expand.c chicken-syntax.c \
+distfiles: library.c eval.c expand.c chicken-syntax.c \
data-structures.c ports.c files.c extras.c lolevel.c utils.c \
tcp.c srfi-1.c srfi-4.c srfi-13.c srfi-14.c srfi-18.c srfi-69.c \
posixunix.c posixwin.c regex.c scheduler.c profiler.c stub.c \
@@ -1276,7 +1276,7 @@ ifdef USES_SONAME
endif
confclean:
- -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) chicken-config.h chicken-defaults.h buildsvnrevision
+ -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) chicken-config.h chicken-defaults.h
spotless: distclean testclean
-$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) library.c eval.c data-structures.c \
diff --git a/svnrevision.sh b/svnrevision.sh
deleted file mode 100644
index 8f68f842..00000000
--- a/svnrevision.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-# svnrevision.sh - figure out SVN revision and update buildsvnrevision file, if needed
-#
-# Copyright (c) 2007, Felix L. Winkelmann
-# Copyright (c) 2008-2009, The Chicken Team
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
-# conditions are met:
-#
-# Redistributions of source code must retain the above copyright notice, this list of conditions and the following
-# disclaimer.
-# Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided with the distribution.
-# Neither the name of the author nor the names of its contributors may be used to endorse or promote
-# products derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-LANG="C"
-
-if test -d ".svn" ;
-then
- if test -x "`which svn`" ;
- then
- rev="`svn info | sed -n -e 's/Revision: \([0-9]*\)/\1/p'`"
- else
- rev="`cat .svn/entries | sed -n -e '4 s/^\([0-9]*\)$/\1/p'`"
- fi
-else
- rev="0"
-fi
-
-if test -e "buildsvnrevision" ;
-then
- if test "`cat buildsvnrevision`" \!= "${rev}" ;
- then
- echo "${rev}" > buildsvnrevision
- fi
-else
- echo "${rev}" > buildsvnrevision
-fi
Trap