Module Name: src
Committed By: jmmv
Date: Tue Feb 11 18:07:30 UTC 2014
Modified Files:
src/external/bsd/atf/dist/tools: atf-version.cpp
src/external/bsd/atf/usr.bin/atf-version: Makefile
Removed Files:
src/external/bsd/atf/usr.bin/atf-version: revision.h
Log Message:
Remove revision.h and associated complexity from atf-version.
Arguably, this was never needed and only made the code and the build system
more complex for no real reason.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/tools/atf-version.cpp
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/usr.bin/atf-version/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/usr.bin/atf-version/revision.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/tools/atf-version.cpp
diff -u src/external/bsd/atf/dist/tools/atf-version.cpp:1.4 src/external/bsd/atf/dist/tools/atf-version.cpp:1.5
--- src/external/bsd/atf/dist/tools/atf-version.cpp:1.4 Tue Feb 11 17:28:20 2014
+++ src/external/bsd/atf/dist/tools/atf-version.cpp Tue Feb 11 18:07:30 2014
@@ -31,8 +31,6 @@
#include <iostream>
#include "application.hpp"
-#include "revision.h"
-#include "ui.hpp"
class atf_version : public tools::application::app {
static const char* m_description;
@@ -55,28 +53,9 @@ atf_version::atf_version(void) :
int
atf_version::main(void)
{
- using tools::ui::format_text;
- using tools::ui::format_text_with_tag;
-
std::cout <<
"Automated Testing Framework " ATF_VERSION " (atf-" ATF_VERSION ")\n"
- "Copyright (c) 2007 The NetBSD Foundation, Inc.\n\n";
-
-#if defined(PACKAGE_REVISION_TYPE_DIST)
- std::cout << format_text("Built from a distribution file; no revision "
- "information available.") << "\n";
-#elif defined(PACKAGE_REVISION_TYPE_GIT)
- std::cout << format_text_with_tag(PACKAGE_REVISION_BRANCH, "Branch: ",
- false) << "\n";
- std::cout << format_text_with_tag(PACKAGE_REVISION_BASE
-# if PACKAGE_REVISION_MODIFIED
- " (locally modified)"
-# endif
- " " PACKAGE_REVISION_DATE,
- "Base revision: ", false) << "\n";
-#else
-# error "Unknown PACKAGE_REVISION_TYPE value"
-#endif
+ "Copyright (c) 2007 The NetBSD Foundation, Inc.\n";
return EXIT_SUCCESS;
}
Index: src/external/bsd/atf/usr.bin/atf-version/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-version/Makefile:1.9 src/external/bsd/atf/usr.bin/atf-version/Makefile:1.10
--- src/external/bsd/atf/usr.bin/atf-version/Makefile:1.9 Tue Feb 11 17:28:21 2014
+++ src/external/bsd/atf/usr.bin/atf-version/Makefile Tue Feb 11 18:07:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/02/11 17:28:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2014/02/11 18:07:30 jmmv Exp $
.include <bsd.own.mk>
@@ -12,7 +12,6 @@ MAN= atf-version.1
CPPFLAGS+= -DATF_VERSION=\"$(ATF_VERSION)\"
CPPFLAGS+= -I${SRCDIR}/tools
-CPPFLAGS+= -I${.CURDIR}
USE_ATF_LIBTOOLS= yes
