diff options
Diffstat (limited to 'src/3rdparty/pcre')
26 files changed, 87 insertions, 54 deletions
diff --git a/src/3rdparty/pcre/import_from_pcre_tarball.sh b/src/3rdparty/pcre/import_from_pcre_tarball.sh index ead4ac8c88..bdc5e0b089 100755 --- a/src/3rdparty/pcre/import_from_pcre_tarball.sh +++ b/src/3rdparty/pcre/import_from_pcre_tarball.sh @@ -2,40 +2,32 @@ ############################################################################# ## ## Copyright (C) 2012 Giuseppe D'Angelo <dangelog@gmail.com>. -## Contact: http://www.qt-project.org/legal +## Contact: http://www.qt.io/licensing/ ## ## This file is the build configuration utility of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL$ +## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 2.1 requirements -## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. -## -## ## $QT_END_LICENSE$ ## ############################################################################# @@ -43,8 +35,6 @@ # This is a small script to copy the required files from a PCRE tarball # into 3rdparty/pcre/ , following the instructions found in the NON-UNIX-USE # file. Documentation, tests, demos etc. are not imported. -# Also, a global s/HAVE_CONFIG_H/PCRE_HAVE_CONFIG_H/g is performed, to avoid -# tampering QtCore compilation with a -DHAVE_CONFIG_H. if [ $# -ne 2 ]; then echo "Usage: $0 pcre_tarball_dir/ \$QTDIR/src/3rdparty/pcre/" @@ -62,10 +52,9 @@ fi # with 1 argument, copies PCRE_DIR/$1 to TARGET_DIR/$1 # with 2 arguments, copies PCRE_DIR/$1 to TARGET_DIR/$2 -# every file copied gets a s/HAVE_CONFIG_H/PCRE_HAVE_CONFIG_H/g -copy_and_convert_file() { +copy_file() { if [ $# -lt 1 -o $# -gt 2 ]; then - echo "Wrong number of arguments to copy_and_convert_file" + echo "Wrong number of arguments to copy_file" exit 3 fi @@ -77,11 +66,11 @@ copy_and_convert_file() { fi mkdir -p "$TARGET_DIR/$(dirname "$SOURCE_FILE")" - sed 's/HAVE_CONFIG_H/PCRE_HAVE_CONFIG_H/g' < "$PCRE_DIR/$SOURCE_FILE" > "$TARGET_DIR/$DEST_FILE" + cp "$PCRE_DIR/$SOURCE_FILE" "$TARGET_DIR/$DEST_FILE" } -copy_and_convert_file "pcre.h.generic" "pcre.h" -copy_and_convert_file "pcre_chartables.c.dist" "pcre_chartables.c" +copy_file "pcre.h.generic" "pcre.h" +copy_file "pcre_chartables.c.dist" "pcre_chartables.c" FILES=" AUTHORS @@ -156,5 +145,5 @@ FILES=" " for i in $FILES; do - copy_and_convert_file "$i" + copy_file "$i" done diff --git a/src/3rdparty/pcre/pcre.pro b/src/3rdparty/pcre/pcre.pro new file mode 100644 index 0000000000..53405e0e46 --- /dev/null +++ b/src/3rdparty/pcre/pcre.pro @@ -0,0 +1,44 @@ +TARGET = qtpcre + +CONFIG += \ + static \ + hide_symbols \ + exceptions_off rtti_off warn_off + +load(qt_helper_lib) + +DEFINES += HAVE_CONFIG_H + +# platform/compiler specific definitions +win32: DEFINES += PCRE_STATIC +ios|qnx|winrt: DEFINES += PCRE_DISABLE_JIT + +SOURCES += \ + $$PWD/pcre16_byte_order.c \ + $$PWD/pcre16_chartables.c \ + $$PWD/pcre16_compile.c \ + $$PWD/pcre16_config.c \ + $$PWD/pcre16_dfa_exec.c \ + $$PWD/pcre16_exec.c \ + $$PWD/pcre16_fullinfo.c \ + $$PWD/pcre16_get.c \ + $$PWD/pcre16_globals.c \ + $$PWD/pcre16_jit_compile.c \ + $$PWD/pcre16_maketables.c \ + $$PWD/pcre16_newline.c \ + $$PWD/pcre16_ord2utf16.c \ + $$PWD/pcre16_refcount.c \ + $$PWD/pcre16_string_utils.c \ + $$PWD/pcre16_study.c \ + $$PWD/pcre16_tables.c \ + $$PWD/pcre16_ucd.c \ + $$PWD/pcre16_utf16_utils.c \ + $$PWD/pcre16_valid_utf16.c \ + $$PWD/pcre16_version.c \ + $$PWD/pcre16_xclass.c + +HEADERS += \ + $$PWD/config.h \ + $$PWD/pcre.h \ + $$PWD/pcre_internal.h \ + $$PWD/ucp.h diff --git a/src/3rdparty/pcre/pcre16_ord2utf16.c b/src/3rdparty/pcre/pcre16_ord2utf16.c index be91cb4477..8e2ce5ea6c 100644 --- a/src/3rdparty/pcre/pcre16_ord2utf16.c +++ b/src/3rdparty/pcre/pcre16_ord2utf16.c @@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE. /* This file contains a private PCRE function that converts an ordinal character value into a UTF16 string. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre16_utf16_utils.c b/src/3rdparty/pcre/pcre16_utf16_utils.c index 6cd6c3ea63..49ced0c0b1 100644 --- a/src/3rdparty/pcre/pcre16_utf16_utils.c +++ b/src/3rdparty/pcre/pcre16_utf16_utils.c @@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. strings to host byte order. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre16_valid_utf16.c b/src/3rdparty/pcre/pcre16_valid_utf16.c index 1987f2710c..09076539d0 100644 --- a/src/3rdparty/pcre/pcre16_valid_utf16.c +++ b/src/3rdparty/pcre/pcre16_valid_utf16.c @@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. strings. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_byte_order.c b/src/3rdparty/pcre/pcre_byte_order.c index 4ce674b0c0..cf5f12b04e 100644 --- a/src/3rdparty/pcre/pcre_byte_order.c +++ b/src/3rdparty/pcre/pcre_byte_order.c @@ -43,7 +43,7 @@ see if it was compiled with the opposite endianness. If so, it uses an auxiliary local function to flip the appropriate bytes. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_chartables.c b/src/3rdparty/pcre/pcre_chartables.c index 89cc255a84..1e20ec29d0 100644 --- a/src/3rdparty/pcre/pcre_chartables.c +++ b/src/3rdparty/pcre/pcre_chartables.c @@ -20,7 +20,7 @@ and dead code stripping is activated. This leads to link errors. Pulling in the header ensures that the array gets flagged as "someone outside this compilation unit might reference this" and so it will always be supplied to the linker. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_compile.c b/src/3rdparty/pcre/pcre_compile.c index 7df7fef4bd..13f738eb88 100644 --- a/src/3rdparty/pcre/pcre_compile.c +++ b/src/3rdparty/pcre/pcre_compile.c @@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. supporting internal functions that are not used by other modules. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_config.c b/src/3rdparty/pcre/pcre_config.c index 0ae23fdc9b..1cbdd9c960 100644 --- a/src/3rdparty/pcre/pcre_config.c +++ b/src/3rdparty/pcre/pcre_config.c @@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE. /* This module contains the external function pcre_config(). */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_dfa_exec.c b/src/3rdparty/pcre/pcre_dfa_exec.c index 64a495cc04..87f4aef9ab 100644 --- a/src/3rdparty/pcre/pcre_dfa_exec.c +++ b/src/3rdparty/pcre/pcre_dfa_exec.c @@ -72,7 +72,7 @@ in others, so I abandoned this code. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_exec.c b/src/3rdparty/pcre/pcre_exec.c index 75fa2a7329..788cc76849 100644 --- a/src/3rdparty/pcre/pcre_exec.c +++ b/src/3rdparty/pcre/pcre_exec.c @@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE. pattern matching using an NFA algorithm, trying to mimic Perl as closely as possible. There are also some static supporting functions. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_fullinfo.c b/src/3rdparty/pcre/pcre_fullinfo.c index dfac243573..a6c2ece6ca 100644 --- a/src/3rdparty/pcre/pcre_fullinfo.c +++ b/src/3rdparty/pcre/pcre_fullinfo.c @@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. information about a compiled pattern. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_get.c b/src/3rdparty/pcre/pcre_get.c index 6f885ac07d..8094b34bbf 100644 --- a/src/3rdparty/pcre/pcre_get.c +++ b/src/3rdparty/pcre/pcre_get.c @@ -43,7 +43,7 @@ from the subject string after a regex match has succeeded. The original idea for these functions came from Scott Wimer. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_globals.c b/src/3rdparty/pcre/pcre_globals.c index 8e02bbc728..0f106aa901 100644 --- a/src/3rdparty/pcre/pcre_globals.c +++ b/src/3rdparty/pcre/pcre_globals.c @@ -52,7 +52,7 @@ a local function is used. Also, when compiling for Virtual Pascal, things are done differently, and global variables are not used. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_jit_compile.c b/src/3rdparty/pcre/pcre_jit_compile.c index 795a5d2b47..46ce0975a9 100644 --- a/src/3rdparty/pcre/pcre_jit_compile.c +++ b/src/3rdparty/pcre/pcre_jit_compile.c @@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE. ----------------------------------------------------------------------------- */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_maketables.c b/src/3rdparty/pcre/pcre_maketables.c index 17a2625fa0..a44a6eaa90 100644 --- a/src/3rdparty/pcre/pcre_maketables.c +++ b/src/3rdparty/pcre/pcre_maketables.c @@ -45,7 +45,7 @@ compilation of dftables.c, in which case the macro DFTABLES is defined. */ #ifndef DFTABLES -# ifdef PCRE_HAVE_CONFIG_H +# ifdef HAVE_CONFIG_H # include "config.h" # endif # include "pcre_internal.h" diff --git a/src/3rdparty/pcre/pcre_newline.c b/src/3rdparty/pcre/pcre_newline.c index 71535b83e1..b8f5a4de19 100644 --- a/src/3rdparty/pcre/pcre_newline.c +++ b/src/3rdparty/pcre/pcre_newline.c @@ -47,7 +47,7 @@ and NLTYPE_ANY. The full list of Unicode newline characters is taken from http://unicode.org/unicode/reports/tr18/. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_ord2utf8.c b/src/3rdparty/pcre/pcre_ord2utf8.c index dc250c8ca8..95f1beb963 100644 --- a/src/3rdparty/pcre/pcre_ord2utf8.c +++ b/src/3rdparty/pcre/pcre_ord2utf8.c @@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE. /* This file contains a private PCRE function that converts an ordinal character value into a UTF8 string. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_refcount.c b/src/3rdparty/pcre/pcre_refcount.c index d1855a3736..79efa90f21 100644 --- a/src/3rdparty/pcre/pcre_refcount.c +++ b/src/3rdparty/pcre/pcre_refcount.c @@ -44,7 +44,7 @@ pattern data block. This might be helpful in applications where the block is shared by different users. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_string_utils.c b/src/3rdparty/pcre/pcre_string_utils.c index 36f9b7b864..25eacc8507 100644 --- a/src/3rdparty/pcre/pcre_string_utils.c +++ b/src/3rdparty/pcre/pcre_string_utils.c @@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. of strings for different data item sizes. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_study.c b/src/3rdparty/pcre/pcre_study.c index 0239fb41a4..a2458c4c96 100644 --- a/src/3rdparty/pcre/pcre_study.c +++ b/src/3rdparty/pcre/pcre_study.c @@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. supporting functions. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_tables.c b/src/3rdparty/pcre/pcre_tables.c index 56fa6e8092..4960af57c4 100644 --- a/src/3rdparty/pcre/pcre_tables.c +++ b/src/3rdparty/pcre/pcre_tables.c @@ -45,7 +45,7 @@ uses macros to change their names from _pcre_xxx to xxxx, thereby avoiding name clashes with the library. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_ucd.c b/src/3rdparty/pcre/pcre_ucd.c index 9e60742edb..69c4fd42c3 100644 --- a/src/3rdparty/pcre/pcre_ucd.c +++ b/src/3rdparty/pcre/pcre_ucd.c @@ -10,7 +10,7 @@ needed. */ #ifndef PCRE_INCLUDED -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_valid_utf8.c b/src/3rdparty/pcre/pcre_valid_utf8.c index 1cf0a14710..3b0f6464a3 100644 --- a/src/3rdparty/pcre/pcre_valid_utf8.c +++ b/src/3rdparty/pcre/pcre_valid_utf8.c @@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. strings. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_version.c b/src/3rdparty/pcre/pcre_version.c index cb57bf34a5..ae86ff28bc 100644 --- a/src/3rdparty/pcre/pcre_version.c +++ b/src/3rdparty/pcre/pcre_version.c @@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. string that identifies the PCRE version that is in use. */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/3rdparty/pcre/pcre_xclass.c b/src/3rdparty/pcre/pcre_xclass.c index 036b6e734a..c2b61f0f92 100644 --- a/src/3rdparty/pcre/pcre_xclass.c +++ b/src/3rdparty/pcre/pcre_xclass.c @@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. class. It is used by both pcre_exec() and pcre_def_exec(). */ -#ifdef PCRE_HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H #include "config.h" #endif |