From e6a77a1543568262a7a2dccb9e4fb840db39ebc3 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 22 Feb 2007 08:57:44 +0000 Subject: Rename TEST_TAG into TAG_SUFFIX. --- Makefile.maint | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.maint b/Makefile.maint index 5d94786637..24995624fd 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -14,6 +14,7 @@ # MAINTAINER notes: + # Cutting a new release: # 1. Perform a non-anonymous cvs checkout of the BRANCH # you want to cut a release tarball from @@ -25,8 +26,8 @@ # ----------------- # SECURITY: Append a string to tag to avoid accidentially screwing up cvs-tags -# For "hot runs" you will want to use "make -f Makefile.maint TEST_TAG= " -TEST_TAG = -test1 +# For "hot runs" you will want to use "make -f Makefile.maint TAG_SUFFIX= " +TAG_SUFFIX = -test1 rtems_version := $(shell cat VERSION | sed -n '/.* Version /{s/^.*Version[ ]*\([0-9\.]\+\)/\1/p};') rtems_tag := $(shell echo "rtems-$(rtems_version)" | tr . -) @@ -36,13 +37,13 @@ rtems_tag := $(shell echo "rtems-$(rtems_version)" | tr . -) tag: cvs -z9 up -dP >/dev/null PATH=/opt/rtems-4.8/bin:$$PATH ./bootstrap -p >/dev/null - cvs tag -c $(rtems_tag)$(TEST_TAG) >/dev/null + cvs tag -c $(rtems_tag)$(TAG_SUFFIX) >/dev/null # ----------------- # Different stages of cvs-exporting rtems-$(rtems_version)/stamp.export: rm -rf rtems-$(rtems_version) - @cvs -z9 export -d rtems-$(rtems_version) -r $(rtems_tag)$(TEST_TAG) rtems >/dev/null + @cvs -z9 export -d rtems-$(rtems_version) -r $(rtems_tag)$(TAG_SUFFIX) rtems >/dev/null @if ! test -f rtems-$(rtems_version)/VERSION; then \ echo "ERROR export failed"; \ echo " Did you run 'make -f Makefile.maint tag' ?"; exit1; fi @@ -123,7 +124,7 @@ VERSION_FILES += cpukit/aclocal/version.m4 VERSION_FILES += c/src/aclocal/version.m4 VERSION_FILES += testsuites/aclocal/version.m4 -CVS_RUN := $(shell if [ -n "$(TEST_TAG)" ]; then echo "cvs -n"; else echo "cvs"; fi) +CVS_RUN := $(shell if [ -n "$(TAG_SUFFIX)" ]; then echo "cvs -n"; else echo "cvs"; fi) commit: $(CVS_RUN) commit -m "Testing: Upgrade to $(rtems_version)" \ -- cgit v1.2.3