Correctly handle the version string, defined in a single place now.
Fix and update README.
1.1 --- a/Makefile Sat May 12 09:54:29 2007 +0000
1.2 +++ b/Makefile Sun May 13 19:03:49 2007 +0000
1.3 @@ -4,11 +4,10 @@
1.4 # Don't print directory as we descend into them
1.5 MAKEFLAGS += --no-print-directory
1.6
1.7 -# The project version
1.8 -export PROJECTVERSION=0.0.2-svn
1.9 +export CT_TOP_DIR=$(shell pwd)
1.10
1.11 -# This should eventually be computed if compiling out-of-tree is implemented
1.12 -export CT_TOP_DIR=$(shell pwd)
1.13 +# This is crosstool-ng version string
1.14 +export CT_VERSION=$(shell cat $(CT_TOP_DIR)/version)
1.15
1.16 .PHONY: all
1.17 all: build
2.1 --- a/README Sat May 12 09:54:29 2007 +0000
2.2 +++ b/README Sun May 13 19:03:49 2007 +0000
2.3 @@ -1,9 +1,9 @@
2.4 This is the README for crosstool-NG
2.5
2.6 -To get you started, hust enter:
2.7 +To get you started, just enter:
2.8 make help
2.9
2.10 You can find a (terse and WIP) documentation in docs/.
2.11
2.12 You can also point your browser to
2.13 - http://ymorin.is-a-geek.org/dokuwiki/doku.php?id=projects:crosstool
2.14 + http://ymorin.is-a-geek.org/dokuwiki/projects/crosstool
3.1 --- a/kconfig/Makefile Sat May 12 09:54:29 2007 +0000
3.2 +++ b/kconfig/Makefile Sun May 13 19:03:49 2007 +0000
3.3 @@ -16,6 +16,9 @@
3.4 CFLAGS += -DKBUILD_NO_NLS
3.5 endif
3.6
3.7 +# Derive the project version from, well, the project version:
3.8 +export PROJECTVERSION=$(CT_VERSION)
3.9 +
3.10 menuconfig: $(obj)/mconf
3.11 @$< $(KCONFIG_TOP)
3.12
4.1 --- a/scripts/crosstool.sh Sat May 12 09:54:29 2007 +0000
4.2 +++ b/scripts/crosstool.sh Sun May 13 19:03:49 2007 +0000
4.3 @@ -182,7 +182,7 @@
4.4 CT_SYS_USER="`id -un`"
4.5 CT_SYS_DATE=`CT_DoDate +%Y%m%d.%H%M%S`
4.6 CT_SYS_GCC=`gcc -dumpversion`
4.7 -CT_TOOLCHAIN_ID="crosstool-${CT_VERSION} build ${CT_SYS_DATE} by ${CT_SYS_USER}@${CT_SYS_HOSTNAME} for ${CT_TARGET}"
4.8 +CT_TOOLCHAIN_ID="crosstool-${CT_VERSION} build ${CT_SYS_DATE} by ${CT_SYS_USER}@${CT_SYS_HOSTNAME}"
4.9
4.10 # Redirect log to the actual log file now we can
4.11 # It's quite understandable that the log file will be installed in the install
5.1 --- a/scripts/functions Sat May 12 09:54:29 2007 +0000
5.2 +++ b/scripts/functions Sun May 13 19:03:49 2007 +0000
5.3 @@ -20,9 +20,6 @@
5.4 set -E
5.5 set -o pipefail
5.6
5.7 -# This is crosstool-ng-0.0.1
5.8 -CT_VERSION=ng-0.0.1
5.9 -
5.10 # The different log levels:
5.11 CT_LOG_LEVEL_ERROR=0
5.12 CT_LOG_LEVEL_WARN=1
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/version Sun May 13 19:03:49 2007 +0000
6.3 @@ -0,0 +1,1 @@
6.4 +0.0.2-svn