Updates to subversion integration, and adding some files I forgot to add earlier

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

diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am
index d0e25d0..db75621 100644 (file)
--- a/synfig-studio/trunk/Makefile.am
+++ b/synfig-studio/trunk/Makefile.am
@@ -30,6 +30,20 @@ GREP=grep
 PRINTF=printf
 SH=sh
 DOXYGEN=doxygen
+#SVN_REPOSITORY=@SVN_REPOSITORY@
+
+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
@@ -41,11 +55,11 @@ stats:
        -@du -hcs $(shell find $(top_srcdir)/src -name '*.[ch]*' | $(GREP) -v libavcodec) | $(GREP) total
        -@echo 
 
-tagstable:
-       $(CVS) tag -F stable
+#tagstable:
+#      $(CVS) tag -F stable
 
-tagrelease:
-       $(CVS) tag -F @PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
+#tagrelease:
+#      $(CVS) tag -F @PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
 
 listfixmes:
        -@echo

diff --git a/synfig-studio/trunk/TODO b/synfig-studio/trunk/TODO
new file mode 100644 (file)
index 0000000..16aa4cb
--- /dev/null
+++ b/synfig-studio/trunk/TODO
@@ -0,0 +1,20 @@
+
+## General ##
+
+* Re-implement draw tool
+* Re-implement WorkArea class to use OpenGL
+* Migrate toward extensible plug-in architecture
+* Migrate toward scripted architecture
+* Ability for "Auto Recover" feature to recover history
+* Ability to edit curves in the curves tab.
+* Subversion integration
+* Integrated error console tab
+* Clean up crazy confusing console output
+
+## Wishful Thinking ##
+
+* Visual conflict resolution for version control merging conflicts
+
+## Long Term ##
+
+* Make majority of user-interface components controlled by scripts

diff --git a/synfig-studio/trunk/bootstrap b/synfig-studio/trunk/bootstrap
index 83e9f41..579e7be 100755 (executable)
--- a/synfig-studio/trunk/bootstrap
+++ b/synfig-studio/trunk/bootstrap
@@ -24,6 +24,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/@VERSION_MAJ@/$VERSION_MAJ/g;
 s/@VERSION_MIN@/$VERSION_MIN/g;
@@ -230,6 +231,18 @@ distcheck:
 dist:
        ./configure --enable-maintainer-mode
        make dist
+
+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 . $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)\"
+
 " ) > Makefile
 
 echo $BOOTSTRAP_NAME: Complete.

diff --git a/synfig-studio/trunk/config/build.cfg b/synfig-studio/trunk/config/build.cfg
index 50cd5df..3fcf5e5 100644 (file)
--- a/synfig-studio/trunk/config/build.cfg
+++ b/synfig-studio/trunk/config/build.cfg
@@ -4,8 +4,9 @@ PACKAGE_BUGREPORT="darco@voria.com"
 PACKAGE_TARNAME=synfigstudio
 VERSION_MAJ="0"
 VERSION_MIN="61"
-VERSION_REV="02"
+VERSION_REV="03"
 VERSION_REL=`svn info | grep Revision | sed "s/.* \([0123456789]*\)/\1/"`
+SVN_REPOSITORY="https://svn.voria.com/code/synfig-studio"
 
 [ -d CVS ] && VERSION_REL="CVS"
 

diff --git a/synfig-studio/trunk/config/configure.ac b/synfig-studio/trunk/config/configure.ac
index 11e9f28..02187fd 100755 (executable)
--- a/synfig-studio/trunk/config/configure.ac
+++ b/synfig-studio/trunk/config/configure.ac
@@ -18,6 +18,8 @@ AM_MAINTAINER_MODE
 
 # -- V A R I A B L E S ----------------------------------------
 
+SVN_REPOSITORY=@SVN_REPOSITORY@
+
 # -- P R O G R A M S ------------------------------------------
 
 AC_PROG_CC
@@ -135,6 +137,7 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(LDFLAGS)
+AC_SUBST(SVN_REPOSITORY)
 
 VERSION_MAJ=@VERSION_MAJ@
 VERSION_MIN=@VERSION_MIN@

