Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/atf Adjust reachover makefiles for atf 0.11.
details: https://anonhg.NetBSD.org/src/rev/4f7adddf0260
branches: trunk
changeset: 758119:4f7adddf0260
user: jmmv <jmmv%NetBSD.org@localhost>
date: Wed Oct 20 09:20:09 2010 +0000
description:
Adjust reachover makefiles for atf 0.11.
diffstat:
external/bsd/atf/Makefile | 4 +-
external/bsd/atf/lib/libatf-c++/Makefile | 25 +++------------
external/bsd/atf/lib/libatf-c/Makefile | 16 +++------
external/bsd/atf/lib/libatf-c/bconfig.h | 9 +++-
external/bsd/atf/libexec/Makefile | 5 +++
external/bsd/atf/libexec/atf-check/Makefile | 20 ++++++++++++
external/bsd/atf/tests/atf/Makefile | 3 +-
external/bsd/atf/tests/atf/atf-c++/Makefile | 22 +++----------
external/bsd/atf/tests/atf/atf-c++/detail/Makefile | 30 ++++++++++++++++++
external/bsd/atf/tests/atf/atf-c/Makefile | 21 +++----------
external/bsd/atf/tests/atf/atf-c/detail/Makefile | 35 ++++++++++++++++++++++
external/bsd/atf/tests/atf/atf-check/Makefile | 15 ---------
external/bsd/atf/tests/atf/atf-report/Makefile | 8 ++--
external/bsd/atf/tests/atf/atf-run/Makefile | 18 ++++++++---
external/bsd/atf/tests/atf/atf-sh/Makefile | 5 +-
external/bsd/atf/usr.bin/Makefile | 4 +-
external/bsd/atf/usr.bin/atf-check/Makefile | 19 -----------
external/bsd/atf/usr.bin/atf-config/Makefile | 3 +-
external/bsd/atf/usr.bin/atf-report/Makefile | 3 +-
external/bsd/atf/usr.bin/atf-run/Makefile | 7 ++-
external/bsd/atf/usr.bin/atf-sh/Makefile | 3 +-
external/bsd/atf/usr.bin/atf-version/Makefile | 3 +-
22 files changed, 154 insertions(+), 124 deletions(-)
diffs (truncated from 632 to 300 lines):
diff -r e4781c352baa -r 4f7adddf0260 external/bsd/atf/Makefile
--- a/external/bsd/atf/Makefile Wed Oct 20 09:17:21 2010 +0000
+++ b/external/bsd/atf/Makefile Wed Oct 20 09:20:09 2010 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2010/07/03 08:14:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/10/20 09:20:09 jmmv Exp $
-SUBDIR= etc lib .WAIT share usr.bin tests
+SUBDIR= etc lib .WAIT libexec share usr.bin tests
.include <bsd.subdir.mk>
diff -r e4781c352baa -r 4f7adddf0260 external/bsd/atf/lib/libatf-c++/Makefile
--- a/external/bsd/atf/lib/libatf-c++/Makefile Wed Oct 20 09:17:21 2010 +0000
+++ b/external/bsd/atf/lib/libatf-c++/Makefile Wed Oct 20 09:20:09 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/07/03 08:14:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/10/20 09:20:10 jmmv Exp $
NOLINT= # defined
@@ -11,6 +11,7 @@
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/atf-c++
+.PATH: ${SRCDIR}/atf-c++/detail
CPPFLAGS+= -I${.CURDIR}/../libatf-c
CPPFLAGS+= -I.
@@ -27,33 +28,17 @@
exceptions.cpp \
expand.cpp \
fs.cpp \
- io.cpp \
parser.cpp \
process.cpp \
- signals.cpp \
tests.cpp \
text.cpp \
- ui.cpp \
- user.cpp
+ ui.cpp
-INCS= application.hpp \
- build.hpp \
+INCS= build.hpp \
check.hpp \
config.hpp \
- env.hpp \
- exceptions.hpp \
- expand.hpp \
- fs.hpp \
- io.hpp \
macros.hpp \
- parser.hpp \
- process.hpp \
- sanity.hpp \
- signals.hpp \
tests.hpp \
- text.hpp \
- ui.hpp \
- user.hpp \
utils.hpp
INCSDIR= /usr/include/atf-c++
@@ -68,7 +53,7 @@
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.10,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.11,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
diff -r e4781c352baa -r 4f7adddf0260 external/bsd/atf/lib/libatf-c/Makefile
--- a/external/bsd/atf/lib/libatf-c/Makefile Wed Oct 20 09:17:21 2010 +0000
+++ b/external/bsd/atf/lib/libatf-c/Makefile Wed Oct 20 09:20:09 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/07/03 08:14:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2010/10/20 09:20:09 jmmv Exp $
NOLINT= # defined
@@ -10,6 +10,7 @@
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/atf-c
+.PATH: ${SRCDIR}/atf-c/detail
CPPFLAGS+= -I${.CURDIR}
CPPFLAGS+= -I.
@@ -47,6 +48,7 @@
sanity.c \
text.c \
user.c \
+ utils.c \
tc.c \
tp.c \
tp_main.c
@@ -55,20 +57,12 @@
check.h \
config.h \
defs.h \
- dynstr.h \
- env.h \
error.h \
error_fwd.h \
- fs.h \
- list.h \
macros.h \
- map.h \
- process.h \
- sanity.h \
tc.h \
- text.h \
tp.h \
- user.h
+ utils.h
INCSDIR= /usr/include/atf-c
INCS+= atf-c.h
@@ -90,7 +84,7 @@
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.10,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.11,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
diff -r e4781c352baa -r 4f7adddf0260 external/bsd/atf/lib/libatf-c/bconfig.h
--- a/external/bsd/atf/lib/libatf-c/bconfig.h Wed Oct 20 09:17:21 2010 +0000
+++ b/external/bsd/atf/lib/libatf-c/bconfig.h Wed Oct 20 09:20:09 2010 +0000
@@ -31,6 +31,9 @@
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
+/* Define to 1 if getopt has optreset */
+/* #undef HAVE_OPTRESET */
+
/* Define to 1 if you have the `putenv' function. */
#define HAVE_PUTENV 1
@@ -102,7 +105,7 @@
#define PACKAGE_NAME "Automated Testing Framework"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Automated Testing Framework 0.10"
+#define PACKAGE_STRING "Automated Testing Framework 0.11"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "atf"
@@ -111,10 +114,10 @@
#define PACKAGE_URL "http://www.NetBSD.org/~jmmv/atf/";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10"
+#define PACKAGE_VERSION "0.11"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.10"
+#define VERSION "0.11"
diff -r e4781c352baa -r 4f7adddf0260 external/bsd/atf/libexec/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/libexec/Makefile Wed Oct 20 09:20:09 2010 +0000
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.4 2010/10/20 09:20:10 jmmv Exp $
+
+SUBDIR= atf-check
+
+.include <bsd.subdir.mk>
diff -r e4781c352baa -r 4f7adddf0260 external/bsd/atf/libexec/atf-check/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/libexec/atf-check/Makefile Wed Oct 20 09:20:09 2010 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2010/10/20 09:20:10 jmmv Exp $
+
+.include <bsd.own.mk>
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/atf-sh
+
+BINDIR= /usr/libexec
+PROG_CXX= atf-check
+SRCS= atf-check.cpp
+MAN= atf-check.1
+
+LDADD+= -latf-c++ -latf-c
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${SRCDIR}
+
+WARNS?= 2
+
+.include <bsd.prog.mk>
diff -r e4781c352baa -r 4f7adddf0260 external/bsd/atf/tests/atf/Makefile
--- a/external/bsd/atf/tests/atf/Makefile Wed Oct 20 09:17:21 2010 +0000
+++ b/external/bsd/atf/tests/atf/Makefile Wed Oct 20 09:20:09 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/07/13 21:12:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2010/10/20 09:20:10 jmmv Exp $
.include <bsd.own.mk>
@@ -7,7 +7,6 @@
SUBDIR= atf-c \
atf-c++ \
- atf-check \
atf-config \
atf-report \
atf-run \
diff -r e4781c352baa -r 4f7adddf0260 external/bsd/atf/tests/atf/atf-c++/Makefile
--- a/external/bsd/atf/tests/atf/atf-c++/Makefile Wed Oct 20 09:17:21 2010 +0000
+++ b/external/bsd/atf/tests/atf/atf-c++/Makefile Wed Oct 20 09:20:09 2010 +0000
@@ -1,39 +1,29 @@
-# $NetBSD: Makefile,v 1.5 2010/07/13 21:12:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2010/10/20 09:20:11 jmmv Exp $
.include <bsd.own.mk>
+TESTS_SUBDIRS= detail
+
TESTSDIR= ${TESTSBASE}/atf/atf-c++
ATFFILE= yes
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-c++
+.PATH: ${SRCDIR}/atf-c++/detail
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-c
+CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-c++
FILESDIR= ${TESTSDIR}
FILES= macros_hpp_test.cpp
TESTS_CXX=
-.for test in application_test \
- atf_c++_test \
+.for test in atf_c++_test \
build_test \
check_test \
config_test \
- env_test \
- exceptions_test \
- expand_test \
- fs_test \
- io_test \
macros_test \
- parser_test \
- process_test \
- sanity_test \
- signals_test \
tests_test \
- text_test \
- ui_test \
- user_test \
utils_test
TESTS_CXX+= ${test}
SRCS.${test}= ${test}.cpp test_helpers.cpp
diff -r e4781c352baa -r 4f7adddf0260 external/bsd/atf/tests/atf/atf-c++/detail/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/tests/atf/atf-c++/detail/Makefile Wed Oct 20 09:20:09 2010 +0000
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.1 2010/10/20 09:20:11 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/atf/atf-c++/detail
+ATFFILE= yes
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/atf-c++/detail
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-c++
+
+TESTS_CXX=
+.for test in application_test \
+ env_test \
+ exceptions_test \
+ expand_test \
+ fs_test \
+ parser_test \
+ process_test \
+ sanity_test \
+ text_test \
+ ui_test
+TESTS_CXX+= ${test}
+SRCS.${test}= ${test}.cpp test_helpers.cpp
+.endfor
+.undef test
+
+.include <bsd.test.mk>
diff -r e4781c352baa -r 4f7adddf0260 external/bsd/atf/tests/atf/atf-c/Makefile
--- a/external/bsd/atf/tests/atf/atf-c/Makefile Wed Oct 20 09:17:21 2010 +0000
+++ b/external/bsd/atf/tests/atf/atf-c/Makefile Wed Oct 20 09:20:09 2010 +0000
Home |
Main Index |
Thread Index |
Old Index