summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2007-05-13 19:03:49 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2007-05-13 19:03:49 (GMT)
commit7ed70a00287d20a775654940c291edb6f04b478b (patch)
tree45249ea8a5151ace9e2f9dceab397430e990e615
parentffabd4408404d70b501f63ab6932e47ca1d6e8c4 (diff)
Correctly handle the version string, defined in a single place now.
Fix and update README.
-rw-r--r--Makefile7
-rw-r--r--README4
-rw-r--r--kconfig/Makefile3
-rwxr-xr-xscripts/crosstool.sh2
-rw-r--r--scripts/functions3
-rw-r--r--version1
6 files changed, 10 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 2d0c47b..4149518 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,11 @@
# Don't print directory as we descend into them
MAKEFLAGS += --no-print-directory
-# The project version
-export PROJECTVERSION=0.0.2-svn
-
-# This should eventually be computed if compiling out-of-tree is implemented
export CT_TOP_DIR=$(shell pwd)
+# This is crosstool-ng version string
+export CT_VERSION=$(shell cat $(CT_TOP_DIR)/version)
+
.PHONY: all
all: build
diff --git a/README b/README
index 2d1f154..dc6ee98 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
This is the README for crosstool-NG
-To get you started, hust enter:
+To get you started, just enter:
make help
You can find a (terse and WIP) documentation in docs/.
You can also point your browser to
- http://ymorin.is-a-geek.org/dokuwiki/doku.php?id=projects:crosstool
+ http://ymorin.is-a-geek.org/dokuwiki/projects/crosstool
diff --git a/kconfig/Makefile b/kconfig/Makefile
index ca97748..7b87a50 100644
--- a/kconfig/Makefile
+++ b/kconfig/Makefile
@@ -16,6 +16,9 @@ ifneq ($(KBUILD_NO_NLS),)
CFLAGS += -DKBUILD_NO_NLS
endif
+# Derive the project version from, well, the project version:
+export PROJECTVERSION=$(CT_VERSION)
+
menuconfig: $(obj)/mconf
@$< $(KCONFIG_TOP)
diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh
index a3e284a..dfe0c80 100755
--- a/scripts/crosstool.sh
+++ b/scripts/crosstool.sh
@@ -182,7 +182,7 @@ CT_SYS_PROCESSOR=`uname -p`
CT_SYS_USER="`id -un`"
CT_SYS_DATE=`CT_DoDate +%Y%m%d.%H%M%S`
CT_SYS_GCC=`gcc -dumpversion`
-CT_TOOLCHAIN_ID="crosstool-${CT_VERSION} build ${CT_SYS_DATE} by ${CT_SYS_USER}@${CT_SYS_HOSTNAME} for ${CT_TARGET}"
+CT_TOOLCHAIN_ID="crosstool-${CT_VERSION} build ${CT_SYS_DATE} by ${CT_SYS_USER}@${CT_SYS_HOSTNAME}"
# Redirect log to the actual log file now we can
# It's quite understandable that the log file will be installed in the install
diff --git a/scripts/functions b/scripts/functions
index da66d83..3ba6a3f 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -20,9 +20,6 @@ trap CT_OnError ERR
set -E
set -o pipefail
-# This is crosstool-ng-0.0.1
-CT_VERSION=ng-0.0.1
-
# The different log levels:
CT_LOG_LEVEL_ERROR=0
CT_LOG_LEVEL_WARN=1
diff --git a/version b/version
new file mode 100644
index 0000000..a6b299a
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+0.0.2-svn