removed cppunit; version 1.12.0 has been included in Ubuntu since gutsy
This commit is contained in:
fgerlits
parent
eb5cd31f69
commit
c0f83fc84c
|
|
@ -144,10 +144,6 @@ doc_tmpdir=$ls_tmpdir/doc
|
|||
etc_tmpdir=$ls_tmpdir/etc
|
||||
tmp_tmpdir=$ls_tmpdir/tmp
|
||||
|
||||
cxxunit_dir=$toolsdir/cppunit
|
||||
cxxunit_version=cppunit-1.10.2
|
||||
cxxunit_tmpdir=$tools_tmpdir/cppunit
|
||||
|
||||
libodbcxx_dir=$toolsdir/libodbc++
|
||||
libodbcxx_version=libodbc++-0.2.4pre4
|
||||
libodbcxx_tmpdir=$tools_tmpdir/libodbc++
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@ system:<br>
|
|||
<li><a href="http://www.gstreamer.net/">gstreamer</a> >= 0.10.17</li>
|
||||
including at least <a href="http://gstreamer.freedesktop.org/releases/gst-plugins-good/">gst-plugins-good</a>; also <a href="http://gstreamer.freedesktop.org/releases/gst-plugins-ugly/">gst-plugins-ugly</a> if you want mp3 playback
|
||||
<li><a href="http://libserial.sourceforge.net/">libserial</a> >= 0.5.2</li>
|
||||
<li><a href="http://sourceforge.net/projects/cppunit">cppunit</a> >= 1.12.0</li>
|
||||
</ul>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -101,8 +101,6 @@ FLAWFINDER_FILE = ${DOC_DIR}/flawfinderReport.html
|
|||
|
||||
TOOLS_DIR = ${SRC_DIR}/tools
|
||||
|
||||
CPPUNIT_DIR = ${TOOLS_DIR}/cppunit
|
||||
CPPUNIT_VERSION = cppunit-1.10.2
|
||||
LIBODBCXX_DIR = ${TOOLS_DIR}/libodbc++
|
||||
LIBODBCXX_VERSION = libodbc++-0.2.4pre4
|
||||
XMLRPCXX_DIR = ${TOOLS_DIR}/xmlrpc++
|
||||
|
|
@ -199,11 +197,6 @@ recompile: modprod_distclean modules_setup products_setup compile
|
|||
|
||||
tools_setup: ${TMP_DIR}/tools_setup.stamp
|
||||
${TMP_DIR}/tools_setup.stamp:
|
||||
ifeq ("@COMPILE_CPPUNIT@", "yes")
|
||||
cd ${CPPUNIT_DIR}/${CPPUNIT_VERSION} && ./configure --prefix=${prefix}
|
||||
${MAKE} -C ${CPPUNIT_DIR}/${CPPUNIT_VERSION} install
|
||||
endif
|
||||
|
||||
cd ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} && ./configure --prefix=${prefix}
|
||||
${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} install
|
||||
|
||||
|
|
@ -219,9 +212,6 @@ endif
|
|||
touch ${TMP_DIR}/tools_setup.stamp
|
||||
|
||||
tools_distclean:
|
||||
ifeq ("@COMPILE_CPPUNIT@", "yes")
|
||||
-${MAKE} -C ${CPPUNIT_DIR}/${CPPUNIT_VERSION} distclean
|
||||
endif
|
||||
-${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} distclean
|
||||
-${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} distclean
|
||||
-${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} distclean
|
||||
|
|
|
|||
|
|
@ -275,22 +275,6 @@ AC_ARG_WITH([studio-audio-cue],
|
|||
AC_MSG_RESULT([using audio cue device for studio: ${STUDIO_AUDIO_CUE}])
|
||||
|
||||
|
||||
dnl-----------------------------------------------------------------------------
|
||||
dnl determine which optional packages will be compiled
|
||||
dnl-----------------------------------------------------------------------------
|
||||
AC_SUBST(COMPILE_CPPUNIT)
|
||||
|
||||
PKG_CHECK_EXISTS([cppunit >= 1.12.0],
|
||||
[
|
||||
AC_MSG_RESULT([using cppunit found on the system])
|
||||
COMPILE_CPPUNIT="no"
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT([did not find cppunit >= 1.12.0, will compile from our own])
|
||||
COMPILE_CPPUNIT="yes"
|
||||
])
|
||||
|
||||
|
||||
dnl-----------------------------------------------------------------------------
|
||||
dnl set up the individual components
|
||||
dnl
|
||||
|
|
@ -371,7 +355,6 @@ AC_MSG_NOTICE(
|
|||
[compiling the following external libraries that are needed
|
||||
by Campcaster:
|
||||
|
||||
cppunit 1.10.2 ${COMPILE_CPPUNIT}
|
||||
libodbc++ 0.2.4pre4 yes
|
||||
taglib 1.4 yes
|
||||
xmlrpc++ 2004-07-13 yes
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
MD5 1d1904de3d5f6dd756279f300a4ae35d cppunit-1.10.2-r1.ebuild 1081
|
||||
MD5 b437cd880b8b07ee37ff84cb9f912bed .cppunit-1.10.2-r1.ebuild.swp 12288
|
||||
MD5 2f66c625e1f7de63458cfb987e9b0d9d files/digest-cppunit-1.10.2-r1 66
|
||||
MD5 bc589fdb15867ba23639c300f62e70f5 files/cppunit-1.10.2-nostandalone.patch 3175
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
# Copyright 1999-2005 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header$
|
||||
|
||||
inherit eutils
|
||||
|
||||
IUSE="doc"
|
||||
|
||||
DESCRIPTION="CppUnit is the C++ port of the famous JUnit framework for unit testing."
|
||||
HOMEPAGE="http://cppunit.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc sparc x86"
|
||||
|
||||
RESTRICT="maketest"
|
||||
|
||||
DEPEND="doc? ( app-doc/doxygen )
|
||||
media-gfx/graphviz"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd ${S}
|
||||
epatch ${FILESDIR}/cppunit-1.10.2-nostandalone.patch
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
econf `use_enable doc doxygen` || die "configure failed"
|
||||
emake || die
|
||||
#make check || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
make DESTDIR=${D} install || die
|
||||
dodoc AUTHORS BUGS COPYING NEWS README THANKS TODO
|
||||
# the package automatically puts its docs into /usr/share/cppunit
|
||||
# move them to the standard location and clean up
|
||||
mv ${D}/usr/share/cppunit/html ${D}/usr/share/doc/${PF}
|
||||
rm -rf ${D}/usr/share/cppunit
|
||||
}
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
diff -Naur cppunit-1.10.2/include/cppunit/XmlOutputter.h cppunit-1.10.2-nostandalone/include/cppunit/XmlOutputter.h
|
||||
--- cppunit-1.10.2/include/cppunit/XmlOutputter.h 2002-09-17 01:31:29.000000000 +0700
|
||||
+++ cppunit-1.10.2-nostandalone/include/cppunit/XmlOutputter.h 2004-07-24 15:44:00.816814688 +0700
|
||||
@@ -94,6 +94,16 @@
|
||||
virtual void addSuccessfulTests( FailedTests &failedTests,
|
||||
XmlElement *rootNode );
|
||||
|
||||
+ /*! \brief set the output document as standalone or not.
|
||||
+ *
|
||||
+ * For the output document, specify wether it's a standalone XML
|
||||
+ * document, or not.
|
||||
+ *
|
||||
+ * \param standalone if true, the output will be specified as standalone.
|
||||
+ * if false, it will be not.
|
||||
+ */
|
||||
+ virtual void setStandalone(bool standalone);
|
||||
+
|
||||
/*! \brief Adds the statics element to the root node.
|
||||
*
|
||||
* Creates a new element containing statistics data and adds it to the root element.
|
||||
diff -Naur cppunit-1.10.2/include/cppunit/tools/XmlDocument.h cppunit-1.10.2-nostandalone/include/cppunit/tools/XmlDocument.h
|
||||
--- cppunit-1.10.2/include/cppunit/tools/XmlDocument.h 2002-08-29 14:36:50.000000000 +0700
|
||||
+++ cppunit-1.10.2-nostandalone/include/cppunit/tools/XmlDocument.h 2004-07-24 15:39:03.516011280 +0700
|
||||
@@ -42,6 +42,9 @@
|
||||
std::string styleSheet() const;
|
||||
void setStyleSheet( const std::string &styleSheet = "" );
|
||||
|
||||
+ bool standalone(void) const;
|
||||
+ void setStandalone(bool standalone);
|
||||
+
|
||||
void setRootElement( XmlElement *rootElement );
|
||||
XmlElement &rootElement() const;
|
||||
|
||||
@@ -58,6 +61,7 @@
|
||||
std::string m_encoding;
|
||||
std::string m_styleSheet;
|
||||
XmlElement *m_rootElement;
|
||||
+ bool m_standalone;
|
||||
};
|
||||
|
||||
|
||||
diff -Naur cppunit-1.10.2/src/cppunit/XmlDocument.cpp cppunit-1.10.2-nostandalone/src/cppunit/XmlDocument.cpp
|
||||
--- cppunit-1.10.2/src/cppunit/XmlDocument.cpp 2002-08-28 04:51:18.000000000 +0700
|
||||
+++ cppunit-1.10.2-nostandalone/src/cppunit/XmlDocument.cpp 2004-07-24 15:40:03.344915904 +0700
|
||||
@@ -11,6 +11,7 @@
|
||||
, m_styleSheet( styleSheet )
|
||||
{
|
||||
setEncoding( encoding );
|
||||
+ m_standalone = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -67,11 +68,29 @@
|
||||
}
|
||||
|
||||
|
||||
+bool
|
||||
+XmlDocument::standalone() const
|
||||
+{
|
||||
+ return m_standalone;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+void
|
||||
+XmlDocument::setStandalone(bool standalone)
|
||||
+{
|
||||
+ m_standalone = standalone;
|
||||
+}
|
||||
+
|
||||
+
|
||||
std::string
|
||||
XmlDocument::toString() const
|
||||
{
|
||||
std::string asString = "<?xml version=\"1.0\" "
|
||||
- "encoding='" + m_encoding + "' standalone='yes' ?>\n";
|
||||
+ "encoding='" + m_encoding + "'";
|
||||
+ if (m_standalone) {
|
||||
+ asString += " standalone='yes'";
|
||||
+ }
|
||||
+ asString += " ?>\n";
|
||||
|
||||
if ( !m_styleSheet.empty() )
|
||||
asString += "<?xml-stylesheet type=\"text/xsl\" href=\"" + m_styleSheet + "\"?>\n";
|
||||
diff -Naur cppunit-1.10.2/src/cppunit/XmlOutputter.cpp cppunit-1.10.2-nostandalone/src/cppunit/XmlOutputter.cpp
|
||||
--- cppunit-1.10.2/src/cppunit/XmlOutputter.cpp 2003-03-15 15:55:29.000000000 +0700
|
||||
+++ cppunit-1.10.2-nostandalone/src/cppunit/XmlOutputter.cpp 2004-07-24 15:42:59.090198560 +0700
|
||||
@@ -43,6 +43,13 @@
|
||||
}
|
||||
|
||||
|
||||
+void
|
||||
+XmlOutputter::setStandalone(bool standalone)
|
||||
+{
|
||||
+ m_xml->setStandalone(standalone);
|
||||
+}
|
||||
+
|
||||
+
|
||||
void
|
||||
XmlOutputter::write()
|
||||
{
|
||||
|
|
@ -1 +0,0 @@
|
|||
MD5 0bc06cd219410f7d4f6bbfc9bdd7c824 cppunit-1.10.2.tar.gz 723340
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
#!/bin/bash
|
||||
#-------------------------------------------------------------------------------
|
||||
# Copyright (c) 2004 Media Development Loan Fund
|
||||
#
|
||||
# This file is part of the Campcaster project.
|
||||
# http://campcaster.campware.org/
|
||||
# To report bugs, send an e-mail to bugs@campware.org
|
||||
#
|
||||
# Campcaster is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Campcaster is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Campcaster; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
#
|
||||
# Author : $Author$
|
||||
# Version : $Revision$
|
||||
# Location : $URL$
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Run this to set up the build system: configure, makefiles, etc.
|
||||
# (based on the version in enlightenment's cvs)
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
package="cppunit"
|
||||
|
||||
# assume we're in $basedir/bin
|
||||
reldir=`dirname $0`/..
|
||||
basedir=`cd $reldir; pwd;`
|
||||
test -z "$basedir" && basedir=.
|
||||
usrdir=`cd $basedir/../../../../usr; pwd;`
|
||||
|
||||
bindir=$basedir/bin
|
||||
etcdir=$basedir/etc
|
||||
tmpdir=$basedir/tmp
|
||||
|
||||
cd "$tmpdir"
|
||||
DIE=0
|
||||
|
||||
(autoheader --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "You must have autoconf installed to compile $package."
|
||||
echo "Download the appropriate package for your distribution,"
|
||||
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
|
||||
DIE=1
|
||||
}
|
||||
|
||||
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "You must have autoconf installed to compile $package."
|
||||
echo "Download the appropriate package for your distribution,"
|
||||
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
|
||||
DIE=1
|
||||
}
|
||||
|
||||
if test "$DIE" -eq 1; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test -z "$*"; then
|
||||
echo "I am going to run ./configure with no arguments - if you wish "
|
||||
echo "to pass any to it, please specify them on the $0 command line."
|
||||
fi
|
||||
|
||||
echo "Generating configuration files for $package, please wait...."
|
||||
|
||||
configure_ac=${etcdir}/configure.ac
|
||||
configure=${tmpdir}/configure
|
||||
aclocal_m4=${tmpdir}/aclocal.m4
|
||||
|
||||
# copy over configure.ac and acinlclude.m4 from etc to tmp,
|
||||
# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to
|
||||
# look for configure.ac in the current directory, and include acinclude.m4
|
||||
# in aclocal.m4 it without a directory path in front
|
||||
#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}"
|
||||
#echo " aclocal $ACLOCAL_FLAGS"
|
||||
#cp -f ${configure_ac} ${tmpdir}
|
||||
#cp -f ${etcdir}/acinclude.m4 ${tmpdir}
|
||||
#aclocal $ACLOCAL_FLAGS
|
||||
|
||||
#echo " autoheader ${configure_ac}"
|
||||
#autoheader ${configure_ac}
|
||||
|
||||
echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}"
|
||||
autoconf -I ${tmpdir} -o ${configure} ${configure_ac}
|
||||
|
||||
|
|
@ -1,323 +0,0 @@
|
|||
#!/bin/bash
|
||||
# install - install a program, script, or datafile
|
||||
|
||||
scriptversion=2005-02-02.21
|
||||
|
||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
||||
# later released in X11R6 (xc/config/util/install.sh) with the
|
||||
# following copyright and license.
|
||||
#
|
||||
# Copyright (C) 1994 X Consortium
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to
|
||||
# deal in the Software without restriction, including without limitation the
|
||||
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
# sell copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in
|
||||
# all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
|
||||
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
#
|
||||
# Except as contained in this notice, the name of the X Consortium shall not
|
||||
# be used in advertising or otherwise to promote the sale, use or other deal-
|
||||
# ings in this Software without prior written authorization from the X Consor-
|
||||
# tium.
|
||||
#
|
||||
#
|
||||
# FSF changes to this file are in the public domain.
|
||||
#
|
||||
# Calling this script install-sh is preferred over install.sh, to prevent
|
||||
# `make' implicit rules from creating a file called install from it
|
||||
# when there is no Makefile.
|
||||
#
|
||||
# This script is compatible with the BSD install script, but was written
|
||||
# from scratch. It can only install one file at a time, a restriction
|
||||
# shared with many OS's install programs.
|
||||
|
||||
# set DOITPROG to echo to test this script
|
||||
|
||||
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
||||
doit="${DOITPROG-}"
|
||||
|
||||
# put in absolute paths if you don't have them in your path; or use env. vars.
|
||||
|
||||
mvprog="${MVPROG-mv}"
|
||||
cpprog="${CPPROG-cp}"
|
||||
chmodprog="${CHMODPROG-chmod}"
|
||||
chownprog="${CHOWNPROG-chown}"
|
||||
chgrpprog="${CHGRPPROG-chgrp}"
|
||||
stripprog="${STRIPPROG-strip}"
|
||||
rmprog="${RMPROG-rm}"
|
||||
mkdirprog="${MKDIRPROG-mkdir}"
|
||||
|
||||
chmodcmd="$chmodprog 0755"
|
||||
chowncmd=
|
||||
chgrpcmd=
|
||||
stripcmd=
|
||||
rmcmd="$rmprog -f"
|
||||
mvcmd="$mvprog"
|
||||
src=
|
||||
dst=
|
||||
dir_arg=
|
||||
dstarg=
|
||||
no_target_directory=
|
||||
|
||||
usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
||||
or: $0 [OPTION]... SRCFILES... DIRECTORY
|
||||
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
|
||||
or: $0 [OPTION]... -d DIRECTORIES...
|
||||
|
||||
In the 1st form, copy SRCFILE to DSTFILE.
|
||||
In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
|
||||
In the 4th, create DIRECTORIES.
|
||||
|
||||
Options:
|
||||
-c (ignored)
|
||||
-d create directories instead of installing files.
|
||||
-g GROUP $chgrpprog installed files to GROUP.
|
||||
-m MODE $chmodprog installed files to MODE.
|
||||
-o USER $chownprog installed files to USER.
|
||||
-s $stripprog installed files.
|
||||
-t DIRECTORY install into DIRECTORY.
|
||||
-T report an error if DSTFILE is a directory.
|
||||
--help display this help and exit.
|
||||
--version display version info and exit.
|
||||
|
||||
Environment variables override the default commands:
|
||||
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
|
||||
"
|
||||
|
||||
while test -n "$1"; do
|
||||
case $1 in
|
||||
-c) shift
|
||||
continue;;
|
||||
|
||||
-d) dir_arg=true
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-g) chgrpcmd="$chgrpprog $2"
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
|
||||
--help) echo "$usage"; exit $?;;
|
||||
|
||||
-m) chmodcmd="$chmodprog $2"
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-o) chowncmd="$chownprog $2"
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-s) stripcmd=$stripprog
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-t) dstarg=$2
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-T) no_target_directory=true
|
||||
shift
|
||||
continue;;
|
||||
|
||||
--version) echo "$0 $scriptversion"; exit $?;;
|
||||
|
||||
*) # When -d is used, all remaining arguments are directories to create.
|
||||
# When -t is used, the destination is already specified.
|
||||
test -n "$dir_arg$dstarg" && break
|
||||
# Otherwise, the last argument is the destination. Remove it from $@.
|
||||
for arg
|
||||
do
|
||||
if test -n "$dstarg"; then
|
||||
# $@ is not empty: it contains at least $arg.
|
||||
set fnord "$@" "$dstarg"
|
||||
shift # fnord
|
||||
fi
|
||||
shift # arg
|
||||
dstarg=$arg
|
||||
done
|
||||
break;;
|
||||
esac
|
||||
done
|
||||
|
||||
if test -z "$1"; then
|
||||
if test -z "$dir_arg"; then
|
||||
echo "$0: no input file specified." >&2
|
||||
exit 1
|
||||
fi
|
||||
# It's OK to call `install-sh -d' without argument.
|
||||
# This can happen when creating conditional directories.
|
||||
exit 0
|
||||
fi
|
||||
|
||||
for src
|
||||
do
|
||||
# Protect names starting with `-'.
|
||||
case $src in
|
||||
-*) src=./$src ;;
|
||||
esac
|
||||
|
||||
if test -n "$dir_arg"; then
|
||||
dst=$src
|
||||
src=
|
||||
|
||||
if test -d "$dst"; then
|
||||
mkdircmd=:
|
||||
chmodcmd=
|
||||
else
|
||||
mkdircmd=$mkdirprog
|
||||
fi
|
||||
else
|
||||
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
|
||||
# might cause directories to be created, which would be especially bad
|
||||
# if $src (and thus $dsttmp) contains '*'.
|
||||
if test ! -f "$src" && test ! -d "$src"; then
|
||||
echo "$0: $src does not exist." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test -z "$dstarg"; then
|
||||
echo "$0: no destination specified." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
dst=$dstarg
|
||||
# Protect names starting with `-'.
|
||||
case $dst in
|
||||
-*) dst=./$dst ;;
|
||||
esac
|
||||
|
||||
# If destination is a directory, append the input filename; won't work
|
||||
# if double slashes aren't ignored.
|
||||
if test -d "$dst"; then
|
||||
if test -n "$no_target_directory"; then
|
||||
echo "$0: $dstarg: Is a directory" >&2
|
||||
exit 1
|
||||
fi
|
||||
dst=$dst/`basename "$src"`
|
||||
fi
|
||||
fi
|
||||
|
||||
# This sed command emulates the dirname command.
|
||||
dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
|
||||
|
||||
# Make sure that the destination directory exists.
|
||||
|
||||
# Skip lots of stat calls in the usual case.
|
||||
if test ! -d "$dstdir"; then
|
||||
defaultIFS='
|
||||
'
|
||||
IFS="${IFS-$defaultIFS}"
|
||||
|
||||
oIFS=$IFS
|
||||
# Some sh's can't handle IFS=/ for some reason.
|
||||
IFS='%'
|
||||
set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
|
||||
shift
|
||||
IFS=$oIFS
|
||||
|
||||
pathcomp=
|
||||
|
||||
while test $# -ne 0 ; do
|
||||
pathcomp=$pathcomp$1
|
||||
shift
|
||||
if test ! -d "$pathcomp"; then
|
||||
$mkdirprog "$pathcomp"
|
||||
# mkdir can fail with a `File exist' error in case several
|
||||
# install-sh are creating the directory concurrently. This
|
||||
# is OK.
|
||||
test -d "$pathcomp" || exit
|
||||
fi
|
||||
pathcomp=$pathcomp/
|
||||
done
|
||||
fi
|
||||
|
||||
if test -n "$dir_arg"; then
|
||||
$doit $mkdircmd "$dst" \
|
||||
&& { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
|
||||
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
|
||||
&& { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
|
||||
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
|
||||
|
||||
else
|
||||
dstfile=`basename "$dst"`
|
||||
|
||||
# Make a couple of temp file names in the proper directory.
|
||||
dsttmp=$dstdir/_inst.$$_
|
||||
rmtmp=$dstdir/_rm.$$_
|
||||
|
||||
# Trap to clean up those temp files at exit.
|
||||
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
|
||||
trap '(exit $?); exit' 1 2 13 15
|
||||
|
||||
# Copy the file name to the temp name.
|
||||
$doit $cpprog "$src" "$dsttmp" &&
|
||||
|
||||
# and set any options; do chmod last to preserve setuid bits.
|
||||
#
|
||||
# If any of these fail, we abort the whole thing. If we want to
|
||||
# ignore errors from any of these, just make sure not to ignore
|
||||
# errors from the above "$doit $cpprog $src $dsttmp" command.
|
||||
#
|
||||
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
|
||||
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
|
||||
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
|
||||
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
|
||||
|
||||
# Now rename the file to the real destination.
|
||||
{ $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
|
||||
|| {
|
||||
# The rename failed, perhaps because mv can't rename something else
|
||||
# to itself, or perhaps because mv is so ancient that it does not
|
||||
# support -f.
|
||||
|
||||
# Now remove or move aside any old file at destination location.
|
||||
# We try this two ways since rm can't unlink itself on some
|
||||
# systems and the destination file might be busy for other
|
||||
# reasons. In this case, the final cleanup might fail but the new
|
||||
# file should still install successfully.
|
||||
{
|
||||
if test -f "$dstdir/$dstfile"; then
|
||||
$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
|
||||
|| $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|
||||
|| {
|
||||
echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
|
||||
(exit 1); exit 1
|
||||
}
|
||||
else
|
||||
:
|
||||
fi
|
||||
} &&
|
||||
|
||||
# Now rename the file to the real destination.
|
||||
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
|
||||
}
|
||||
}
|
||||
fi || { (exit 1); exit 1; }
|
||||
done
|
||||
|
||||
# The final little trick to "correctly" pass the exit status to the exit trap.
|
||||
{
|
||||
(exit 0); exit 0
|
||||
}
|
||||
|
||||
# Local variables:
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-end: "$"
|
||||
# End:
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
#!/bin/bash
|
||||
#-------------------------------------------------------------------------------
|
||||
# Copyright (c) 2004 Media Development Loan Fund
|
||||
#
|
||||
# This file is part of the Campcaster project.
|
||||
# http://campcaster.campware.org/
|
||||
# To report bugs, send an e-mail to bugs@campware.org
|
||||
#
|
||||
# Campcaster is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Campcaster is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Campcaster; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
#
|
||||
# Author : $Author$
|
||||
# Version : $Revision$
|
||||
# Location : $URL$
|
||||
#-------------------------------------------------------------------------------
|
||||
#-------------------------------------------------------------------------------
|
||||
# Run this script to prepare cppunit to be configured and compiled.
|
||||
# For more information on CppUnit, see http://cppunit.sourceforge.net/
|
||||
#-------------------------------------------------------------------------------
|
||||
product=cppunit-1.10.2
|
||||
|
||||
reldir=`dirname $0`/..
|
||||
basedir=`cd $reldir; pwd;`
|
||||
bindir=$basedir/bin
|
||||
etcdir=$basedir/etc
|
||||
tmpdir=$basedir/tmp
|
||||
|
||||
tar=$basedir/src/$product.tar.gz
|
||||
|
||||
mkdir -p $tmpdir
|
||||
cd $tmpdir
|
||||
|
||||
# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it
|
||||
cp -r $bindir/install-sh $tmpdir
|
||||
|
||||
# untar and patch the sources
|
||||
if [ ! -d $product ]; then
|
||||
tar xfz $tar
|
||||
cd $product
|
||||
# see http://sourceforge.net/tracker/index.php?func=detail&aid=997006&group_id=11795&atid=311795
|
||||
patch -p1 < $etcdir/cppunit-1.10.2-nostandalone.patch
|
||||
fi
|
||||
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
#!/bin/sh
|
||||
#-------------------------------------------------------------------------------
|
||||
# Copyright (c) 2004 Media Development Loan Fund
|
||||
#
|
||||
# This file is part of the Campcaster project.
|
||||
# http://campcaster.campware.org/
|
||||
# To report bugs, send an e-mail to bugs@campware.org
|
||||
#
|
||||
# Campcaster is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Campcaster is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Campcaster; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
#
|
||||
# Author : $Author$
|
||||
# Version : $Revision$
|
||||
# Location : $URL$
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Run this script to configure the environment.
|
||||
#
|
||||
# This script in effect calls the real automake / autoconf configure script
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
# assume we're in $basedir
|
||||
reldir=`dirname $0`
|
||||
basedir=`cd $reldir; pwd;`
|
||||
test -z "$basedir" && basedir=.
|
||||
|
||||
bindir=$basedir/bin
|
||||
tmpdir=$basedir/tmp
|
||||
|
||||
|
||||
autogen=$bindir/autogen.sh
|
||||
configure=$tmpdir/configure
|
||||
|
||||
if [ ! -x $configure ]; then
|
||||
(cd $basedir && $autogen $*)
|
||||
fi
|
||||
|
||||
(cd $tmpdir && $configure $*)
|
||||
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
#-------------------------------------------------------------------------------
|
||||
# Copyright (c) 2004 Media Development Loan Fund
|
||||
#
|
||||
# This file is part of the Campcaster project.
|
||||
# http://campcaster.campware.org/
|
||||
# To report bugs, send an e-mail to bugs@campware.org
|
||||
#
|
||||
# Campcaster is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Campcaster is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Campcaster; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
#
|
||||
# Author : $Author$
|
||||
# Version : $Revision$
|
||||
# Location : $URL$
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# General command definitions
|
||||
#-------------------------------------------------------------------------------
|
||||
MKDIR = mkdir -p
|
||||
RM = rm -f
|
||||
RMDIR = rm -rf
|
||||
DOXYGEN = doxygen
|
||||
DOXYTAG = doxytag
|
||||
XSLTPROC = xsltproc
|
||||
ECHO = @echo
|
||||
FLAWFINDER = flawfinder
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Basic directory and file definitions
|
||||
#-------------------------------------------------------------------------------
|
||||
BASE_DIR = .
|
||||
BIN_DIR = ${BASE_DIR}/bin
|
||||
DOC_DIR = ${BASE_DIR}/doc
|
||||
DOXYGEN_DIR = ${DOC_DIR}/doxygen
|
||||
COVERAGE_DIR = ${DOC_DIR}/coverage
|
||||
ETC_DIR = ${BASE_DIR}/etc
|
||||
TMP_DIR = ${BASE_DIR}/tmp
|
||||
|
||||
CXXUNIT_VERSION = cppunit-1.10.2
|
||||
CXXUNIT_DIR = ${TMP_DIR}/${CXXUNIT_VERSION}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Targets
|
||||
#-------------------------------------------------------------------------------
|
||||
all:
|
||||
${MAKE} -C ${CXXUNIT_DIR}
|
||||
|
||||
install:
|
||||
${MAKE} -C ${CXXUNIT_DIR} install
|
||||
|
||||
clean:
|
||||
${MAKE} -C ${CXXUNIT_DIR} clean
|
||||
|
||||
distclean:
|
||||
${RMDIR} ${CXXUNIT_DIR}
|
||||
${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh
|
||||
|
||||
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
dnl-----------------------------------------------------------------------------
|
||||
dnl Copyright (c) 2004 Media Development Loan Fund
|
||||
dnl
|
||||
dnl This file is part of the Campcaster project.
|
||||
dnl http://campcaster.campware.org/
|
||||
dnl To report bugs, send an e-mail to bugs@campware.org
|
||||
dnl
|
||||
dnl Campcaster is free software; you can redistribute it and/or modify
|
||||
dnl it under the terms of the GNU General Public License as published by
|
||||
dnl the Free Software Foundation; either version 2 of the License, or
|
||||
dnl (at your option) any later version.
|
||||
dnl
|
||||
dnl Campcaster is distributed in the hope that it will be useful,
|
||||
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
dnl GNU General Public License for more details.
|
||||
dnl
|
||||
dnl You should have received a copy of the GNU General Public License
|
||||
dnl along with Campcaster; if not, write to the Free Software
|
||||
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
dnl
|
||||
dnl
|
||||
dnl Author : $Author$
|
||||
dnl Version : $Revision$
|
||||
dnl Location : $URL$
|
||||
dnl-----------------------------------------------------------------------------
|
||||
|
||||
dnl-----------------------------------------------------------------------------
|
||||
dnl NOTE: Run all configure related scripts from the tmp directory of the
|
||||
dnl project.
|
||||
dnl This is due to the fact that configure spreads a lot of trash around,
|
||||
dnl like atom4te cache directories, config.* files, etc. into the directory
|
||||
dnl it is being run from. We clearly don't want these in our base directory.
|
||||
dnl-----------------------------------------------------------------------------
|
||||
AC_INIT(cppunit, 1.10.2, bugs@campware.org)
|
||||
AC_PREREQ(2.59)
|
||||
AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
|
||||
AC_REVISION($Revision$)
|
||||
|
||||
AC_CONFIG_SRCDIR(../src/cppunit-1.10.2.tar.gz)
|
||||
|
||||
|
||||
dnl untar the cppunit sources before anything happens
|
||||
../bin/prepare.sh
|
||||
|
||||
dnl configure cppunit with the same parameters as we have
|
||||
AC_CONFIG_SUBDIRS(../tmp/cppunit-1.10.2)
|
||||
|
||||
|
||||
AC_CONFIG_FILES(../Makefile:../etc/Makefile.in)
|
||||
|
||||
AC_OUTPUT()
|
||||
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
diff -Naur cppunit-1.10.2/include/cppunit/XmlOutputter.h cppunit-1.10.2-nostandalone/include/cppunit/XmlOutputter.h
|
||||
--- cppunit-1.10.2/include/cppunit/XmlOutputter.h 2002-09-17 01:31:29.000000000 +0700
|
||||
+++ cppunit-1.10.2-nostandalone/include/cppunit/XmlOutputter.h 2004-07-24 15:44:00.816814688 +0700
|
||||
@@ -94,6 +94,16 @@
|
||||
virtual void addSuccessfulTests( FailedTests &failedTests,
|
||||
XmlElement *rootNode );
|
||||
|
||||
+ /*! \brief set the output document as standalone or not.
|
||||
+ *
|
||||
+ * For the output document, specify wether it's a standalone XML
|
||||
+ * document, or not.
|
||||
+ *
|
||||
+ * \param standalone if true, the output will be specified as standalone.
|
||||
+ * if false, it will be not.
|
||||
+ */
|
||||
+ virtual void setStandalone(bool standalone);
|
||||
+
|
||||
/*! \brief Adds the statics element to the root node.
|
||||
*
|
||||
* Creates a new element containing statistics data and adds it to the root element.
|
||||
diff -Naur cppunit-1.10.2/include/cppunit/tools/XmlDocument.h cppunit-1.10.2-nostandalone/include/cppunit/tools/XmlDocument.h
|
||||
--- cppunit-1.10.2/include/cppunit/tools/XmlDocument.h 2002-08-29 14:36:50.000000000 +0700
|
||||
+++ cppunit-1.10.2-nostandalone/include/cppunit/tools/XmlDocument.h 2004-07-24 15:39:03.516011280 +0700
|
||||
@@ -42,6 +42,9 @@
|
||||
std::string styleSheet() const;
|
||||
void setStyleSheet( const std::string &styleSheet = "" );
|
||||
|
||||
+ bool standalone(void) const;
|
||||
+ void setStandalone(bool standalone);
|
||||
+
|
||||
void setRootElement( XmlElement *rootElement );
|
||||
XmlElement &rootElement() const;
|
||||
|
||||
@@ -58,6 +61,7 @@
|
||||
std::string m_encoding;
|
||||
std::string m_styleSheet;
|
||||
XmlElement *m_rootElement;
|
||||
+ bool m_standalone;
|
||||
};
|
||||
|
||||
|
||||
diff -Naur cppunit-1.10.2/src/cppunit/XmlDocument.cpp cppunit-1.10.2-nostandalone/src/cppunit/XmlDocument.cpp
|
||||
--- cppunit-1.10.2/src/cppunit/XmlDocument.cpp 2002-08-28 04:51:18.000000000 +0700
|
||||
+++ cppunit-1.10.2-nostandalone/src/cppunit/XmlDocument.cpp 2004-07-24 15:40:03.344915904 +0700
|
||||
@@ -11,6 +11,7 @@
|
||||
, m_styleSheet( styleSheet )
|
||||
{
|
||||
setEncoding( encoding );
|
||||
+ m_standalone = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -67,11 +68,29 @@
|
||||
}
|
||||
|
||||
|
||||
+bool
|
||||
+XmlDocument::standalone() const
|
||||
+{
|
||||
+ return m_standalone;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+void
|
||||
+XmlDocument::setStandalone(bool standalone)
|
||||
+{
|
||||
+ m_standalone = standalone;
|
||||
+}
|
||||
+
|
||||
+
|
||||
std::string
|
||||
XmlDocument::toString() const
|
||||
{
|
||||
std::string asString = "<?xml version=\"1.0\" "
|
||||
- "encoding='" + m_encoding + "' standalone='yes' ?>\n";
|
||||
+ "encoding='" + m_encoding + "'";
|
||||
+ if (m_standalone) {
|
||||
+ asString += " standalone='yes'";
|
||||
+ }
|
||||
+ asString += " ?>\n";
|
||||
|
||||
if ( !m_styleSheet.empty() )
|
||||
asString += "<?xml-stylesheet type=\"text/xsl\" href=\"" + m_styleSheet + "\"?>\n";
|
||||
diff -Naur cppunit-1.10.2/src/cppunit/XmlOutputter.cpp cppunit-1.10.2-nostandalone/src/cppunit/XmlOutputter.cpp
|
||||
--- cppunit-1.10.2/src/cppunit/XmlOutputter.cpp 2003-03-15 15:55:29.000000000 +0700
|
||||
+++ cppunit-1.10.2-nostandalone/src/cppunit/XmlOutputter.cpp 2004-07-24 15:42:59.090198560 +0700
|
||||
@@ -43,6 +43,13 @@
|
||||
}
|
||||
|
||||
|
||||
+void
|
||||
+XmlOutputter::setStandalone(bool standalone)
|
||||
+{
|
||||
+ m_xml->setStandalone(standalone);
|
||||
+}
|
||||
+
|
||||
+
|
||||
void
|
||||
XmlOutputter::write()
|
||||
{
|
||||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
|||
keep me
|
||||
Loading…
Reference in New Issue