aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-10 15:59:44 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-10 15:59:44 +0000
commit06aa0bc20f87b3134d09b05babcb13ba045acbed (patch)
tree3a4beab11bee4e1765977c5a2ab65e5694aecbb5
parent2e650b0eda2f7efe25d4f7d2f3494ded4a96ed6e (diff)
downloadpaludis-06aa0bc20f87b3134d09b05babcb13ba045acbed.tar.gz
paludis-06aa0bc20f87b3134d09b05babcb13ba045acbed.tar.xz
Don't use sync points any more
-rw-r--r--paludis/resolver/Makefile.am11
-rw-r--r--paludis/resolver/job.hh1
-rw-r--r--paludis/resolver/sync_point-fwd.hh34
-rw-r--r--paludis/resolver/sync_point.cc29
-rw-r--r--paludis/resolver/sync_point.hh30
-rw-r--r--paludis/resolver/sync_point.se15
6 files changed, 0 insertions, 120 deletions
diff --git a/paludis/resolver/Makefile.am b/paludis/resolver/Makefile.am
index 7b097a0..72bafeb 100644
--- a/paludis/resolver/Makefile.am
+++ b/paludis/resolver/Makefile.am
@@ -5,7 +5,6 @@ DISTCLEANFILES = \
change_type-se.hh change_type-se.cc \
destination_types-se.hh destination_types-se.cc \
failure_kinds-se.hh failure_kinds-se.cc \
- sync_point-se.hh sync_point-se.cc \
use_existing-se.hh use_existing-se.cc
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
EXTRA_DIST = \
@@ -13,7 +12,6 @@ EXTRA_DIST = \
change_type-se.hh change_type-se.cc change_type.se \
destination_types-se.hh destination_types-se.cc destination_types.se \
failure_kinds-se.hh failure_kinds-se.cc failure_kinds.se \
- sync_point-se.hh sync_point-se.cc sync_point.se \
use_existing-se.hh use_existing-se.cc use_existing.se \
$(check_SCRIPTS)
BUILT_SOURCES = \
@@ -21,7 +19,6 @@ BUILT_SOURCES = \
change_type-se.hh change_type-se.cc \
destination_types-se.hh destination_types-se.cc \
failure_kinds-se.hh failure_kinds-se.cc \
- sync_point-se.hh sync_point-se.cc \
use_existing-se.hh use_existing-se.cc
noinst_HEADERS = \
@@ -50,7 +47,6 @@ noinst_HEADERS = \
sanitised_dependencies.hh sanitised_dependencies-fwd.hh \
spec_rewriter.hh spec_rewriter-fwd.hh \
suggest_restart.hh suggest_restart-fwd.hh \
- sync_point.hh sync_point-fwd.hh sync_point-se.hh \
unsuitable_candidates.hh unsuitable_candidates-fwd.hh \
use_existing.hh use_existing-fwd.hh use_existing-se.hh
@@ -79,7 +75,6 @@ libpaludisresolver_a_SOURCES = \
sanitised_dependencies.cc \
spec_rewriter.cc \
suggest_restart.cc \
- sync_point.cc \
unsuitable_candidates.cc \
use_existing.cc
@@ -228,12 +223,6 @@ use_existing-se.hh : use_existing.se $(top_srcdir)/misc/make_se.bash
use_existing-se.cc : use_existing.se $(top_srcdir)/misc/make_se.bash
if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/use_existing.se > $@ ; then rm -f $@ ; exit 1 ; fi
-sync_point-se.hh : sync_point.se $(top_srcdir)/misc/make_se.bash
- if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/sync_point.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-sync_point-se.cc : sync_point.se $(top_srcdir)/misc/make_se.bash
- if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/sync_point.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
failure_kinds-se.hh : failure_kinds.se $(top_srcdir)/misc/make_se.bash
if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/failure_kinds.se > $@ ; then rm -f $@ ; exit 1 ; fi
diff --git a/paludis/resolver/job.hh b/paludis/resolver/job.hh
index a8fc79c..bb3d2f0 100644
--- a/paludis/resolver/job.hh
+++ b/paludis/resolver/job.hh
@@ -25,7 +25,6 @@
#include <paludis/resolver/arrow-fwd.hh>
#include <paludis/resolver/resolution-fwd.hh>
#include <paludis/resolver/decision-fwd.hh>
-#include <paludis/resolver/sync_point-fwd.hh>
#include <paludis/resolver/required_confirmations-fwd.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/simple_visitor.hh>
diff --git a/paludis/resolver/sync_point-fwd.hh b/paludis/resolver/sync_point-fwd.hh
deleted file mode 100644
index 54187dd..0000000
--- a/paludis/resolver/sync_point-fwd.hh
+++ /dev/null
@@ -1,34 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2009 Ciaran McCreesh
- *
- * This file is part of the Paludis package manager. Paludis is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef PALUDIS_GUARD_PALUDIS_RESOLVER_SYNC_POINT_FWD_HH
-#define PALUDIS_GUARD_PALUDIS_RESOLVER_SYNC_POINT_FWD_HH 1
-
-#include <paludis/util/attributes.hh>
-#include <iosfwd>
-
-namespace paludis
-{
- namespace resolver
- {
-#include <paludis/resolver/sync_point-se.hh>
- }
-}
-
-#endif
diff --git a/paludis/resolver/sync_point.cc b/paludis/resolver/sync_point.cc
deleted file mode 100644
index 2e342d8..0000000
--- a/paludis/resolver/sync_point.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2009 Ciaran McCreesh
- *
- * This file is part of the Paludis package manager. Paludis is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include <paludis/resolver/sync_point.hh>
-#include <paludis/util/exception.hh>
-#include <paludis/util/stringify.hh>
-#include <ostream>
-
-using namespace paludis;
-using namespace paludis::resolver;
-
-#include <paludis/resolver/sync_point-se.cc>
-
diff --git a/paludis/resolver/sync_point.hh b/paludis/resolver/sync_point.hh
deleted file mode 100644
index ddccb95..0000000
--- a/paludis/resolver/sync_point.hh
+++ /dev/null
@@ -1,30 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2009 Ciaran McCreesh
- *
- * This file is part of the Paludis package manager. Paludis is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef PALUDIS_GUARD_PALUDIS_RESOLVER_SYNC_POINT_HH
-#define PALUDIS_GUARD_PALUDIS_RESOLVER_SYNC_POINT_HH 1
-
-#include <paludis/resolver/sync_point-fwd.hh>
-
-namespace paludis
-{
-
-}
-
-#endif
diff --git a/paludis/resolver/sync_point.se b/paludis/resolver/sync_point.se
deleted file mode 100644
index baef962..0000000
--- a/paludis/resolver/sync_point.se
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et ft=sh :
-
-make_enum_SyncPoint()
-{
- prefix sp
- namespace paludis::resolver
-
- key sp_done_pretends "Done pretends"
- key sp_done_installs "Done installs"
-
- want_destringify
-}
-
-