[Aptitude-svn-commit] r4245 - in branches/aptitude-0.3/aptitude: .
src src/generic src/generic/apt src/generic/problemresolver
src/generic/util src/vscreen
Daniel Burrows
dburrows at costa.debian.org
Sat Sep 24 20:54:03 UTC 2005
Author: dburrows
Date: Sat Sep 24 20:53:59 2005
New Revision: 4245
Added:
branches/aptitude-0.3/aptitude/src/generic/apt/
branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am
branches/aptitude-0.3/aptitude/src/generic/apt/README.hier
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/README.hier
branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/acqprogress.cc
branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/acqprogress.h
branches/aptitude-0.3/aptitude/src/generic/apt/apt.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/apt.cc
branches/aptitude-0.3/aptitude/src/generic/apt/apt.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/apt.h
branches/aptitude-0.3/aptitude/src/generic/apt/apt_undo_group.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/apt_undo_group.cc
branches/aptitude-0.3/aptitude/src/generic/apt/apt_undo_group.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/apt_undo_group.h
branches/aptitude-0.3/aptitude/src/generic/apt/aptcache.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
branches/aptitude-0.3/aptitude/src/generic/apt/aptcache.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/aptcache.h
branches/aptitude-0.3/aptitude/src/generic/apt/aptitude_resolver.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc
branches/aptitude-0.3/aptitude/src/generic/apt/aptitude_resolver.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
branches/aptitude-0.3/aptitude/src/generic/apt/aptitude_resolver_universe.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
branches/aptitude-0.3/aptitude/src/generic/apt/aptitude_resolver_universe.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.h
branches/aptitude-0.3/aptitude/src/generic/apt/aptitudepolicy.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/aptitudepolicy.cc
branches/aptitude-0.3/aptitude/src/generic/apt/aptitudepolicy.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/aptitudepolicy.h
branches/aptitude-0.3/aptitude/src/generic/apt/config_signal.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/config_signal.cc
branches/aptitude-0.3/aptitude/src/generic/apt/config_signal.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/config_signal.h
branches/aptitude-0.3/aptitude/src/generic/apt/infer_reason.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/infer_reason.cc
branches/aptitude-0.3/aptitude/src/generic/apt/infer_reason.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/infer_reason.h
branches/aptitude-0.3/aptitude/src/generic/apt/matchers.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/matchers.cc
branches/aptitude-0.3/aptitude/src/generic/apt/matchers.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/matchers.h
branches/aptitude-0.3/aptitude/src/generic/apt/pkg_acqfile.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/pkg_acqfile.cc
branches/aptitude-0.3/aptitude/src/generic/apt/pkg_acqfile.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/pkg_acqfile.h
branches/aptitude-0.3/aptitude/src/generic/apt/pkg_changelog.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/pkg_changelog.cc
branches/aptitude-0.3/aptitude/src/generic/apt/pkg_changelog.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/pkg_changelog.h
branches/aptitude-0.3/aptitude/src/generic/apt/pkg_hier.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/pkg_hier.cc
branches/aptitude-0.3/aptitude/src/generic/apt/pkg_hier.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/pkg_hier.h
branches/aptitude-0.3/aptitude/src/generic/apt/pkg_hier_dump.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/pkg_hier_dump.cc
branches/aptitude-0.3/aptitude/src/generic/apt/resolver_manager.cc
- copied unchanged from r4243, branches/aptitude-0.3/aptitude/src/generic/resolver_manager.cc
branches/aptitude-0.3/aptitude/src/generic/apt/resolver_manager.h
- copied unchanged from r4243, branches/aptitude-0.3/aptitude/src/generic/resolver_manager.h
branches/aptitude-0.3/aptitude/src/generic/apt/rev_dep_iterator.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/rev_dep_iterator.h
branches/aptitude-0.3/aptitude/src/generic/apt/tags.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/tags.cc
branches/aptitude-0.3/aptitude/src/generic/apt/tags.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/tags.h
branches/aptitude-0.3/aptitude/src/generic/apt/tasks.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/tasks.cc
branches/aptitude-0.3/aptitude/src/generic/apt/tasks.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/tasks.h
branches/aptitude-0.3/aptitude/src/generic/util/
branches/aptitude-0.3/aptitude/src/generic/util/Makefile.am
branches/aptitude-0.3/aptitude/src/generic/util/dense_setset.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/dense_setset.h
branches/aptitude-0.3/aptitude/src/generic/util/event_queue.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/event_queue.h
branches/aptitude-0.3/aptitude/src/generic/util/exception.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/exception.h
branches/aptitude-0.3/aptitude/src/generic/util/immset.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/immset.h
branches/aptitude-0.3/aptitude/src/generic/util/mut_fun.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/mut_fun.h
branches/aptitude-0.3/aptitude/src/generic/util/setset.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/setset.h
branches/aptitude-0.3/aptitude/src/generic/util/strhash.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/strhash.h
branches/aptitude-0.3/aptitude/src/generic/util/threads.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/threads.cc
branches/aptitude-0.3/aptitude/src/generic/util/threads.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/threads.h
branches/aptitude-0.3/aptitude/src/generic/util/undo.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/undo.cc
branches/aptitude-0.3/aptitude/src/generic/util/undo.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/undo.h
branches/aptitude-0.3/aptitude/src/generic/util/util.cc
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/util.cc
branches/aptitude-0.3/aptitude/src/generic/util/util.h
- copied unchanged from r4229, branches/aptitude-0.3/aptitude/src/generic/util.h
Removed:
branches/aptitude-0.3/aptitude/src/generic/README.hier
branches/aptitude-0.3/aptitude/src/generic/acqprogress.cc
branches/aptitude-0.3/aptitude/src/generic/acqprogress.h
branches/aptitude-0.3/aptitude/src/generic/apt.cc
branches/aptitude-0.3/aptitude/src/generic/apt.h
branches/aptitude-0.3/aptitude/src/generic/apt_undo_group.cc
branches/aptitude-0.3/aptitude/src/generic/apt_undo_group.h
branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
branches/aptitude-0.3/aptitude/src/generic/aptcache.h
branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc
branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.h
branches/aptitude-0.3/aptitude/src/generic/aptitudepolicy.cc
branches/aptitude-0.3/aptitude/src/generic/aptitudepolicy.h
branches/aptitude-0.3/aptitude/src/generic/config_signal.cc
branches/aptitude-0.3/aptitude/src/generic/config_signal.h
branches/aptitude-0.3/aptitude/src/generic/dense_setset.h
branches/aptitude-0.3/aptitude/src/generic/event_queue.h
branches/aptitude-0.3/aptitude/src/generic/exception.h
branches/aptitude-0.3/aptitude/src/generic/immset.h
branches/aptitude-0.3/aptitude/src/generic/infer_reason.cc
branches/aptitude-0.3/aptitude/src/generic/infer_reason.h
branches/aptitude-0.3/aptitude/src/generic/matchers.cc
branches/aptitude-0.3/aptitude/src/generic/matchers.h
branches/aptitude-0.3/aptitude/src/generic/mut_fun.h
branches/aptitude-0.3/aptitude/src/generic/pkg_acqfile.cc
branches/aptitude-0.3/aptitude/src/generic/pkg_acqfile.h
branches/aptitude-0.3/aptitude/src/generic/pkg_changelog.cc
branches/aptitude-0.3/aptitude/src/generic/pkg_changelog.h
branches/aptitude-0.3/aptitude/src/generic/pkg_hier.cc
branches/aptitude-0.3/aptitude/src/generic/pkg_hier.h
branches/aptitude-0.3/aptitude/src/generic/pkg_hier_dump.cc
branches/aptitude-0.3/aptitude/src/generic/resolver_manager.cc
branches/aptitude-0.3/aptitude/src/generic/resolver_manager.h
branches/aptitude-0.3/aptitude/src/generic/rev_dep_iterator.h
branches/aptitude-0.3/aptitude/src/generic/setset.h
branches/aptitude-0.3/aptitude/src/generic/strhash.h
branches/aptitude-0.3/aptitude/src/generic/tags.cc
branches/aptitude-0.3/aptitude/src/generic/tags.h
branches/aptitude-0.3/aptitude/src/generic/tasks.cc
branches/aptitude-0.3/aptitude/src/generic/tasks.h
branches/aptitude-0.3/aptitude/src/generic/threads.cc
branches/aptitude-0.3/aptitude/src/generic/threads.h
branches/aptitude-0.3/aptitude/src/generic/undo.cc
branches/aptitude-0.3/aptitude/src/generic/undo.h
branches/aptitude-0.3/aptitude/src/generic/util.cc
branches/aptitude-0.3/aptitude/src/generic/util.h
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/configure.ac
branches/aptitude-0.3/aptitude/src/Makefile.am
branches/aptitude-0.3/aptitude/src/generic/Makefile.am
branches/aptitude-0.3/aptitude/src/generic/problemresolver/Makefile.am
branches/aptitude-0.3/aptitude/src/vscreen/Makefile.am
Log:
Reorganize the source; it doesn't compile because some changes are needed and svn is
too stupid to handle moving and changing a file at the same time.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sat Sep 24 20:53:59 2005
@@ -1,5 +1,16 @@
2005-09-24 Daniel Burrows <dburrows at debian.org>
+ * Makefile.am, src/Makefile.am, src/vscreen/Makefile.am, src/generic/***:
+
+ Massively reorganize the generic/ subdirectory. The code is now
+ split into three parts: code which is fully generic (util/), the
+ problem resolver, and "generic" apt routines (apt/). Not only
+ is this more aesthetically pleasing, it also means that there
+ are no weird cross-directory dependencies (dependencies still
+ exist but they aren't weird any more: specifically, a straight
+ "make" will now always build code before its dependencies are
+ built.
+
* src/ui.cc:
Fix do_next_solution_enabled().
Modified: branches/aptitude-0.3/aptitude/configure.ac
==============================================================================
--- branches/aptitude-0.3/aptitude/configure.ac (original)
+++ branches/aptitude-0.3/aptitude/configure.ac Sat Sep 24 20:53:59 2005
@@ -229,7 +229,9 @@
src/Makefile
src/cmdline/Makefile
src/generic/Makefile
+ src/generic/apt/Makefile
src/generic/problemresolver/Makefile
+ src/generic/util/Makefile
src/mine/Makefile
src/vscreen/Makefile
src/vscreen/config/Makefile
Modified: branches/aptitude-0.3/aptitude/src/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/Makefile.am Sat Sep 24 20:53:59 2005
@@ -8,7 +8,9 @@
bin_PROGRAMS=aptitude
-LDADD=@LIBINTL@ cmdline/libcmdline.a vscreen/config/libconf.a mine/libcmine.a vscreen/libvscreen.a generic/libgeneric.a
+LDADD=@LIBINTL@ cmdline/libcmdline.a vscreen/config/libconf.a \
+ mine/libcmine.a vscreen/libvscreen.a \
+ generic/util/libgeneric-util.a generic/apt/libgeneric-apt.a
aptitude_SOURCES= \
aptitude.h \
Modified: branches/aptitude-0.3/aptitude/src/generic/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/generic/Makefile.am Sat Sep 24 20:53:59 2005
@@ -1,63 +1,3 @@
MAINTAINERCLEANFILES=Makefile.in
-SUBDIRS=problemresolver
-
-localedir = $(datadir)/locale
-INCLUDES = -Wall @WERROR@ -I../../ -I$(srcdir) -I$(top_srcdir)/lib -I../../intl
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-LDADD = @LIBINTL@
-
-EXTRA_DIST = README.hier
-
-noinst_LIBRARIES=libgeneric.a
-noinst_PROGRAMS=pkg_hier_dump
-
-libgeneric_a_SOURCES= \
- acqprogress.h \
- acqprogress.cc \
- apt.h \
- apt.cc \
- aptcache.h \
- aptcache.cc \
- aptitudepolicy.h\
- aptitudepolicy.cc\
- aptitude_resolver.h\
- aptitude_resolver.cc\
- aptitude_resolver_universe.cc\
- aptitude_resolver_universe.h\
- apt_undo_group.h\
- apt_undo_group.cc\
- config_signal.h \
- config_signal.cc\
- event_queue.h \
- exception.h \
- infer_reason.h \
- infer_reason.cc \
- matchers.h \
- matchers.cc \
- mut_fun.h \
- pkg_acqfile.h \
- pkg_acqfile.cc \
- pkg_changelog.h \
- pkg_changelog.cc\
- pkg_hier.h \
- pkg_hier.cc \
- resolver_manager.h\
- resolver_manager.cc\
- rev_dep_iterator.h \
- strhash.h \
- tags.h \
- tags.cc \
- tasks.h \
- tasks.cc \
- threads.cc \
- threads.h \
- undo.h \
- undo.cc \
- util.h \
- util.cc
-
-pkg_hier_dump_SOURCES= \
- pkg_hier_dump.cc
-
-pkg_hier_dump_LDADD=libgeneric.a
+SUBDIRS = util problemresolver apt
Added: branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am
==============================================================================
--- (empty file)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am Sat Sep 24 20:53:59 2005
@@ -0,0 +1,49 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+localedir = $(datadir)/locale
+INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir)/intl
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+LDADD = @LIBINTL@
+
+EXTRA_DIST = README.hier
+
+noinst_LIBRARIES = libgeneric-apt.a
+noinst_PROGRAMS = pkg_hier_dump
+
+pkg_hier_dump_LDADD = ../util/libgeneric-util.a
+
+libgeneric_apt_a_SOURCES = \
+ acqprogress.cc \
+ acqprogress.h \
+ aptcache.cc \
+ aptcache.h \
+ apt.cc \
+ apt.h \
+ aptitudepolicy.cc \
+ aptitudepolicy.h \
+ aptitude_resolver.cc \
+ aptitude_resolver.h \
+ aptitude_resolver_universe.cc \
+ aptitude_resolver_universe.h \
+ apt_undo_group.cc \
+ apt_undo_group.h \
+ config_signal.cc \
+ config_signal.h \
+ infer_reason.cc \
+ infer_reason.h \
+ matchers.cc \
+ matchers.h \
+ pkg_acqfile.cc \
+ pkg_acqfile.h \
+ pkg_changelog.cc \
+ pkg_changelog.h \
+ pkg_hier.cc \
+ pkg_hier_dump.cc \
+ pkg_hier.h \
+ resolver_manager.cc \
+ resolver_manager.h \
+ rev_dep_iterator.h \
+ tags.cc \
+ tags.h \
+ tasks.cc \
+ tasks.h
Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/Makefile.am Sat Sep 24 20:53:59 2005
@@ -4,6 +4,8 @@
noinst_PROGRAMS=test
+test_LDADD = ../util/libgeneric-util.a
+
test_SOURCES=test.cc dump_universe.h \
dummy_universe.cc dummy_universe.h \
exceptions.h problemresolver.h solution.h
Added: branches/aptitude-0.3/aptitude/src/generic/util/Makefile.am
==============================================================================
--- (empty file)
+++ branches/aptitude-0.3/aptitude/src/generic/util/Makefile.am Sat Sep 24 20:53:59 2005
@@ -0,0 +1,21 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+localedir = $(datadir)/locale
+INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir)/intl
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+
+noinst_LIBRARIES = libgeneric-util.a
+libgeneric_util_a_SOURCES = \
+ dense_setset.h \
+ event_queue.h \
+ exception.h \
+ immset.h \
+ mut_fun.h \
+ setset.h \
+ strhash.h \
+ threads.cc \
+ threads.h \
+ undo.cc \
+ undo.h \
+ util.cc \
+ util.h
\ No newline at end of file
Modified: branches/aptitude-0.3/aptitude/src/vscreen/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/Makefile.am Sat Sep 24 20:53:59 2005
@@ -89,4 +89,4 @@
testvscreen_SOURCES= \
testvscreen.cc
-testvscreen_LDADD=libvscreen.a config/libconf.a ../generic/libgeneric.a
+testvscreen_LDADD=libvscreen.a config/libconf.a ../generic/util/libgeneric-util.a
More information about the Aptitude-svn-commit
mailing list