aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Piotr Jaroszyński <peper@gentoo.org> 2007-10-13 12:21:44 +0000
committerAvatar Piotr Jaroszyński <peper@gentoo.org> 2007-10-13 12:21:44 +0000
commit9b7d7efdf7b1f240f10f8697e17355fabbf4e8c1 (patch)
treedc78f4e73789ec129198137b332ab4563cb7c236
parente307621686a40c781a9cb36d620f87eccaec9fa5 (diff)
downloadpaludis-9b7d7efdf7b1f240f10f8697e17355fabbf4e8c1.tar.gz
paludis-9b7d7efdf7b1f240f10f8697e17355fabbf4e8c1.tar.xz
Standardise --help, --version. Fixes: ticket:389
-rw-r--r--src/clients/accerso/accerso.cc26
-rw-r--r--src/clients/adjutrix/adjutrix.cc26
-rw-r--r--src/clients/contrarius/contrarius.cc28
-rw-r--r--src/clients/importare/importare.cc4
-rw-r--r--src/clients/inquisitio/inquisitio.cc4
-rw-r--r--src/clients/instruo/instruo.cc26
-rw-r--r--src/clients/qualudis/qualudis.cc28
-rw-r--r--src/clients/reconcilio/reconcilio.cc6
8 files changed, 11 insertions, 137 deletions
diff --git a/src/clients/accerso/accerso.cc b/src/clients/accerso/accerso.cc
index c0c38e5..4bd09c0 100644
--- a/src/clients/accerso/accerso.cc
+++ b/src/clients/accerso/accerso.cc
@@ -78,35 +78,11 @@ main(int argc, char *argv[])
if (CommandLine::get_instance()->a_version.specified())
{
- cout << "accerso " << PALUDIS_VERSION_MAJOR << "."
+ cout << "accerso, part of " << PALUDIS_PACKAGE << " " << PALUDIS_VERSION_MAJOR << "."
<< PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO;
if (! std::string(PALUDIS_SUBVERSION_REVISION).empty())
cout << " svn " << PALUDIS_SUBVERSION_REVISION;
cout << endl << endl;
- cout << "Built by " << PALUDIS_BUILD_USER << "@" << PALUDIS_BUILD_HOST
- << " on " << PALUDIS_BUILD_DATE << endl;
- cout << "CXX: " << PALUDIS_BUILD_CXX
-#if defined(__ICC)
- << " " << __ICC
-#elif defined(__VERSION__)
- << " " << __VERSION__
-#endif
- << endl;
- cout << "CXXFLAGS: " << PALUDIS_BUILD_CXXFLAGS << endl;
- cout << "LDFLAGS: " << PALUDIS_BUILD_LDFLAGS << endl;
- cout << "DATADIR: " << DATADIR << endl;
- cout << "LIBDIR: " << LIBDIR << endl;
- cout << "LIBEXECDIR: " << LIBEXECDIR << endl;
- cout << "SYSCONFDIR: " << SYSCONFDIR << endl;
- cout << "stdlib: "
-#if defined(__GLIBCXX__)
-# define XSTRINGIFY(x) #x
-# define STRINGIFY(x) XSTRINGIFY(x)
- << "GNU libstdc++ " << STRINGIFY(__GLIBCXX__)
-#endif
- << endl;
-
- cout << endl;
cout << "Paludis comes with ABSOLUTELY NO WARRANTY. Paludis is free software, and you" << endl;
cout << "are welcome to redistribute it under the terms of the GNU General Public" << endl;
cout << "License, version 2." << endl;
diff --git a/src/clients/adjutrix/adjutrix.cc b/src/clients/adjutrix/adjutrix.cc
index 77a868f..c4e88be 100644
--- a/src/clients/adjutrix/adjutrix.cc
+++ b/src/clients/adjutrix/adjutrix.cc
@@ -73,33 +73,11 @@ namespace
void display_version()
{
- cout << "adjutrix " << PALUDIS_VERSION_MAJOR << "."
+ cout << "adjutrix, part of " << PALUDIS_PACKAGE << " " << PALUDIS_VERSION_MAJOR << "."
<< PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO;
if (! std::string(PALUDIS_SUBVERSION_REVISION).empty())
cout << " svn " << PALUDIS_SUBVERSION_REVISION;
- cout << endl << endl;
- cout << "Built by " << PALUDIS_BUILD_USER << "@" << PALUDIS_BUILD_HOST
- << " on " << PALUDIS_BUILD_DATE << endl;
- cout << "CXX: " << PALUDIS_BUILD_CXX
-#if defined(__ICC)
- << " " << __ICC
-#elif defined(__VERSION__)
- << " " << __VERSION__
-#endif
- << endl;
- cout << "CXXFLAGS: " << PALUDIS_BUILD_CXXFLAGS << endl;
- cout << "LDFLAGS: " << PALUDIS_BUILD_LDFLAGS << endl;
- cout << "DATADIR: " << DATADIR << endl;
- cout << "LIBDIR: " << LIBDIR << endl;
- cout << "LIBEXECDIR: " << LIBEXECDIR << endl;
- cout << "SYSCONFDIR: " << SYSCONFDIR << endl;
- cout << "stdlib: "
-#if defined(__GLIBCXX__)
-# define XSTRINGIFY(x) #x
-# define STRINGIFY(x) XSTRINGIFY(x)
- << "GNU libstdc++ " << STRINGIFY(__GLIBCXX__)
-#endif
- << endl;
+ cout << endl;
}
struct DoVersion
diff --git a/src/clients/contrarius/contrarius.cc b/src/clients/contrarius/contrarius.cc
index 2f98b0b..e57fa77 100644
--- a/src/clients/contrarius/contrarius.cc
+++ b/src/clients/contrarius/contrarius.cc
@@ -133,34 +133,6 @@ int main(int argc, char *argv[])
if (! std::string(PALUDIS_SUBVERSION_REVISION).empty())
cout << " svn " << PALUDIS_SUBVERSION_REVISION;
cout << endl << endl;
- cout << "Built by " << PALUDIS_BUILD_USER << "@" << PALUDIS_BUILD_HOST
- << " on " << PALUDIS_BUILD_DATE << endl;
- cout << "CXX: " << PALUDIS_BUILD_CXX
-#if defined(__ICC)
- << " " << __ICC
-#elif defined(__VERSION__)
- << " " << __VERSION__
-#endif
- << endl;
- cout << "CXXFLAGS: " << PALUDIS_BUILD_CXXFLAGS << endl;
- cout << "LDFLAGS: " << PALUDIS_BUILD_LDFLAGS << endl;
- cout << "SYSCONFDIR: " << SYSCONFDIR << endl;
- cout << "LIBEXECDIR: " << LIBEXECDIR << endl;
- cout << "BIGTEMPDIR: " << BIGTEMPDIR << endl;
- cout << "stdlib: "
-#if defined(__GLIBCXX__)
-# define XSTRINGIFY(x) #x
-# define STRINGIFY(x) XSTRINGIFY(x)
- << "GNU libstdc++ " << STRINGIFY(__GLIBCXX__)
-#endif
- << endl;
-
- cout << "libebt: " << LIBEBT_VERSION_MAJOR << "." << LIBEBT_VERSION_MINOR
- << "." << LIBEBT_VERSION_MICRO << endl;
- cout << "libwrapiter: " << LIBWRAPITER_VERSION_MAJOR << "." << LIBWRAPITER_VERSION_MINOR
- << "." << LIBWRAPITER_VERSION_MICRO << endl;
-
- cout << endl;
cout << "Paludis comes with ABSOLUTELY NO WARRANTY. Paludis is free software, and you" << endl;
cout << "are welcome to redistribute it under the terms of the GNU General Public" << endl;
cout << "License, version 2." << endl;
diff --git a/src/clients/importare/importare.cc b/src/clients/importare/importare.cc
index f4840c4..8be8649 100644
--- a/src/clients/importare/importare.cc
+++ b/src/clients/importare/importare.cc
@@ -50,8 +50,8 @@ namespace
void display_version()
{
- cout << "importare" << " " << PALUDIS_VERSION_MAJOR << "."
- << PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO << PALUDIS_VERSION_SUFFIX;
+ cout << "importare, part of " << PALUDIS_PACKAGE << " " << PALUDIS_VERSION_MAJOR << "."
+ << PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO;
if (! std::string(PALUDIS_SUBVERSION_REVISION).empty())
cout << " svn " << PALUDIS_SUBVERSION_REVISION;
cout << endl;
diff --git a/src/clients/inquisitio/inquisitio.cc b/src/clients/inquisitio/inquisitio.cc
index 1716348..28e7843 100644
--- a/src/clients/inquisitio/inquisitio.cc
+++ b/src/clients/inquisitio/inquisitio.cc
@@ -44,11 +44,11 @@ namespace
void display_version()
{
- cout << "inquisitio" << " " << PALUDIS_VERSION_MAJOR << "."
+ cout << "inquisitio, part of " << PALUDIS_PACKAGE << " " << PALUDIS_VERSION_MAJOR << "."
<< PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO;
if (! std::string(PALUDIS_SUBVERSION_REVISION).empty())
cout << " svn " << PALUDIS_SUBVERSION_REVISION;
- cout << endl << endl;
+ cout << endl;
}
}
diff --git a/src/clients/instruo/instruo.cc b/src/clients/instruo/instruo.cc
index 3eae934..609f033 100644
--- a/src/clients/instruo/instruo.cc
+++ b/src/clients/instruo/instruo.cc
@@ -249,35 +249,11 @@ main(int argc, char *argv[])
if (CommandLine::get_instance()->a_version.specified())
{
- cout << "instruo " << PALUDIS_VERSION_MAJOR << "."
+ cout << "instruo, part of " << PALUDIS_PACKAGE << " " << PALUDIS_VERSION_MAJOR << "."
<< PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO;
if (! std::string(PALUDIS_SUBVERSION_REVISION).empty())
cout << " svn " << PALUDIS_SUBVERSION_REVISION;
cout << endl << endl;
- cout << "Built by " << PALUDIS_BUILD_USER << "@" << PALUDIS_BUILD_HOST
- << " on " << PALUDIS_BUILD_DATE << endl;
- cout << "CXX: " << PALUDIS_BUILD_CXX
-#if defined(__ICC)
- << " " << __ICC
-#elif defined(__VERSION__)
- << " " << __VERSION__
-#endif
- << endl;
- cout << "CXXFLAGS: " << PALUDIS_BUILD_CXXFLAGS << endl;
- cout << "LDFLAGS: " << PALUDIS_BUILD_LDFLAGS << endl;
- cout << "DATADIR: " << DATADIR << endl;
- cout << "LIBDIR: " << LIBDIR << endl;
- cout << "LIBEXECDIR: " << LIBEXECDIR << endl;
- cout << "SYSCONFDIR: " << SYSCONFDIR << endl;
- cout << "stdlib: "
-#if defined(__GLIBCXX__)
-# define XSTRINGIFY(x) #x
-# define STRINGIFY(x) XSTRINGIFY(x)
- << "GNU libstdc++ " << STRINGIFY(__GLIBCXX__)
-#endif
- << endl;
-
- cout << endl;
cout << "Paludis comes with ABSOLUTELY NO WARRANTY. Paludis is free software, and you" << endl;
cout << "are welcome to redistribute it under the terms of the GNU General Public" << endl;
cout << "License, version 2." << endl;
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index c6af6d4..7477fb8 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -297,34 +297,6 @@ int main(int argc, char *argv[])
if (! std::string(PALUDIS_SUBVERSION_REVISION).empty())
cout << " svn " << PALUDIS_SUBVERSION_REVISION;
cout << endl << endl;
- cout << "Built by " << PALUDIS_BUILD_USER << "@" << PALUDIS_BUILD_HOST
- << " on " << PALUDIS_BUILD_DATE << endl;
- cout << "CXX: " << PALUDIS_BUILD_CXX
-#if defined(__ICC)
- << " " << __ICC
-#elif defined(__VERSION__)
- << " " << __VERSION__
-#endif
- << endl;
- cout << "CXXFLAGS: " << PALUDIS_BUILD_CXXFLAGS << endl;
- cout << "LDFLAGS: " << PALUDIS_BUILD_LDFLAGS << endl;
- cout << "SYSCONFDIR: " << SYSCONFDIR << endl;
- cout << "LIBEXECDIR: " << LIBEXECDIR << endl;
- cout << "BIGTEMPDIR: " << BIGTEMPDIR << endl;
- cout << "stdlib: "
-#if defined(__GLIBCXX__)
-# define XSTRINGIFY(x) #x
-# define STRINGIFY(x) XSTRINGIFY(x)
- << "GNU libstdc++ " << STRINGIFY(__GLIBCXX__)
-#endif
- << endl;
-
- cout << "libebt: " << LIBEBT_VERSION_MAJOR << "." << LIBEBT_VERSION_MINOR
- << "." << LIBEBT_VERSION_MICRO << endl;
- cout << "libwrapiter: " << LIBWRAPITER_VERSION_MAJOR << "." << LIBWRAPITER_VERSION_MINOR
- << "." << LIBWRAPITER_VERSION_MICRO << endl;
-
- cout << endl;
cout << "Paludis comes with ABSOLUTELY NO WARRANTY. Paludis is free software, and you" << endl;
cout << "are welcome to redistribute it under the terms of the GNU General Public" << endl;
cout << "License, version 2." << endl;
diff --git a/src/clients/reconcilio/reconcilio.cc b/src/clients/reconcilio/reconcilio.cc
index 4da7794c..dc0f443 100644
--- a/src/clients/reconcilio/reconcilio.cc
+++ b/src/clients/reconcilio/reconcilio.cc
@@ -42,11 +42,11 @@ namespace
void display_version()
{
- std::cout << "reconcilio" << " " << PALUDIS_VERSION_MAJOR << "."
- << PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO;
+ std::cout << "reconcilio, part of " << PALUDIS_PACKAGE << " " << PALUDIS_VERSION_MAJOR << "."
+ << PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO;
if (! std::string(PALUDIS_SUBVERSION_REVISION).empty())
std::cout << " svn " << PALUDIS_SUBVERSION_REVISION;
- std::cout << std::endl << std::endl;
+ std::cout << std::endl;
}
}