From fd57f6e2bba71c71aeb614aa002499004253c612 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Sat, 26 Aug 2006 22:48:47 +0000
Subject: EncapPackages: Added bcfg2 bump functionality to
 encap/src/encap-profiles/Makefile

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2122 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/TODO                        | 20 ++++++++++----------
 encap/VERSION                     |  2 +-
 encap/src/encap-profiles/Makefile | 29 ++++++++++++++++++++++++++++-
 3 files changed, 39 insertions(+), 12 deletions(-)

(limited to 'encap')

diff --git a/encap/TODO b/encap/TODO
index 2205b2a92..5820f63ae 100644
--- a/encap/TODO
+++ b/encap/TODO
@@ -1,21 +1,21 @@
- * makeself-dist: create/test
-   * End result will be .run distribution that installs all client stuff
-     * gamin and glib (server requirements) will be manual install items
-
- * Double-check all permissions, and make sure they are not effected by 
-   the environment's umask
+= TODO =
 
+== For 0.8.3 ==
  * Small documentation update
-    
+
+ * Build everywhere, basic test
+
  * Send blurb to desai for 0.8.3 announcement:
    * daemontools & ostiary stuff
    * encap support for Solaris (sparc and x86)
    * Binary epkg archive at 
      http://www.pobox.com/users/dclark/mirror/bcfg2-encaps
 
- * Build everywhere, basic test
- 
+== For 0.8.4 ==
  * Big documentation update
-     
+
+ * Double-check all permissions, and make sure they are not effected by 
+   the environment's umask
+   
  * Handle removals nicely (preremove/postremove scripts)
    * Work towards full compliance with encap 2.1 spec
diff --git a/encap/VERSION b/encap/VERSION
index b63ba696b..b3e7b0fc6 100644
--- a/encap/VERSION
+++ b/encap/VERSION
@@ -1 +1 @@
-0.9
+.91
diff --git a/encap/src/encap-profiles/Makefile b/encap/src/encap-profiles/Makefile
index c79c729d6..f2c4d04b9 100644
--- a/encap/src/encap-profiles/Makefile
+++ b/encap/src/encap-profiles/Makefile
@@ -1,6 +1,6 @@
 # $Id$
 
-.PHONY : test log all install clean distclean uninstall encaps rename bcfg2only
+.PHONY : test log all install clean distclean uninstall encaps rename bcfg2only bcfg2bump
 .SUFFIXES : 
 .SUFFIXES : .ep .sh .installed .packaged .d
 
@@ -160,5 +160,32 @@ uninstall : distclean
 
 bcfg2only :
 	$(MAKE) -t; sleep 2; touch $(srcdir)/$(BCFG2).ep; $(MAKE)
+    
+bcfg2bump :
+	@if [ "$(NEWVERSION)x" != "x" ]; then NEWVERSION="$(NEWVERSION)"; fi && \
+	if [ "$(FORCE)x" != "x" ]; then FORCE="$(FORCE)"; fi && \
+	if [ "$${NEWVERSION}x" != "x" ]; then \
+		if [ "$${FORCE}x" != "yesmamx" ]; then \
+			printf "About to 'svn mv %s %s'\n" "$(BCFG2).ep" "$$NEWVERSION"; \
+			printf "\tand edit the later as appropriate.\n"; \
+			printf "Press 'return' to continue, or 'ctrl-c' to exit. "; \
+			read THROWAWAY; \
+		fi; \
+		svn mv $(BCFG2).ep $${NEWVERSION}; \
+		NVBASE="`printf "%s\n" "$${NEWVERSION}" | sed 's:\.ep::g'`"; \
+		sed s:$(BCFG2):$$NVBASE:g $${NEWVERSION} > $${NEWVERSION}.tmp; \
+		mv $${NEWVERSION}.tmp $${NEWVERSION}; \
+		printf "Changes to %s are:\n" "$${NEWVERSION}"; \
+		svn diff $${NEWVERSION}; \
+		if [ "$${FORCE}x" != "yesmamx" ]; then \
+			printf "'svn commit %s -m \"EncapPackages: Bumped bcfg2 .ep version to %s\"'? \n" "$${NEWVERSION}" "$${NEWVERSION}"; \
+			printf "Press 'return' to commit, or 'ctrl-c' to exit. "; \
+			read THROWAWAY; \
+		fi; \
+		svn commit $${NEWVERSION} -m "EncapPackages: Bumped bcfg2 .ep version to $${NVBASE}"; \
+	else \
+		printf "Set the NEWVERSION (and optionally FORCE) environment variables\n"; \
+		printf "Example: 'NEWVERSION=bcfg2-0.8.3.ep $(MAKE) bcfg2bump'\n"; \
+	fi
 
 include $(addsuffix .d,$(sources))
-- 
cgit v1.2.3-1-g7c22