diff --git a/synfig-studio/trunk/pkg-info/macosx/studio-resources/InstallationCheck b/synfig-studio/trunk/pkg-info/macosx/studio-resources/InstallationCheck
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/synfig-studio/trunk/pkg-info/macosx/studio-resources/synfig-studio.post_install b/synfig-studio/trunk/pkg-info/macosx/studio-resources/synfig-studio.post_install
new file mode 100755 (executable)
index 0000000..42e2b02
--- /dev/null
+++ b/synfig-studio/trunk/pkg-info/macosx/studio-resources/synfig-studio.post_install
@@ -0,0 +1,61 @@
+#!/bin/sh
+# finish up the installation
+# this script should be executed using the sudo command
+# this file is copied to synfig-devel.post_install and synfig-devel.post_upgrade
+# inside the .pkg bundle
+LOGFILE="~/synfig-core_install.log"
+
+/usr/X11R6/bin/fc-cache
+/usr/X11R6/bin/fc-list
+
+exit 0
+
+
+umask 022
+
+RESOURCE_DIR=`dirname $0`
+PREFIX=/usr/local
+
+cd $RESOURCE_DIR
+
+echo "Creating synfig-config script"
+[ -d $PREFIX ] || mkdir $PREFIX
+[ -d $PREFIX/bin ] || mkdir $PREFIX/bin
+[ -d $PREFIX/include ] || mkdir $PREFIX/include
+[ -d $PREFIX/lib ] || mkdir $PREFIX/lib
+[ -d $PREFIX/sbin ] || mkdir $PREFIX/sbin
+
+echo "Cleaning up any previous installation"
+[ -d $PREFIX/include/synfig ] && rm -fr $PREFIX/include/synfig
+ln -s /Library/Frameworks/synfig.framework/Headers $PREFIX/include/synfig
+
+sed '
+s:@exec_prefix@:/usr/local:g;
+s:@prefix@:/usr/local:g;
+s:@bindir@:$exec_prefix/bin:g;
+s:@libdir@:$exec_prefix/lib:g;
+s:@includedir@:$prefix/include:g;
+s:@VERSION@:@_VERSION_@:g;
+s:@PACKAGE@:@_PACKAGE_@:g;
+s:@LIBS@::g;
+s:@VERSION@:@_VERSION_@:;
+s:@PACKAGE@:@_PACKAGE_@:;
+s:@CONFIG_LIBS@:-F/Library/Frameworks/synfig.framework:;
+s:@synfig_LIBS@:-F/Library/Frameworks/synfig.framework:;
+s:@CONFIG_CFLAGS@:-framework synfig:;
+' < $RESOURCE_DIR/synfig-config.in > $PREFIX/bin/synfig-config
+chmod 775 $PREFIX/bin/synfig-config
+
+echo "Precompiling Headers"
+#/usr/bin/c++ -precomp /Library/Frameworks/synfig.framework/Headers/synfig.h -o /Library/Frameworks/synfig.framework/Headers/synfig.p
+
+echo "Moving synfig tool"
+cp $RESOURCE_DIR/synfig $PREFIX/bin || exit 1
+
+echo "Done with shell script"
+
+
+exit 0
+
+
+

diff --git a/synfig-studio/trunk/pkg-info/macosx/studio-resources/synfig-studio.post_upgrade b/synfig-studio/trunk/pkg-info/macosx/studio-resources/synfig-studio.post_upgrade
new file mode 100755 (executable)
index 0000000..42e2b02
--- /dev/null
+++ b/synfig-studio/trunk/pkg-info/macosx/studio-resources/synfig-studio.post_upgrade
@@ -0,0 +1,61 @@
+#!/bin/sh
+# finish up the installation
+# this script should be executed using the sudo command
+# this file is copied to synfig-devel.post_install and synfig-devel.post_upgrade
+# inside the .pkg bundle
+LOGFILE="~/synfig-core_install.log"
+
+/usr/X11R6/bin/fc-cache
+/usr/X11R6/bin/fc-list
+
+exit 0
+
+
+umask 022
+
+RESOURCE_DIR=`dirname $0`
+PREFIX=/usr/local
+
+cd $RESOURCE_DIR
+
+echo "Creating synfig-config script"
+[ -d $PREFIX ] || mkdir $PREFIX
+[ -d $PREFIX/bin ] || mkdir $PREFIX/bin
+[ -d $PREFIX/include ] || mkdir $PREFIX/include
+[ -d $PREFIX/lib ] || mkdir $PREFIX/lib
+[ -d $PREFIX/sbin ] || mkdir $PREFIX/sbin
+
+echo "Cleaning up any previous installation"
+[ -d $PREFIX/include/synfig ] && rm -fr $PREFIX/include/synfig
+ln -s /Library/Frameworks/synfig.framework/Headers $PREFIX/include/synfig
+
+sed '
+s:@exec_prefix@:/usr/local:g;
+s:@prefix@:/usr/local:g;
+s:@bindir@:$exec_prefix/bin:g;
+s:@libdir@:$exec_prefix/lib:g;
+s:@includedir@:$prefix/include:g;
+s:@VERSION@:@_VERSION_@:g;
+s:@PACKAGE@:@_PACKAGE_@:g;
+s:@LIBS@::g;
+s:@VERSION@:@_VERSION_@:;
+s:@PACKAGE@:@_PACKAGE_@:;
+s:@CONFIG_LIBS@:-F/Library/Frameworks/synfig.framework:;
+s:@synfig_LIBS@:-F/Library/Frameworks/synfig.framework:;
+s:@CONFIG_CFLAGS@:-framework synfig:;
+' < $RESOURCE_DIR/synfig-config.in > $PREFIX/bin/synfig-config
+chmod 775 $PREFIX/bin/synfig-config
+
+echo "Precompiling Headers"
+#/usr/bin/c++ -precomp /Library/Frameworks/synfig.framework/Headers/synfig.h -o /Library/Frameworks/synfig.framework/Headers/synfig.p
+
+echo "Moving synfig tool"
+cp $RESOURCE_DIR/synfig $PREFIX/bin || exit 1
+
+echo "Done with shell script"
+
+
+exit 0
+
+
+

