aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-08-24 21:24:15 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-08-24 21:24:15 +0000
commit1e6dd79d2c881ab3e6f41852c8a66362144e07a2 (patch)
tree5e4b2dd8b66349baa4e49bf97912293f07415f18
parente156e686c5d6ccf0be0d6ce6e8eeacd2add6d77d (diff)
downloadpaludis-1e6dd79d2c881ab3e6f41852c8a66362144e07a2.tar.gz
paludis-1e6dd79d2c881ab3e6f41852c8a66362144e07a2.tar.xz
archtool is now called adjutrix
-rw-r--r--src/Makefile.am2
-rw-r--r--src/adjutrix/Makefile.am24
-rw-r--r--src/adjutrix/adjutrix.cc (renamed from src/adjutrix/archtool.cc)6
-rw-r--r--src/adjutrix/adjutrix_environment.cc (renamed from src/adjutrix/archtool_environment.cc)16
-rw-r--r--src/adjutrix/adjutrix_environment.hh (renamed from src/adjutrix/archtool_environment.hh)8
-rw-r--r--src/adjutrix/command_line.cc8
-rwxr-xr-xsrc/adjutrix/find_stable_candidates_TEST4
-rwxr-xr-xsrc/adjutrix/help_TEST2
-rw-r--r--src/adjutrix/man_adjutrix.cc (renamed from src/adjutrix/man_archtool.cc)0
-rwxr-xr-xsrc/adjutrix/version_TEST2
10 files changed, 36 insertions, 36 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 311ffa8..c0e1cbf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . paludis gtkpaludis qualudis archtool
+SUBDIRS = . paludis gtkpaludis qualudis adjutrix
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/adjutrix/Makefile.am b/src/adjutrix/Makefile.am
index 5447556..95c9727 100644
--- a/src/adjutrix/Makefile.am
+++ b/src/adjutrix/Makefile.am
@@ -7,33 +7,33 @@ DEFS= \
SUBDIRS = .
-bin_PROGRAMS = archtool
-noinst_PROGRAMS = man-archtool
+bin_PROGRAMS = adjutrix
+noinst_PROGRAMS = man-adjutrix
-man_MANS = archtool.1
+man_MANS = adjutrix.1
-archtool.1 : man-archtool
- ./man-archtool | tee $@ | sed -e 's/^/ /'
+adjutrix.1 : man-adjutrix
+ ./man-adjutrix | tee $@ | sed -e 's/^/ /'
-man_archtool_SOURCES = \
- man_archtool.cc \
+man_adjutrix_SOURCES = \
+ man_adjutrix.cc \
command_line.hh \
command_line.cc
-man_archtool_LDADD = \
+man_adjutrix_LDADD = \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(DYNAMIC_LD_LIBS)
-archtool_SOURCES = \
+adjutrix_SOURCES = \
command_line.hh command_line.cc \
find_stable_candidates.hh find_stable_candidates.cc \
find_dropped_keywords.hh find_dropped_keywords.cc \
keywords_graph.hh keywords_graph.cc \
- archtool_environment.hh archtool_environment.cc \
- archtool.cc
+ adjutrix_environment.hh adjutrix_environment.cc \
+ adjutrix.cc
-archtool_LDADD = \
+adjutrix_LDADD = \
$(top_builddir)/paludis/tasks/libpaludistasks.a \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/args/libpaludisargs.la \
diff --git a/src/adjutrix/archtool.cc b/src/adjutrix/adjutrix.cc
index 9a691c6..d335cd0 100644
--- a/src/adjutrix/archtool.cc
+++ b/src/adjutrix/adjutrix.cc
@@ -21,7 +21,7 @@
#include "find_stable_candidates.hh"
#include "find_dropped_keywords.hh"
#include "keywords_graph.hh"
-#include "archtool_environment.hh"
+#include "adjutrix_environment.hh"
#include <paludis/about.hh>
#include <paludis/util/join.hh>
@@ -66,7 +66,7 @@ namespace
void display_version()
{
- cout << "archtool " << PALUDIS_VERSION_MAJOR << "."
+ cout << "adjutrix " << PALUDIS_VERSION_MAJOR << "."
<< PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO;
if (! std::string(PALUDIS_SUBVERSION_REVISION).empty())
cout << " svn " << PALUDIS_SUBVERSION_REVISION;
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
CommandLine::get_instance()->a_keywords_graph.specified()))
throw DoHelp("you should specify exactly one action");
- ArchtoolEnvironment env(get_location_and_add_filters());
+ AdjutrixEnvironment env(get_location_and_add_filters());
if (CommandLine::get_instance()->a_find_stable_candidates.specified())
{
diff --git a/src/adjutrix/archtool_environment.cc b/src/adjutrix/adjutrix_environment.cc
index fbe97ea..6e5187a 100644
--- a/src/adjutrix/archtool_environment.cc
+++ b/src/adjutrix/adjutrix_environment.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "archtool_environment.hh"
+#include "adjutrix_environment.hh"
#include <paludis/util/collection_concrete.hh>
using namespace paludis;
@@ -25,8 +25,8 @@ using namespace paludis;
namespace paludis
{
template<>
- struct Implementation<ArchtoolEnvironment> :
- InternalCounted<Implementation<ArchtoolEnvironment> >
+ struct Implementation<AdjutrixEnvironment> :
+ InternalCounted<Implementation<AdjutrixEnvironment> >
{
const FSEntry top_level_dir;
PackageDatabase::Pointer db;
@@ -39,9 +39,9 @@ namespace paludis
};
}
-ArchtoolEnvironment::ArchtoolEnvironment(const FSEntry & dir) :
- PrivateImplementationPattern<ArchtoolEnvironment>(
- new Implementation<ArchtoolEnvironment>(this, dir)),
+AdjutrixEnvironment::AdjutrixEnvironment(const FSEntry & dir) :
+ PrivateImplementationPattern<AdjutrixEnvironment>(
+ new Implementation<AdjutrixEnvironment>(this, dir)),
Environment(_imp->db)
{
AssociativeCollection<std::string, std::string>::Pointer keys(
@@ -56,12 +56,12 @@ ArchtoolEnvironment::ArchtoolEnvironment(const FSEntry & dir) :
_imp->db.raw_pointer(), keys));
}
-ArchtoolEnvironment::~ArchtoolEnvironment()
+AdjutrixEnvironment::~AdjutrixEnvironment()
{
}
std::string
-ArchtoolEnvironment::paludis_command() const
+AdjutrixEnvironment::paludis_command() const
{
return "false";
}
diff --git a/src/adjutrix/archtool_environment.hh b/src/adjutrix/adjutrix_environment.hh
index 31e0f24..c1c441c 100644
--- a/src/adjutrix/archtool_environment.hh
+++ b/src/adjutrix/adjutrix_environment.hh
@@ -26,14 +26,14 @@
namespace paludis
{
- class ArchtoolEnvironment :
- private PrivateImplementationPattern<ArchtoolEnvironment>,
+ class AdjutrixEnvironment :
+ private PrivateImplementationPattern<AdjutrixEnvironment>,
public Environment
{
public:
- ArchtoolEnvironment(const FSEntry & dir);
+ AdjutrixEnvironment(const FSEntry & dir);
- virtual ~ArchtoolEnvironment();
+ virtual ~AdjutrixEnvironment();
virtual std::string paludis_command() const;
};
diff --git a/src/adjutrix/command_line.cc b/src/adjutrix/command_line.cc
index e0118a0..868ca00 100644
--- a/src/adjutrix/command_line.cc
+++ b/src/adjutrix/command_line.cc
@@ -74,7 +74,7 @@ CommandLine::CommandLine() :
std::string
CommandLine::app_name() const
{
- return "archtool";
+ return "adjutrix";
}
std::string
@@ -87,10 +87,10 @@ std::string
CommandLine::app_description() const
{
return
- "archtool provides a number of utilities that may be useful for arch teams."
+ "adjutrix provides a number of utilities that may be useful for arch teams."
"\n\n"
- "The --repository-dir switch can be used to tell archtool where to find "
- "the repository. If this switch is not used, archtool will check the current "
+ "The --repository-dir switch can be used to tell adjutrix where to find "
+ "the repository. If this switch is not used, adjutrix will check the current "
"directory, the parent directory and the parent's parent directory for "
"something resembling a profile root. If run inside a package or category "
"directory, filtering in the style of --package and --category is carried "
diff --git a/src/adjutrix/find_stable_candidates_TEST b/src/adjutrix/find_stable_candidates_TEST
index 9da4752..9ae9850 100755
--- a/src/adjutrix/find_stable_candidates_TEST
+++ b/src/adjutrix/find_stable_candidates_TEST
@@ -1,6 +1,6 @@
#!/bin/bash
-./archtool --find-stable-candidates -D find_stable_candidates_TEST_dir/ best | \
+./adjutrix --find-stable-candidates -D find_stable_candidates_TEST_dir/ best | \
tee find_stable_candidates_TEST_dir/out1.txt
if grep --silent '^ ' find_stable_candidates_TEST_dir/out1.txt ; then
@@ -8,7 +8,7 @@ if grep --silent '^ ' find_stable_candidates_TEST_dir/out1.txt ; then
exit 127
fi
-./archtool --find-stable-candidates -D find_stable_candidates_TEST_dir/ one | \
+./adjutrix --find-stable-candidates -D find_stable_candidates_TEST_dir/ one | \
tee find_stable_candidates_TEST_dir/out2.txt
if [[ $(grep --count '^ ' find_stable_candidates_TEST_dir/out2.txt ) != "1" ]] ; then
diff --git a/src/adjutrix/help_TEST b/src/adjutrix/help_TEST
index d736ff3..7694394 100755
--- a/src/adjutrix/help_TEST
+++ b/src/adjutrix/help_TEST
@@ -1,4 +1,4 @@
#!/bin/bash
-./archtool --help
+./adjutrix --help
diff --git a/src/adjutrix/man_archtool.cc b/src/adjutrix/man_adjutrix.cc
index a195aaf..a195aaf 100644
--- a/src/adjutrix/man_archtool.cc
+++ b/src/adjutrix/man_adjutrix.cc
diff --git a/src/adjutrix/version_TEST b/src/adjutrix/version_TEST
index e06d36a..7d5c45e 100755
--- a/src/adjutrix/version_TEST
+++ b/src/adjutrix/version_TEST
@@ -1,3 +1,3 @@
#!/bin/bash
-./archtool --version
+./adjutrix --version