Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove some old CVS/SVN stuff #1791

Merged
merged 2 commits into from Oct 20, 2020
Merged

Remove some old CVS/SVN stuff #1791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e16a80
remove old SVN-related stuff
rodolforg Oct 19, 2020
26fde94
remove old hidden feature of CVS support for synfig document
rodolforg Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions ETL/Makefile.am
View file
Open in desktop
Expand Up @@ -52,9 +52,6 @@ EXTRA_DIST = \
ETL.pc.in


SVN=svn
TAG=@PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@

GREP=grep

PRINTF=printf
Expand Down
3 changes: 0 additions & 3 deletions ETL/configure.ac
View file
Open in desktop
Expand Up @@ -17,9 +17,6 @@ AM_MAINTAINER_MODE

debug="no"

SVN_REPOSITORY=https://synfig.svn.sourceforge.net/svnroot/synfig/ETL
AC_SUBST(SVN_REPOSITORY)

# -- A R G U M E N T S ----------------------------------------


Expand Down
3 changes: 0 additions & 3 deletions synfig-core/Makefile.am
View file
Open in desktop
Expand Up @@ -87,9 +87,6 @@ PRINTF=printf
SH=sh
DOXYGEN=doxygen

SVN=svn
TAG=@PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@

stats:
-@echo
-@echo -- Stats
Expand Down
38 changes: 2 additions & 36 deletions synfig-core/build_tools/autorevision.sh
View file
Open in desktop
Expand Up @@ -30,24 +30,6 @@ get_git_id(){
#REVISION="$REVISION"`cd "$1"; [[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "*"`
}

get_git_svn_id(){
export SCM=git-svn
export REVISION=`cd "$1"; git svn find-rev HEAD`
export COMPARE="$1/.git/"
if [ x = "x$REVISION" ] ; then
# The extra M at the end is for Modified
export REVISION=`cd "$1"; git svn find-rev \`git rev-list --max-count=1 --grep='git-svn-id: ' HEAD\``M
else
export REVISION="$REVISION"`cd "$1"; git diff --quiet HEAD || echo M`
fi
}

get_svn_id(){
export SCM=svn
export REVISION=`cd "$1"; svnversion || svn info | sed -n 's/^Revision: \(.*\)/\1/p'`
}


HEADER="$2/autorevision.h"
SCM=none

Expand All @@ -57,21 +39,9 @@ if [ ! -f "$HEADER" ] ; then
fi


# Extract the revision from SVN/git/etc
# Extract the revision from git
if git rev-parse --git-dir > /dev/null 2>&1 ; then
get_git_id "."
elif [ -d "$1/.git/svn" ] ; then
get_git_svn_id "$1"
elif [ -d "$1/../.git/svn" ] ; then
get_git_svn_id "$1/.."
elif [ -d "$1/../../.git/svn" ] ; then
get_git_svn_id "$1/../.."
elif [ -d "$1/.svn" ] ; then
COMPARE="$1/.svn"
get_svn_id "$1"
elif [ -d "$1/_svn" ] ; then
COMPARE="$1/_svn"
get_svn_id "$1"
fi


Expand All @@ -88,11 +58,7 @@ if [ "$COMPARE" -ot "$HEADER" ] ; then exit; fi
# Set the development version string
if [ x = "x$DEVEL_VERSION" ] ; then
if [ x != "x$REVISION" ] ; then
if [ $SCM = svn ] ; then
DEVEL_VERSION="SVN r$REVISION"
elif [ $SCM = git-svn ] ; then
DEVEL_VERSION="SVN r$REVISION (via git)"
elif [ $SCM = git ] ; then
if [ $SCM = git ] ; then
DEVEL_VERSION="Revision: ${REVISION}\\\\nBranch: ${BRANCH}\\\\nRevision ID: ${REVISION_ID}"
elif [ $SCM = manual ] ; then
DEVEL_VERSION="$REVISION (manually configured)"
Expand Down
6 changes: 3 additions & 3 deletions synfig-core/config/package
View file
Open in desktop
Expand Up @@ -217,12 +217,12 @@ if ( $?resDir ) then
pushd $resDir > /dev/null
# get lists of resources. We'll want to change
# permissions on just these things later.
set directoriesInResDir = `find . -type d | grep -v -e .svn -e CVS`
set filesInResDir = `find . -type f`
set directoriesInResDir = `find . -type d | grep -v -e .git`
set filesInResDir = `find . -type f | grep -v -e .git`
popd > /dev/null

# copy the resource directory contents into the package directory
foreach resFile (`cd $resDir && find . | grep -v -e .svn -e CVS`)
foreach resFile (`cd $resDir && find . | grep -v -e .git`)
cp -r "$resDir/$resFile" "$pkg/Contents/Resources"
end

