aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-13 15:20:41 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-13 20:08:58 +0100
commitb8e139c487eb9e5640e0a6ff106b9ea98de59851 (patch)
tree36b9ae0bd0c429811f28e09b9f67e3758ba4d532
parent0a1612f46f1e9cc5f0f5b39e642def22a04c5a85 (diff)
downloadpaludis-b8e139c487eb9e5640e0a6ff106b9ea98de59851.tar.gz
paludis-b8e139c487eb9e5640e0a6ff106b9ea98de59851.tar.xz
UninstallList, ReportTask legacy
-rw-r--r--.gitignore2
-rw-r--r--paludis/files.m42
-rw-r--r--paludis/legacy/Makefile.am34
-rw-r--r--paludis/legacy/report_task.cc (renamed from paludis/report_task.cc)4
-rw-r--r--paludis/legacy/report_task.hh (renamed from paludis/report_task.hh)0
-rw-r--r--paludis/legacy/uninstall_list.cc (renamed from paludis/uninstall_list.cc)4
-rw-r--r--paludis/legacy/uninstall_list.hh (renamed from paludis/uninstall_list.hh)2
-rw-r--r--paludis/legacy/uninstall_list.se (renamed from paludis/uninstall_list.se)0
-rw-r--r--paludis/legacy/uninstall_list_TEST.cc (renamed from paludis/uninstall_list_TEST.cc)2
-rw-r--r--paludis/legacy/uninstall_task.cc2
-rw-r--r--src/clients/paludis/report.cc2
-rw-r--r--src/clients/paludis/uninstall.cc2
12 files changed, 40 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore
index 8f8481b..5395239 100644
--- a/.gitignore
+++ b/.gitignore
@@ -255,6 +255,7 @@ paludis-*.*.*.tar.bz2
/paludis/legacy/dep_list_TEST
/paludis/legacy/dep_list_TEST_blockers
/paludis/legacy/range_rewriter_TEST
+/paludis/legacy/uninstall_list_TEST
/paludis/name_TEST
/paludis/package_database_TEST
/paludis/paludis.hh
@@ -422,7 +423,6 @@ paludis-*.*.*.tar.bz2
/paludis/syncers/dotar+http
/paludis/syncers/dotar+https
/paludis/tar_merger_TEST
-/paludis/uninstall_list_TEST
/paludis/user_dep_spec_TEST
/paludis/util/Makefile.am
/paludis/util/action_queue_TEST
diff --git a/paludis/files.m4 b/paludis/files.m4
index 58d8c75..16713e5 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -80,7 +80,6 @@ add(`package_id', `hh', `cc', `fwd', `se')
add(`paludis', `hh')
add(`paludislike_options_conf', `hh', `cc', `fwd')
add(`partially_made_package_dep_spec', `hh', `cc', `fwd', `se')
-add(`report_task', `hh', `cc')
add(`repository', `hh', `fwd', `cc')
add(`repository_factory', `hh', `fwd', `cc')
add(`repository_name_cache', `hh', `cc', `test', `testscript')
@@ -98,7 +97,6 @@ add(`syncer', `hh', `cc')
add(`tar_merger', `hh', `cc', `fwd', `test', `testscript', `se')
add(`tee_output_manager', `hh', `cc', `fwd')
add(`unchoices_key', `hh', `cc', `fwd')
-add(`uninstall_list', `hh', `cc', `se', `test')
add(`unmerger', `hh', `cc')
add(`user_dep_spec', `hh', `cc', `se', `fwd', `test')
add(`version_operator', `hh', `cc', `fwd', `se', `test')
diff --git a/paludis/legacy/Makefile.am b/paludis/legacy/Makefile.am
index 3d4497d..37401fd 100644
--- a/paludis/legacy/Makefile.am
+++ b/paludis/legacy/Makefile.am
@@ -2,17 +2,20 @@ include $(top_srcdir)/misc/common-makefile.am
DISTCLEANFILES = \
dep_list_options-se.hh dep_list_options-se.cc \
- install_task-se.hh install_task-se.cc
+ install_task-se.hh install_task-se.cc \
+ uninstall_task-se.hh uninstall_task-se.cc
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
EXTRA_DIST = \
dep_list_options-se.hh dep_list_options-se.cc dep_list_options.se \
- install_task-se.hh install_task-se.cc install_task.se
+ install_task-se.hh install_task-se.cc install_task.se \
+ uninstall_task-se.hh uninstall_task-se.cc uninstall_task.se
BUILT_SOURCES = \
dep_list_options-se.hh dep_list_options-se.cc \
- install_task-se.hh install_task-se.cc
+ install_task-se.hh install_task-se.cc \
+ uninstall_list-se.hh uninstall_list-se.cc
paludis_legacy_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/legacy
@@ -25,9 +28,11 @@ paludis_legacy_include_HEADERS = \
install_task.hh install_task-se.hh \
query_visitor.hh \
range_rewriter.hh \
+ report_task.hh \
show_suggest_visitor.hh \
sync_task.hh \
tasks_exceptions.hh \
+ uninstall_list.hh uninstall_list-se.hh \
uninstall_task.hh
libpaludislegacy_@PALUDIS_PC_SLOT@_la_SOURCES = \
@@ -39,9 +44,11 @@ libpaludislegacy_@PALUDIS_PC_SLOT@_la_SOURCES = \
install_task.cc \
query_visitor.cc \
range_rewriter.cc \
+ report_task.cc \
show_suggest_visitor.cc \
sync_task.cc \
tasks_exceptions.cc \
+ uninstall_list.cc \
uninstall_task.cc
libpaludislegacy_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
@@ -55,7 +62,8 @@ lib_LTLIBRARIES = libpaludislegacy_@PALUDIS_PC_SLOT@.la
TESTS = \
dep_list_TEST \
dep_list_TEST_blockers \
- range_rewriter_TEST
+ range_rewriter_TEST \
+ uninstall_list_TEST
check_PROGRAMS = $(TESTS)
@@ -95,6 +103,18 @@ range_rewriter_TEST_LDADD = \
range_rewriter_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+uninstall_list_TEST_SOURCES = uninstall_list_TEST.cc
+
+uninstall_list_TEST_LDADD = \
+ $(top_builddir)/paludis/util/test_extras.o \
+ $(top_builddir)/test/libtest.a \
+ $(top_builddir)/paludis/legacy/libpaludislegacy_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(DYNAMIC_LD_LIBS)
+
+uninstall_list_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
test_ldadd = \
$(top_builddir)/paludis/util/test_extras.o \
libpaludislegacy_@PALUDIS_PC_SLOT@.la \
@@ -107,6 +127,12 @@ dep_list_options-se.hh : dep_list_options.se $(top_srcdir)/misc/make_se.bash
dep_list_options-se.cc : dep_list_options.se $(top_srcdir)/misc/make_se.bash
if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/dep_list_options.se > $@ ; then rm -f $@ ; exit 1 ; fi
+uninstall_list-se.hh : uninstall_list.se $(top_srcdir)/misc/make_se.bash
+ if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/uninstall_list.se > $@ ; then rm -f $@ ; exit 1 ; fi
+
+uninstall_list-se.cc : uninstall_list.se $(top_srcdir)/misc/make_se.bash
+ if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/uninstall_list.se > $@ ; then rm -f $@ ; exit 1 ; fi
+
install_task-se.hh : install_task.se $(top_srcdir)/misc/make_se.bash
if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/install_task.se > $@ ; then rm -f $@ ; exit 1 ; fi
diff --git a/paludis/report_task.cc b/paludis/legacy/report_task.cc
index 22abd8a..4924b55 100644
--- a/paludis/report_task.cc
+++ b/paludis/legacy/report_task.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/report_task.hh>
+#include <paludis/legacy/report_task.hh>
+#include <paludis/legacy/uninstall_list.hh>
#include <paludis/util/log.hh>
-#include <paludis/uninstall_list.hh>
#include <paludis/environment.hh>
#include <paludis/metadata_key.hh>
#include <paludis/dep_tag.hh>
diff --git a/paludis/report_task.hh b/paludis/legacy/report_task.hh
index 20ba664..20ba664 100644
--- a/paludis/report_task.hh
+++ b/paludis/legacy/report_task.hh
diff --git a/paludis/uninstall_list.cc b/paludis/legacy/uninstall_list.cc
index 8736854..c4a0315 100644
--- a/paludis/uninstall_list.cc
+++ b/paludis/legacy/uninstall_list.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/uninstall_list.hh>
+#include <paludis/legacy/uninstall_list.hh>
#include <paludis/environment.hh>
#include <paludis/util/join.hh>
#include <paludis/util/log.hh>
@@ -52,7 +52,7 @@
using namespace paludis;
-#include <paludis/uninstall_list-se.cc>
+#include <paludis/legacy/uninstall_list-se.cc>
typedef std::unordered_map<
std::shared_ptr<const PackageID>,
diff --git a/paludis/uninstall_list.hh b/paludis/legacy/uninstall_list.hh
index fbb959f..281b0a8 100644
--- a/paludis/uninstall_list.hh
+++ b/paludis/legacy/uninstall_list.hh
@@ -38,7 +38,7 @@
namespace paludis
{
-#include <paludis/uninstall_list-se.hh>
+#include <paludis/legacy/uninstall_list-se.hh>
namespace n
{
diff --git a/paludis/uninstall_list.se b/paludis/legacy/uninstall_list.se
index 6903fbf..6903fbf 100644
--- a/paludis/uninstall_list.se
+++ b/paludis/legacy/uninstall_list.se
diff --git a/paludis/uninstall_list_TEST.cc b/paludis/legacy/uninstall_list_TEST.cc
index 6e3d5bf..04481d8 100644
--- a/paludis/uninstall_list_TEST.cc
+++ b/paludis/legacy/uninstall_list_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/uninstall_list.hh>
+#include <paludis/legacy/uninstall_list.hh>
#include <paludis/repositories/fake/fake_repository.hh>
#include <paludis/repositories/fake/fake_installed_repository.hh>
#include <paludis/repositories/fake/fake_package_id.hh>
diff --git a/paludis/legacy/uninstall_task.cc b/paludis/legacy/uninstall_task.cc
index 148bd4f..6523716 100644
--- a/paludis/legacy/uninstall_task.cc
+++ b/paludis/legacy/uninstall_task.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/legacy/uninstall_task.hh>
+#include <paludis/legacy/uninstall_list.hh>
#include <paludis/environment.hh>
#include <paludis/action.hh>
-#include <paludis/uninstall_list.hh>
#include <paludis/dep_spec_flattener.hh>
#include <paludis/legacy/tasks_exceptions.hh>
#include <paludis/user_dep_spec.hh>
diff --git a/src/clients/paludis/report.cc b/src/clients/paludis/report.cc
index 5bc73a5..583dd90 100644
--- a/src/clients/paludis/report.cc
+++ b/src/clients/paludis/report.cc
@@ -20,7 +20,7 @@
#include "report.hh"
#include <src/output/colour.hh>
#include <src/output/mask_displayer.hh>
-#include <paludis/report_task.hh>
+#include <paludis/legacy/report_task.hh>
#include <paludis/mask.hh>
#include <paludis/dep_tag.hh>
#include <paludis/package_id.hh>
diff --git a/src/clients/paludis/uninstall.cc b/src/clients/paludis/uninstall.cc
index 45fa168..cbade32 100644
--- a/src/clients/paludis/uninstall.cc
+++ b/src/clients/paludis/uninstall.cc
@@ -22,8 +22,8 @@
#include <paludis/legacy/uninstall_task.hh>
#include <paludis/legacy/tasks_exceptions.hh>
+#include <paludis/legacy/uninstall_list.hh>
#include <paludis/util/set.hh>
-#include <paludis/uninstall_list.hh>
#include <paludis/package_database.hh>
#include <paludis/action.hh>
#include <paludis/fuzzy_finder.hh>