You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by sc...@apache.org on 2017/07/07 18:07:36 UTC
svn commit: r1801203 - in /xerces/c/trunk: ./ Makefile.am
samples/Makefile.am src/Makefile.am tests/Makefile.am
Author: scantor
Date: Fri Jul 7 18:07:36 2017
New Revision: 1801203
URL: http://svn.apache.org/viewvc?rev=1801203&view=rev
Log:
Bring Makefile/dist changes over from branch.
Modified:
xerces/c/trunk/ (props changed)
xerces/c/trunk/Makefile.am
xerces/c/trunk/samples/Makefile.am
xerces/c/trunk/src/Makefile.am
xerces/c/trunk/tests/Makefile.am
Propchange: xerces/c/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 7 18:07:36 2017
@@ -19,3 +19,7 @@ xerces-c.pc
.vscode
.settings
test-results.log
+*.bz2
+*.gz
+*.xz
+*.zip
Modified: xerces/c/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Makefile.am?rev=1801203&r1=1801202&r2=1801203&view=diff
==============================================================================
--- xerces/c/trunk/Makefile.am (original)
+++ xerces/c/trunk/Makefile.am Fri Jul 7 18:07:36 2017
@@ -4,12 +4,25 @@ EXTRA_DIST = version.incl \
CMakeLists.txt \
cmake \
config.h.cmake.in \
+ xerces-c.spec \
+ xerces-c.pc.in \
+ CREDITS \
+ INSTALL \
+ KEYS \
+ LICENSE \
+ NOTICE \
+ README \
config/pretty-make \
+ doc \
+ projects \
+ reconf \
scripts/createBindingsFormatFromHPP.pl \
scripts/makeStringDefinition.pl \
scripts/sanityTest.pl \
- scripts/sanityTest_ExpectedResult.log
+ scripts/sanityTest_ExpectedResult.log \
+ tools
+AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip dist-xz
ACLOCAL_AMFLAGS = -I m4
CLEANFILES = test-results.log
@@ -19,5 +32,5 @@ pkgconfig_DATA= xerces-c.pc
check:
-rm -f test-results.log
- export PATH=${abs_top_builddir}/samples:${abs_top_builddir}/tests:"${PATH}" && export XERCESC_NLS_HOME=${abs_top_builddir}/src/ && cd ${top_srcdir} && perl scripts/sanityTest.pl 2>&1 | ${SED} 's/ *[0-9][0-9]* *ms */{timing removed}/' 1> ${abs_top_builddir}/test-results.log
+ export PATH=${abs_top_builddir}/samples:${abs_top_builddir}/tests:"${PATH}" && export XERCESC_NLS_HOME=${abs_top_builddir}/src/.libs && cd ${top_srcdir} && perl scripts/sanityTest.pl 2>&1 | ${SED} 's/ *[0-9][0-9]* *ms */{timing removed}/' 1> ${abs_top_builddir}/test-results.log
diff test-results.log ${top_srcdir}/scripts/sanityTest_ExpectedResult.log
Modified: xerces/c/trunk/samples/Makefile.am
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/Makefile.am?rev=1801203&r1=1801202&r2=1801203&view=diff
==============================================================================
--- xerces/c/trunk/samples/Makefile.am (original)
+++ xerces/c/trunk/samples/Makefile.am Fri Jul 7 18:07:36 2017
@@ -32,7 +32,7 @@ EXTRA_DIST = CMak
data/personal.xsd \
data/personal-schema.xml \
data/redirect.dtd \
- expected
+ data/long.xml
sampleprogs =
Modified: xerces/c/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/Makefile.am?rev=1801203&r1=1801202&r2=1801203&view=diff
==============================================================================
--- xerces/c/trunk/src/Makefile.am (original)
+++ xerces/c/trunk/src/Makefile.am Fri Jul 7 18:07:36 2017
@@ -58,8 +58,10 @@ nodist_autoconfheaders_HEADERS = ${top_b
EXTRA_DIST = CMakeLists.txt \
XercesCConfig.cmake.in \
stricmp.h strnicmp.h towlower.h towupper.h \
+ xercesc/NLS \
xercesc/util/Xerces_autoconf_config.hpp.cmake.in \
- xercesc/util/MsgLoaders/Win32
+ xercesc/util/MsgLoaders/Win32 \
+ xercesc/util/MsgLoaders/ICU/resources
libxerces_c_la_LIBADD = ${LTLIBOBJS}
@@ -129,9 +131,6 @@ nodist_libxerces_c_la_SOURCES = ${msgicu
nobase_libxerces_c_la_HEADERS += ${msgicu_headers}
AM_CPPFLAGS += ${ICU_FLAGS}
-EXTRA_DIST += xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt \
-xercesc/util/MsgLoaders/ICU/resources/root.txt
-
# Resource shortname
PKGNAME=xercesc_messages_${INTERFACE_VER_U}
Modified: xerces/c/trunk/tests/Makefile.am
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/Makefile.am?rev=1801203&r1=1801202&r2=1801203&view=diff
==============================================================================
--- xerces/c/trunk/tests/Makefile.am (original)
+++ xerces/c/trunk/tests/Makefile.am Fri Jul 7 18:07:36 2017
@@ -38,7 +38,9 @@ EXTRA_DIST =
src/DOM/TypeInfo/data/TypeInfo.xsd \
src/DOM/TypeInfo/data/TypeInfoJustDTD.xml \
src/DOM/TypeInfo/data/TypeInfoNoDTD.xml \
- src/DOM/TypeInfo/data/TypeInfoNoDTD.xsd
+ src/DOM/TypeInfo/data/TypeInfoNoDTD.xsd \
+ src/XSTSHarness/regression \
+ src/xinclude
testprogs =
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org