Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/atf Update reachover makefiles for atf 0.10.
details: https://anonhg.NetBSD.org/src/rev/6a46b106046d
branches: trunk
changeset: 756015:6a46b106046d
user: jmmv <jmmv%NetBSD.org@localhost>
date: Sat Jul 03 08:14:11 2010 +0000
description:
Update reachover makefiles for atf 0.10.
diffstat:
external/bsd/atf/Makefile | 4 +-
external/bsd/atf/lib/libatf-c++/Makefile | 8 +-
external/bsd/atf/lib/libatf-c/Makefile | 10 +-
external/bsd/atf/lib/libatf-c/bconfig.h | 6 +-
external/bsd/atf/libexec/Makefile | 5 -
external/bsd/atf/libexec/atf-cleanup/Makefile | 17 -
external/bsd/atf/libexec/atf-format/Makefile | 17 -
external/bsd/atf/prepare-import.sh | 9 +-
external/bsd/atf/tests/atf/Makefile | 8 +-
external/bsd/atf/tests/atf/atf-c++/Makefile | 74 ++-----
external/bsd/atf/tests/atf/atf-c/Makefile | 78 ++-----
external/bsd/atf/tests/atf/atf-check/Makefile | 8 +-
external/bsd/atf/tests/atf/atf-cleanup/Makefile | 12 -
external/bsd/atf/tests/atf/atf-config/Makefile | 8 +-
external/bsd/atf/tests/atf/atf-report/Makefile | 20 +-
external/bsd/atf/tests/atf/atf-run/Makefile | 38 ++-
external/bsd/atf/tests/atf/atf-sh/Makefile | 20 +-
external/bsd/atf/tests/atf/formats/Makefile | 211 ----------------------
external/bsd/atf/tests/atf/test-programs/Makefile | 24 ++
external/bsd/atf/tests/atf/test_programs/Makefile | 22 --
external/bsd/atf/usr.bin/atf-check/Makefile | 4 +-
external/bsd/atf/usr.bin/atf-config/Makefile | 4 +-
external/bsd/atf/usr.bin/atf-report/Makefile | 6 +-
external/bsd/atf/usr.bin/atf-run/Makefile | 7 +-
external/bsd/atf/usr.bin/atf-sh/Makefile | 4 +-
external/bsd/atf/usr.bin/atf-version/Makefile | 9 +-
external/bsd/atf/usr.bin/atf-version/revision.h | 3 +
27 files changed, 170 insertions(+), 466 deletions(-)
diffs (truncated from 1023 to 300 lines):
diff -r 24bcf067a5e2 -r 6a46b106046d external/bsd/atf/Makefile
--- a/external/bsd/atf/Makefile Sat Jul 03 08:11:25 2010 +0000
+++ b/external/bsd/atf/Makefile Sat Jul 03 08:14:11 2010 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/03 08:14:11 jmmv Exp $
-SUBDIR= etc lib .WAIT libexec share usr.bin tests
+SUBDIR= etc lib .WAIT share usr.bin tests
.include <bsd.subdir.mk>
diff -r 24bcf067a5e2 -r 6a46b106046d external/bsd/atf/lib/libatf-c++/Makefile
--- a/external/bsd/atf/lib/libatf-c++/Makefile Sat Jul 03 08:11:25 2010 +0000
+++ b/external/bsd/atf/lib/libatf-c++/Makefile Sat Jul 03 08:14:11 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/07/03 08:14:11 jmmv Exp $
NOLINT= # defined
@@ -20,14 +20,12 @@
WARNS?= 2
SRCS= application.cpp \
- atffile.cpp \
build.cpp \
check.cpp \
config.cpp \
env.cpp \
exceptions.cpp \
expand.cpp \
- formats.cpp \
fs.cpp \
io.cpp \
parser.cpp \
@@ -39,14 +37,12 @@
user.cpp
INCS= application.hpp \
- atffile.hpp \
build.hpp \
check.hpp \
config.hpp \
env.hpp \
exceptions.hpp \
expand.hpp \
- formats.hpp \
fs.hpp \
io.hpp \
macros.hpp \
@@ -72,7 +68,7 @@
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.9,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.10,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
diff -r 24bcf067a5e2 -r 6a46b106046d external/bsd/atf/lib/libatf-c/Makefile
--- a/external/bsd/atf/lib/libatf-c/Makefile Sat Jul 03 08:11:25 2010 +0000
+++ b/external/bsd/atf/lib/libatf-c/Makefile Sat Jul 03 08:14:11 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2010/07/03 08:14:11 jmmv Exp $
NOLINT= # defined
@@ -41,16 +41,13 @@
env.c \
error.c \
fs.c \
- io.c \
list.c \
map.c \
process.c \
sanity.c \
text.c \
- ui.c \
user.c \
tc.c \
- tcr.c \
tp.c \
tp_main.c
@@ -63,17 +60,14 @@
error.h \
error_fwd.h \
fs.h \
- io.h \
list.h \
macros.h \
map.h \
process.h \
sanity.h \
tc.h \
- tcr.h \
text.h \
tp.h \
- ui.h \
user.h
INCSDIR= /usr/include/atf-c
@@ -96,7 +90,7 @@
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.9,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.10,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
diff -r 24bcf067a5e2 -r 6a46b106046d external/bsd/atf/lib/libatf-c/bconfig.h
--- a/external/bsd/atf/lib/libatf-c/bconfig.h Sat Jul 03 08:11:25 2010 +0000
+++ b/external/bsd/atf/lib/libatf-c/bconfig.h Sat Jul 03 08:14:11 2010 +0000
@@ -102,7 +102,7 @@
#define PACKAGE_NAME "Automated Testing Framework"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Automated Testing Framework 0.9"
+#define PACKAGE_STRING "Automated Testing Framework 0.10"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "atf"
@@ -111,10 +111,10 @@
#define PACKAGE_URL "http://www.NetBSD.org/~jmmv/atf/";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.9"
+#define PACKAGE_VERSION "0.10"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.9"
+#define VERSION "0.10"
diff -r 24bcf067a5e2 -r 6a46b106046d external/bsd/atf/libexec/Makefile
--- a/external/bsd/atf/libexec/Makefile Sat Jul 03 08:11:25 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:33 jmmv Exp $
-
-SUBDIR= atf-cleanup atf-format
-
-.include <bsd.subdir.mk>
diff -r 24bcf067a5e2 -r 6a46b106046d external/bsd/atf/libexec/atf-cleanup/Makefile
--- a/external/bsd/atf/libexec/atf-cleanup/Makefile Sat Jul 03 08:11:25 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:33 jmmv Exp $
-
-.include <bsd.own.mk>
-
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/atf-cleanup
-
-BINDIR= /usr/libexec
-PROG_CXX= atf-cleanup
-SRCS= atf-cleanup.cpp
-MAN= atf-cleanup.1
-
-LDADD+= -latf-c++ -latf-c
-
-WARNS?= 2
-
-.include <bsd.prog.mk>
diff -r 24bcf067a5e2 -r 6a46b106046d external/bsd/atf/libexec/atf-format/Makefile
--- a/external/bsd/atf/libexec/atf-format/Makefile Sat Jul 03 08:11:25 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:34 jmmv Exp $
-
-.include <bsd.own.mk>
-
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/atf-format
-
-BINDIR= /usr/libexec
-PROG_CXX= atf-format
-SRCS= atf-format.cpp
-MAN= atf-format.1
-
-LDADD+= -latf-c++ -latf-c
-
-WARNS?= 2
-
-.include <bsd.prog.mk>
diff -r 24bcf067a5e2 -r 6a46b106046d external/bsd/atf/prepare-import.sh
--- a/external/bsd/atf/prepare-import.sh Sat Jul 03 08:11:25 2010 +0000
+++ b/external/bsd/atf/prepare-import.sh Sat Jul 03 08:14:11 2010 +0000
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.1 2010/06/18 15:39:17 jmmv Exp $
+# $NetBSD: prepare-import.sh,v 1.2 2010/07/03 08:14:11 jmmv Exp $
#
# Use this script to recreate the 'dist' subdirectory from a newly released
# distfile. The script takes care of unpacking the distfile, removing any
@@ -14,14 +14,11 @@
CLEAN_PATTERNS=
CLEAN_PATTERNS="${CLEAN_PATTERNS} *.m4"
CLEAN_PATTERNS="${CLEAN_PATTERNS} INSTALL"
-CLEAN_PATTERNS="${CLEAN_PATTERNS} Makefile*"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} Makefile* */Makefile*"
CLEAN_PATTERNS="${CLEAN_PATTERNS} admin/[a-qsz]*"
CLEAN_PATTERNS="${CLEAN_PATTERNS} bconfig.h.in"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} bootstrap"
CLEAN_PATTERNS="${CLEAN_PATTERNS} configure*"
-CLEAN_PATTERNS="${CLEAN_PATTERNS} doc/*.sh"
-CLEAN_PATTERNS="${CLEAN_PATTERNS} doc/*.xml"
-CLEAN_PATTERNS="${CLEAN_PATTERNS} doc/standalone"
-CLEAN_PATTERNS="${CLEAN_PATTERNS} doc/text"
CLEAN_PATTERNS="${CLEAN_PATTERNS} m4"
err() {
diff -r 24bcf067a5e2 -r 6a46b106046d external/bsd/atf/tests/atf/Makefile
--- a/external/bsd/atf/tests/atf/Makefile Sat Jul 03 08:11:25 2010 +0000
+++ b/external/bsd/atf/tests/atf/Makefile Sat Jul 03 08:14:11 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/07/03 08:14:11 jmmv Exp $
.include <bsd.own.mk>
@@ -7,16 +7,14 @@
SUBDIR= atf-c \
atf-c++ \
atf-check \
- atf-cleanup \
atf-config \
atf-report \
atf-run \
atf-sh \
- formats \
- test_programs
+ test-programs
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tests/atf
+.PATH: ${SRCDIR}
.include <bsd.test.mk>
.include <bsd.subdir.mk>
diff -r 24bcf067a5e2 -r 6a46b106046d external/bsd/atf/tests/atf/atf-c++/Makefile
--- a/external/bsd/atf/tests/atf/atf-c++/Makefile Sat Jul 03 08:11:25 2010 +0000
+++ b/external/bsd/atf/tests/atf/atf-c++/Makefile Sat Jul 03 08:14:11 2010 +0000
@@ -1,68 +1,44 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/07/03 08:14:12 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/atf/atf-c++
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tests/atf/atf-c++
+.PATH: ${SRCDIR}/atf-c++
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-c
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
+FILES= macros_hpp_test.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 \
Home |
Main Index |
Thread Index |
Old Index