Author: rhys Date: Fri Dec 12 03:04:24 2014 New Revision: 1644820 URL: http://svn.apache.org/r1644820 Log: LOGCXX-428: Wildcards in Makefile.am break either VPATH or non-VPATH installs
Also, LOGCXX-446: make install fails, trying to overwrite header files Many Makefile.am files spread throughout the source tree used wildcards. This is invalid, as discussed at https://www.gnu.org/software/automake/manual/html_node/Wildcards.html. The use of wildcards was problematic for VPATH builds, in particular there was one Makefile.am which included srcdir and builddir headers twice. Correcting it to install only the builddir log4cxx.h and the remaining headers from srcdir/*.h addresses LOGCXX-446. Modified: incubator/log4cxx/trunk/ (props changed) incubator/log4cxx/trunk/Makefile.am incubator/log4cxx/trunk/configure.ac incubator/log4cxx/trunk/src/changes/changes.xml incubator/log4cxx/trunk/src/examples/cpp/Makefile.am incubator/log4cxx/trunk/src/main/cpp/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/config/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/db/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/filter/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/net/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/nt/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/pattern/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/private/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/rolling/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/spi/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/spi/location/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/varia/Makefile.am incubator/log4cxx/trunk/src/main/include/log4cxx/xml/Makefile.am incubator/log4cxx/trunk/src/site/doxy/Makefile.am incubator/log4cxx/trunk/src/test/cpp/Makefile.am incubator/log4cxx/trunk/src/test/cpp/customlogger/ (props changed) incubator/log4cxx/trunk/src/test/cpp/db/ (props changed) incubator/log4cxx/trunk/src/test/cpp/defaultinit/ (props changed) incubator/log4cxx/trunk/src/test/cpp/filter/ (props changed) incubator/log4cxx/trunk/src/test/cpp/helpers/ (props changed) incubator/log4cxx/trunk/src/test/cpp/net/ (props changed) incubator/log4cxx/trunk/src/test/cpp/nt/ (props changed) incubator/log4cxx/trunk/src/test/cpp/pattern/ (props changed) incubator/log4cxx/trunk/src/test/cpp/rolling/ (props changed) incubator/log4cxx/trunk/src/test/cpp/util/ (props changed) incubator/log4cxx/trunk/src/test/cpp/varia/ (props changed) incubator/log4cxx/trunk/src/test/cpp/xml/ (props changed) incubator/log4cxx/trunk/src/test/resources/Makefile.am incubator/log4cxx/trunk/src/test/resources/input/Makefile.am incubator/log4cxx/trunk/src/test/resources/input/ndc/Makefile.am incubator/log4cxx/trunk/src/test/resources/input/rolling/Makefile.am incubator/log4cxx/trunk/src/test/resources/input/xml/Makefile.am incubator/log4cxx/trunk/src/test/resources/witness/Makefile.am incubator/log4cxx/trunk/src/test/resources/witness/encoding/Makefile.am incubator/log4cxx/trunk/src/test/resources/witness/ndc/Makefile.am incubator/log4cxx/trunk/src/test/resources/witness/rolling/Makefile.am Propchange: incubator/log4cxx/trunk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -1,33 +1,32 @@ -Makefile -Makefile.in -configure -build -.cdtproject aclocal.m4 autom4te.cache bak +build +cbx +.cdtproject +compile +config.guess +config.log +config.status +config.sub +configure +configure.patch +depcomp +.dirstamp +install-sh lib liblog4cxx.pc libtool linux log4cxx.cbx log4cxx.cbx.local -xcode -cbx -msvc -velocity.log -configure.patch -config.log -depcomp -config.guess -config.sub ltmain.sh -mkinstalldirs -config.status +Makefile +Makefile.in missing -install-sh -target +mkinstalldirs +msvc socket.lcf - - - +target +velocity.log +xcode Modified: incubator/log4cxx/trunk/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/Makefile.am (original) +++ incubator/log4cxx/trunk/Makefile.am Fri Dec 12 03:04:24 2014 @@ -13,11 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # - AUTOMAKE_OPTIONS = foreign SUBDIRS = src -EXTRA_DIST = autogen.sh aclocal.m4 find_apr.m4 find_apu.m4 build.xml pom.xml NOTICE LICENSE INSTALL pom.xml KEYS +EXTRA_DIST = \ + aclocal.m4 \ + autogen.sh \ + build.xml \ + find_apr.m4 \ + find_apu.m4 \ + INSTALL \ + KEYS \ + LICENSE \ + NOTICE \ + pom.xml pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = liblog4cxx.pc Modified: incubator/log4cxx/trunk/configure.ac URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/configure.ac?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/configure.ac (original) +++ incubator/log4cxx/trunk/configure.ac Fri Dec 12 03:04:24 2014 @@ -45,6 +45,7 @@ AM_INIT_AUTOMAKE([foreign subdir-objects AM_PROG_LIBTOOL AC_PROG_INSTALL +AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_CXX([g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC QCC]) Modified: incubator/log4cxx/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/changes/changes.xml?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/changes/changes.xml (original) +++ incubator/log4cxx/trunk/src/changes/changes.xml Fri Dec 12 03:04:24 2014 @@ -87,7 +87,9 @@ <action issue="LOGCXX-423" type="fix">Repair autogen script warnings</action> <action issue="LOGCXX-424" type="fix">liblog4cxx.pc.in should reflect dependency on apr-1, apr-1-util</action> <action issue="LOGCXX-425" type="fix">exceptions in CachedDateFormatTestCase after LOGCXX-420</action> + <action issue="LOGCXX-428" type="fix">Wildcards in Makefile.am break either VPATH or non-VPATH installs</action> <action issue="LOGCXX-443" type="fix">Return by const reference in Logger::getName()</action> + <action issue="LOGCXX-446" type="fix">make install fails, trying to overwrite header files</action> <action type="change">Behavior of StringHelper::startsWith and endsWith synced</action> <action type="change">Documented C (class) and M (method) log format keywords.</action> Modified: incubator/log4cxx/trunk/src/examples/cpp/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/examples/cpp/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/examples/cpp/Makefile.am (original) +++ incubator/log4cxx/trunk/src/examples/cpp/Makefile.am Fri Dec 12 03:04:24 2014 @@ -28,4 +28,3 @@ stream_LDADD = $(top_builddir)/src/main/ console_SOURCES = console.cpp console_LDADD = $(top_builddir)/src/main/cpp/liblog4cxx.la - Modified: incubator/log4cxx/trunk/src/main/cpp/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/cpp/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/cpp/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/cpp/Makefile.am Fri Dec 12 03:04:24 2014 @@ -17,7 +17,6 @@ lib_LTLIBRARIES = liblog4cxx.la AM_CPPFLAGS = -I$(top_srcdir)/src/main/include -I$(top_builddir)/src/main/include - liblog4cxx_la_SOURCES = \ action.cpp \ andfilter.cpp \ @@ -172,4 +171,3 @@ liblog4cxx_la_SOURCES = \ AM_CPPFLAGS += @CPPFLAGS_ODBC@ liblog4cxx_la_LDFLAGS = -version-info @LT_VERSION@ @LIBS_ODBC@ -@APR_LIBS@ - Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/Makefile.am Fri Dec 12 03:04:24 2014 @@ -15,11 +15,42 @@ # SUBDIRS = helpers net nt rolling spi varia xml config db private pattern filter log4cxxincdir = $(includedir)/log4cxx -log4cxxinc_HEADERS = $(top_srcdir)/src/main/include/log4cxx/*.h # Breaks VPATH install -log4cxxinc_HEADERS += $(top_builddir)/src/main/include/log4cxx/*.h # Breaks non-VPATH install DISTCLEANFILES = log4cxx.h EXTRA_DIST = log4cxx.hw +# Importantly, $(top_srcdir)/src/main/include/log4cxx/log4cxx.h +# does NOT appear in the following list so the built version is preferred. +# This subtly is important for properly handling VPATH vs non-VPATH builds. +log4cxxinc_HEADERS = $(top_builddir)/src/main/include/log4cxx/log4cxx.h +log4cxxinc_HEADERS += \ + $(top_srcdir)/src/main/include/log4cxx/appender.h \ + $(top_srcdir)/src/main/include/log4cxx/appenderskeleton.h \ + $(top_srcdir)/src/main/include/log4cxx/asyncappender.h \ + $(top_srcdir)/src/main/include/log4cxx/basicconfigurator.h \ + $(top_srcdir)/src/main/include/log4cxx/consoleappender.h \ + $(top_srcdir)/src/main/include/log4cxx/dailyrollingfileappender.h \ + $(top_srcdir)/src/main/include/log4cxx/defaultconfigurator.h \ + $(top_srcdir)/src/main/include/log4cxx/defaultloggerfactory.h \ + $(top_srcdir)/src/main/include/log4cxx/fileappender.h \ + $(top_srcdir)/src/main/include/log4cxx/file.h \ + $(top_srcdir)/src/main/include/log4cxx/hierarchy.h \ + $(top_srcdir)/src/main/include/log4cxx/htmllayout.h \ + $(top_srcdir)/src/main/include/log4cxx/layout.h \ + $(top_srcdir)/src/main/include/log4cxx/level.h \ + $(top_srcdir)/src/main/include/log4cxx/logger.h \ + $(top_srcdir)/src/main/include/log4cxx/logmanager.h \ + $(top_srcdir)/src/main/include/log4cxx/logstring.h \ + $(top_srcdir)/src/main/include/log4cxx/mdc.h \ + $(top_srcdir)/src/main/include/log4cxx/ndc.h \ + $(top_srcdir)/src/main/include/log4cxx/patternlayout.h \ + $(top_srcdir)/src/main/include/log4cxx/portability.h \ + $(top_srcdir)/src/main/include/log4cxx/propertyconfigurator.h \ + $(top_srcdir)/src/main/include/log4cxx/provisionnode.h \ + $(top_srcdir)/src/main/include/log4cxx/rollingfileappender.h \ + $(top_srcdir)/src/main/include/log4cxx/simplelayout.h \ + $(top_srcdir)/src/main/include/log4cxx/stream.h \ + $(top_srcdir)/src/main/include/log4cxx/ttcclayout.h \ + $(top_srcdir)/src/main/include/log4cxx/writerappender.h + dist-hook: -rm -f $(distdir)/log4cxx.h - Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/config/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/config/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/config/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/config/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,5 +14,5 @@ # limitations under the License. # configincdir = $(includedir)/log4cxx/config -configinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/config/*.h - +configinc_HEADERS= \ + propertysetter.h Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/db/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/db/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/db/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/db/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,5 +14,5 @@ # limitations under the License. # dbincdir = $(includedir)/log4cxx/db -dbinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/db/*.h - +dbinc_HEADERS= \ + odbcappender.h Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/filter/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/filter/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/filter/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/filter/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,5 +14,14 @@ # limitations under the License. # filterincdir = $(includedir)/log4cxx/filter -filterinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/filter/*.h - +filterinc_HEADERS= \ + andfilter.h \ + denyallfilter.h \ + expressionfilter.h \ + levelmatchfilter.h \ + levelrangefilter.h \ + locationinfofilter.h \ + loggermatchfilter.h \ + mapfilter.h \ + propertyfilter.h \ + stringmatchfilter.h Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,5 +14,75 @@ # limitations under the License. # helpersincdir = $(includedir)/log4cxx/helpers -helpersinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/helpers/*.h - +helpersinc_HEADERS= \ + absolutetimedateformat.h \ + appenderattachableimpl.h \ + aprinitializer.h \ + bufferedoutputstream.h \ + bufferedwriter.h \ + bytearrayinputstream.h \ + bytearrayoutputstream.h \ + bytebuffer.h \ + cacheddateformat.h \ + charsetdecoder.h \ + charsetencoder.h \ + class.h \ + classregistration.h \ + condition.h \ + cyclicbuffer.h \ + datagrampacket.h \ + datagramsocket.h \ + dateformat.h \ + date.h \ + datelayout.h \ + datetimedateformat.h \ + exception.h \ + fileinputstream.h \ + fileoutputstream.h \ + filewatchdog.h \ + inetaddress.h \ + inputstream.h \ + inputstreamreader.h \ + integer.h \ + iso8601dateformat.h \ + loader.h \ + locale.h \ + loglog.h \ + messagebuffer.h \ + mutex.h \ + object.h \ + objectimpl.h \ + objectoutputstream.h \ + objectptr.h \ + onlyonceerrorhandler.h \ + optionconverter.h \ + outputstream.h \ + outputstreamwriter.h \ + pool.h \ + properties.h \ + propertyresourcebundle.h \ + reader.h \ + relativetimedateformat.h \ + resourcebundle.h \ + serversocket.h \ + simpledateformat.h \ + socket.h \ + socketoutputstream.h \ + strftimedateformat.h \ + strictmath.h \ + stringhelper.h \ + stringtokenizer.h \ + synchronized.h \ + syslogwriter.h \ + systemerrwriter.h \ + system.h \ + systemoutwriter.h \ + tchar.h \ + thread.h \ + threadlocal.h \ + threadspecificdata.h \ + timezone.h \ + transcoder.h \ + transform.h \ + writer.h \ + xml.h Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/net/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/net/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/net/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/net/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,5 +14,11 @@ # limitations under the License. # netincdir = $(includedir)/log4cxx/net -netinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/net/*.h - +netinc_HEADERS= \ + smtpappender.h \ + socketappender.h \ + socketappenderskeleton.h \ + sockethubappender.h \ + syslogappender.h \ + telnetappender.h \ + xmlsocketappender.h Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/nt/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/nt/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/nt/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/nt/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,5 +14,6 @@ # limitations under the License. # ntincdir = $(includedir)/log4cxx/nt -ntinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/nt/*.h - +ntinc_HEADERS= \ + nteventlogappender.h \ + outputdebugstringappender.h Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/pattern/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/pattern/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/pattern/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/pattern/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,5 +14,28 @@ # limitations under the License. # patternincdir = $(includedir)/log4cxx/pattern -patterninc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/pattern/*.h - +patterninc_HEADERS= \ + classnamepatternconverter.h \ + datepatternconverter.h \ + filedatepatternconverter.h \ + filelocationpatternconverter.h \ + formattinginfo.h \ + fulllocationpatternconverter.h \ + integerpatternconverter.h \ + levelpatternconverter.h \ + linelocationpatternconverter.h \ + lineseparatorpatternconverter.h \ + literalpatternconverter.h \ + loggerpatternconverter.h \ + loggingeventpatternconverter.h \ + messagepatternconverter.h \ + methodlocationpatternconverter.h \ + nameabbreviator.h \ + namepatternconverter.h \ + ndcpatternconverter.h \ + patternconverter.h \ + patternparser.h \ + propertiespatternconverter.h \ + relativetimepatternconverter.h \ + threadpatternconverter.h \ + throwableinformationpatternconverter.h Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/private/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/private/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/private/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/private/Makefile.am Fri Dec 12 03:04:24 2014 @@ -16,4 +16,3 @@ privateincdir = $(includedir)/log4cxx/private privateinc_HEADERS = log4cxx_private.h EXTRA_DIST = log4cxx_private.hw - Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/rolling/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/rolling/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/rolling/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/rolling/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,5 +14,19 @@ # limitations under the License. # rollingincdir = $(includedir)/log4cxx/rolling -rollinginc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/rolling/*.h - +rollinginc_HEADERS= \ + action.h \ + filerenameaction.h \ + filterbasedtriggeringpolicy.h \ + fixedwindowrollingpolicy.h \ + gzcompressaction.h \ + manualtriggeringpolicy.h \ + rollingfileappender.h \ + rollingfileappenderskeleton.h \ + rollingpolicybase.h \ + rollingpolicy.h \ + rolloverdescription.h \ + sizebasedtriggeringpolicy.h \ + timebasedrollingpolicy.h \ + triggeringpolicy.h \ + zipcompressaction.h Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/spi/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/spi/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/spi/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/spi/Makefile.am Fri Dec 12 03:04:24 2014 @@ -15,5 +15,17 @@ # SUBDIRS = location spiincdir = $(includedir)/log4cxx/spi -spiinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/spi/*.h - +spiinc_HEADERS= \ + appenderattachable.h \ + configurator.h \ + defaultrepositoryselector.h \ + errorhandler.h \ + filter.h \ + hierarchyeventlistener.h \ + loggerfactory.h \ + loggerrepository.h \ + loggingevent.h \ + optionhandler.h \ + repositoryselector.h \ + rootlogger.h \ + triggeringeventevaluator.h Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/spi/location/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/spi/location/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/spi/location/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/spi/location/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,5 +14,5 @@ # limitations under the License. # spiincdir = $(includedir)/log4cxx/spi/location -spiinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/spi/location/*.h - +spiinc_HEADERS= \ + locationinfo.h Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/varia/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/varia/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/varia/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/varia/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,5 +14,5 @@ # limitations under the License. # variaincdir = $(includedir)/log4cxx/varia -variainc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/varia/*.h - +variainc_HEADERS= \ + fallbackerrorhandler.h Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/xml/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/xml/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/xml/Makefile.am (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/xml/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,5 +14,6 @@ # limitations under the License. # xmlincdir = $(includedir)/log4cxx/xml -xmlinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/xml/*.h - +xmlinc_HEADERS= \ + domconfigurator.h \ + xmllayout.h Modified: incubator/log4cxx/trunk/src/site/doxy/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/site/doxy/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/site/doxy/Makefile.am (original) +++ incubator/log4cxx/trunk/src/site/doxy/Makefile.am Fri Dec 12 03:04:24 2014 @@ -83,4 +83,3 @@ clean-local: dist-hook: -rm -f $(distdir)/Doxyfile - Modified: incubator/log4cxx/trunk/src/test/cpp/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/Makefile.am (original) +++ incubator/log4cxx/trunk/src/test/cpp/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,158 +14,181 @@ # limitations under the License. # noinst_HEADERS = \ - $(top_srcdir)/src/test/cpp/customlogger/*.h \ - $(top_srcdir)/src/test/cpp/helpers/*.h \ - $(top_srcdir)/src/test/cpp/net/*.h \ - $(top_srcdir)/src/test/cpp/pattern/*.h \ - $(top_srcdir)/src/test/cpp/util/*.h \ - $(top_srcdir)/src/test/cpp/xml/*.h \ - $(top_srcdir)/src/test/cpp/*.h + $(top_srcdir)/src/test/cpp/abts.h \ + $(top_srcdir)/src/test/cpp/abts_tests.h \ + $(top_srcdir)/src/test/cpp/appenderskeletontestcase.h \ + $(top_srcdir)/src/test/cpp/customlogger/xlogger.h \ + $(top_srcdir)/src/test/cpp/fileappendertestcase.h \ + $(top_srcdir)/src/test/cpp/helpers/localechanger.h \ + $(top_srcdir)/src/test/cpp/insertwide.h \ + $(top_srcdir)/src/test/cpp/logunit.h \ + $(top_srcdir)/src/test/cpp/net/socketservertestcase.h \ + $(top_srcdir)/src/test/cpp/pattern/num343patternconverter.h \ + $(top_srcdir)/src/test/cpp/testchar.h \ + $(top_srcdir)/src/test/cpp/testutil.h \ + $(top_srcdir)/src/test/cpp/util/absolutedateandtimefilter.h \ + $(top_srcdir)/src/test/cpp/util/absolutetimefilter.h \ + $(top_srcdir)/src/test/cpp/util/binarycompare.h \ + $(top_srcdir)/src/test/cpp/util/compare.h \ + $(top_srcdir)/src/test/cpp/util/controlfilter.h \ + $(top_srcdir)/src/test/cpp/util/filenamefilter.h \ + $(top_srcdir)/src/test/cpp/util/filter.h \ + $(top_srcdir)/src/test/cpp/util/iso8601filter.h \ + $(top_srcdir)/src/test/cpp/util/linenumberfilter.h \ + $(top_srcdir)/src/test/cpp/util/relativetimefilter.h \ + $(top_srcdir)/src/test/cpp/util/serializationtesthelper.h \ + $(top_srcdir)/src/test/cpp/util/threadfilter.h \ + $(top_srcdir)/src/test/cpp/util/transformer.h \ + $(top_srcdir)/src/test/cpp/util/xmlfilenamefilter.h \ + $(top_srcdir)/src/test/cpp/util/xmllineattributefilter.h \ + $(top_srcdir)/src/test/cpp/util/xmlthreadfilter.h \ + $(top_srcdir)/src/test/cpp/util/xmltimestampfilter.h \ + $(top_srcdir)/src/test/cpp/vectorappender.h \ + $(top_srcdir)/src/test/cpp/writerappendertestcase.h \ + $(top_srcdir)/src/test/cpp/xml/xlevel.h AM_CPPFLAGS = -I$(top_srcdir)/src/main/include -I$(top_builddir)/src/main/include check_PROGRAMS = testsuite customlogger_tests = \ - customlogger/xlogger.cpp\ - customlogger/xloggertestcase.cpp + customlogger/xlogger.cpp \ + customlogger/xloggertestcase.cpp defaultinit_tests = \ - defaultinit/testcase1.cpp\ - defaultinit/testcase2.cpp\ - defaultinit/testcase3.cpp\ - defaultinit/testcase4.cpp - + defaultinit/testcase1.cpp \ + defaultinit/testcase2.cpp \ + defaultinit/testcase3.cpp \ + defaultinit/testcase4.cpp + filter_tests = \ - filter/andfiltertest.cpp\ - filter/denyallfiltertest.cpp\ - filter/levelmatchfiltertest.cpp\ - filter/levelrangefiltertest.cpp\ - filter/loggermatchfiltertest.cpp\ + filter/andfiltertest.cpp \ + filter/denyallfiltertest.cpp \ + filter/levelmatchfiltertest.cpp \ + filter/levelrangefiltertest.cpp \ + filter/loggermatchfiltertest.cpp \ filter/stringmatchfiltertest.cpp helpers = \ - helpers/absolutetimedateformattestcase.cpp \ - helpers/cacheddateformattestcase.cpp \ - helpers/charsetdecodertestcase.cpp \ - helpers/charsetencodertestcase.cpp \ - helpers/cyclicbuffertestcase.cpp\ - helpers/datetimedateformattestcase.cpp \ - helpers/inetaddresstestcase.cpp \ - helpers/iso8601dateformattestcase.cpp \ - helpers/localechanger.cpp\ - helpers/messagebuffertest.cpp \ - helpers/optionconvertertestcase.cpp \ - helpers/propertiestestcase.cpp \ - helpers/relativetimedateformattestcase.cpp \ - helpers/stringtokenizertestcase.cpp \ - helpers/stringhelpertestcase.cpp \ - helpers/syslogwritertest.cpp \ - helpers/threadtestcase.cpp \ - helpers/timezonetestcase.cpp \ - helpers/transcodertestcase.cpp + helpers/absolutetimedateformattestcase.cpp \ + helpers/cacheddateformattestcase.cpp \ + helpers/charsetdecodertestcase.cpp \ + helpers/charsetencodertestcase.cpp \ + helpers/cyclicbuffertestcase.cpp \ + helpers/datetimedateformattestcase.cpp \ + helpers/inetaddresstestcase.cpp \ + helpers/iso8601dateformattestcase.cpp \ + helpers/localechanger.cpp \ + helpers/messagebuffertest.cpp \ + helpers/optionconvertertestcase.cpp \ + helpers/propertiestestcase.cpp \ + helpers/relativetimedateformattestcase.cpp \ + helpers/stringtokenizertestcase.cpp \ + helpers/stringhelpertestcase.cpp \ + helpers/syslogwritertest.cpp \ + helpers/threadtestcase.cpp \ + helpers/timezonetestcase.cpp \ + helpers/transcodertestcase.cpp net_tests = \ - net/smtpappendertestcase.cpp \ - net/socketappendertestcase.cpp \ - net/sockethubappendertestcase.cpp \ - net/socketservertestcase.cpp \ - net/syslogappendertestcase.cpp \ - net/telnetappendertestcase.cpp \ - net/xmlsocketappendertestcase.cpp + net/smtpappendertestcase.cpp \ + net/socketappendertestcase.cpp \ + net/sockethubappendertestcase.cpp \ + net/socketservertestcase.cpp \ + net/syslogappendertestcase.cpp \ + net/telnetappendertestcase.cpp \ + net/xmlsocketappendertestcase.cpp pattern_tests = \ - pattern/num343patternconverter.cpp \ - pattern/patternparsertestcase.cpp + pattern/num343patternconverter.cpp \ + pattern/patternparsertestcase.cpp rolling_tests = \ - rolling/filenamepatterntestcase.cpp \ - rolling/filterbasedrollingtest.cpp \ - rolling/manualrollingtest.cpp \ - rolling/obsoletedailyrollingfileappendertest.cpp \ - rolling/obsoleterollingfileappendertest.cpp \ - rolling/sizebasedrollingtest.cpp \ - rolling/timebasedrollingtest.cpp + rolling/filenamepatterntestcase.cpp \ + rolling/filterbasedrollingtest.cpp \ + rolling/manualrollingtest.cpp \ + rolling/obsoletedailyrollingfileappendertest.cpp \ + rolling/obsoleterollingfileappendertest.cpp \ + rolling/sizebasedrollingtest.cpp \ + rolling/timebasedrollingtest.cpp util = \ - util/absolutetimefilter.cpp\ - util/absolutedateandtimefilter.cpp\ - util/binarycompare.cpp\ - util/compare.cpp\ - util/controlfilter.cpp\ - util/filenamefilter.cpp \ - util/utilfilter.cpp\ - util/iso8601filter.cpp\ - util/linenumberfilter.cpp\ - util/relativetimefilter.cpp\ + util/absolutetimefilter.cpp \ + util/absolutedateandtimefilter.cpp \ + util/binarycompare.cpp \ + util/compare.cpp \ + util/controlfilter.cpp \ + util/filenamefilter.cpp \ + util/utilfilter.cpp \ + util/iso8601filter.cpp \ + util/linenumberfilter.cpp \ + util/relativetimefilter.cpp \ util/serializationtesthelper.cpp \ - util/threadfilter.cpp\ - util/transformer.cpp\ - util/xmlfilenamefilter.cpp \ - util/xmllineattributefilter.cpp\ - util/xmltimestampfilter.cpp \ - util/xmlthreadfilter.cpp + util/threadfilter.cpp \ + util/transformer.cpp \ + util/xmlfilenamefilter.cpp \ + util/xmllineattributefilter.cpp \ + util/xmltimestampfilter.cpp \ + util/xmlthreadfilter.cpp varia_tests = \ - varia/errorhandlertestcase.cpp \ - varia/levelmatchfiltertestcase.cpp \ - varia/levelrangefiltertestcase.cpp + varia/errorhandlertestcase.cpp \ + varia/levelmatchfiltertestcase.cpp \ + varia/levelrangefiltertestcase.cpp db_tests = \ - db/odbcappendertestcase.cpp + db/odbcappendertestcase.cpp xml_tests = \ - xml/customleveltestcase.cpp \ - xml/domtestcase.cpp \ - xml/xlevel.cpp \ - xml/xmllayouttestcase.cpp \ + xml/customleveltestcase.cpp \ + xml/domtestcase.cpp \ + xml/xlevel.cpp \ + xml/xmllayouttestcase.cpp \ xml/xmllayouttest.cpp nt_tests = \ - nt/nteventlogappendertestcase.cpp + nt/nteventlogappendertestcase.cpp testsuite_SOURCES = \ - $(customlogger_tests) \ - $(defaultinit_tests) \ - $(filter_tests) \ - $(helpers) \ - $(net_tests) \ - $(pattern_tests) \ - $(rolling_tests) \ - $(util) \ - $(varia_tests) \ - $(db_tests) \ - $(xml_tests) \ - $(nt_tests) \ - abts.cpp \ - asyncappendertestcase.cpp\ - encodingtest.cpp\ - filetestcase.cpp \ - hierarchytest.cpp\ - hierarchythresholdtestcase.cpp\ - l7dtestcase.cpp\ - leveltestcase.cpp \ - logunit.cpp \ - loggertestcase.cpp\ - minimumtestcase.cpp\ - patternlayouttest.cpp\ - vectorappender.cpp\ - appenderskeletontestcase.cpp\ - consoleappendertestcase.cpp\ - fileappendertestcase.cpp\ - rollingfileappendertestcase.cpp\ - streamtestcase.cpp\ - writerappendertestcase.cpp \ - ndctestcase.cpp \ - propertyconfiguratortest.cpp \ - mdctestcase.cpp + $(customlogger_tests) \ + $(defaultinit_tests) \ + $(filter_tests) \ + $(helpers) \ + $(net_tests) \ + $(pattern_tests) \ + $(rolling_tests) \ + $(util) \ + $(varia_tests) \ + $(db_tests) \ + $(xml_tests) \ + $(nt_tests) \ + abts.cpp \ + asyncappendertestcase.cpp \ + encodingtest.cpp \ + filetestcase.cpp \ + hierarchytest.cpp \ + hierarchythresholdtestcase.cpp \ + l7dtestcase.cpp \ + leveltestcase.cpp \ + logunit.cpp \ + loggertestcase.cpp \ + minimumtestcase.cpp \ + patternlayouttest.cpp \ + vectorappender.cpp \ + appenderskeletontestcase.cpp \ + consoleappendertestcase.cpp \ + fileappendertestcase.cpp \ + rollingfileappendertestcase.cpp \ + streamtestcase.cpp \ + writerappendertestcase.cpp \ + ndctestcase.cpp \ + propertyconfiguratortest.cpp \ + mdctestcase.cpp testsuite_LDADD = \ - $(top_builddir)/src/main/cpp/liblog4cxx.la - + $(top_builddir)/src/main/cpp/liblog4cxx.la testsuite_DEPENDENCIES = \ - $(top_builddir)/src/main/cpp/liblog4cxx.la + $(top_builddir)/src/main/cpp/liblog4cxx.la check: testsuite - Propchange: incubator/log4cxx/trunk/src/test/cpp/customlogger/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -1,4 +1,5 @@ -Makefile -Makefile.in .deps +.dirstamp .libs +Makefile +Makefile.in Propchange: incubator/log4cxx/trunk/src/test/cpp/db/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -1,4 +1,5 @@ -Makefile -Makefile.in .deps +.dirstamp .libs +Makefile +Makefile.in Propchange: incubator/log4cxx/trunk/src/test/cpp/defaultinit/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -1,4 +1,5 @@ -Makefile -Makefile.in .deps +.dirstamp .libs +Makefile +Makefile.in Propchange: incubator/log4cxx/trunk/src/test/cpp/filter/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -0,0 +1,2 @@ +.deps +.dirstamp Propchange: incubator/log4cxx/trunk/src/test/cpp/helpers/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -1,4 +1,5 @@ -Makefile -Makefile.in .deps +.dirstamp .libs +Makefile +Makefile.in Propchange: incubator/log4cxx/trunk/src/test/cpp/net/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -1,4 +1,5 @@ -Makefile -Makefile.in .deps +.dirstamp .libs +Makefile +Makefile.in Propchange: incubator/log4cxx/trunk/src/test/cpp/nt/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -1,4 +1,5 @@ -Makefile -Makefile.in .deps +.dirstamp .libs +Makefile +Makefile.in Propchange: incubator/log4cxx/trunk/src/test/cpp/pattern/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -1,4 +1,5 @@ -Makefile -Makefile.in .deps +.dirstamp .libs +Makefile +Makefile.in Propchange: incubator/log4cxx/trunk/src/test/cpp/rolling/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -1,4 +1,5 @@ -Makefile -Makefile.in .deps +.dirstamp .libs +Makefile +Makefile.in Propchange: incubator/log4cxx/trunk/src/test/cpp/util/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -1,4 +1,5 @@ -Makefile -Makefile.in .deps +.dirstamp .libs +Makefile +Makefile.in Propchange: incubator/log4cxx/trunk/src/test/cpp/varia/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -1,4 +1,5 @@ -Makefile -Makefile.in .deps +.dirstamp .libs +Makefile +Makefile.in Propchange: incubator/log4cxx/trunk/src/test/cpp/xml/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Dec 12 03:04:24 2014 @@ -1,4 +1,5 @@ -Makefile -Makefile.in .deps +.dirstamp .libs +Makefile +Makefile.in Modified: incubator/log4cxx/trunk/src/test/resources/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/resources/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/resources/Makefile.am (original) +++ incubator/log4cxx/trunk/src/test/resources/Makefile.am Fri Dec 12 03:04:24 2014 @@ -16,40 +16,36 @@ SUBDIRS = input witness EXTRA_DIST = L7D_en_US.properties L7D_fr_CH.properties L7D_fr.properties - - -# if we are building in a separate build tree, then copy all necessary files +# if we are building in a separate build tree, then prepare all necessary links all-local: @if test "$(top_srcdir)" != "$(top_builddir)"; then \ - echo "Copying test suite data files ..." ; \ - list='$(EXTRA_DIST)'; for file in $$list; do \ - cp -p $(srcdir)/$$file . ; \ + echo "Symlinking test suite data files ..." ; \ + for file in $(EXTRA_DIST); do \ + test -a "$$file" || $(LN_S) "$(srcdir)/$$file"; \ done \ fi prepare: - @if test ! -d "output"; then \ - mkdir output; \ - fi; + @test -d output || mkdir output @rm -rf log4j.xml @rm -rf log4j.properties @rm -rf log4cxx.xml @rm -rf log4cxx.properties - + build: check-recursive prepare -cleanOutputDir: +clean-local: @rm -rf output/* - + check: prepare run-unittest DefaultInit -run-unittest: build cleanOutputDir +run-unittest: build clean-local @export TOTO=wonderful; \ export key1=value1; \ export key2=value2; \ ../cpp/testsuite -v - -DefaultInit: build cleanOutputDir + +DefaultInit: build clean-local ../cpp/testsuite -v testcase1 @cp input/xml/defaultInit.xml log4j.xml ../cpp/testsuite -v testcase2 @@ -63,6 +59,5 @@ DefaultInit: build cleanOutputDir @rm -f log4j.xml @rm -f log4j.properties -SocketServer: build cleanOutputDir +SocketServer: build clean-local ../cpp/testsuite -v socketservertestcase - Modified: incubator/log4cxx/trunk/src/test/resources/input/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/resources/input/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/resources/input/Makefile.am (original) +++ incubator/log4cxx/trunk/src/test/resources/input/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,13 +14,45 @@ # limitations under the License. # SUBDIRS = ndc xml rolling -EXTRA_DIST = *.properties +EXTRA_DIST = \ + defaultInit3.properties \ + hierarchyThreshold1.properties \ + hierarchyThreshold2.properties \ + hierarchyThreshold3.properties \ + hierarchyThreshold4.properties \ + hierarchyThreshold5.properties \ + hierarchyThreshold6.properties \ + hierarchyThreshold7.properties \ + hierarchyThreshold8.properties \ + l7d1.properties \ + patternLayout10.properties \ + patternLayout11.properties \ + patternLayout12.properties \ + patternLayout1.properties \ + patternLayout2.properties \ + patternLayout3.properties \ + patternLayout4.properties \ + patternLayout5.properties \ + patternLayout6.properties \ + patternLayout7.properties \ + patternLayout8.properties \ + patternLayout9.properties \ + patternLayout.mdc.1.properties \ + propertiestestcase.properties \ + socketServer1.properties \ + socketServer2.properties \ + socketServer3.properties \ + socketServer4.properties \ + socketServer5.properties \ + socketServer6.properties \ + socketServer7.properties \ + socketServer8.properties -# if we are building in a separate build tree, then copy all necessary files +# if we are building in a separate build tree, then prepare all necessary links all-local: @if test "$(top_srcdir)" != "$(top_builddir)"; then \ - echo "Copying test suite data files ..." ; \ - list='$(EXTRA_DIST)'; for file in $$list; do \ - cp -p $(srcdir)/$$file . ; \ + echo "Symlinking test suite data files ..." ; \ + for file in $(EXTRA_DIST); do \ + test -a "$$file" || $(LN_S) "$(srcdir)/$$file"; \ done \ fi Modified: incubator/log4cxx/trunk/src/test/resources/input/ndc/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/resources/input/ndc/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/resources/input/ndc/Makefile.am (original) +++ incubator/log4cxx/trunk/src/test/resources/input/ndc/Makefile.am Fri Dec 12 03:04:24 2014 @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -EXTRA_DIST = *.properties +EXTRA_DIST = \ + NDC1.properties -# if we are building in a separate build tree, then copy all necessary files +# if we are building in a separate build tree, then prepare all necessary links all-local: @if test "$(top_srcdir)" != "$(top_builddir)"; then \ - echo "Copying test suite data files ..." ; \ - list='$(EXTRA_DIST)'; for file in $$list; do \ - cp -p $(srcdir)/$$file . ; \ + echo "Symlinking test suite data files ..." ; \ + for file in $(EXTRA_DIST); do \ + test -a "$$file" || $(LN_S) "$(srcdir)/$$file"; \ done \ fi Modified: incubator/log4cxx/trunk/src/test/resources/input/rolling/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/resources/input/rolling/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/resources/input/rolling/Makefile.am (original) +++ incubator/log4cxx/trunk/src/test/resources/input/rolling/Makefile.am Fri Dec 12 03:04:24 2014 @@ -13,13 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -EXTRA_DIST = *.xml *.properties +EXTRA_DIST = \ + filter1.xml \ + obsoleteDRFA1.properties \ + obsoleteERFA1.properties \ + obsoleteRFA1.properties \ + time1.xml -# if we are building in a separate build tree, then copy all necessary files +# if we are building in a separate build tree, then prepare all necessary links all-local: @if test "$(top_srcdir)" != "$(top_builddir)"; then \ - echo "Copying test suite data files ..." ; \ - list='$(EXTRA_DIST)'; for file in $$list; do \ - cp -p $(srcdir)/$$file . ; \ + echo "Symlinking test suite data files ..." ; \ + for file in $(EXTRA_DIST); do \ + test -a "$$file" || $(LN_S) "$(srcdir)/$$file"; \ done \ fi Modified: incubator/log4cxx/trunk/src/test/resources/input/xml/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/resources/input/xml/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/resources/input/xml/Makefile.am (original) +++ incubator/log4cxx/trunk/src/test/resources/input/xml/Makefile.am Fri Dec 12 03:04:24 2014 @@ -13,13 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -EXTRA_DIST = log4j.dtd *.xml +EXTRA_DIST = \ + log4j.dtd \ + asyncAppender1.xml \ + customLevel1.xml \ + customLevel2.xml \ + customLevel3.xml \ + customLevel4.xml \ + customLogger1.xml \ + customLogger2.xml \ + defaultInit.xml \ + DOMTestCase1.xml \ + DOMTestCase2.xml \ + DOMTestCase3.xml \ + DOMTestCase4.xml \ + fallback1.xml \ + filters.LevelMatchFilter.test4.0.xml \ + filters.LevelMatchFilter.test4.1.xml \ + filters.LevelMatchFilter.test4.2.xml \ + filters.LevelMatchFilter.test4.3.xml \ + filters.LevelMatchFilter.test4.4.xml \ + smtpAppender1.xml -# if we are building in a separate build tree, then copy all necessary files +# if we are building in a separate build tree, then prepare all necessary links all-local: @if test "$(top_srcdir)" != "$(top_builddir)"; then \ - echo "Copying test suite data files ..." ; \ - list='$(EXTRA_DIST)'; for file in $$list; do \ - cp -p $(srcdir)/$$file . ; \ + echo "Symlinking test suite data files ..." ; \ + for file in $(EXTRA_DIST); do \ + test -a "$$file" || $(LN_S) "$(srcdir)/$$file"; \ done \ fi Modified: incubator/log4cxx/trunk/src/test/resources/witness/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/resources/witness/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/resources/witness/Makefile.am (original) +++ incubator/log4cxx/trunk/src/test/resources/witness/Makefile.am Fri Dec 12 03:04:24 2014 @@ -14,25 +14,69 @@ # limitations under the License. # SUBDIRS = encoding ndc rolling -EXTRA_DIST = LevelMatchFilter* \ - LevelRangeFilter* \ - NDCMatchFilter* \ - custom* \ - dom.* \ - hierarchyThreshold.* \ - l7d.* \ - patternLayout.* \ - socketServer.* \ - xmlLayout.* \ - fallback1 \ - simple \ - ttcc +EXTRA_DIST = \ + customLevel.1 \ + customLevel.2 \ + customLevel.3 \ + customLevel.4 \ + customLogger.1 \ + customLogger.2 \ + dom.A1.1 \ + dom.A1.2 \ + dom.A2.1 \ + dom.A2.2 \ + fallback1 \ + hierarchyThreshold.1 \ + hierarchyThreshold.2 \ + hierarchyThreshold.3 \ + hierarchyThreshold.4 \ + hierarchyThreshold.5 \ + hierarchyThreshold.6 \ + hierarchyThreshold.7 \ + hierarchyThreshold.8 \ + l7d.1 \ + LevelMatchFilter_accept \ + LevelMatchFilter_deny \ + LevelRangeFilter_accept \ + LevelRangeFilter_neutral \ + NDCMatchFilter_accept \ + NDCMatchFilter_deny \ + patternLayout.1 \ + patternLayout.10 \ + patternLayout.11 \ + patternLayout.12 \ + patternLayout.2 \ + patternLayout.3 \ + patternLayout.4 \ + patternLayout.5 \ + patternLayout.6 \ + patternLayout.7 \ + patternLayout.8 \ + patternLayout.9 \ + patternLayout.mdc.1 \ + patternLayout.mdc.2 \ + simple \ + socketServer.1 \ + socketServer.2 \ + socketServer.3 \ + socketServer.4 \ + socketServer.5 \ + socketServer.6 \ + socketServer.7 \ + socketServer.8 \ + ttcc \ + xmlLayout.1 \ + xmlLayout.2 \ + xmlLayout.3 \ + xmlLayout.mdc.1 \ + xmlLayout.mdc.2 \ + xmlLayout.null -# if we are building in a separate build tree, then copy all necessary files +# if we are building in a separate build tree, then prepare all necessary links all-local: @if test "$(top_srcdir)" != "$(top_builddir)"; then \ - echo "Copying test suite data files ..." ; \ - list='$(EXTRA_DIST)'; for file in $$list; do \ - cp -p $(srcdir)/$$file . ; \ + echo "Symlinking test suite data files ..." ; \ + for file in $(EXTRA_DIST); do \ + test -a "$$file" || $(LN_S) "$(srcdir)/$$file"; \ done \ fi Modified: incubator/log4cxx/trunk/src/test/resources/witness/encoding/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/resources/witness/encoding/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/resources/witness/encoding/Makefile.am (original) +++ incubator/log4cxx/trunk/src/test/resources/witness/encoding/Makefile.am Fri Dec 12 03:04:24 2014 @@ -13,15 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # -EXTRA_DIST = UTF-* \ - ascii.log \ - latin1.log +EXTRA_DIST = \ + ascii.log \ + latin1.log \ + UTF-16BE.log \ + UTF-16LE.log \ + UTF-16.log \ + UTF-8.log -# if we are building in a separate build tree, then copy all necessary files +# if we are building in a separate build tree, then prepare all necessary links all-local: @if test "$(top_srcdir)" != "$(top_builddir)"; then \ - echo "Copying test suite data files ..." ; \ - list='$(EXTRA_DIST)'; for file in $$list; do \ - cp -p $(srcdir)/$$file . ; \ + echo "Symlinking test suite data files ..." ; \ + for file in $(EXTRA_DIST); do \ + test -a "$$file" || $(LN_S) "$(srcdir)/$$file"; \ done \ fi Modified: incubator/log4cxx/trunk/src/test/resources/witness/ndc/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/resources/witness/ndc/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/resources/witness/ndc/Makefile.am (original) +++ incubator/log4cxx/trunk/src/test/resources/witness/ndc/Makefile.am Fri Dec 12 03:04:24 2014 @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -EXTRA_DIST = NDC.* +EXTRA_DIST = \ + NDC.1 -# if we are building in a separate build tree, then copy all necessary files +# if we are building in a separate build tree, then prepare all necessary links all-local: @if test "$(top_srcdir)" != "$(top_builddir)"; then \ - echo "Copying test suite data files ..." ; \ - list='$(EXTRA_DIST)'; for file in $$list; do \ - cp -p $(srcdir)/$$file . ; \ + echo "Symlinking test suite data files ..." ; \ + for file in $(EXTRA_DIST); do \ + test -a "$$file" || $(LN_S) "$(srcdir)/$$file"; \ done \ fi Modified: incubator/log4cxx/trunk/src/test/resources/witness/rolling/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/resources/witness/rolling/Makefile.am?rev=1644820&r1=1644819&r2=1644820&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/resources/witness/rolling/Makefile.am (original) +++ incubator/log4cxx/trunk/src/test/resources/witness/rolling/Makefile.am Fri Dec 12 03:04:24 2014 @@ -13,14 +13,38 @@ # See the License for the specific language governing permissions and # limitations under the License. # -EXTRA_DIST = sbr-test* \ - tbr-test* +EXTRA_DIST = \ + sbr-test2.0 \ + sbr-test2.1 \ + sbr-test2.log \ + sbr-test3.0.gz \ + sbr-test3.1.gz \ + sbr-test3.log \ + sbr-test4.log \ + tbr-test1.0 \ + tbr-test1.1 \ + tbr-test1.2 \ + tbr-test1.3 \ + tbr-test2.0 \ + tbr-test2.1 \ + tbr-test2.2 \ + tbr-test2.3 \ + tbr-test3.3 \ + tbr-test4.0 \ + tbr-test4.1 \ + tbr-test4.2 \ + tbr-test4.3 \ + tbr-test5.0 \ + tbr-test5.1 \ + tbr-test5.2 \ + tbr-test5.3 \ + tbr-test6.3 -# if we are building in a separate build tree, then copy all necessary files +# if we are building in a separate build tree, then prepare all necessary links all-local: @if test "$(top_srcdir)" != "$(top_builddir)"; then \ - echo "Copying test suite data files ..." ; \ - list='$(EXTRA_DIST)'; for file in $$list; do \ - cp -p $(srcdir)/$$file . ; \ + echo "Symlinking test suite data files ..." ; \ + for file in $(EXTRA_DIST); do \ + test -a "$$file" || $(LN_S) "$(srcdir)/$$file"; \ done \ fi