Expand Down
7 changes: 2 additions & 5 deletions synfig-studio/Makefile.am
View file
Open in desktop
Expand Up @@ -89,9 +89,6 @@ PRINTF=printf
SH=sh
DOXYGEN=doxygen

SVN=svn
TAG=@PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@

ChangeLog:
../autobuild/git2cl > ChangeLog

Expand All @@ -109,14 +106,14 @@ listfixmes:
-@echo
-@echo -- List of pending FIXMEs
-@echo
-@$(GREP) FIXME -n `shell find $(top_srcdir) -name '*.[ch]*' | grep -v svn`
-@$(GREP) FIXME -n `shell find $(top_srcdir) -name '*.[ch]*' | grep -v .git`
-@echo

listhacks:
-@echo
-@echo -- List of pending HACKs
-@echo
-@$(GREP) HACK -n `shell find $(top_srcdir) -name '*.[ch]*' | grep -v svn`
-@$(GREP) HACK -n `shell find $(top_srcdir) -name '*.[ch]*' | grep -v .git`
-@echo

run: check
Expand Down
37 changes: 2 additions & 35 deletions synfig-studio/build_tools/autorevision.sh
View file
Open in desktop
Expand Up @@ -30,23 +30,6 @@ get_git_id(){
#REVISION="$REVISION"`cd "$1"; [[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "*"`
}

get_git_svn_id(){
export SCM=git-svn
export REVISION=`cd "$1"; git svn find-rev HEAD`
export COMPARE="$1/.git/"
if [ x = "x$REVISION" ] ; then
# The extra M at the end is for Modified
export REVISION=`cd "$1"; git svn find-rev \`git rev-list --max-count=1 --grep='git-svn-id: ' HEAD\``M
else
export REVISION="$REVISION"`cd "$1"; git diff --quiet HEAD || echo M`
fi
}

get_svn_id(){
export SCM=svn
export REVISION=`cd "$1"; svnversion || svn info | sed -n 's/^Revision: \(.*\)/\1/p'`
}


HEADER="$2/autorevision.h"
SCM=none
Expand All @@ -57,21 +40,9 @@ if [ ! -f "$HEADER" ] ; then
fi


# Extract the revision from SVN/git/etc
# Extract the revision from git
if git rev-parse --git-dir > /dev/null 2>&1 ; then
get_git_id "."
elif [ -d "$1/.git/svn" ] ; then
get_git_svn_id "$1"
elif [ -d "$1/../.git/svn" ] ; then
get_git_svn_id "$1/.."
elif [ -d "$1/../../.git/svn" ] ; then
get_git_svn_id "$1/../.."
elif [ -d "$1/.svn" ] ; then
COMPARE="$1/.svn"
get_svn_id "$1"
elif [ -d "$1/_svn" ] ; then
COMPARE="$1/_svn"
get_svn_id "$1"
fi


Expand All @@ -88,11 +59,7 @@ if [ "$COMPARE" -ot "$HEADER" ] ; then exit; fi
# Set the development version string
if [ x = "x$DEVEL_VERSION" ] ; then
if [ x != "x$REVISION" ] ; then
if [ $SCM = svn ] ; then
DEVEL_VERSION="SVN r$REVISION"
elif [ $SCM = git-svn ] ; then
DEVEL_VERSION="SVN r$REVISION (via git)"
elif [ $SCM = git ] ; then
if [ $SCM = git ] ; then
DEVEL_VERSION="Revision: ${REVISION}\\\\nBranch: ${BRANCH}\\\\nRevision ID: ${REVISION_ID}"
elif [ $SCM = manual ] ; then
DEVEL_VERSION="$REVISION (manually configured)"
Expand Down
6 changes: 3 additions & 3 deletions synfig-studio/config/package
View file
Open in desktop
Expand Up @@ -217,12 +217,12 @@ if ( $?resDir ) then
pushd $resDir > /dev/null
# get lists of resources. We'll want to change
# permissions on just these things later.
set directoriesInResDir = `find . -type d | grep -v -e svn -e CVS`
set filesInResDir = `find . -type f | grep -v -e svn -e CVS`
set directoriesInResDir = `find . -type d | grep -v -e .git`
set filesInResDir = `find . -type f | grep -v -e .git`
popd > /dev/null

# copy the resource directory contents into the package directory
foreach resFile (`cd $resDir && find . | grep -v svn`)
foreach resFile (`cd $resDir && find . | grep -v -e .git`)

