diff --git a/third-party/libstudxml/CMakeLists.txt b/third-party/libstudxml/CMakeLists.txt index b6529c9e..8504e492 100644 --- a/third-party/libstudxml/CMakeLists.txt +++ b/third-party/libstudxml/CMakeLists.txt @@ -14,40 +14,40 @@ if(STATIC_CRT) endif() set(LIBSTUDXML - ${LIBSTUDXML_ROOT_DIR}/xml/parser.cxx - ${LIBSTUDXML_ROOT_DIR}/xml/qname.cxx - ${LIBSTUDXML_ROOT_DIR}/xml/serializer.cxx - ${LIBSTUDXML_ROOT_DIR}/xml/value-traits.cxx - ${LIBSTUDXML_ROOT_DIR}/xml/content - ${LIBSTUDXML_ROOT_DIR}/xml/exception - ${LIBSTUDXML_ROOT_DIR}/xml/forward - ${LIBSTUDXML_ROOT_DIR}/xml/parser - ${LIBSTUDXML_ROOT_DIR}/xml/qname - ${LIBSTUDXML_ROOT_DIR}/xml/serializer - ${LIBSTUDXML_ROOT_DIR}/xml/value-traits) + ${LIBSTUDXML_ROOT_DIR}/libstudxml/parser.cxx + ${LIBSTUDXML_ROOT_DIR}/libstudxml/qname.cxx + ${LIBSTUDXML_ROOT_DIR}/libstudxml/serializer.cxx + ${LIBSTUDXML_ROOT_DIR}/libstudxml/value-traits.cxx + ${LIBSTUDXML_ROOT_DIR}/libstudxml/content + ${LIBSTUDXML_ROOT_DIR}/libstudxml/exception + ${LIBSTUDXML_ROOT_DIR}/libstudxml/forward + ${LIBSTUDXML_ROOT_DIR}/libstudxml/parser + ${LIBSTUDXML_ROOT_DIR}/libstudxml/qname + ${LIBSTUDXML_ROOT_DIR}/libstudxml/serializer + ${LIBSTUDXML_ROOT_DIR}/libstudxml/value-traits) set(GENX - ${LIBSTUDXML_ROOT_DIR}/xml/details/genx/char-props.c - ${LIBSTUDXML_ROOT_DIR}/xml/details/genx/genx.c - ${LIBSTUDXML_ROOT_DIR}/xml/details/genx/genx.h) + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/genx/char-props.c + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/genx/genx.c + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/genx/genx.h) set(EXPAT - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmlparse.c - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmlrole.c - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmltok.c - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/ascii.h - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/asciitab.h - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/config.h - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/expat_external.h - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/expat.h - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/iasciitab.h - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/internal.h - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/latin1tab.h - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/nametab.h - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/utf8tab.h - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmlrole.h - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmltok_impl.h - ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmltok.h) + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/xmlparse.c + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/xmlrole.c + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/xmltok.c + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/ascii.h + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/asciitab.h + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/config.h + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/expat_external.h + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/expat.h + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/iasciitab.h + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/internal.h + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/latin1tab.h + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/nametab.h + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/utf8tab.h + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/xmlrole.h + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/xmltok_impl.h + ${LIBSTUDXML_ROOT_DIR}/libstudxml/details/expat/xmltok.h) add_library(libstudxml OBJECT ${LIBSTUDXML} ${GENX} ${EXPAT}) diff --git a/third-party/libstudxml/LICENSE b/third-party/libstudxml/LICENSE index b8b424d5..94be864c 100644 --- a/third-party/libstudxml/LICENSE +++ b/third-party/libstudxml/LICENSE @@ -8,7 +8,7 @@ Code found in the xml/details/genx/ directory is distributed under the MIT License (see the xml/details/genx/LICENSE file for copyright information). -The rest is Copyright (c) 2013-2017 Code Synthesis Tools CC and is +The rest is Copyright (c) 2013-2019 Code Synthesis Tools CC and is distributed under the MIT License: Permission is hereby granted, free of charge, to any person obtaining diff --git a/third-party/libstudxml/libstudxml/buildfile b/third-party/libstudxml/libstudxml/buildfile new file mode 100644 index 00000000..cc5a1ca8 --- /dev/null +++ b/third-party/libstudxml/libstudxml/buildfile @@ -0,0 +1,82 @@ +# file : libstudxml/buildfile +# copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC +# license : MIT; see accompanying LICENSE file + +lib{studxml}: {hxx ixx txx cxx}{** -version} {hxx}{version} \ + details/{h}{config*} + +# Expat. Note that we treat a whole bunch of its sources as files since they +# are private and #include's (including .c file). +# +lib{studxml}: details/expat/{ \ + h{expat expat_external} \ + c{xmlparse xmlrole xmltok} \ +file{ascii.h asciitab.h config.h iasciitab.h internal.h latin1tab.h nametab.h \ + utf8tab.h xmlrole.h xmltok.h xmltok_impl.h xmltok_impl.c xmltok_ns.c} \ + doc{LICENSE README} \ +} + +details/expat/doc{README}@./: install = false +details/expat/doc{LICENSE}@./: install = doc/EXPAT-LICENSE + +# Genx. +# +lib{studxml}: details/genx/{h{*} c{*} doc{LICENSE README}} + +# Include the generated version header into the distribution (so that we don't +# pick up an installed one) and don't remove it when cleaning in src (so that +# clean results in a state identical to distributed). +# +hxx{version}: in{version} $src_root/manifest +hxx{version}: +{ + dist = true + clean = ($src_root != $out_root) +} + +# Build options. +# +if ($c.class == 'gcc') +{ + # Disable warnings that pop up with -Wextra (e.g, -fimplicit-fallthrough) + # in C implementation details. + # + details/expat/ c.coptions += -Wno-extra + details/genx/ c.coptions += -Wno-extra +} + +# We are a mixed C/C++ library, though C is implementation-only, kind of: we +# need headers but not symbols. +# +cc.poptions =+ "-I$out_root" "-I$src_root" + +obja{*}: cc.poptions += -DLIBSTUDXML_STATIC_BUILD +objs{*}: cc.poptions += -DLIBSTUDXML_SHARED_BUILD + +# Export options. +# +lib{studxml}: cc.export.poptions = "-I$out_root" "-I$src_root" + +liba{studxml}: cc.export.poptions += -DLIBSTUDXML_STATIC +libs{studxml}: cc.export.poptions += -DLIBSTUDXML_SHARED + +# For pre-releases use the complete version to make sure they cannot be used +# in place of another pre-release or the final version. See the version module +# for details on the version.* variable values. +# +if $version.pre_release + lib{studxml}: bin.lib.version = @"-$version.project_id" +else + lib{studxml}: bin.lib.version = @"-$version.major.$version.minor" + +# Install into the libstudxml/ subdirectory of, say, /usr/include/ +# recreating subdirectories. +# +{h hxx ixx txx}{*}: +{ + install = include/libstudxml/ + install.subdirs = true +} + +details/genx/doc{README}@./: install = false +details/genx/doc{LICENSE}@./: install = doc/GENX-LICENSE diff --git a/third-party/libstudxml/xml/content b/third-party/libstudxml/libstudxml/content.hxx similarity index 67% rename from third-party/libstudxml/xml/content rename to third-party/libstudxml/libstudxml/content.hxx index 61e56259..4e352240 100644 --- a/third-party/libstudxml/xml/content +++ b/third-party/libstudxml/libstudxml/content.hxx @@ -1,11 +1,11 @@ -// file : xml/content -*- C++ -*- -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/content.hxx -*- C++ -*- +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file -#ifndef XML_CONTENT -#define XML_CONTENT +#ifndef LIBSTUDXML_CONTENT_HXX +#define LIBSTUDXML_CONTENT_HXX -#include +#include namespace xml { @@ -30,6 +30,6 @@ namespace xml }; } -#include +#include -#endif // XML_CONTENT +#endif // LIBSTUDXML_CONTENT_HXX diff --git a/third-party/libstudxml/libstudxml/details/config-vc.h b/third-party/libstudxml/libstudxml/details/config-vc.h new file mode 100644 index 00000000..2fc23635 --- /dev/null +++ b/third-party/libstudxml/libstudxml/details/config-vc.h @@ -0,0 +1,15 @@ +/* file : libstudxml/details/config-vc.h + * copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC + * license : MIT; see accompanying LICENSE file + */ + +/* Configuration file for Windows/VC++ for the build2 build. */ + +#ifndef LIBSTUDXML_DETAILS_CONFIG_VC_H +#define LIBSTUDXML_DETAILS_CONFIG_VC_H + +// Always little-endian, at least on i686 and x86_64. +// +#define LIBSTUDXML_BYTEORDER 1234 + +#endif /* LIBSTUDXML_DETAILS_CONFIG_VC_H */ diff --git a/third-party/libstudxml/xml/details/build2/config.h b/third-party/libstudxml/libstudxml/details/config.h similarity index 71% rename from third-party/libstudxml/xml/details/build2/config.h rename to third-party/libstudxml/libstudxml/details/config.h index e10b8eed..aec5f666 100644 --- a/third-party/libstudxml/xml/details/build2/config.h +++ b/third-party/libstudxml/libstudxml/details/config.h @@ -1,17 +1,12 @@ -/* file : xml/details/build2/config.h - * copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +/* file : libstudxml/details/build2/config.h + * copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC * license : MIT; see accompanying LICENSE file */ /* Static configuration file for the build2 build. */ -#ifndef XML_DETAILS_CONFIG_H -#define XML_DETAILS_CONFIG_H - -/* Define LIBSTUDXML_BUILD2 for the installed case. */ -#ifndef LIBSTUDXML_BUILD2 -# define LIBSTUDXML_BUILD2 -#endif +#ifndef LIBSTUDXML_DETAILS_CONFIG_H +#define LIBSTUDXML_DETAILS_CONFIG_H #ifdef __FreeBSD__ # include /* BYTE_ORDER */ @@ -42,4 +37,4 @@ # define LIBSTUDXML_BYTEORDER 1234 #endif -#endif /* XML_DETAILS_CONFIG_H */ +#endif /* LIBSTUDXML_DETAILS_CONFIG_H */ diff --git a/third-party/libstudxml/xml/details/config.hxx b/third-party/libstudxml/libstudxml/details/config.hxx similarity index 59% rename from third-party/libstudxml/xml/details/config.hxx rename to third-party/libstudxml/libstudxml/details/config.hxx index 5c461214..d6147814 100644 --- a/third-party/libstudxml/xml/details/config.hxx +++ b/third-party/libstudxml/libstudxml/details/config.hxx @@ -1,9 +1,9 @@ -// file : xml/details/config.hxx -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/details/config.hxx +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file -#ifndef XML_DETAILS_CONFIG_HXX -#define XML_DETAILS_CONFIG_HXX +#ifndef LIBSTUDXML_DETAILS_CONFIG_HXX +#define LIBSTUDXML_DETAILS_CONFIG_HXX // C++11 support. // @@ -31,20 +31,10 @@ # define STUDXML_NOTHROW_NOEXCEPT throw() #endif -// Note: the same in expat/config.h -// -#ifdef LIBSTUDXML_BUILD2 -# ifdef _MSC_VER -# include -# else -# include -# endif +#ifdef _MSC_VER +# include #else -# ifdef _MSC_VER -# include -# else -# include -# endif +# include #endif -#endif // XML_DETAILS_CONFIG_HXX +#endif // LIBSTUDXML_DETAILS_CONFIG_HXX diff --git a/third-party/libstudxml/xml/details/expat/LICENSE b/third-party/libstudxml/libstudxml/details/expat/LICENSE similarity index 100% rename from third-party/libstudxml/xml/details/expat/LICENSE rename to third-party/libstudxml/libstudxml/details/expat/LICENSE diff --git a/third-party/libstudxml/xml/details/expat/README b/third-party/libstudxml/libstudxml/details/expat/README similarity index 100% rename from third-party/libstudxml/xml/details/expat/README rename to third-party/libstudxml/libstudxml/details/expat/README diff --git a/third-party/libstudxml/xml/details/expat/ascii.h b/third-party/libstudxml/libstudxml/details/expat/ascii.h similarity index 100% rename from third-party/libstudxml/xml/details/expat/ascii.h rename to third-party/libstudxml/libstudxml/details/expat/ascii.h diff --git a/third-party/libstudxml/xml/details/expat/asciitab.h b/third-party/libstudxml/libstudxml/details/expat/asciitab.h similarity index 100% rename from third-party/libstudxml/xml/details/expat/asciitab.h rename to third-party/libstudxml/libstudxml/details/expat/asciitab.h diff --git a/third-party/libstudxml/xml/details/expat/config.h b/third-party/libstudxml/libstudxml/details/expat/config.h similarity index 61% rename from third-party/libstudxml/xml/details/expat/config.h rename to third-party/libstudxml/libstudxml/details/expat/config.h index a335147f..99fa673e 100644 --- a/third-party/libstudxml/xml/details/expat/config.h +++ b/third-party/libstudxml/libstudxml/details/expat/config.h @@ -1,18 +1,10 @@ #ifndef EXPAT_CONFIG_H #define EXPAT_CONFIG_H -#ifdef LIBSTUDXML_BUILD2 -# ifdef _MSC_VER -# include -# else -# include -# endif +#ifdef _MSC_VER +# include #else -# ifdef _MSC_VER -# include -# else -# include -# endif +# include #endif #define BYTEORDER LIBSTUDXML_BYTEORDER diff --git a/third-party/libstudxml/xml/details/expat/expat.h b/third-party/libstudxml/libstudxml/details/expat/expat.h similarity index 99% rename from third-party/libstudxml/xml/details/expat/expat.h rename to third-party/libstudxml/libstudxml/details/expat/expat.h index 77baa3a6..9671b736 100644 --- a/third-party/libstudxml/xml/details/expat/expat.h +++ b/third-party/libstudxml/libstudxml/details/expat/expat.h @@ -15,7 +15,7 @@ #endif #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/third-party/libstudxml/xml/details/expat/expat_external.h b/third-party/libstudxml/libstudxml/details/expat/expat_external.h similarity index 100% rename from third-party/libstudxml/xml/details/expat/expat_external.h rename to third-party/libstudxml/libstudxml/details/expat/expat_external.h diff --git a/third-party/libstudxml/xml/details/expat/iasciitab.h b/third-party/libstudxml/libstudxml/details/expat/iasciitab.h similarity index 100% rename from third-party/libstudxml/xml/details/expat/iasciitab.h rename to third-party/libstudxml/libstudxml/details/expat/iasciitab.h diff --git a/third-party/libstudxml/xml/details/expat/internal.h b/third-party/libstudxml/libstudxml/details/expat/internal.h similarity index 100% rename from third-party/libstudxml/xml/details/expat/internal.h rename to third-party/libstudxml/libstudxml/details/expat/internal.h diff --git a/third-party/libstudxml/xml/details/expat/latin1tab.h b/third-party/libstudxml/libstudxml/details/expat/latin1tab.h similarity index 100% rename from third-party/libstudxml/xml/details/expat/latin1tab.h rename to third-party/libstudxml/libstudxml/details/expat/latin1tab.h diff --git a/third-party/libstudxml/xml/details/expat/nametab.h b/third-party/libstudxml/libstudxml/details/expat/nametab.h similarity index 100% rename from third-party/libstudxml/xml/details/expat/nametab.h rename to third-party/libstudxml/libstudxml/details/expat/nametab.h diff --git a/third-party/libstudxml/xml/details/expat/utf8tab.h b/third-party/libstudxml/libstudxml/details/expat/utf8tab.h similarity index 100% rename from third-party/libstudxml/xml/details/expat/utf8tab.h rename to third-party/libstudxml/libstudxml/details/expat/utf8tab.h diff --git a/third-party/libstudxml/xml/details/expat/xmlparse.c b/third-party/libstudxml/libstudxml/details/expat/xmlparse.c similarity index 99% rename from third-party/libstudxml/xml/details/expat/xmlparse.c rename to third-party/libstudxml/libstudxml/details/expat/xmlparse.c index d3c7873d..5bc63731 100644 --- a/third-party/libstudxml/xml/details/expat/xmlparse.c +++ b/third-party/libstudxml/libstudxml/details/expat/xmlparse.c @@ -10,10 +10,10 @@ #define XML_BUILDING_EXPAT 1 -#include +#include -#include -#include +#include +#include #ifdef XML_UNICODE #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX @@ -74,9 +74,9 @@ typedef char ICHAR; #endif /* HAVE_BCOPY */ #endif /* HAVE_MEMMOVE */ -#include -#include -#include +#include +#include +#include typedef const XML_Char *KEY; diff --git a/third-party/libstudxml/xml/details/expat/xmlrole.c b/third-party/libstudxml/libstudxml/details/expat/xmlrole.c similarity index 99% rename from third-party/libstudxml/xml/details/expat/xmlrole.c rename to third-party/libstudxml/libstudxml/details/expat/xmlrole.c index c36db3a1..b0586e6f 100644 --- a/third-party/libstudxml/xml/details/expat/xmlrole.c +++ b/third-party/libstudxml/libstudxml/details/expat/xmlrole.c @@ -4,12 +4,12 @@ #include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include /* Doesn't check: diff --git a/third-party/libstudxml/xml/details/expat/xmlrole.h b/third-party/libstudxml/libstudxml/details/expat/xmlrole.h similarity index 98% rename from third-party/libstudxml/xml/details/expat/xmlrole.h rename to third-party/libstudxml/libstudxml/details/expat/xmlrole.h index 0a0d6b87..4eeb5b2a 100644 --- a/third-party/libstudxml/xml/details/expat/xmlrole.h +++ b/third-party/libstudxml/libstudxml/details/expat/xmlrole.h @@ -11,7 +11,7 @@ #define XmlPrologStateInitExternalEntity XmlPrologStateInitExternalEnt #endif -#include +#include #ifdef __cplusplus extern "C" { diff --git a/third-party/libstudxml/xml/details/expat/xmltok.c b/third-party/libstudxml/libstudxml/details/expat/xmltok.c similarity index 95% rename from third-party/libstudxml/xml/details/expat/xmltok.c rename to third-party/libstudxml/libstudxml/details/expat/xmltok.c index b15fcc8e..5a8f36f2 100644 --- a/third-party/libstudxml/xml/details/expat/xmltok.c +++ b/third-party/libstudxml/libstudxml/details/expat/xmltok.c @@ -4,12 +4,12 @@ #include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef XML_DTD #define IGNORE_SECTION_TOK_VTABLE , PREFIX(ignoreSectionTok) @@ -242,8 +242,8 @@ struct normal_encoding { static int FASTCALL checkCharRefNumber(int); -#include -#include +#include +#include #ifdef XML_MIN_SIZE #define sb_isNameMin isNever @@ -316,7 +316,7 @@ sb_charMatches(const ENCODING *enc, const char *p, int c) #define PREFIX(ident) normal_ ## ident #define XML_TOK_IMPL_C -#include +#include #undef XML_TOK_IMPL_C #undef MINBPC @@ -404,8 +404,8 @@ after: static const struct normal_encoding utf8_encoding_ns = { { VTABLE1, utf8_toUtf8, utf8_toUtf16, 1, 1, 0 }, { -#include -#include +#include +#include }, STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_) }; @@ -415,9 +415,9 @@ static const struct normal_encoding utf8_encoding = { { VTABLE1, utf8_toUtf8, utf8_toUtf16, 1, 1, 0 }, { #define BT_COLON BT_NMSTRT -#include +#include #undef BT_COLON -#include +#include }, STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_) }; @@ -427,8 +427,8 @@ static const struct normal_encoding utf8_encoding = { static const struct normal_encoding internal_utf8_encoding_ns = { { VTABLE1, utf8_toUtf8, utf8_toUtf16, 1, 1, 0 }, { -#include -#include +#include +#include }, STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_) }; @@ -439,9 +439,9 @@ static const struct normal_encoding internal_utf8_encoding = { { VTABLE1, utf8_toUtf8, utf8_toUtf16, 1, 1, 0 }, { #define BT_COLON BT_NMSTRT -#include +#include #undef BT_COLON -#include +#include }, STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_) }; @@ -489,8 +489,8 @@ latin1_toUtf16(const ENCODING *enc, static const struct normal_encoding latin1_encoding_ns = { { VTABLE1, latin1_toUtf8, latin1_toUtf16, 1, 0, 0 }, { -#include -#include +#include +#include }, STANDARD_VTABLE(sb_) ZERO_VTABLE }; @@ -501,9 +501,9 @@ static const struct normal_encoding latin1_encoding = { { VTABLE1, latin1_toUtf8, latin1_toUtf16, 1, 0, 0 }, { #define BT_COLON BT_NMSTRT -#include +#include #undef BT_COLON -#include +#include }, STANDARD_VTABLE(sb_) ZERO_VTABLE }; @@ -524,7 +524,7 @@ ascii_toUtf8(const ENCODING *enc, static const struct normal_encoding ascii_encoding_ns = { { VTABLE1, ascii_toUtf8, latin1_toUtf16, 1, 1, 0 }, { -#include +#include /* BT_NONXML == 0 */ }, STANDARD_VTABLE(sb_) ZERO_VTABLE @@ -536,7 +536,7 @@ static const struct normal_encoding ascii_encoding = { { VTABLE1, ascii_toUtf8, latin1_toUtf16, 1, 1, 0 }, { #define BT_COLON BT_NMSTRT -#include +#include #undef BT_COLON /* BT_NONXML == 0 */ }, @@ -726,7 +726,7 @@ little2_isNmstrtMin(const ENCODING *enc, const char *p) #define IS_NMSTRT_CHAR_MINBPC(enc, p) LITTLE2_IS_NMSTRT_CHAR_MINBPC(enc, p) #define XML_TOK_IMPL_C -#include +#include #undef XML_TOK_IMPL_C #undef MINBPC @@ -752,8 +752,8 @@ static const struct normal_encoding little2_encoding_ns = { #endif }, { -#include -#include +#include +#include }, STANDARD_VTABLE(little2_) ZERO_VTABLE }; @@ -770,9 +770,9 @@ static const struct normal_encoding little2_encoding = { }, { #define BT_COLON BT_NMSTRT -#include +#include #undef BT_COLON -#include +#include }, STANDARD_VTABLE(little2_) ZERO_VTABLE }; @@ -784,8 +784,8 @@ static const struct normal_encoding little2_encoding = { static const struct normal_encoding internal_little2_encoding_ns = { { VTABLE, 2, 0, 1 }, { -#include -#include +#include +#include }, STANDARD_VTABLE(little2_) ZERO_VTABLE }; @@ -796,9 +796,9 @@ static const struct normal_encoding internal_little2_encoding = { { VTABLE, 2, 0, 1 }, { #define BT_COLON BT_NMSTRT -#include +#include #undef BT_COLON -#include +#include }, STANDARD_VTABLE(little2_) ZERO_VTABLE }; @@ -867,7 +867,7 @@ big2_isNmstrtMin(const ENCODING *enc, const char *p) #define IS_NMSTRT_CHAR_MINBPC(enc, p) BIG2_IS_NMSTRT_CHAR_MINBPC(enc, p) #define XML_TOK_IMPL_C -#include +#include #undef XML_TOK_IMPL_C #undef MINBPC @@ -893,8 +893,8 @@ static const struct normal_encoding big2_encoding_ns = { #endif }, { -#include -#include +#include +#include }, STANDARD_VTABLE(big2_) ZERO_VTABLE }; @@ -911,9 +911,9 @@ static const struct normal_encoding big2_encoding = { }, { #define BT_COLON BT_NMSTRT -#include +#include #undef BT_COLON -#include +#include }, STANDARD_VTABLE(big2_) ZERO_VTABLE }; @@ -925,8 +925,8 @@ static const struct normal_encoding big2_encoding = { static const struct normal_encoding internal_big2_encoding_ns = { { VTABLE, 2, 0, 1 }, { -#include -#include +#include +#include }, STANDARD_VTABLE(big2_) ZERO_VTABLE }; @@ -937,9 +937,9 @@ static const struct normal_encoding internal_big2_encoding = { { VTABLE, 2, 0, 1 }, { #define BT_COLON BT_NMSTRT -#include +#include #undef BT_COLON -#include +#include }, STANDARD_VTABLE(big2_) ZERO_VTABLE }; @@ -1649,7 +1649,7 @@ initScan(const ENCODING * const *encodingTable, #define NS(x) x #define ns(x) x #define XML_TOK_NS_C -#include +#include #undef XML_TOK_NS_C #undef NS #undef ns @@ -1660,7 +1660,7 @@ initScan(const ENCODING * const *encodingTable, #define ns(x) x ## _ns #define XML_TOK_NS_C -#include +#include #undef XML_TOK_NS_C #undef NS diff --git a/third-party/libstudxml/xml/details/expat/xmltok.h b/third-party/libstudxml/libstudxml/details/expat/xmltok.h similarity index 100% rename from third-party/libstudxml/xml/details/expat/xmltok.h rename to third-party/libstudxml/libstudxml/details/expat/xmltok.h diff --git a/third-party/libstudxml/xml/details/expat/xmltok_impl.c b/third-party/libstudxml/libstudxml/details/expat/xmltok_impl.c similarity index 100% rename from third-party/libstudxml/xml/details/expat/xmltok_impl.c rename to third-party/libstudxml/libstudxml/details/expat/xmltok_impl.c diff --git a/third-party/libstudxml/xml/details/expat/xmltok_impl.h b/third-party/libstudxml/libstudxml/details/expat/xmltok_impl.h similarity index 100% rename from third-party/libstudxml/xml/details/expat/xmltok_impl.h rename to third-party/libstudxml/libstudxml/details/expat/xmltok_impl.h diff --git a/third-party/libstudxml/xml/details/expat/xmltok_ns.c b/third-party/libstudxml/libstudxml/details/expat/xmltok_ns.c similarity index 100% rename from third-party/libstudxml/xml/details/expat/xmltok_ns.c rename to third-party/libstudxml/libstudxml/details/expat/xmltok_ns.c diff --git a/third-party/libstudxml/xml/details/export.hxx b/third-party/libstudxml/libstudxml/details/export.hxx similarity index 60% rename from third-party/libstudxml/xml/details/export.hxx rename to third-party/libstudxml/libstudxml/details/export.hxx index 3202872e..913f72ea 100644 --- a/third-party/libstudxml/xml/details/export.hxx +++ b/third-party/libstudxml/libstudxml/details/export.hxx @@ -1,11 +1,9 @@ -// file : xml/details/export.hxx -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/details/export.hxx +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file -#ifndef XML_DETAILS_EXPORT_HXX -#define XML_DETAILS_EXPORT_HXX - -#include +#ifndef LIBSTUDXML_DETAILS_EXPORT_HXX +#define LIBSTUDXML_DETAILS_EXPORT_HXX // Normally we don't export class templates (but do complete specializations), // inline functions, and classes with only inline member functions. Exporting @@ -15,8 +13,6 @@ // used before their inline definition. The workaround is to reorder code. In // the end it's all trial and error. -#ifdef LIBSTUDXML_BUILD2 - #if defined(LIBSTUDXML_STATIC) // Using static. # define LIBSTUDXML_EXPORT #elif defined(LIBSTUDXML_STATIC_BUILD) // Building static. @@ -42,34 +38,4 @@ # define LIBSTUDXML_EXPORT // Using static or shared. #endif -#else // LIBSTUDXML_BUILD2 - -#ifdef LIBSTUDXML_STATIC_LIB -# define LIBSTUDXML_EXPORT -#else -# ifdef _WIN32 -# ifdef _MSC_VER -# ifdef LIBSTUDXML_DYNAMIC_LIB -# define LIBSTUDXML_EXPORT __declspec(dllexport) -# else -# define LIBSTUDXML_EXPORT __declspec(dllimport) -# endif -# else -# ifdef LIBSTUDXML_DYNAMIC_LIB -# ifdef DLL_EXPORT -# define LIBSTUDXML_EXPORT __declspec(dllexport) -# else -# define LIBSTUDXML_EXPORT -# endif -# else -# define LIBSTUDXML_EXPORT __declspec(dllimport) -# endif -# endif -# else -# define LIBSTUDXML_EXPORT -# endif -#endif - -#endif // LIBSTUDXML_BUILD2 - -#endif // XML_DETAILS_EXPORT_HXX +#endif // LIBSTUDXML_DETAILS_EXPORT_HXX diff --git a/third-party/libstudxml/xml/details/genx/LICENSE b/third-party/libstudxml/libstudxml/details/genx/LICENSE similarity index 95% rename from third-party/libstudxml/xml/details/genx/LICENSE rename to third-party/libstudxml/libstudxml/details/genx/LICENSE index 6fc3fa74..616519a9 100644 --- a/third-party/libstudxml/xml/details/genx/LICENSE +++ b/third-party/libstudxml/libstudxml/details/genx/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2007-2017 Code Synthesis Tools CC. +Copyright (c) 2007-2019 Code Synthesis Tools CC. Copyright (c) Tim Bray and Sun Microsystems, 2004. Permission is hereby granted, free of charge, to any person obtaining diff --git a/third-party/libstudxml/xml/details/genx/README b/third-party/libstudxml/libstudxml/details/genx/README similarity index 100% rename from third-party/libstudxml/xml/details/genx/README rename to third-party/libstudxml/libstudxml/details/genx/README diff --git a/third-party/libstudxml/xml/details/genx/char-props.c b/third-party/libstudxml/libstudxml/details/genx/char-props.c similarity index 99% rename from third-party/libstudxml/xml/details/genx/char-props.c rename to third-party/libstudxml/libstudxml/details/genx/char-props.c index f58a3a23..2ea0208f 100644 --- a/third-party/libstudxml/xml/details/genx/char-props.c +++ b/third-party/libstudxml/libstudxml/details/genx/char-props.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2017 Code Synthesis Tools CC. + * Copyright (c) 2007-2019 Code Synthesis Tools CC. * Copyright (c) 2004 by Tim Bray and Sun Microsystems. * * For copying permission, see the accompanying COPYING file. @@ -11,7 +11,7 @@ * This version is generated semi-automatically from the source code of the * XML specification via emacs global replace and keyboard macros */ -#include +#include static void charProp(char * p, int c, int prop) { diff --git a/third-party/libstudxml/xml/details/genx/genx.c b/third-party/libstudxml/libstudxml/details/genx/genx.c similarity index 99% rename from third-party/libstudxml/xml/details/genx/genx.c rename to third-party/libstudxml/libstudxml/details/genx/genx.c index b8492f2d..36aad97f 100644 --- a/third-party/libstudxml/xml/details/genx/genx.c +++ b/third-party/libstudxml/libstudxml/details/genx/genx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2017 Code Synthesis Tools CC. + * Copyright (c) 2007-2019 Code Synthesis Tools CC. * Copyright (c) 2004 by Tim Bray and Sun Microsystems. * * For copying permission, see the accompanying COPYING file. @@ -11,7 +11,7 @@ #include #include -#include +#include #define Boolean int #define True 1 @@ -231,7 +231,7 @@ static genxStatus collectString(genxWriter w, collector * c, constUtf8 string) return GENX_SUCCESS; } -#define collectPiece(w,c,d,size) {if (((c)->used+(size))>=(c)->space){if (((w)->status=growCollector(w,c,(c)->used+(size)))!=GENX_SUCCESS) return (w)->status;}strncpy((char *)(c)->buf+(c)->used,d,size);(c)->used+=size;} +#define collectPiece(w,c,d,size) {if (((c)->used+(size))>=(c)->space){if (((w)->status=growCollector(w,c,(c)->used+(size)))!=GENX_SUCCESS) return (w)->status;}memcpy((char *)(c)->buf+(c)->used,d,size);(c)->used+=size;} /******************************* * private list utilities diff --git a/third-party/libstudxml/xml/details/genx/genx.h b/third-party/libstudxml/libstudxml/details/genx/genx.h similarity index 99% rename from third-party/libstudxml/xml/details/genx/genx.h rename to third-party/libstudxml/libstudxml/details/genx/genx.h index 166ee89f..89ef1e83 100644 --- a/third-party/libstudxml/xml/details/genx/genx.h +++ b/third-party/libstudxml/libstudxml/details/genx/genx.h @@ -3,7 +3,7 @@ */ /* - * Copyright (c) 2007-2017 Code Synthesis Tools CC. + * Copyright (c) 2007-2019 Code Synthesis Tools CC. * Copyright (c) 2004 by Tim Bray and Sun Microsystems. * * For copying permission, see the accompanying COPYING file. diff --git a/third-party/libstudxml/libstudxml/details/post.hxx b/third-party/libstudxml/libstudxml/details/post.hxx new file mode 100644 index 00000000..f2f857a0 --- /dev/null +++ b/third-party/libstudxml/libstudxml/details/post.hxx @@ -0,0 +1,7 @@ +// file : libstudxml/details/post.hxx +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC +// license : MIT; see accompanying LICENSE file + +#ifdef _MSC_VER +# pragma warning (pop) +#endif diff --git a/third-party/libstudxml/xml/details/pre.hxx b/third-party/libstudxml/libstudxml/details/pre.hxx similarity index 82% rename from third-party/libstudxml/xml/details/pre.hxx rename to third-party/libstudxml/libstudxml/details/pre.hxx index a3370de4..912430c6 100644 --- a/third-party/libstudxml/xml/details/pre.hxx +++ b/third-party/libstudxml/libstudxml/details/pre.hxx @@ -1,5 +1,5 @@ -// file : xml/details/pre.hxx -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/details/pre.hxx +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file #ifdef _MSC_VER diff --git a/third-party/libstudxml/libstudxml/exception.hxx b/third-party/libstudxml/libstudxml/exception.hxx new file mode 100644 index 00000000..bbfd8002 --- /dev/null +++ b/third-party/libstudxml/libstudxml/exception.hxx @@ -0,0 +1,19 @@ +// file : libstudxml/exception.hxx -*- C++ -*- +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC +// license : MIT; see accompanying LICENSE file + +#ifndef LIBSTUDXML_EXCEPTION_HXX +#define LIBSTUDXML_EXCEPTION_HXX + +#include + +#include + +namespace xml +{ + class exception: public std::exception {}; +} + +#include + +#endif // LIBSTUDXML_EXCEPTION_HXX diff --git a/third-party/libstudxml/libstudxml/forward.hxx b/third-party/libstudxml/libstudxml/forward.hxx new file mode 100644 index 00000000..3b55f19a --- /dev/null +++ b/third-party/libstudxml/libstudxml/forward.hxx @@ -0,0 +1,22 @@ +// file : libstudxml/forward.hxx -*- C++ -*- +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC +// license : MIT; see accompanying LICENSE file + +#ifndef LIBSTUDXML_FORWARD_HXX +#define LIBSTUDXML_FORWARD_HXX + +#include + +#include + +namespace xml +{ + class qname; + class parser; + class serializer; + class exception; +} + +#include + +#endif // LIBSTUDXML_FORWARD_HXX diff --git a/third-party/libstudxml/xml/parser.cxx b/third-party/libstudxml/libstudxml/parser.cxx similarity index 98% rename from third-party/libstudxml/xml/parser.cxx rename to third-party/libstudxml/libstudxml/parser.cxx index 2091939b..581ce7ac 100644 --- a/third-party/libstudxml/xml/parser.cxx +++ b/third-party/libstudxml/libstudxml/parser.cxx @@ -1,5 +1,5 @@ -// file : xml/parser.cxx -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/parser.cxx +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file #include // std::bad_alloc @@ -9,7 +9,7 @@ #include #include -#include +#include using namespace std; @@ -452,8 +452,8 @@ namespace xml pqname_ = &qname_; break; // No more declarations. } - // Fall through. } + // Fall through. case start_element: { event_ = start_namespace_decl; @@ -497,8 +497,8 @@ namespace xml pvalue_ = &value_; break; // No more attributes. } - // Fall through. } + // Fall through. case start_element: case start_namespace_decl: { @@ -531,13 +531,13 @@ namespace xml pqname_ = &qname_; break; // No more declarations. } - // Fall through. } - // The end namespace declaration comes before the end element - // which means it can follow pretty much any other event. - // + // Fall through. default: { + // The end namespace declaration comes before the end element which + // means it can follow pretty much any other event. + // event_ = end_namespace_decl; pqname_ = &end_ns_[end_ns_i_]; return event_; diff --git a/third-party/libstudxml/xml/parser b/third-party/libstudxml/libstudxml/parser.hxx similarity index 94% rename from third-party/libstudxml/xml/parser rename to third-party/libstudxml/libstudxml/parser.hxx index 6d508f12..7c29d4b7 100644 --- a/third-party/libstudxml/xml/parser +++ b/third-party/libstudxml/libstudxml/parser.hxx @@ -1,11 +1,11 @@ -// file : xml/parser -*- C++ -*- -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/parser.hxx -*- C++ -*- +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file -#ifndef XML_PARSER -#define XML_PARSER +#ifndef LIBSTUDXML_PARSER_HXX +#define LIBSTUDXML_PARSER_HXX -#include +#include #include #include @@ -13,11 +13,11 @@ #include #include // std::size_t -#include // STUDXML_NOTHROW_NOEXCEPT, - // LIBSTUDXML_EXTERNAL_EXPAT +#include // STUDXML_NOTHROW_NOEXCEPT, + // LIBSTUDXML_EXTERNAL_EXPAT #ifndef LIBSTUDXML_EXTERNAL_EXPAT -# include +# include #else # include #endif @@ -28,12 +28,12 @@ # error UTF-16 expat (XML_UNICODE defined) is not supported #endif -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include namespace xml { @@ -464,9 +464,9 @@ namespace xml operator<< (std::ostream&, parser::event_type); } -#include -#include +#include +#include -#include +#include -#endif // XML_PARSER +#endif // LIBSTUDXML_PARSER_HXX diff --git a/third-party/libstudxml/xml/parser.ixx b/third-party/libstudxml/libstudxml/parser.ixx similarity index 97% rename from third-party/libstudxml/xml/parser.ixx rename to third-party/libstudxml/libstudxml/parser.ixx index a62fbbcb..564b4a9a 100644 --- a/third-party/libstudxml/xml/parser.ixx +++ b/third-party/libstudxml/libstudxml/parser.ixx @@ -1,10 +1,10 @@ -// file : xml/parser.ixx -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/parser.ixx +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file #include -#include +#include namespace xml { @@ -215,16 +215,16 @@ namespace xml inline void parser:: next_expect (event_type e, const qname_type& qn, content_type c) { - next_expect (e, qn); assert (e == start_element); + next_expect (e, qn); content (c); } inline void parser:: next_expect (event_type e, const std::string& n, content_type c) { - next_expect (e, std::string (), n); assert (e == start_element); + next_expect (e, std::string (), n); content (c); } @@ -233,8 +233,8 @@ namespace xml const std::string& ns, const std::string& n, content_type c) { - next_expect (e, ns, n); assert (e == start_element); + next_expect (e, ns, n); content (c); } } diff --git a/third-party/libstudxml/xml/parser.txx b/third-party/libstudxml/libstudxml/parser.txx similarity index 84% rename from third-party/libstudxml/xml/parser.txx rename to third-party/libstudxml/libstudxml/parser.txx index 2212876b..4a102345 100644 --- a/third-party/libstudxml/xml/parser.txx +++ b/third-party/libstudxml/libstudxml/parser.txx @@ -1,8 +1,8 @@ -// file : xml/parser.txx -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/parser.txx +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file -#include +#include namespace xml { diff --git a/third-party/libstudxml/xml/qname.cxx b/third-party/libstudxml/libstudxml/qname.cxx similarity index 73% rename from third-party/libstudxml/xml/qname.cxx rename to third-party/libstudxml/libstudxml/qname.cxx index 8bbc1eaf..bc4cb65c 100644 --- a/third-party/libstudxml/xml/qname.cxx +++ b/third-party/libstudxml/libstudxml/qname.cxx @@ -1,10 +1,10 @@ -// file : xml/qname.cxx -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/qname.cxx +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file #include -#include +#include using namespace std; diff --git a/third-party/libstudxml/xml/qname b/third-party/libstudxml/libstudxml/qname.hxx similarity index 83% rename from third-party/libstudxml/xml/qname rename to third-party/libstudxml/libstudxml/qname.hxx index e49eb298..ff32ec44 100644 --- a/third-party/libstudxml/xml/qname +++ b/third-party/libstudxml/libstudxml/qname.hxx @@ -1,18 +1,18 @@ -// file : xml/qname -*- C++ -*- -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/qname.hxx -*- C++ -*- +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file -#ifndef XML_QNAME -#define XML_QNAME +#ifndef LIBSTUDXML_QNAME_HXX +#define LIBSTUDXML_QNAME_HXX -#include +#include #include #include -#include +#include -#include +#include namespace xml { @@ -81,6 +81,6 @@ namespace xml operator<< (std::ostream&, const qname&); } -#include +#include -#endif // XML_QNAME +#endif // LIBSTUDXML_QNAME_HXX diff --git a/third-party/libstudxml/xml/serializer.cxx b/third-party/libstudxml/libstudxml/serializer.cxx similarity index 98% rename from third-party/libstudxml/xml/serializer.cxx rename to third-party/libstudxml/libstudxml/serializer.cxx index 33062b06..dcfe5f0a 100644 --- a/third-party/libstudxml/xml/serializer.cxx +++ b/third-party/libstudxml/libstudxml/serializer.cxx @@ -1,11 +1,11 @@ -// file : xml/serializer.cxx -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/serializer.cxx +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file #include // std::bad_alloc #include // std::strlen -#include +#include using namespace std; diff --git a/third-party/libstudxml/xml/serializer b/third-party/libstudxml/libstudxml/serializer.hxx similarity index 92% rename from third-party/libstudxml/xml/serializer rename to third-party/libstudxml/libstudxml/serializer.hxx index 22ab3a27..914c5c58 100644 --- a/third-party/libstudxml/xml/serializer +++ b/third-party/libstudxml/libstudxml/serializer.hxx @@ -1,24 +1,24 @@ -// file : xml/serializer -*- C++ -*- -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/serializer.hxx -*- C++ -*- +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file -#ifndef XML_SERIALIZER -#define XML_SERIALIZER +#ifndef LIBSTUDXML_SERIALIZER_HXX +#define LIBSTUDXML_SERIALIZER_HXX -#include +#include #include #include #include // std::size_t -#include +#include -#include -#include -#include +#include +#include +#include -#include // STUDXML_NOTHROW_NOEXCEPT -#include +#include // STUDXML_NOTHROW_NOEXCEPT +#include namespace xml { @@ -300,8 +300,8 @@ namespace xml operator<< (serializer&, const T& value); } -#include +#include -#include +#include -#endif // XML_SERIALIZER +#endif // LIBSTUDXML_SERIALIZER_HXX diff --git a/third-party/libstudxml/xml/serializer.ixx b/third-party/libstudxml/libstudxml/serializer.ixx similarity index 97% rename from third-party/libstudxml/xml/serializer.ixx rename to third-party/libstudxml/libstudxml/serializer.ixx index a94dc4c2..a77c3b9d 100644 --- a/third-party/libstudxml/xml/serializer.ixx +++ b/third-party/libstudxml/libstudxml/serializer.ixx @@ -1,8 +1,8 @@ -// file : xml/serializer.ixx -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/serializer.ixx +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file -#include +#include namespace xml { diff --git a/third-party/libstudxml/xml/value-traits.cxx b/third-party/libstudxml/libstudxml/value-traits.cxx similarity index 74% rename from third-party/libstudxml/xml/value-traits.cxx rename to third-party/libstudxml/libstudxml/value-traits.cxx index a6ba89c6..e271820d 100644 --- a/third-party/libstudxml/xml/value-traits.cxx +++ b/third-party/libstudxml/libstudxml/value-traits.cxx @@ -1,8 +1,8 @@ -// file : xml/value-traits.cxx -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/value-traits.cxx +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file -#include +#include using namespace std; diff --git a/third-party/libstudxml/xml/value-traits b/third-party/libstudxml/libstudxml/value-traits.hxx similarity index 70% rename from third-party/libstudxml/xml/value-traits rename to third-party/libstudxml/libstudxml/value-traits.hxx index eda91bf7..b324f19e 100644 --- a/third-party/libstudxml/xml/value-traits +++ b/third-party/libstudxml/libstudxml/value-traits.hxx @@ -1,18 +1,18 @@ -// file : xml/value-traits -*- C++ -*- -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/value-traits.hxx -*- C++ -*- +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file -#ifndef XML_VALUE_TRAITS -#define XML_VALUE_TRAITS +#ifndef LIBSTUDXML_VALUE_TRAITS_HXX +#define LIBSTUDXML_VALUE_TRAITS_HXX -#include +#include #include #include // std::size_t -#include +#include -#include +#include namespace xml { @@ -62,8 +62,8 @@ namespace xml struct value_traits: default_value_traits {}; } -#include +#include -#include +#include -#endif // XML_VALUE_TRAITS +#endif // LIBSTUDXML_VALUE_TRAITS_HXX diff --git a/third-party/libstudxml/xml/value-traits.txx b/third-party/libstudxml/libstudxml/value-traits.txx similarity index 76% rename from third-party/libstudxml/xml/value-traits.txx rename to third-party/libstudxml/libstudxml/value-traits.txx index 5bf56787..9801fba9 100644 --- a/third-party/libstudxml/xml/value-traits.txx +++ b/third-party/libstudxml/libstudxml/value-traits.txx @@ -1,11 +1,11 @@ -// file : xml/value-traits.txx -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC +// file : libstudxml/value-traits.txx +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file #include -#include -#include +#include +#include namespace xml { diff --git a/third-party/libstudxml/libstudxml/version.hxx b/third-party/libstudxml/libstudxml/version.hxx new file mode 100644 index 00000000..e69de29b diff --git a/third-party/libstudxml/libstudxml/version.hxx.in b/third-party/libstudxml/libstudxml/version.hxx.in new file mode 100644 index 00000000..fe380285 --- /dev/null +++ b/third-party/libstudxml/libstudxml/version.hxx.in @@ -0,0 +1,39 @@ +// file : libstudxml/version.hxx.in -*- C++ -*- +// copyright : Copyright (c) 2013-2019 Code Synthesis Tools CC +// license : MIT; see accompanying LICENSE file + +#ifndef LIBSTUDXML_VERSION // Note: using the version macro itself. + +// The numeric version format is AAAAABBBBBCCCCCDDDE where: +// +// AAAAA - major version number +// BBBBB - minor version number +// CCCCC - bugfix version number +// DDD - alpha / beta (DDD + 500) version number +// E - final (0) / snapshot (1) +// +// When DDDE is not 0, 1 is subtracted from AAAAABBBBBCCCCC. For example: +// +// Version AAAAABBBBBCCCCCDDDE +// +// 0.1.0 0000000001000000000 +// 0.1.2 0000000001000020000 +// 1.2.3 0000100002000030000 +// 2.2.0-a.1 0000200001999990010 +// 3.0.0-b.2 0000299999999995020 +// 2.2.0-a.1.z 0000200001999990011 +// +#define LIBSTUDXML_VERSION $libstudxml.version.project_number$ULL +#define LIBSTUDXML_VERSION_STR "$libstudxml.version.project$" +#define LIBSTUDXML_VERSION_ID "$libstudxml.version.project_id$" + +#define LIBSTUDXML_VERSION_MAJOR $libstudxml.version.major$ +#define LIBSTUDXML_VERSION_MINOR $libstudxml.version.minor$ +#define LIBSTUDXML_VERSION_PATCH $libstudxml.version.patch$ + +#define LIBSTUDXML_PRE_RELEASE $libstudxml.version.pre_release$ + +#define LIBSTUDXML_SNAPSHOT $libstudxml.version.snapshot_sn$ULL +#define LIBSTUDXML_SNAPSHOT_ID "$libstudxml.version.snapshot_id$" + +#endif // LIBSTUDXML_VERSION diff --git a/third-party/libstudxml/version b/third-party/libstudxml/version index 4b4561aa..f3fce4f6 100644 --- a/third-party/libstudxml/version +++ b/third-party/libstudxml/version @@ -1 +1 @@ -1.1.0-a5 +1.1.0-b.8 \ No newline at end of file diff --git a/third-party/libstudxml/xml/Makefile.am b/third-party/libstudxml/xml/Makefile.am deleted file mode 100644 index 531d4561..00000000 --- a/third-party/libstudxml/xml/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# file : xml/Makefile.am -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -EXTRA_DIST = __file__(extra_dist) - -studxmlincludedir = $(includedir)/xml - -lib_LTLIBRARIES = libstudxml.la -libstudxml_la_SOURCES = __path__(sources) - -nobase_studxmlinclude_HEADERS = __path__(headers) -nobase_nodist_studxmlinclude_HEADERS = details/config.h - -if !LIBSTUDXML_EXTERNAL_EXPAT -libstudxml_la_SOURCES += __path__(expat_sources) -nobase_studxmlinclude_HEADERS += __path__(expat_headers) -endif - -libstudxml_la_SOURCES += __path__(genx_sources) -nobase_studxmlinclude_HEADERS += __path__(genx_headers) - -nobase_studxmlinclude_HEADERS += __path__(xml_headers) - -# Make sure make doesn't try to build the no-extension headers -# thinking that they are executable. -# -__foreach_w__(__f,__path__(xml_headers),__f $(top_srcdir)/xml/__f ): ; @: - -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -DLIBSTUDXML_DYNAMIC_LIB -AM_LDFLAGS = -release __value__(interface_version) -no-undefined diff --git a/third-party/libstudxml/xml/buildfile b/third-party/libstudxml/xml/buildfile deleted file mode 100644 index fd163165..00000000 --- a/third-party/libstudxml/xml/buildfile +++ /dev/null @@ -1,87 +0,0 @@ -# file : xml/buildfile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -lib{studxml}: \ - {hxx }{ content } \ - {hxx }{ exception } \ - {hxx }{ forward } \ - {hxx ixx txx cxx}{ parser } \ - {hxx cxx}{ qname } \ - {hxx ixx cxx}{ serializer } \ - {hxx txx cxx}{ value-traits } \ - {hxx }{ version } \ - details/{hxx }{ config.hxx } \ - details/{hxx }{ export.hxx } \ - details/{hxx }{ post.hxx } \ - details/{hxx }{ pre.hxx } \ -details/build2/{h }{ config } \ -details/build2/{h }{ config-vc } - -# Expat. Note that we treat a whole bunch of its sources as files since they -# are private and #include's (including .c file). -# -lib{studxml}: \ -details/expat/h{ expat } \ -details/expat/h{ expat_external } \ -details/expat/c{ xmlparse } \ -details/expat/c{ xmlrole } \ -details/expat/c{ xmltok } \ -details/expat/file{ ascii.h asciitab.h config.h iasciitab.h internal.h \ -latin1tab.h nametab.h utf8tab.h xmlrole.h xmltok.h xmltok_impl.c \ -xmltok_impl.h xmltok_ns.c} \ -details/expat/doc{LICENSE README} - -details/expat/doc{README}@./: install = false -details/expat/doc{LICENSE}@./: install = doc/EXPAT-LICENSE - -# Genx. -# -lib{studxml}: \ -details/genx/c{ char-props } \ -details/genx/c{ genx } \ -details/genx/h{ genx } \ -details/genx/doc{LICENSE README} - -details/genx/doc{README}@./: install = false -details/genx/doc{LICENSE}@./: install = doc/GENX-LICENSE - -# For pre-releases use the complete version to make sure they cannot be used -# in place of another pre-release or the final version. -# -if $abi_prerelease - lib{studxml}: bin.lib.version = @-$version -else - lib{studxml}: bin.lib.version = @-$abi_major.$abi_minor - -# We are a mixed C/C++ library, though C is implementatio-only, kind of: we -# need headers but not symbols. -# -cc.poptions =+ "-I$src_root" -DLIBSTUDXML_BUILD2 -obja{*}: cc.poptions += -DLIBSTUDXML_STATIC_BUILD -objs{*}: cc.poptions += -DLIBSTUDXML_SHARED_BUILD - -lib{studxml}: cc.export.poptions = "-I$src_root" -DLIBSTUDXML_BUILD2 -liba{studxml}: cc.export.poptions += -DLIBSTUDXML_STATIC -libs{studxml}: cc.export.poptions += -DLIBSTUDXML_SHARED - -# Install into the xml/ subdirectory of, say, /usr/include/. Bold, I know. -# -install.include = $install.include/xml/ -install.include.subdirs = true # Recreate subdirectories. - -# We want these to be picked up even when LIBSTUDXML_BUILD2 is not defined. -# -details/build2/: -{ - if ($cxx.id == "msvc") - { - h{config}@./: install = false - h{config-vc}@./: install = $install.include/details/ - } - else - { - h{config}@./: install = $install.include/details/ - h{config-vc}@./: install = false - } -} diff --git a/third-party/libstudxml/xml/details/build2/config-vc.h b/third-party/libstudxml/xml/details/build2/config-vc.h deleted file mode 100644 index f9287497..00000000 --- a/third-party/libstudxml/xml/details/build2/config-vc.h +++ /dev/null @@ -1,20 +0,0 @@ -/* file : xml/details/build2/config-vc.h - * copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC - * license : MIT; see accompanying LICENSE file - */ - -/* Configuration file for Windows/VC++ for the build2 build. */ - -#ifndef XML_DETAILS_CONFIG_VC_H -#define XML_DETAILS_CONFIG_VC_H - -/* Define LIBSTUDXML_BUILD2 for the installed case. */ -#ifndef LIBSTUDXML_BUILD2 -# define LIBSTUDXML_BUILD2 -#endif - -// Always little-endian, at least on i686 and x86_64. -// -#define LIBSTUDXML_BYTEORDER 1234 - -#endif /* XML_DETAILS_CONFIG_VC_H */ diff --git a/third-party/libstudxml/xml/details/config-vc.h b/third-party/libstudxml/xml/details/config-vc.h deleted file mode 100644 index 444981da..00000000 --- a/third-party/libstudxml/xml/details/config-vc.h +++ /dev/null @@ -1,14 +0,0 @@ -/* file : xml/details/config-vc.h - * copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC - * license : MIT; see accompanying LICENSE file - */ - -/* Configuration file for Windows/VC++. */ - -#ifndef XML_DETAILS_CONFIG_VC_H -#define XML_DETAILS_CONFIG_VC_H - -#define LIBSTUDXML_BYTEORDER 1234 -#define LIBSTUDXML_STATIC_LIB 1 - -#endif /* XML_DETAILS_CONFIG_VC_H */ diff --git a/third-party/libstudxml/xml/details/config.h b/third-party/libstudxml/xml/details/config.h deleted file mode 100644 index 15ca16f5..00000000 --- a/third-party/libstudxml/xml/details/config.h +++ /dev/null @@ -1,13 +0,0 @@ -/* file : xml/details/config.h.in - * copyright : Copyright (c) 2013-2014 Code Synthesis Tools CC - * license : MIT; see accompanying LICENSE file - */ - -/* This file is automatically processed by configure. */ - -#ifndef XML_DETAILS_CONFIG_H -#define XML_DETAILS_CONFIG_H - -#define LIBSTUDXML_STATIC_LIB 1 - -#endif /* XML_DETAILS_CONFIG_H */ diff --git a/third-party/libstudxml/xml/details/config.h.in b/third-party/libstudxml/xml/details/config.h.in deleted file mode 100644 index c8cb44dd..00000000 --- a/third-party/libstudxml/xml/details/config.h.in +++ /dev/null @@ -1,15 +0,0 @@ -/* file : xml/details/config.h.in - * copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC - * license : MIT; see accompanying LICENSE file - */ - -/* This file is automatically processed by configure. */ - -#ifndef XML_DETAILS_CONFIG_H -#define XML_DETAILS_CONFIG_H - -#undef LIBSTUDXML_STATIC_LIB -#undef LIBSTUDXML_EXTERNAL_EXPAT -#undef LIBSTUDXML_BYTEORDER - -#endif /* XML_DETAILS_CONFIG_H */ diff --git a/third-party/libstudxml/xml/details/post.hxx b/third-party/libstudxml/xml/details/post.hxx deleted file mode 100644 index b4513f46..00000000 --- a/third-party/libstudxml/xml/details/post.hxx +++ /dev/null @@ -1,7 +0,0 @@ -// file : xml/details/post.hxx -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -// license : MIT; see accompanying LICENSE file - -#ifdef _MSC_VER -# pragma warning (pop) -#endif diff --git a/third-party/libstudxml/xml/exception b/third-party/libstudxml/xml/exception deleted file mode 100644 index 557a475b..00000000 --- a/third-party/libstudxml/xml/exception +++ /dev/null @@ -1,19 +0,0 @@ -// file : xml/exception -*- C++ -*- -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -// license : MIT; see accompanying LICENSE file - -#ifndef XML_EXCEPTION -#define XML_EXCEPTION - -#include - -#include - -namespace xml -{ - class exception: public std::exception {}; -} - -#include - -#endif // XML_EXCEPTION diff --git a/third-party/libstudxml/xml/forward b/third-party/libstudxml/xml/forward deleted file mode 100644 index 6b4fef52..00000000 --- a/third-party/libstudxml/xml/forward +++ /dev/null @@ -1,22 +0,0 @@ -// file : xml/forward -*- C++ -*- -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -// license : MIT; see accompanying LICENSE file - -#ifndef XML_FORWARD -#define XML_FORWARD - -#include - -#include - -namespace xml -{ - class qname; - class parser; - class serializer; - class exception; -} - -#include - -#endif // XML_FORWARD diff --git a/third-party/libstudxml/xml/libstudxml-vc10.vcxproj b/third-party/libstudxml/xml/libstudxml-vc10.vcxproj deleted file mode 100644 index 5a49c393..00000000 --- a/third-party/libstudxml/xml/libstudxml-vc10.vcxproj +++ /dev/null @@ -1,175 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {DCFCED35-A6E4-4554-948D-4A5E982D6824} - Win32Proj - libstudxml - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - - - - - - - - - - - - - true - ..\bin\ - studxml-d-__value__(interface_version)-vc10 - - - true - ..\bin64\ - studxml-d-__value__(interface_version)-vc10 - - - false - ..\bin\ - studxml-__value__(interface_version)-vc10 - - - false - ..\bin64\ - studxml-__value__(interface_version)-vc10 - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - $(TargetPath) - ..\lib\studxml-d.lib - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - $(TargetPath) - ..\lib64\studxml-d.lib - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - true - true - $(TargetPath) - ..\lib\studxml.lib - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - true - true - $(TargetPath) - ..\lib64\studxml.lib - - - -__header_entries__(headers) -__header_entries__(expat_headers) -__header_entries__(genx_headers) -__header_entry__(details\config-vc.h) - - -__source_entries__(sources) -__source_entries__(expat_sources) -__source_entries__(genx_sources) - - - - - diff --git a/third-party/libstudxml/xml/libstudxml-vc10.vcxproj.filters b/third-party/libstudxml/xml/libstudxml-vc10.vcxproj.filters deleted file mode 100644 index 8f90e396..00000000 --- a/third-party/libstudxml/xml/libstudxml-vc10.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - {51AEF41C-865B-40D5-89C8-151CE797B6C4} - c;cxx - - - {06415D1D-41F6-4BA3-A026-126239CCD920} - h;hxx;ixx;txx - - - -__header_filter_entries__(headers) -__header_filter_entries__(expat_headers) -__header_filter_entries__(genx_headers) -__header_filter_entry__(details\config-vc.h) - - -__source_filter_entries__(sources) -__source_filter_entries__(expat_sources) -__source_filter_entries__(genx_sources) - - diff --git a/third-party/libstudxml/xml/libstudxml-vc11.vcxproj b/third-party/libstudxml/xml/libstudxml-vc11.vcxproj deleted file mode 100644 index 54b59a2a..00000000 --- a/third-party/libstudxml/xml/libstudxml-vc11.vcxproj +++ /dev/null @@ -1,179 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {518885FE-EDEC-494D-A3FA-CBEAC9A7FCBB} - Win32Proj - libstudxml - - - - DynamicLibrary - true - v110 - Unicode - - - DynamicLibrary - true - v110 - Unicode - - - DynamicLibrary - false - v110 - true - Unicode - - - DynamicLibrary - false - v110 - true - Unicode - - - - - - - - - - - - - - - - - - - true - ..\bin\ - studxml-d-__value__(interface_version)-vc11 - - - true - ..\bin64\ - studxml-d-__value__(interface_version)-vc11 - - - false - ..\bin\ - studxml-__value__(interface_version)-vc11 - - - false - ..\bin64\ - studxml-__value__(interface_version)-vc11 - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - $(TargetPath) - ..\lib\studxml-d.lib - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - $(TargetPath) - ..\lib64\studxml-d.lib - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - true - true - $(TargetPath) - ..\lib\studxml.lib - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - true - true - $(TargetPath) - ..\lib64\studxml.lib - - - -__header_entries__(headers) -__header_entries__(expat_headers) -__header_entries__(genx_headers) -__header_entry__(details\config-vc.h) - - -__source_entries__(sources) -__source_entries__(expat_sources) -__source_entries__(genx_sources) - - - - - diff --git a/third-party/libstudxml/xml/libstudxml-vc11.vcxproj.filters b/third-party/libstudxml/xml/libstudxml-vc11.vcxproj.filters deleted file mode 100644 index 9b770261..00000000 --- a/third-party/libstudxml/xml/libstudxml-vc11.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - {8EC23642-5CC3-4086-92C9-AE14E512CA6C} - c;cxx - - - {8CB2105E-BD73-4B1B-8DCE-E1FCB9B4D894} - h;hxx;ixx;txx - - - -__header_filter_entries__(headers) -__header_filter_entries__(expat_headers) -__header_filter_entries__(genx_headers) -__header_filter_entry__(details\config-vc.h) - - -__source_filter_entries__(sources) -__source_filter_entries__(expat_sources) -__source_filter_entries__(genx_sources) - - diff --git a/third-party/libstudxml/xml/libstudxml-vc12.vcxproj b/third-party/libstudxml/xml/libstudxml-vc12.vcxproj deleted file mode 100644 index 664bb199..00000000 --- a/third-party/libstudxml/xml/libstudxml-vc12.vcxproj +++ /dev/null @@ -1,179 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {26482FB9-45CC-4188-8CA1-B86456967F47} - Win32Proj - libstudxml - - - - DynamicLibrary - true - v120 - Unicode - - - DynamicLibrary - true - v120 - Unicode - - - DynamicLibrary - false - v120 - true - Unicode - - - DynamicLibrary - false - v120 - true - Unicode - - - - - - - - - - - - - - - - - - - true - ..\bin\ - studxml-d-__value__(interface_version)-vc12 - - - true - ..\bin64\ - studxml-d-__value__(interface_version)-vc12 - - - false - ..\bin\ - studxml-__value__(interface_version)-vc12 - - - false - ..\bin64\ - studxml-__value__(interface_version)-vc12 - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - $(TargetPath) - ..\lib\studxml-d.lib - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - $(TargetPath) - ..\lib64\studxml-d.lib - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - true - true - $(TargetPath) - ..\lib\studxml.lib - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - true - true - $(TargetPath) - ..\lib64\studxml.lib - - - -__header_entries__(headers) -__header_entries__(expat_headers) -__header_entries__(genx_headers) -__header_entry__(details\config-vc.h) - - -__source_entries__(sources) -__source_entries__(expat_sources) -__source_entries__(genx_sources) - - - - - diff --git a/third-party/libstudxml/xml/libstudxml-vc12.vcxproj.filters b/third-party/libstudxml/xml/libstudxml-vc12.vcxproj.filters deleted file mode 100644 index b6093d35..00000000 --- a/third-party/libstudxml/xml/libstudxml-vc12.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - {B3C787E6-B23A-41BB-BF39-DFD42DEE8FDA} - c;cxx - - - {90BC2EB8-E1F4-4ADA-AD98-FB8727184CAA} - h;hxx;ixx;txx - - - -__header_filter_entries__(headers) -__header_filter_entries__(expat_headers) -__header_filter_entries__(genx_headers) -__header_filter_entry__(details\config-vc.h) - - -__source_filter_entries__(sources) -__source_filter_entries__(expat_sources) -__source_filter_entries__(genx_sources) - - diff --git a/third-party/libstudxml/xml/libstudxml-vc9.vcproj b/third-party/libstudxml/xml/libstudxml-vc9.vcproj deleted file mode 100644 index 5502ab77..00000000 --- a/third-party/libstudxml/xml/libstudxml-vc9.vcproj +++ /dev/null @@ -1,360 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -__source_entries__(sources) -__source_entries__(expat_sources) -__source_entries__(genx_sources) - - -__file_entries__(headers) -__file_entries__(expat_headers) -__file_entries__(genx_headers) -__file_entry__(details\config-vc.h) - - - - - diff --git a/third-party/libstudxml/xml/makefile b/third-party/libstudxml/xml/makefile deleted file mode 100644 index ca9d63c7..00000000 --- a/third-party/libstudxml/xml/makefile +++ /dev/null @@ -1,143 +0,0 @@ -# file : xml/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make - -sources := qname.cxx parser.cxx serializer.cxx value-traits.cxx -xml_headers := content exception forward qname parser serializer value-traits \ -version - -# Expat. -# -expat_sources := xmlparse.c xmlrole.c xmltok.c -expat_headers := expat.h expat_external.h -expat_dist := ascii.h asciitab.h config.h iasciitab.h internal.h \ -latin1tab.h nametab.h utf8tab.h xmlrole.h xmltok.h xmltok_impl.c \ -xmltok_impl.h xmltok_ns.c README LICENSE - -expat_sources := $(addprefix details/expat/,$(expat_sources)) -expat_headers := $(addprefix details/expat/,$(expat_headers)) -expat_dist := $(addprefix details/expat/,$(expat_dist)) - -# Genx. -# -genx_sources := details/genx/genx.c details/genx/char-props.c -genx_headers := details/genx/genx.h -genx_dist := details/genx/README details/genx/LICENSE - -c_tun := $(expat_sources) $(genx_sources) -c_obj := $(addprefix $(out_base)/,$(c_tun:.c=.o)) -c_od := $(c_obj:.o=.o.d) - -cxx_tun := $(sources) -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -studxml.l := $(out_base)/studxml.l -studxml.l.cpp-options := $(out_base)/studxml.l.cpp-options - -default := $(out_base)/ -dist := $(out_base)/.dist -install := $(out_base)/.install -clean := $(out_base)/.clean - -# Build. -# -$(studxml.l): $(c_obj) $(cxx_obj) - -$(c_obj) $(cxx_obj) $(c_od) $(cxx_od): $(studxml.l.cpp-options) \ - $(out_base)/details/config.h -$(studxml.l.cpp-options): value := -I$(out_root) -I$(src_root) - -$(call include,$(bld_root)/ld/configuration-lib.make) # ld_lib_type - -$(out_base)/details/config.h: | $(out_base)/details/. - @echo '/* file : xml/details/config.h' >$@ - @echo ' * note : automatically generated' >>$@ - @echo ' */' >>$@ - @echo '#ifndef XML_DETAILS_CONFIG_H' >>$@ - @echo '#define XML_DETAILS_CONFIG_H' >>$@ - @echo '' >>$@ - @echo '#define LIBSTUDXML_BYTEORDER 1234' >>$@ -ifeq ($(ld_lib_type),archive) - @echo '#define LIBSTUDXML_STATIC_LIB' >>$@ -endif - @echo '' >>$@ - @echo '#endif /* XML_DETAILS_CONFIG_H */' >>$@ - -$(call include-dep,$(c_od) $(cxx_od),$(c_obj) $(cxx_obj),$(out_base)/details/config.h) - -# Convenience alias for default target. -# -$(out_base)/: $(studxml.l) - -# Dist. -# - -# Set it for the out_root so that it is visible in examples/tests. See -# Makefile.am for why we need it there. -# -$(our_root)/%.dist: export xml_headers := $(xml_headers) - -$(dist): export sources := $(sources) -$(dist): export expat_sources := $(expat_sources) -$(dist): export expat_headers := $(expat_headers) -$(dist): export genx_sources := $(genx_sources) -$(dist): export genx_headers := $(genx_headers) -$(dist): export headers := $(subst $(src_base)/,,$(shell find $(src_base) \ --name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) -$(dist): data_dist := details/config-vc.h $(expat_dist) $(genx_dist) -$(dist): export extra_dist := $(data_dist) libstudxml-vc9.vcproj \ -libstudxml-vc10.vcxproj libstudxml-vc10.vcxproj.filters \ -libstudxml-vc11.vcxproj libstudxml-vc11.vcxproj.filters \ -libstudxml-vc12.vcxproj libstudxml-vc12.vcxproj.filters -$(dist): export interface_version = $(shell sed -e \ -'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) - -$(dist): - $(call dist-data,$(sources) $(expat_sources) $(genx_sources)) - $(call dist-data,$(headers) $(xml_headers) $(expat_headers) $(genx_headers)) - $(call dist-data,$(data_dist) details/config.h.in) - $(call meta-vc9proj,libstudxml-vc9.vcproj) - $(call meta-vc10proj,libstudxml-vc10.vcxproj) - $(call meta-vc10proj,libstudxml-vc11.vcxproj) - $(call meta-vc12proj,libstudxml-vc12.vcxproj) - $(call meta-automake) - -# Clean. -# -$(clean): $(studxml.l).o.clean \ - $(studxml.l.cpp-options).clean \ - $(addsuffix .cxx.clean,$(c_obj)) \ - $(addsuffix .cxx.clean,$(c_od)) \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - $(call message,rm $$1,rm -f $$1,$(out_base)/details/config.h) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(studxml.l): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := details/config.h -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/install.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/c/c-o.make) -$(call include,$(bld_root)/c/c-d.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) -$(call include,$(bld_root)/cxx/o-l.make) diff --git a/third-party/libstudxml/xml/version b/third-party/libstudxml/xml/version deleted file mode 100644 index fe562530..00000000 --- a/third-party/libstudxml/xml/version +++ /dev/null @@ -1,27 +0,0 @@ -// file : xml/version -*- C++ -*- -// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -// license : MIT; see accompanying LICENSE file - -#ifndef LIBSTUDXML_VERSION // Note: using the version macro itself. - -// Version format is AABBCCDD where -// -// AA - major version number -// BB - minor version number -// CC - bugfix version number -// DD - alpha / beta (DD + 50) version number -// -// When DD is not 00, 1 is subtracted from AABBCC. For example: -// -// Version AABBCCDD -// 2.0.0 02000000 -// 2.1.0 02010000 -// 2.1.1 02010100 -// 2.2.0-a1 02019901 -// 3.0.0-b2 02999952 -// - -#define LIBSTUDXML_VERSION 1009905 -#define LIBSTUDXML_VERSION_STR "1.1.0-a5" - -#endif // LIBSTUDXML_VERSION