summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.maint10
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 423ec7fc34..cd82ffce77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2007-02-15 Ralf Corsépius <ralf.corsepius@rtems.org>
+ * Makefile.maint: Use VERSION as master source for version.m4's.
* VERSION: Sync with version in aclocal/version.m4.
2007-01-28 Ralf Corsépius <ralf.corsepius@rtems.org>
diff --git a/Makefile.maint b/Makefile.maint
index c8412c0520..9253577ea2 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -28,7 +28,7 @@
# For "hot runs" you will want to use "make -f Makefile.maint TEST_TAG= <command>"
TEST_TAG = -test1
-rtems_version := $(shell cat aclocal/version.m4 | sed -n '/_RTEMS_VERSION/{s/^.*VERSION.*\[\(.*\)\].*/\1/p};')
+rtems_version := $(shell cat VERSION | sed -n '/.* Version /{s/^.*Version[ ]*\([0-9\.]\+\)/\1/p};')
rtems_tag := $(shell echo "rtems-$(rtems_version)" | tr . -)
# -----------------
@@ -79,7 +79,8 @@ new-minor:
r=$$(($$r + 1)); version="$$v.$$r.0"; \
echo "New minor release: $$version"; \
sed -i -e "s|\[_RTEMS_VERSION\],\[.*\]|\[_RTEMS_VERSION\],\[$$version\]|" \
- $(VERSION_FILES);
+ $(VERSION_FILES); \
+ sed -i -e "s,\(^RTEMS Version\).*,\1 $$version," VERSION
# Create a new revision release
# increments the last digit of the version number
@@ -91,7 +92,8 @@ new-revision:
n=$$(($$n + 1)); version="$$m.$$n";\
echo "New revision release: $$version"; \
sed -i -e "s|\[_RTEMS_VERSION\],\[.*\]|\[_RTEMS_VERSION\],\[$$version\]|" \
- $(VERSION_FILES);
+ $(VERSION_FILES); \
+ sed -i -e "s,\(^RTEMS Version\).*,\1 $$version," VERSION
VERSION_FILES += aclocal/version.m4
VERSION_FILES += cpukit/aclocal/version.m4
@@ -102,6 +104,6 @@ CVS_RUN := $(shell if [ -n "$(TEST_TAG)" ]; then echo "cvs -n"; else echo "cvs";
commit:
$(CVS_RUN) commit -m "Upgrade to $(rtems_version)" \
- $(VERSION_FILES)
+ $(VERSION_FILES) VERSION
.PHONY: commit new-minor new-revision tag tarball