Page MenuHomeFreeBSD
Files F148157052

D24103.id69613.diff
No OneTemporary
Actions

D24103.id69613.diff
View Options

Index: etc/mtree/BSD.root.dist
===================================================================
--- etc/mtree/BSD.root.dist
+++ etc/mtree/BSD.root.dist
@@ -54,6 +54,8 @@
..
gss
..
+ kyua
+ ..
mail
..
mtree
Index: etc/mtree/BSD.usr.dist
===================================================================
--- etc/mtree/BSD.usr.dist
+++ etc/mtree/BSD.usr.dist
@@ -313,6 +313,8 @@
..
..
..
+ kyua
+ ..
libusb20
..
libvgl
@@ -450,6 +452,12 @@
..
..
..
+ kyua
+ misc
+ ..
+ store
+ ..
+ ..
locale
af_ZA.ISO8859-1
..
Index: lib/Makefile
===================================================================
--- lib/Makefile
+++ lib/Makefile
@@ -205,6 +205,8 @@
SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil
SUBDIR.${MK_TELNET}+= libtelnet
SUBDIR.${MK_TESTS_SUPPORT}+= atf
+SUBDIR.${MK_TESTS_SUPPORT}.${MK_CXX}+= kyua
+SUBDIR.${MK_TESTS_SUPPORT}.${MK_CXX}+= liblutok
SUBDIR.${MK_TESTS}+= tests
SUBDIR.${MK_UNBOUND}+= libunbound
SUBDIR.${MK_USB}+= libusbhid libusb
Index: lib/kyua/Makefile
===================================================================
--- /dev/null
+++ lib/kyua/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+SUBDIR= cli \
+ drivers \
+ engine \
+ model \
+ store \
+ utils
+
+.include <bsd.subdir.mk>
Index: lib/kyua/Makefile.inc
===================================================================
--- /dev/null
+++ lib/kyua/Makefile.inc
@@ -0,0 +1,18 @@
+KYUA_LIBDIR:= ${.PARSEDIR}
+
+.include "${KYUA_LIBDIR}/Makefile.kyua"
+
+LIB_CXX= kyua_${KYUA_LIB}
+INTERNALLIB=
+
+.PATH: ${KYUA_SRCDIR}/${KYUA_LIB}
+CFLAGS+= -I${KYUA_LIBDIR} \
+ -I${KYUA_SRCDIR} \
+ -I${SRCTOP}/contrib/lutok/include
+
+CFLAGS+= -DHAVE_CONFIG_H
+
+# kyua uses auto_ptr
+CFLAGS+= -Wno-deprecated-declarations
+
+.include "${.PARSEDIR}/../Makefile.inc"
Index: lib/kyua/Makefile.kyua
===================================================================
--- /dev/null
+++ lib/kyua/Makefile.kyua
@@ -0,0 +1,9 @@
+KYUA_VERSION= 0.13
+
+KYUA_CONFDIR= /etc/kyua
+KYUA_DOCDIR= /nonexistant
+KYUA_EGDIR= /usr/share/examples/kyua
+KYUA_MISCDIR= /usr/share/kyua/misc
+KYUA_STOREDIR= /usr/share/kyua/store
+
+KYUA_SRCDIR= ${SRCTOP}/contrib/kyua
Index: lib/kyua/cli/Makefile
===================================================================
--- /dev/null
+++ lib/kyua/cli/Makefile
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+KYUA_LIB= cli
+INTERNALLIB=
+CFLAGS+= -DKYUA_CONFDIR=\"${KYUA_CONFDIR}\" \
+ -DKYUA_DOCDIR=\"${KYUA_CONFDIR}\" \
+ -DKYUA_MISCDIR=\"${KYUA_MISCDIR}\" \
+ -DPACKAGE=\"kyua\" \
+ -DPACKAGE_NAME=\"Kyua\" \
+ -DPACKAGE_VERSION=\"${KYUA_VERSION}\" \
+ -DVERSION=\"${KYUA_VERSION}\"
+
+SRCS= cmd_about.cpp \
+ cmd_config.cpp \
+ cmd_db_exec.cpp \
+ cmd_db_migrate.cpp \
+ cmd_debug.cpp \
+ cmd_help.cpp \
+ cmd_list.cpp \
+ cmd_report.cpp \
+ cmd_report_html.cpp \
+ cmd_report_junit.cpp \
+ cmd_test.cpp \
+ common.cpp \
+ config.cpp \
+ main.cpp
+
+.include <bsd.lib.mk>
Index: lib/kyua/config.h
===================================================================
--- /dev/null
+++ lib/kyua/config.h
@@ -0,0 +1,122 @@
+/* config.h. Generated from config.h.in by configure. */
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define to the optind value to reset getopt processing */
+#define GETOPT_OPTIND_RESET_VALUE 1
+
+/* Define to 1 if getcwd(NULL, 0) works */
+#define HAVE_GETCWD_DYN 1
+
+/* Define to 1 if getopt allows a + sign for POSIX behavior */
+/* #undef HAVE_GETOPT_GNU */
+
+/* Define to 1 if getopt has optreset */
+#define HAVE_GETOPT_WITH_OPTRESET 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `putenv' function. */
+#define HAVE_PUTENV 1
+
+/* Define to 1 if you have the `setenv' function. */
+#define HAVE_SETENV 1
+
+/* Define to 1 if you have the `statfs' function. */
+#define HAVE_STATFS 1
+
+/* Define to 1 if you have the `statvfs' function. */
+#define HAVE_STATVFS 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `sysctlbyname' function. */
+#define HAVE_SYSCTLBYNAME 1
+
+/* Define to 1 if you have the <sys/mount.h> header file. */
+#define HAVE_SYS_MOUNT_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/statvfs.h> header file. */
+#define HAVE_SYS_STATVFS_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#define HAVE_SYS_SYSCTL_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/vfs.h> header file. */
+/* #undef HAVE_SYS_VFS_H */
+
+/* Define to 1 if you have the <termios.h> header file. */
+#define HAVE_TERMIOS_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `unmount' function. */
+#define HAVE_UNMOUNT 1
+
+/* Define to 1 if you have the `unsetenv' function. */
+#define HAVE_UNSETENV 1
+
+/* Define to 1 if your lchmod works */
+#define HAVE_WORKING_LCHMOD 1
+
+/* Define to the last valid signal number */
+#define LAST_SIGNO 128
+
+/* Define to the name of the sysctl MIB */
+#define MEMORY_QUERY_SYSCTL_MIB "hw.usermem"
+
+/* Define to the memory query type */
+#define MEMORY_QUERY_TYPE "sysctlbyname"
+
+/* Name of package */
+#define PACKAGE "kyua"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "kyua-discuss@googlegroups.com"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "Kyua"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "Kyua 0.13"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "kyua"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL "https://github.com/jmmv/kyua/"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.13"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Set to the path of umount(8) */
+/* #undef UMOUNT */
+
+/* Version number of package */
+#define VERSION "0.13"
Index: lib/kyua/drivers/Makefile
===================================================================
--- /dev/null
+++ lib/kyua/drivers/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+KYUA_LIB= drivers
+
+SRCS= debug_test.cpp \
+ list_tests.cpp \
+ report_junit.cpp \
+ run_tests.cpp \
+ scan_results.cpp
+
+.include <bsd.lib.mk>
Index: lib/kyua/engine/Makefile
===================================================================
--- /dev/null
+++ lib/kyua/engine/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+KYUA_LIB= engine
+CFLAGS= -DKYUA_ARCHITECTURE=\"${MACHINE_ARCH}\" \
+ -DKYUA_PLATFORM=\"${MACHINE}\"
+
+SRCS= atf.cpp \
+ atf_list.cpp \
+ atf_result.cpp \
+ config.cpp \
+ exceptions.cpp \
+ filters.cpp \
+ kyuafile.cpp \
+ plain.cpp \
+ requirements.cpp \
+ scanner.cpp \
+ tap.cpp \
+ tap_parser.cpp \
+ scheduler.cpp
+
+.include <bsd.lib.mk>
Index: lib/kyua/model/Makefile
===================================================================
--- /dev/null
+++ lib/kyua/model/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+KYUA_LIB= model
+
+SRCS= context.cpp \
+ exceptions.cpp \
+ metadata.cpp \
+ test_case.cpp \
+ test_program.cpp \
+ test_result.cpp
+
+.include <bsd.lib.mk>
Index: lib/kyua/store/Makefile
===================================================================
--- /dev/null
+++ lib/kyua/store/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+KYUA_LIB= store
+
+CFLAGS+= -DKYUA_STOREDIR=\"${KYUA_STOREDIR}\"
+
+SRCS= dbtypes.cpp \
+ exceptions.cpp \
+ layout.cpp \
+ metadata.cpp \
+ migrate.cpp \
+ read_backend.cpp \
+ read_transaction.cpp \
+ write_backend.cpp \
+ write_transaction.cpp
+
+.include <bsd.lib.mk>
Index: lib/kyua/utils/Makefile
===================================================================
--- /dev/null
+++ lib/kyua/utils/Makefile
@@ -0,0 +1,64 @@
+# $FreeBSD$
+
+KYUA_LIB= utils
+
+CFLAGS+= -I${SRCTOP}/contrib/sqlite3
+CFLAGS+= -DGDB=\"/usr/local/bin/gdb\"
+
+SRCS= datetime.cpp \
+ env.cpp \
+ memory.cpp \
+ passwd.cpp \
+ sanity.cpp \
+ stacktrace.cpp \
+ stream.cpp \
+ units.cpp \
+ cmdline/base_command.cpp \
+ cmdline/exceptions.cpp \
+ cmdline/globals.cpp \
+ cmdline/options.cpp \
+ cmdline/parser.cpp \
+ cmdline/ui.cpp \
+ cmdline/ui_mock.cpp \
+ config/exceptions.cpp \
+ config/keys.cpp \
+ config/lua_module.cpp \
+ config/nodes.cpp \
+ config/parser.cpp \
+ config/tree.cpp \
+ format/exceptions.cpp \
+ format/formatter.cpp \
+ fs/auto_cleaners.cpp \
+ fs/directory.cpp \
+ fs/exceptions.cpp \
+ fs/lua_module.cpp \
+ fs/operations.cpp \
+ fs/path.cpp \
+ logging/operations.cpp \
+ process/child.cpp \
+ process/deadline_killer.cpp \
+ process/exceptions.cpp \
+ process/executor.cpp \
+ process/fdstream.cpp \
+ process/isolation.cpp \
+ process/operations.cpp \
+ process/status.cpp \
+ process/system.cpp \
+ process/systembuf.cpp \
+ signals/exceptions.cpp \
+ signals/interrupts.cpp \
+ signals/misc.cpp \
+ signals/programmer.cpp \
+ signals/timer.cpp \
+ sqlite/c_gate.cpp \
+ sqlite/database.cpp \
+ sqlite/exceptions.cpp \
+ sqlite/statement.cpp \
+ sqlite/transaction.cpp \
+ text/exceptions.cpp \
+ text/operations.cpp \
+ text/regex.cpp \
+ text/table.cpp \
+ text/templates.cpp \
+
+.include <bsd.lib.mk>
Index: lib/kyua/utils/defs.hpp
===================================================================
--- /dev/null
+++ lib/kyua/utils/defs.hpp
@@ -0,0 +1,70 @@
+// Copyright 2010 The Kyua Authors.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/// \file utils/defs.hpp
+///
+/// Definitions for compiler and system features autodetected at configuration
+/// time.
+
+#if !defined(UTILS_DEFS_HPP)
+#define UTILS_DEFS_HPP
+
+
+/// Attribute to mark a function as non-returning.
+#define UTILS_NORETURN __attribute__((noreturn))
+
+
+/// Attribute to mark a function as pure.
+#define UTILS_PURE __attribute__((__pure__))
+
+
+/// Attribute to mark an entity as unused.
+#define UTILS_UNUSED __attribute__((__unused__))
+
+
+/// Unconstifies a pointer.
+///
+/// \param type The target type of the conversion.
+/// \param ptr The pointer to be unconstified.
+#define UTILS_UNCONST(type, ptr) ((type*)(unsigned long)(const void*)(ptr))
+
+
+/// Macro to mark a parameter as unused.
+///
+/// This macro has to be called on the name of a parameter during the
+/// definition (not declaration) of a function. When doing so, it declares
+/// the parameter as unused to silence compiler warnings and also renames
+/// the parameter by prefixing "unused_" to it. This is to ensure that the
+/// developer remembers to remove the call to this macro from the parameter
+/// when he actually starts using it.
+///
+/// \param name The name of the function parameter to mark as unused.
+#define UTILS_UNUSED_PARAM(name) unused_ ## name UTILS_UNUSED
+
+
+#endif // !defined(UTILS_DEFS_HPP)
Index: lib/liblutok/Makefile
===================================================================
--- /dev/null
+++ lib/liblutok/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+LIB_CXX= lutok
+INTERNALLIB=
+
+LIBADD= lua
+
+.PATH: ${SRCTOP}/contrib/lutok
+SRCS= c_gate.cpp \
+ debug.cpp \
+ exceptions.cpp \
+ operations.cpp \
+ stack_cleaner.cpp \
+ state.cpp
+
+CFLAGS+= -I${SRCTOP}/contrib/lutok/include \
+ -I${SRCTOP}/lib/liblua \
+ -I${SRCTOP}/contrib/lua/src
+
+WARNS?= 3
+SHLIB_MAJOR= 0
+
+# lutok uses auto_ptr
+CFLAGS+= -Wno-deprecated-declarations
+
+.include <bsd.lib.mk>
Index: share/mk/src.libnames.mk
===================================================================
--- share/mk/src.libnames.mk
+++ share/mk/src.libnames.mk
@@ -40,8 +40,15 @@
fifolog \
ifconfig \
ipf \
+ kyua_cli \
+ kyua_drivers \
+ kyua_engine \
+ kyua_model \
+ kyua_store \
+ kyua_utils \
lpr \
lua \
+ lutok \
netbsd \
ntp \
ntpevent \
@@ -256,6 +263,8 @@
_DP_geom= bsdxml sbuf
_DP_cam= sbuf
_DP_kvm= elf
+_DP_kyua_cli= lutok kyua_utils
+_DP_kyua_store= sqlite3
_DP_casper= nv
_DP_cap_dns= nv
_DP_cap_fileargs= nv
@@ -295,6 +304,7 @@
_DP_mt= sbuf bsdxml
_DP_ldns= ssl crypto
_DP_lua= m
+_DP_lutok= lua
.if ${MK_OPENSSL} != "no"
_DP_fetch= ssl crypto
.else
@@ -470,9 +480,30 @@
LIBELFTCDIR= ${_LIB_OBJTOP}/lib/libelftc
LIBELFTC?= ${LIBELFTCDIR}/libelftc${PIE_SUFFIX}.a
+LIBKYUA_CLIDIR= ${_LIB_OBJTOP}/lib/kyua/cli
+LIBKYUA_CLI?= ${LIBKYUA_CLIDIR}/libkyua_cli${PIE_SUFFIX}.a
+
+LIBKYUA_DRIVERSDIR= ${_LIB_OBJTOP}/lib/kyua/drivers
+LIBKYUA_DRIVERS?= ${LIBKYUA_DRIVERSDIR}/libkyua_drivers${PIE_SUFFIX}.a
+
+LIBKYUA_ENGINEDIR= ${_LIB_OBJTOP}/lib/kyua/engine
+LIBKYUA_ENGINE?= ${LIBKYUA_ENGINEDIR}/libkyua_engine${PIE_SUFFIX}.a
+
+LIBKYUA_MODELDIR= ${_LIB_OBJTOP}/lib/kyua/model
+LIBKYUA_MODEL?= ${LIBKYUA_MODELDIR}/libkyua_model${PIE_SUFFIX}.a
+
+LIBKYUA_STOREDIR= ${_LIB_OBJTOP}/lib/kyua/store
+LIBKYUA_STORE?= ${LIBKYUA_STOREDIR}/libkyua_store${PIE_SUFFIX}.a
+
+LIBKYUA_UTILSDIR= ${_LIB_OBJTOP}/lib/kyua/utils
+LIBKYUA_UTILS?= ${LIBKYUA_UTILSDIR}/libkyua_utils${PIE_SUFFIX}.a
+
LIBLUADIR= ${_LIB_OBJTOP}/lib/liblua
LIBLUA?= ${LIBLUADIR}/liblua${PIE_SUFFIX}.a
+LIBLUTOKDIR= ${_LIB_OBJTOP}/lib/liblutok
+LIBLUTOK?= ${LIBLUTOKDIR}/liblutok${PIE_SUFFIX}.a
+
LIBPEDIR= ${_LIB_OBJTOP}/lib/libpe
LIBPE?= ${LIBPEDIR}/libpe${PIE_SUFFIX}.a
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -8769,6 +8769,7 @@
.endif # Test suite.
.if ${MK_TESTS_SUPPORT} == no
+OLD_FILES+=usr/bin/kyua
OLD_FILES+=usr/include/atf-c++.hpp
OLD_FILES+=usr/include/atf-c++/build.hpp
OLD_FILES+=usr/include/atf-c++/check.hpp
@@ -8785,12 +8786,36 @@
OLD_FILES+=usr/include/atf-c/tc.h
OLD_FILES+=usr/include/atf-c/tp.h
OLD_FILES+=usr/include/atf-c/utils.h
+OLD_FILES+=usr/lib/debug/usr/bin/kyua.debug
OLD_LIBS+=usr/lib/private/libatf-c++.so.2
OLD_LIBS+=usr/lib/private/libatf-c.so.1
+OLD_FILES+=usr/share/examples/kyua/kyua.conf
+OLD_FILES+=usr/share/examples/kyua/Kyuafile.top
+OLD_FILES+=usr/share/kyua/misc/context.html
+OLD_FILES+=usr/share/kyua/misc/index.html
+OLD_FILES+=usr/share/kyua/misc/report.css
+OLD_FILES+=usr/share/kyua/misc/test_result.html
+OLD_FILES+=usr/share/kyua/store/migrate_v1_v2.sql
+OLD_FILES+=usr/share/kyua/store/migrate_v2_v3.sql
+OLD_FILES+=usr/share/kyua/store/schema_v3.sql
+OLD_FILES+=usr/share/man/man1/kyua-about.1.gz
+OLD_FILES+=usr/share/man/man1/kyua-config.1.gz
+OLD_FILES+=usr/share/man/man1/kyua-db-exec.1.gz
+OLD_FILES+=usr/share/man/man1/kyua-db-migrate.1.gz
+OLD_FILES+=usr/share/man/man1/kyua-debug.1.gz
+OLD_FILES+=usr/share/man/man1/kyua-help.1.gz
+OLD_FILES+=usr/share/man/man1/kyua-list.1.gz
+OLD_FILES+=usr/share/man/man1/kyua-report-html.1.gz
+OLD_FILES+=usr/share/man/man1/kyua-report-junit.1.gz
+OLD_FILES+=usr/share/man/man1/kyua-report.1.gz
+OLD_FILES+=usr/share/man/man1/kyua-test.1.gz
+OLD_FILES+=usr/share/man/man1/kyua.1.gz
OLD_FILES+=usr/share/man/man3/atf-c++.3.gz
OLD_FILES+=usr/share/man/man3/atf-c-api++.3.gz
OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz
OLD_FILES+=usr/share/man/man3/atf-c.3.gz
+OLD_FILES+=usr/share/man/man5/kyua.conf.5.gz
+OLD_FILES+=usr/share/man/man5/kyuafile.5.gz
OLD_FILES+=usr/tests/lib/atf/Kyuafile
OLD_FILES+=usr/tests/lib/atf/libatf-c++/Kyuafile
OLD_FILES+=usr/tests/lib/atf/libatf-c++/atf_c++_test
Index: usr.bin/Makefile
===================================================================
--- usr.bin/Makefile
+++ usr.bin/Makefile
@@ -246,6 +246,7 @@
SUBDIR.${MK_SENDMAIL}+= vacation
SUBDIR.${MK_TALK}+= talk
SUBDIR.${MK_TELNET}+= telnet
+SUBDIR.${MK_TESTS_SUPPORT}.${MK_CXX}+= kyua
SUBDIR.${MK_TESTS}+= tests
SUBDIR.${MK_TEXTPROC}+= ul
SUBDIR.${MK_TFTP}+= tftp
Index: usr.bin/kyua/Makefile
===================================================================
--- /dev/null
+++ usr.bin/kyua/Makefile
@@ -0,0 +1,64 @@
+# $FreeBSD$
+
+.include "${SRCTOP}/lib/kyua/Makefile.kyua"
+
+.PATH: ${KYUA_SRCDIR}
+
+PROG_CXX= kyua
+SRCS= main.cpp
+LIBADD= kyua_cli kyua_drivers kyua_engine kyua_model kyua_store
+
+MAN= kyua-about.1 \
+ kyua-config.1 \
+ kyua-db-exec.1 \
+ kyua-db-migrate.1 \
+ kyua-debug.1 \
+ kyua-help.1 \
+ kyua-list.1 \
+ kyua-report-html.1 \
+ kyua-report-junit.1 \
+ kyua-report.1 \
+ kyua-test.1 \
+ kyua.1 \
+ kyua.conf.5 \
+ kyuafile.5
+
+CFLAGS+= -I${KYUA_SRCDIR}
+
+# kyua uses auto_ptr
+CFLAGS+= -Wno-deprecated-declarations
+
+FILESGROUPS= EXAMPLES MISC STORE
+
+CONFS= kyua.conf
+CONFSDIR= ${KYUA_CONFDIR}
+
+EXAMPLES= Kyuafile.top kyua.conf
+EXAMPLESDIR= ${KYUA_EGDIR}
+.PATH: ${KYUA_SRCDIR}/examples
+
+MISC= context.html index.html report.css test_result.html
+MISCDIR= ${KYUA_MISCDIR}
+.PATH: ${KYUA_SRCDIR}/misc
+
+STORE= migrate_v1_v2.sql migrate_v2_v3.sql schema_v3.sql
+STOREDIR= ${KYUA_STOREDIR}
+.PATH: ${KYUA_SRCDIR}/store
+
+CLEANFILES+= ${MAN}
+.PATH: ${KYUA_SRCDIR}/doc
+.for man in ${MAN}
+${man}: ${man}.in
+ ${SH} ${KYUA_SRCDIR}/doc/manbuild.sh \
+ -v "CONFDIR=${KYUA_CONFDIR}" \
+ -v "DOCDIR=${KYUA_DOCDIR}" \
+ -v "EGDIR=${KYUA_EGDIR}" \
+ -v "MISCDIR=${KYUA_MISCDIR}" \
+ -v "PACKAGE=kyua" \
+ -v "STOREDIR=${KYUA_STOREDIR}" \
+ -v "TESTSDIR=${TESTSBASE}" \
+ -v "VERSION=${KYUA_VERSION}" \
+ ${.ALLSRC} ${.TARGET}
+.endfor
+
+.include <bsd.prog.mk>

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 17, 3:45 AM (18 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29806245
Default Alt Text
D24103.id69613.diff (19 KB)

Event Timeline