Bump version number. Add SVN version to version number. Convert tagstable and tagrele...

git-svn-id: http://svn.voria.com/code@139 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/ETL/trunk/ETL.pc.in b/ETL/trunk/ETL.pc.in
index 8b8dcd4..9983444 100644 (file)
--- a/ETL/trunk/ETL.pc.in
+++ b/ETL/trunk/ETL.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: ETL
 Description: Voria Extended Class and Template Library
 Requires:
-Version: 0.04.07
+Version: 0.04.08-138
 Libs: @LIBS@
 Cflags: -I${includedir}

diff --git a/ETL/trunk/Makefile.am b/ETL/trunk/Makefile.am
index 6f67533..321c061 100644 (file)
--- a/ETL/trunk/Makefile.am
+++ b/ETL/trunk/Makefile.am
@@ -16,6 +16,8 @@ aclocaldir = $(prefix)/share/aclocal
 EXTRA_DIST=bootstrap config/subs.m4 config/depcomp config/cxx_macros.m4 ETL.pbproj/project.pbxproj ETL.pbproj/etl_profile.h ETL.pbproj/frameworkfix.cpp @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg ETL-config.in config/ETL.m4 config/doxygen.cfg.in doxygen.cfg config/pkgconfig.pc.in @PACKAGE_TARNAME@.pc.in
 
 CVS=cvs
+SVN=svn
+TAG=@PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
 
 GREP=grep
 
@@ -36,10 +38,14 @@ stats:
        -@echo 
 
 tagstable:
-       $(CVS) tag -F stable
+       -$(SVN) delete $(SVN_REPOSITORY)/tags/stable -m "Stabe Tag: Removing old tag"
+       $(SVN) mkdir $(SVN_REPOSITORY)/tags/stable -m "Stable Tag: Creating new directory"
+       $(SVN) copy $(top_srcdir) $(SVN_REPOSITORY)/tags/stable -m "Stable Tag: Copying everyhting over"
 
 tagrelease:
-       $(CVS) tag -F $(PACKAGE_TARNAME)_$(VERSION_MAJ)_$(VERSION_MIN)_$(VERSION_REV)
+       $(SVN) mkdir $(SVN_REPOSITORY)/tags/$(TAG) -m "Release Tag: Making directory"
+       $(SVN) copy $(top_srcdir) $(SVN_REPOSITORY)/tags/$(TAG) -m "Release $(TAG)"
+
 
 listfixmes:
        -@echo

diff --git a/ETL/trunk/bootstrap b/ETL/trunk/bootstrap
index b843286..e62cbbf 100755 (executable)
--- a/ETL/trunk/bootstrap
+++ b/ETL/trunk/bootstrap
@@ -35,6 +35,7 @@ s/@VERSION_MAJ@/$VERSION_MAJ/g;
 s/@VERSION_MIN@/$VERSION_MIN/g;
 s/@VERSION_REV@/$VERSION_REV/g;
 s/@VERSION_REL@/$VERSION_REL/g;
+s'@SVN_REPOSITORY@'$SVN_REPOSITORY'g;
 s/@CFLAGS@//g;
 "
 

diff --git a/ETL/trunk/config/build.cfg b/ETL/trunk/config/build.cfg
index a9edf09..2a5a0c3 100644 (file)
--- a/ETL/trunk/config/build.cfg
+++ b/ETL/trunk/config/build.cfg
@@ -4,10 +4,17 @@ PACKAGE_BUGREPORT="darco@deepdarc.com"
 PACKAGE_TARNAME="ETL"
 VERSION_MAJ="0"
 VERSION_MIN="04"
-VERSION_REV="07"
-VERSION_REL="1"
+VERSION_REV="08"
+[ -d ".svn" ] && VERSION_REL=`svn info | grep Revision | sed "s/.* \([0123456789]*\)/\1/"`
+SVN_REPOSITORY="https://svn.voria.com/code/ETL"
 
-VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_REV
+[ -d CVS ] && VERSION_REL="CVS"
+
+if [ x$VERSION_REL = "x" ] ; then {
+       VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_REV
+} else {
+       VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_REV-$VERSION_REL
+} ; fi
 
 PACKAGE_VERSION=$VERSION
 PACKAGE=$PACKAGE_TARNAME

diff --git a/ETL/trunk/config/configure.ac b/ETL/trunk/config/configure.ac
index 7f18434..bd3af72 100644 (file)
--- a/ETL/trunk/config/configure.ac
+++ b/ETL/trunk/config/configure.ac
@@ -19,6 +19,9 @@ AM_MAINTAINER_MODE
 
 debug="no"
 
+SVN_REPOSITORY=@SVN_REPOSITORY@
+AC_SUBST(SVN_REPOSITORY)
+
 # -- A R G U M E N T S ----------------------------------------
 
 

diff --git a/ETL/trunk/doxygen.cfg b/ETL/trunk/doxygen.cfg
index 1fea9e6..4e43d9f 100644 (file)
--- a/ETL/trunk/doxygen.cfg
+++ b/ETL/trunk/doxygen.cfg
@@ -23,7 +23,7 @@ PROJECT_NAME           = ETL
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.04.07
+PROJECT_NUMBER         = 0.04.08-138
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put.