A few more updates to how the whole subversion thing works

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

diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am
index 8672766..61d6446 100644 (file)
--- a/synfig-core/trunk/Makefile.am
+++ b/synfig-core/trunk/Makefile.am
@@ -17,16 +17,24 @@ bin_SCRIPTS=synfig-config
 EXTRA_DIST=TODO config/subs.m4 bootstrap config/package doc/hw-gfx-mapping.txt win32build.sh macosxbuild.sh win32inst.nsi.in COPYING config/depcomp config/synfig.m4 config/cxx_macros.m4 synfig.pbproj/config.h synfig.pbproj/project.pbxproj @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg synfig.kdevprj synfig-config.in config/ETL.m4 config/doxygen.cfg.in doxygen.cfg config/pkgconfig.pc.in config/pkgconfig.m4 config/libxml++.m4 @PACKAGE_TARNAME@.pc.in pkg-info/macosx/core-resources/ReadMe.txt pkg-info/macosx/core-resources/Welcome.txt pkg-info/macosx/core-resources/install.sh
 
 CVS=cvs
-SVN=svn
-SVN_REPOSITORY=https://svn.voria.com/code/synfig-core
 GREP=grep
-TAG=@PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
 PRINTF=printf
-
 SH=sh
-
 DOXYGEN=doxygen
 
+SVN=svn
+TAG=@PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
+
+
+tagstable:
+       -$(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:
+       $(SVN) mkdir $(SVN_REPOSITORY)/tags/$(TAG) -m "Release Tag: Making directory"
+       $(SVN) copy $(top_srcdir) $(SVN_REPOSITORY)/tags/$(TAG) -m "Release $(TAG)"
+
 stats:
        -@echo
        -@echo  -- Stats
@@ -43,14 +51,6 @@ stats:
 #tagrelease:
 #      $(CVS) tag -F @PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
 
-tagstable:
-       -$(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 . $(SVN_REPOSITORY)/tags/stable -m "Stable Tag: Copying everyhting over"
-
-tagrelease:
-       $(SVN) mkdir $(SVN_REPOSITORY)/tags/$(TAG) -m "Release Tag: Making directory"
-       $(SVN) copy . $(SVN_REPOSITORY)/tags/$(TAG) -m "Release $(TAG)"
 
 listfixmes:
        -@echo

diff --git a/synfig-core/trunk/bootstrap b/synfig-core/trunk/bootstrap
index 3d7759b..de408c8 100755 (executable)
--- a/synfig-core/trunk/bootstrap
+++ b/synfig-core/trunk/bootstrap
@@ -37,6 +37,7 @@ s/@PACKAGE_NAME@/$PACKAGE_NAME/g;
 s/@PACKAGE_BUGREPORT@/$PACKAGE_BUGREPORT/g;
 s/@PACKAGE_TARNAME@/$PACKAGE_TARNAME/g;
 s/@PACKAGE_VERSION@/$PACKAGE_VERSION/g;
+s|@SVN_REPOSITORY@|$SVN_REPOSITORY|g;
 s/@VERSION@/$VERSION/g;
 s/@API_VERSION@/$API_VERSION/g;
 s/@VERSION_MAJ@/$VERSION_MAJ/g;

diff --git a/synfig-core/trunk/config/build.cfg b/synfig-core/trunk/config/build.cfg
index 128d14a..7425218 100644 (file)
--- a/synfig-core/trunk/config/build.cfg
+++ b/synfig-core/trunk/config/build.cfg
@@ -6,6 +6,7 @@ VERSION_MAJ="0"
 VERSION_MIN="61"
 VERSION_REV="03"
 [ -d ".svn" ] && VERSION_REL=`svn info | grep Revision | sed "s/.* \([0123456789]*\)/\1/"`
+SVN_REPOSITORY="https://svn.voria.com/code/synfig-core"
 
 [ -d CVS ] && VERSION_REL="CVS"
 

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index 3dda9b5..cc4efcf 100644 (file)
--- a/synfig-core/trunk/config/configure.ac
+++ b/synfig-core/trunk/config/configure.ac
@@ -29,6 +29,8 @@ AC_DEFINE(LT_SCOPE,[extern],[LibLTDL is linked staticly])
 
 # -- V A R I A B L E S ----------------------------------------
 
+SVN_REPOSITORY=@SVN_REPOSITORY@
+AC_SUBST(SVN_REPOSITORY)
 
 # -- P R O G R A M S ------------------------------------------
 

diff --git a/synfig-core/trunk/examples/Makefile.in b/synfig-core/trunk/examples/Makefile.in
index 408d6bc..b96ef0b 100644 (file)
--- a/synfig-core/trunk/examples/Makefile.in
+++ b/synfig-core/trunk/examples/Makefile.in
@@ -139,6 +139,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SVN_REPOSITORY = @SVN_REPOSITORY@
 SYNFIGLIB_DIR = @SYNFIGLIB_DIR@
 SYNFIG_CFLAGS = @SYNFIG_CFLAGS@
 SYNFIG_LIBS = @SYNFIG_LIBS@