From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Wed, 29 Aug 2007 03:02:02 +0000 (+0000)
Subject: When tagging, only delete and re-create distro-specific tags
X-Git-Tag: release/1.79.1~6^2~1723
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9632f04595e18c853171910fc52ad1ec65919ff8;p=docbook-dsssl

When tagging, only delete and re-create distro-specific tags
directories.  Don't delete the parent (tag number) directory.
---

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 82ca3d2ed..afe8c8a49 100644
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -232,12 +232,15 @@ announce: $(ANNOUNCE_CHANGES) .announcement-text distrib
 
 tag:
 ifeq (,$(shell svn status))
-ifneq (,$(shell svn info $(REPOSITORY_ROOT)/tags/$(TAG) 2>/dev/null))
-	  $(SVN) $(SVN_OPTS) delete -m "deleting the $(ZIPVER) tag" \
+ifneq (,$(shell svn info $(REPOSITORY_ROOT)/tags/$(TAG)/$(DISTRO) 2>/dev/null))
+	  $(SVN) $(SVN_OPTS) delete -m "deleting the $(DISTRO) $(ZIPVER) tag" \
+	    $(REPOSITORY_ROOT)/tags/$(TAG)/$(DISTRO)
+endif
+ifeq (,$(shell svn info $(REPOSITORY_ROOT)/tags/$(TAG) 2>/dev/null))
+	  $(SVN) $(SVN_OPTS) mkdir -m "creating the $(ZIPVER) tag" \
 	    $(REPOSITORY_ROOT)/tags/$(TAG)
 endif
-	  $(SVN) $(SVN_OPTS) mkdir -m "creating the $(ZIPVER) tag" $(REPOSITORY_ROOT)/tags/$(TAG) \
-	  && $(SVN) $(SVN_OPTS) copy -m "tagging the docbook-$(DISTRO) $(ZIPVER) release" \
+	  $(SVN) $(SVN_OPTS) copy -m "tagging the $(DISTRO) $(ZIPVER) release" \
 	    -r $(REVISION) $(DISTRO_URL) $(REPOSITORY_ROOT)/tags/$(TAG)/$(DISTRO)
 else
 	  @echo "Unversioned or uncommitted files found. Before tagging/uploading"