Rename TEST_TAG into TAG_SUFFIX.

This commit is contained in:
Ralf Corsepius
2007-02-22 08:57:44 +00:00
parent 85cf3374b6
commit e6a77a1543

View File

@@ -14,6 +14,7 @@
# MAINTAINER notes: # MAINTAINER notes:
# Cutting a new release: # Cutting a new release:
# 1. Perform a non-anonymous cvs checkout of the BRANCH # 1. Perform a non-anonymous cvs checkout of the BRANCH
# you want to cut a release tarball from # 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 # 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= <command>" # For "hot runs" you will want to use "make -f Makefile.maint TAG_SUFFIX= <command>"
TEST_TAG = -test1 TAG_SUFFIX = -test1
rtems_version := $(shell cat VERSION | sed -n '/.* Version /{s/^.*Version[ ]*\([0-9\.]\+\)/\1/p};') rtems_version := $(shell cat VERSION | sed -n '/.* Version /{s/^.*Version[ ]*\([0-9\.]\+\)/\1/p};')
rtems_tag := $(shell echo "rtems-$(rtems_version)" | tr . -) rtems_tag := $(shell echo "rtems-$(rtems_version)" | tr . -)
@@ -36,13 +37,13 @@ rtems_tag := $(shell echo "rtems-$(rtems_version)" | tr . -)
tag: tag:
cvs -z9 up -dP >/dev/null cvs -z9 up -dP >/dev/null
PATH=/opt/rtems-4.8/bin:$$PATH ./bootstrap -p >/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 # Different stages of cvs-exporting
rtems-$(rtems_version)/stamp.export: rtems-$(rtems_version)/stamp.export:
rm -rf rtems-$(rtems_version) 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 \ @if ! test -f rtems-$(rtems_version)/VERSION; then \
echo "ERROR export failed"; \ echo "ERROR export failed"; \
echo " Did you run 'make -f Makefile.maint tag' ?"; exit1; fi 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 += c/src/aclocal/version.m4
VERSION_FILES += testsuites/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: commit:
$(CVS_RUN) commit -m "Testing: Upgrade to $(rtems_version)" \ $(CVS_RUN) commit -m "Testing: Upgrade to $(rtems_version)" \