diff --git a/synfig-studio/trunk/pkg-info/macosx/studio-resources/upgrade.sh b/synfig-studio/trunk/pkg-info/macosx/studio-resources/upgrade.sh
new file mode 100755 (executable)
index 0000000..42e2b02
--- /dev/null
+++ b/synfig-studio/trunk/pkg-info/macosx/studio-resources/upgrade.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+# finish up the installation
+# this script should be executed using the sudo command
+# this file is copied to synfig-devel.post_install and synfig-devel.post_upgrade
+# inside the .pkg bundle
+LOGFILE="~/synfig-core_install.log"
+
+/usr/X11R6/bin/fc-cache
+/usr/X11R6/bin/fc-list
+
+exit 0
+
+
+umask 022
+
+RESOURCE_DIR=`dirname $0`
+PREFIX=/usr/local
+
+cd $RESOURCE_DIR
+
+echo "Creating synfig-config script"
+[ -d $PREFIX ] || mkdir $PREFIX
+[ -d $PREFIX/bin ] || mkdir $PREFIX/bin
+[ -d $PREFIX/include ] || mkdir $PREFIX/include
+[ -d $PREFIX/lib ] || mkdir $PREFIX/lib
+[ -d $PREFIX/sbin ] || mkdir $PREFIX/sbin
+
+echo "Cleaning up any previous installation"
+[ -d $PREFIX/include/synfig ] && rm -fr $PREFIX/include/synfig
+ln -s /Library/Frameworks/synfig.framework/Headers $PREFIX/include/synfig
+
+sed '
+s:@exec_prefix@:/usr/local:g;
+s:@prefix@:/usr/local:g;
+s:@bindir@:$exec_prefix/bin:g;
+s:@libdir@:$exec_prefix/lib:g;
+s:@includedir@:$prefix/include:g;
+s:@VERSION@:@_VERSION_@:g;
+s:@PACKAGE@:@_PACKAGE_@:g;
+s:@LIBS@::g;
+s:@VERSION@:@_VERSION_@:;
+s:@PACKAGE@:@_PACKAGE_@:;
+s:@CONFIG_LIBS@:-F/Library/Frameworks/synfig.framework:;
+s:@synfig_LIBS@:-F/Library/Frameworks/synfig.framework:;
+s:@CONFIG_CFLAGS@:-framework synfig:;
+' < $RESOURCE_DIR/synfig-config.in > $PREFIX/bin/synfig-config
+chmod 775 $PREFIX/bin/synfig-config
+
+echo "Precompiling Headers"
+#/usr/bin/c++ -precomp /Library/Frameworks/synfig.framework/Headers/synfig.h -o /Library/Frameworks/synfig.framework/Headers/synfig.p
+
+echo "Moving synfig tool"
+cp $RESOURCE_DIR/synfig $PREFIX/bin || exit 1
+
+echo "Done with shell script"
+
+
+exit 0
+
+
+