cp -fr "$resDir/$resFile" "$pkg/Contents/Resources"
end
Expand Down
2 changes: 0 additions & 2 deletions synfig-studio/po/POTFILES.in
View file
Open in desktop
Expand Up @@ -503,8 +503,6 @@ src/synfigapp/blineconvert.cpp
src/synfigapp/blineconvert.h
src/synfigapp/canvasinterface.cpp
src/synfigapp/canvasinterface.h
src/synfigapp/cvs.cpp
src/synfigapp/cvs.h
src/synfigapp/editmode.h
src/synfigapp/inputdevice.cpp
src/synfigapp/inputdevice.h
Expand Down
18 changes: 0 additions & 18 deletions synfig-studio/src/gui/app.cpp
View file
Open in desktop
Expand Up @@ -3926,15 +3926,6 @@ App::open(std::string filename, /* std::string as, */ synfig::FileContainerZip::
throw (String)strprintf(_("Unable to create instance for \"%s\""),filename.c_str());

one_moment.hide();

if(instance->is_updated() && App::dialog_message_2b(
_("Newer version of this file available on the CVS repository!"),
_("repository. Would you like to update now? (It would probably be a good idea)"),
Gtk::MESSAGE_QUESTION,
_("Cancel"),
_("Update Anyway"))
)
instance->dialog_cvs_update();
}
}
catch(String &x)
Expand Down Expand Up @@ -4037,15 +4028,6 @@ App::open_from_temporary_filesystem(std::string temporary_filename)

one_moment.hide();

if(instance->is_updated() && App::dialog_message_2b(
_("Newer version of this file available on the CVS repository!"),
_("Would you like to update now? (It would probably be a good idea)"),
Gtk::MESSAGE_QUESTION,
_("Cancel"),
_("Update Anyway"))
)
instance->dialog_cvs_update();

// This file isn't saved! mark it as such
instance->inc_action_count();
}
Expand Down
23 changes: 0 additions & 23 deletions synfig-studio/src/gui/canvasview.cpp
View file
Open in desktop
Expand Up @@ -1472,20 +1472,6 @@ CanvasView::init_menus()
action_group->add( Gtk::Action::create("revert", Gtk::Stock::REVERT_TO_SAVED),
sigc::hide_return(sigc::mem_fun(*get_instance().get(), &Instance::safe_revert))
);
/*
action_group->add( Gtk::Action::create("cvs-add", Gtk::StockID("synfig-cvs_add")),
sigc::hide_return(sigc::mem_fun(*get_instance(), &Instance::dialog_cvs_add))
);
action_group->add( Gtk::Action::create("cvs-update", Gtk::StockID("synfig-cvs_update")),
sigc::hide_return(sigc::mem_fun(*get_instance(), &Instance::dialog_cvs_update))
);
action_group->add( Gtk::Action::create("cvs-revert", Gtk::StockID("synfig-cvs_revert")),
sigc::hide_return(sigc::mem_fun(*get_instance(), &Instance::dialog_cvs_revert))
);
action_group->add( Gtk::Action::create("cvs-commit", Gtk::StockID("synfig-cvs_commit")),
sigc::hide_return(sigc::mem_fun(*get_instance(), &Instance::dialog_cvs_commit))
);
*/
action_group->add( Gtk::Action::create("import", _("Import...")),
sigc::hide_return(sigc::mem_fun(*this, &CanvasView::image_import))
);
Expand Down Expand Up @@ -1952,15 +1938,6 @@ CanvasView::update_title()
: filename + " (" + canvas_title + ")";
if (modified) title = "*" + title;

if (get_instance()->Instance::in_repository()) {
title += " (CVS";
if (get_instance()->Instance::is_modified())
title += _("-MODIFIED");
if (get_instance()->Instance::is_updated())
title += _("-UPDATED");
title += ')';
}

set_local_name(title);
App::dock_manager->update_window_titles();
}
Expand Down
2 changes: 1 addition & 1 deletion synfig-studio/src/gui/dialogs/about.cpp
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@
#include <synfig/general.h>
#include <synfig/version.h>

// This is generated at make time from .svn or .git/svn or autorevision.conf
// This is generated at make time from .git or autorevision.conf
#include <autorevision.h>

#include "about.h"
Expand Down
5 changes: 0 additions & 5 deletions synfig-studio/src/gui/iconcontroller.cpp
View file
Open in desktop
Expand Up @@ -352,11 +352,6 @@ IconController::init_icons(const synfig::String& path_to_icons)
INIT_STOCK_ICON(utils_chain_link_off, "utils_chain_link_off_icon." IMAGE_EXT, _("Unlinked"));
INIT_STOCK_ICON(utils_timetrack_align, "utils_timetrack_align_icon." IMAGE_EXT, _("Utils Timetrack align"));

INIT_STOCK_ICON_CLONE(cvs_add, _("CVS Add"));
INIT_STOCK_ICON_CLONE(cvs_update, _("CVS Update"));
INIT_STOCK_ICON_CLONE(cvs_commit, _("CVS Commit"));
INIT_STOCK_ICON_CLONE(cvs_revert, _("CVS Revert"));

#undef INIT_STOCK_ICON
#undef INIT_STOCK_ICON_CLONE
#undef INIT_STOCK_ITEM
Expand Down