Author: rleigh
Date: Tue Jan 30 20:04:45 2018
New Revision: 1822693
URL: http://svn.apache.org/viewvc?rev=1822693&view=rev
Log:
travis: Test XMLCh variants
Modified:
xerces/c/trunk/.travis.yml
xerces/c/trunk/scripts/ci-travis
Modified: xerces/c/trunk/.travis.yml
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/.travis.yml?rev=1822693&r1=1822692&r2=1822693&view=diff
==============================================================================
--- xerces/c/trunk/.travis.yml (original)
+++ xerces/c/trunk/.travis.yml Tue Jan 30 20:04:45 2018
@@ -31,29 +31,29 @@ os:
env:
matrix:
- - BUILD=autoconf TYPE=Release NETWORK=ON NETACCESSOR=curl
MSGLOADER=inmemory TRANSCODER=iconv
- - BUILD=cmake TOOL="Unix Makefiles" TYPE=Debug NETWORK=ON NETACCESSOR=curl
MSGLOADER=icu TRANSCODER=iconv
- - BUILD=cmake TOOL="Ninja" TYPE=Release NETWORK=ON NETACCESSOR=socket
MSGLOADER=inmemory TRANSCODER=icu
- - BUILD=autoconf TYPE=Debug NETWORK=ON MSGLOADER=iconv
+ - BUILD=autoconf TYPE=Release NETWORK=ON NETACCESSOR=curl
MSGLOADER=inmemory TRANSCODER=iconv XMLCH=char16_t
+ - BUILD=cmake TOOL="Unix Makefiles" TYPE=Debug NETWORK=ON NETACCESSOR=curl
MSGLOADER=icu TRANSCODER=iconv XMLCH=uint16_t
+ - BUILD=cmake TOOL="Ninja" TYPE=Release NETWORK=ON NETACCESSOR=socket
MSGLOADER=inmemory TRANSCODER=icu XMLCH=char16_t
+ - BUILD=autoconf TYPE=Debug NETWORK=ON MSGLOADER=iconv XMLCH=uint16_t
- BUILD=cmake TOOL="Unix Makefiles" TYPE=Release NETWORK=ON
- BUILD=cmake TOOL="Ninja" TYPE=Debug
- - BUILD=cmake TOOL="Ninja" TYPE=Debug NETACCESSOR=cfurl
TRANSCODER=macosunicodeconverter
+ - BUILD=cmake TOOL="Ninja" TYPE=Debug NETACCESSOR=cfurl
TRANSCODER=macosunicodeconverter XMLCH=uint16_t
matrix:
fast_finish: true
exclude:
- os: linux
- env: BUILD=cmake TOOL="Ninja" TYPE=Debug NETACCESSOR=cfurl
TRANSCODER=macosunicodeconverter
+ env: BUILD=cmake TOOL="Ninja" TYPE=Debug NETACCESSOR=cfurl
TRANSCODER=macosunicodeconverter XMLCH=uint16_t
- os: osx
- env: BUILD=cmake TOOL="Unix Makefiles" TYPE=Debug NETWORK=ON
NETACCESSOR=curl MSGLOADER=icu TRANSCODER=iconv
+ env: BUILD=cmake TOOL="Unix Makefiles" TYPE=Debug NETWORK=ON
NETACCESSOR=curl MSGLOADER=icu TRANSCODER=iconv XMLCH=uint16_t
- os: osx
- env: BUILD=cmake TOOL="Ninja" TYPE=Release NETWORK=ON NETACCESSOR=socket
MSGLOADER=inmemory TRANSCODER=icu
+ env: BUILD=cmake TOOL="Ninja" TYPE=Release NETWORK=ON NETACCESSOR=socket
MSGLOADER=inmemory TRANSCODER=icu XMLCH=char16_t
- os: osx
- env: BUILD=autoconf TYPE=Debug NETWORK=ON MSGLOADER=iconv
+ env: BUILD=autoconf TYPE=Debug NETWORK=ON MSGLOADER=iconv XMLCH=uint16_t
- os: osx
env: BUILD=cmake TOOL="Unix Makefiles" TYPE=Release NETWORK=ON
- os: osx
env: BUILD=cmake TOOL="Ninja" TYPE=Debug
script:
- - ./scripts/ci-travis "$BUILD" "$TOOL" "$TYPE" "$NETWORK" "$NETACCESSOR"
"$MSGLOADER" "$TRANSCODER"
+ - ./scripts/ci-travis "$BUILD" "$TOOL" "$TYPE" "$NETWORK" "$NETACCESSOR"
"$MSGLOADER" "$TRANSCODER" "$XMLCH"
Modified: xerces/c/trunk/scripts/ci-travis
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/scripts/ci-travis?rev=1822693&r1=1822692&r2=1822693&view=diff
==============================================================================
--- xerces/c/trunk/scripts/ci-travis (original)
+++ xerces/c/trunk/scripts/ci-travis Tue Jan 30 20:04:45 2018
@@ -40,6 +40,12 @@ autoconf_build()
windows) opts="$opts --enable-transcoder-windows" ;;
esac
+ # msgloader
+ case "$7" in
+ char16_t) opts="$opts --enable-xmlch-char16_t" ;;
+ uint16_t) opts="$opts --enable-xmlch-uint16_t" ;;
+ esac
+
autoreconf -ivf
mkdir autoconf-build
@@ -118,6 +124,9 @@ cmake_build()
if [ -n "$6" ]; then
opts="$opts -Dtranscoder=$6"
fi
+ if [ -n "$7" ]; then
+ opts="$opts -Dxmlch-type=$7"
+ fi
PATH="$(pwd)/tools/bin:$PATH"
if [ "$(uname -s)" = "Darwin" ]; then
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
