Module Name: src
Committed By: jmmv
Date: Tue Dec 22 13:38:11 UTC 2009
Modified Files:
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/share/doc/atf: Makefile
src/external/bsd/atf/tests/atf/atf-c: Makefile
src/external/bsd/atf/tests/atf/atf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
Log Message:
Update build files to match atf 0.7.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/share/doc/atf/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/atf-c/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/usr.bin/atf-run/Makefile
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/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.2 src/external/bsd/atf/lib/libatf-c/Makefile:1.3
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.2 Mon Jan 26 16:30:14 2009
+++ src/external/bsd/atf/lib/libatf-c/Makefile Tue Dec 22 13:38:10 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/01/26 16:30:14 christos Exp $
+# $NetBSD: Makefile,v 1.3 2009/12/22 13:38:10 jmmv Exp $
NOLINT= # defined
@@ -16,16 +16,26 @@
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -DATF_ARCH=\"${MACHINE}\"
+CPPFLAGS+= -DATF_BUILD_CC=\"/usr/bin/cc\"
+CPPFLAGS+= -DATF_BUILD_CFLAGS=\"\"
+CPPFLAGS+= -DATF_BUILD_CPP=\"/usr/bin/cpp\"
+CPPFLAGS+= -DATF_BUILD_CPPFLAGS=\"\"
+CPPFLAGS+= -DATF_BUILD_CXX=\"/usr/bin/c++\"
+CPPFLAGS+= -DATF_BUILD_CXXFLAGS=\"\"
CPPFLAGS+= -DATF_CONFDIR=\"/etc/atf\"
+CPPFLAGS+= -DATF_INCLUDEDIR=\"/usr/include\"
+CPPFLAGS+= -DATF_LIBDIR=\"/usr/lib\"
CPPFLAGS+= -DATF_LIBEXECDIR=\"/usr/libexec\"
CPPFLAGS+= -DATF_MACHINE=\"${MACHINE_ARCH}\"
+CPPFLAGS+= -DATF_M4=\"/usr/bin/m4\"
CPPFLAGS+= -DATF_PKGDATADIR=\"/usr/share/atf\"
CPPFLAGS+= -DATF_SHELL=\"/bin/sh\"
CPPFLAGS+= -DATF_WORKDIR=\"/tmp\"
WARNS?= 4
-SRCS= check.c \
+SRCS= build.c \
+ check.c \
config.c \
dynstr.c \
env.c \
@@ -47,7 +57,8 @@
tp.c \
tp_main.c
-INCS= check.h \
+INCS= build.h \
+ check.h \
config.h \
defs.h \
dynstr.h \
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.1 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.2
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.1 Mon Jan 19 07:13:04 2009
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Tue Dec 22 13:38:10 2009
@@ -83,22 +83,25 @@
#define PACKAGE_BUGREPORT "[email protected]"
/* Define to the copyright string applicable to this package. */
-#define PACKAGE_COPYRIGHT "Copyright (c) 2007, 2008 The NetBSD Foundation, Inc."
+#define PACKAGE_COPYRIGHT "Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc."
/* Define to the full name of this package. */
#define PACKAGE_NAME "Automated Testing Framework"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Automated Testing Framework 0.6"
+#define PACKAGE_STRING "Automated Testing Framework 0.7"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "atf"
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.6"
+#define PACKAGE_VERSION "0.7"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.6"
+#define VERSION "0.7"
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.1 src/external/bsd/atf/lib/libatf-c++/Makefile:1.2
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.1 Mon Jan 19 07:13:04 2009
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Tue Dec 22 13:38:10 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/22 13:38:10 jmmv Exp $
NOLINT= # defined
@@ -21,6 +21,7 @@
SRCS= application.cpp \
atffile.cpp \
+ build.cpp \
check.cpp \
config.cpp \
env.cpp \
@@ -39,6 +40,7 @@
INCS= application.hpp \
atffile.hpp \
+ build.hpp \
check.hpp \
config.hpp \
env.hpp \
Index: src/external/bsd/atf/share/doc/atf/Makefile
diff -u src/external/bsd/atf/share/doc/atf/Makefile:1.1 src/external/bsd/atf/share/doc/atf/Makefile:1.2
--- src/external/bsd/atf/share/doc/atf/Makefile:1.1 Mon Jan 19 07:13:04 2009
+++ src/external/bsd/atf/share/doc/atf/Makefile Tue Dec 22 13:38:10 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/22 13:38:10 jmmv Exp $
.include <bsd.own.mk>
@@ -11,7 +11,7 @@
.if ${MKDOC} != "no"
FILESDIR= /usr/share/doc/atf
-FILES= AUTHORS COPYING NEWS README ROADMAP
+FILES= AUTHORS COPYING NEWS README
.endif
MAN= atf.7 atf-formats.5 atf-test-case.4 atf-test-program.1
Index: src/external/bsd/atf/tests/atf/atf-c/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/Makefile:1.1 src/external/bsd/atf/tests/atf/atf-c/Makefile:1.2
--- src/external/bsd/atf/tests/atf/atf-c/Makefile:1.1 Mon Jan 19 07:13:05 2009
+++ src/external/bsd/atf/tests/atf/atf-c/Makefile Tue Dec 22 13:38:10 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/22 13:38:10 jmmv Exp $
.include <bsd.own.mk>
@@ -10,29 +10,64 @@
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${NETBSDSRCDIR}/external/bsd/atf/lib/libatf-c
-PROGS= h_check
-SRCS.h_check= h_check.c
-MAN.h_check= # defined
-BINDIR.h_check= ${TESTSDIR}
-
-TESTS_C= t_check
-TESTS_C+= t_config
-TESTS_C+= t_dynstr
-TESTS_C+= t_env
-TESTS_C+= t_error
-TESTS_C+= t_expand
-TESTS_C+= t_fs
-TESTS_C+= t_io
-TESTS_C+= t_list
-TESTS_C+= t_macros
-TESTS_C+= t_map
-TESTS_C+= t_process
-TESTS_C+= t_sanity
-TESTS_C+= t_signals
-TESTS_C+= t_tc
-TESTS_C+= t_tcr
-TESTS_C+= t_text
-TESTS_C+= t_ui
-TESTS_C+= t_user
+PROGS= h_processes
+SRCS.h_processes= h_processes.c
+MAN.h_processes= # defined
+BINDIR.h_processes= ${TESTSDIR}
+
+FILESDIR= ${TESTSDIR}
+FILES= d_include_atf_c_h.c \
+ d_include_build_h.c \
+ d_include_check_h.c \
+ d_include_config_h.c \
+ d_include_dynstr_h.c \
+ d_include_env_h.c \
+ d_include_error_fwd_h.c \
+ d_include_error_h.c \
+ d_include_expand_h.c \
+ d_include_fs_h.c \
+ d_include_io_h.c \
+ d_include_list_h.c \
+ d_include_macros_h.c \
+ d_include_map_h.c \
+ d_include_object_h.c \
+ d_include_process_h.c \
+ d_include_sanity_h.c \
+ d_include_signals_h.c \
+ d_include_tc_h.c \
+ d_include_tcr_h.c \
+ d_include_text_h.c \
+ d_include_tp_h.c \
+ d_include_ui_h.c \
+ d_include_user_h.c \
+ d_use_macros_h.c
+
+TESTS_C=
+.for test in t_atf_c \
+ t_build \
+ t_check \
+ t_config \
+ t_dynstr \
+ t_env \
+ t_error \
+ t_expand \
+ t_fs \
+ t_h_lib \
+ t_io \
+ t_list \
+ t_macros \
+ t_map \
+ t_process \
+ t_sanity \
+ t_signals \
+ t_tc \
+ t_tcr \
+ t_text \
+ t_ui \
+ t_user
+TESTS_C+= ${test}
+SRCS.${test}= ${test}.c h_lib.c
+.endfor
+.undef test
.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-c++/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.1 src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.2
--- src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.1 Mon Jan 19 07:13:05 2009
+++ src/external/bsd/atf/tests/atf/atf-c++/Makefile Tue Dec 22 13:38:10 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/22 13:38:10 jmmv Exp $
.include <bsd.own.mk>
@@ -10,19 +10,57 @@
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-c
-TESTS_CXX= t_check
-TESTS_CXX+= t_config
-TESTS_CXX+= t_env
-TESTS_CXX+= t_expand
-TESTS_CXX+= t_fs
-TESTS_CXX+= t_io
-TESTS_CXX+= t_macros
-TESTS_CXX+= t_parser
-TESTS_CXX+= t_process
-TESTS_CXX+= t_signals
-TESTS_CXX+= t_tests
-TESTS_CXX+= t_text
-TESTS_CXX+= t_user
-TESTS_CXX+= t_utils
+FILESDIR= ${TESTSDIR}
+FILES= d_include_application_hpp.cpp \
+ d_include_atf_c++_hpp.cpp \
+ d_include_atffile_hpp.cpp \
+ d_include_build_hpp.cpp \
+ d_include_check_hpp.cpp \
+ d_include_config_hpp.cpp \
+ d_include_env_hpp.cpp \
+ d_include_exceptions_hpp.cpp \
+ d_include_expand_hpp.cpp \
+ d_include_formats_hpp.cpp \
+ d_include_fs_hpp.cpp \
+ d_include_io_hpp.cpp \
+ d_include_macros_hpp.cpp \
+ d_include_parser_hpp.cpp \
+ d_include_process_hpp.cpp \
+ d_include_sanity_hpp.cpp \
+ d_include_signals_hpp.cpp \
+ d_include_tests_hpp.cpp \
+ d_include_text_hpp.cpp \
+ d_include_ui_hpp.cpp \
+ d_include_user_hpp.cpp \
+ d_include_utils_hpp.cpp \
+ d_use_macros_hpp.cpp
+
+TESTS_CXX=
+.for test in t_application \
+ t_atf_c++ \
+ t_atffile \
+ t_build \
+ t_check \
+ t_config \
+ t_env \
+ t_exceptions \
+ t_expand \
+ t_formats \
+ t_fs \
+ t_io \
+ t_macros \
+ t_parser \
+ t_process \
+ t_sanity \
+ t_signals \
+ t_tests \
+ t_text \
+ t_ui \
+ t_user \
+ t_utils
+TESTS_CXX+= ${test}
+SRCS.${test}= ${test}.cpp h_lib.cpp
+.endfor
+.undef test
.include <bsd.test.mk>
Index: src/external/bsd/atf/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.2 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.3
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.2 Wed Mar 11 15:57:08 2009
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Tue Dec 22 13:38:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/03/11 15:57:08 njoly Exp $
+# $NetBSD: Makefile,v 1.3 2009/12/22 13:38:11 jmmv Exp $
.include <bsd.own.mk>
@@ -32,7 +32,7 @@
realall: atf-c.pc
atf-c.pc: atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.6,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.7,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
@@ -41,7 +41,7 @@
realall: atf-c++.pc
atf-c++.pc: atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.6,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.7,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
