Merge branch 'master' of github.com:CppCXY/EmmyLuaCodeStyle

Author: CppCXY

3rd/uriparser/.github/workflows/build-and-test.yml

@@ -12,31 +12,70 @@ on:
 jobs:
   build_and_test:
     name: Build and test
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - name: Native Linux
+            cmake_args: >-
+              -DCMAKE_C_COMPILER=clang-13
+              -DCMAKE_CXX_COMPILER=clang++-13
+            cflags: >-
+              -fsanitize=address,undefined,leak
+              -fno-sanitize-recover=all
+              -fno-omit-frame-pointer
+            ldflags: >-
+              -fsanitize=address
+          - name: MingGW on Linux
+            cmake_args: >-
+              -DCMAKE_C_COMPILER=i686-w64-mingw32-gcc
+              -DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++
+              -DCMAKE_SYSTEM_NAME=Windows
+              -DWIN32=ON
+              -DMINGW=ON
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2.4.0
 
-      - name: Add Clang/LLVM repositories
+      - name: Add Clang/LLVM repositories (Non-MinGW)
+        if: "${{ ! contains(matrix.cmake_args, 'mingw') }}"
         run: |-
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main'
+          sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main'
 
       - name: Install build dependencies
         run: |-
+          sudo apt-get update
           sudo apt-get install --yes --no-install-recommends -V \
-              clang-11 \
               cmake \
               doxygen \
               graphviz \
-              llvm-11 \
               lzip \
               qhelpgenerator-qt5 \
               qtchooser
 
+      - name: Install build dependencies (MinGW)
+        if: "${{ contains(matrix.cmake_args, 'mingw') }}"
+        run: |-
+          sudo dpkg --add-architecture i386  # for wine32
+          sudo apt-add-repository ppa:ondrej/php -y  # due to libwine:i386 conflicts
+          sudo apt-get update  # again, due to new architecture
+          sudo apt-get install --yes --no-install-recommends -V \
+              mingw-w64 \
+              wine-stable \
+              wine32
+
+      - name: Install build dependencies (Non-MinGW)
+        if: "${{ ! contains(matrix.cmake_args, 'mingw') }}"
+        run: |-
+          sudo apt-get install --yes --no-install-recommends -V \
+              clang-13 \
+              llvm-13
+
       - name: Build, test and install
         run: |-
+          set -x
           sed 's,:,\n,g' <<<"${PATH}"
-          clang --version
+          cmake --version
 
           GTEST_VERSION=1.8.1
           GTEST_PREFIX=~/.local/
@@ -45,10 +84,15 @@ jobs:
           tar xf release-${GTEST_VERSION}.tar.gz
           (
             cd googletest-release-${GTEST_VERSION}/
+
+            # Silence warning "Compatibility with CMake < 2.8.12 will be removed"
+            find -name CMakeLists.txt -print -exec sed 's/cmake_minimum_required.*/cmake_minimum_required(VERSION 3.0.2)/' -i {} \;
+
             cmake \
                 -DBUILD_SHARED_LIBS=ON \
                 -DCVF_VERSION=${GTEST_VERSION} \
                 -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_PREFIX} \
+                ${{ matrix.cmake_args }} \
                 .
             make
             make install
@@ -61,17 +105,15 @@ jobs:
 
               -O1
               -g
-              -fsanitize=address,undefined,leak
-              -fno-sanitize-recover=all
-              -fno-omit-frame-pointer
+              ${{ matrix.cflags }}
 
               -Wall
               -Wextra
               -pedantic
             )
             CFLAGS="${compile_flags[*]} -std=c89"
             CXXFLAGS="${compile_flags[*]} -std=c++98"
-            LDFLAGS='-g -fsanitize=address'
+            LDFLAGS='-g ${{ matrix.ldflags }}'
             cmake_args=(
               -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_PREFIX}
 
@@ -80,20 +122,29 @@ jobs:
               -Wdeprecated
               -Werror=deprecated
 
-              -DCMAKE_C_COMPILER=clang-11
-              -DCMAKE_CXX_COMPILER=clang++-11
               -DCMAKE_C_FLAGS="${CFLAGS}"
               -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
               -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}"
               -DCMAKE_MODULE_LINKER_FLAGS="${LDFLAGS}"
               -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}"
 
+              ${{ matrix.cmake_args }}
+
               -DURIPARSER_WARNINGS_AS_ERRORS=ON
             )
             cmake "${cmake_args[@]}" -DCMAKE_INSTALL_INCLUDEDIR=include123 ..
 
             make VERBOSE=1 all
 
+            # NOTE: We need to copy some .dll files next to the
+            #       Windows binaries so that they are ready to be executed
+            if [[ "${{ matrix.cmake_args }}" == *mingw* ]]; then
+              cp /usr/lib/gcc/i686-w64-mingw32/*-posix/libgcc_s_sjlj-1.dll ./
+              cp /usr/lib/gcc/i686-w64-mingw32/*-posix/libstdc++-6.dll ./
+              cp /usr/i686-w64-mingw32/lib/libwinpthread-1.dll ./
+              cp "${GTEST_PREFIX}"/bin/libgtest.dll ./
+            fi
+
             make VERBOSE=1 test ARGS=--verbose
             cat Testing/Temporary/LastTest.log
 
@@ -106,11 +157,19 @@ jobs:
           pushd cmake/test_find_package
             cmake "${cmake_args[@]}" .
             make VERBOSE=1
-            ./hello
+            if [[ "${{ matrix.cmake_args }}" == *mingw* ]]; then
+              cp "${GTEST_PREFIX}"/bin/liburiparser-1.dll ./
+              wine ./hello.exe
+            else
+              ./hello
+            fi
           popd
 
           git fetch --tags --unshallow origin  # for "git describe" in make-distcheck.sh
 
-          ./make-distcheck.sh -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_PREFIX}  # without AddressSanitizer
+          GTEST_PREFIX="${GTEST_PREFIX}" \
+            ./make-distcheck.sh \
+            -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_PREFIX} \
+            ${{ matrix.cmake_args }}
 
           ! git status | fgrep -A100 'Untracked files:'  # works best at the very end

3rd/uriparser/.gitignore

@@ -1,5 +1,7 @@
+/.idea/
 /config.h
 /build/
+/cmake-build-debug/
 /CMakeCache.txt
 /CMakeDoxyfile.in
 /CMakeDoxygenDefaults.cmake

3rd/uriparser/CMakeLists.txt

@@ -40,7 +40,7 @@ cmake_minimum_required(VERSION 3.11)
 
 project(uriparser
     VERSION
-        0.9.5
+        0.9.6
     LANGUAGES
         C
 )

3rd/uriparser/README.md

@@ -18,8 +18,11 @@ please check out [https://uriparser.github.io/](https://uriparser.github.io/).
 
 
 # Example use from an existing CMake project
+
 ```cmake
-project(hello VERSION 1.0)
+cmake_minimum_required(VERSION 3.3)
+
+project(hello VERSION 1.0.0)
 
 find_package(uriparser 0.9.2 CONFIG REQUIRED char wchar_t)
 

3rd/uriparser/THANKS

@@ -1,8 +1,8 @@
 Adam Frisby
 Adam Gross
-Adeodato Sim�
-Adrian Manrique
+Adeodato Sim?Adrian Manrique
 Alexander Klink
+Alexander Richardson
 Arkadiusz Miskiewicz
 Andreas Sturmlechner
 Blair Sadewitz
@@ -44,9 +44,10 @@ myd7349
 Periklis Akritidis
 Philip de Nier
 Radu Hociung
+Rafael Fontenelle
 Ralf S. Engelschall
 Rakesh Pandit
-Ren� Rebe
+Ren?Rebe
 Richard Hodges
 Robert Buchholz
 Robert Kausch

3rd/uriparser/appveyor.yml

@@ -41,7 +41,7 @@ configuration:
 # - Release
 
 environment:
-  GTEST_VERSION: 1.8.1
+  GTEST_VERSION: 1.10.0
 
   # https://www.appveyor.com/docs/windows-images-software/
   matrix:
@@ -65,19 +65,30 @@ environment:
       CMAKE_GENERATOR: Visual Studio 15 2017 Win64
       PLATFORM: x64
 
+  # Visual Studio 2019, 32 bit
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      CMAKE_GENERATOR: Visual Studio 16 2019
+      COMMON_CMAKE_ARGS: -A Win32
+
+  # Visual Studio 2019, 64 bit
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      CMAKE_GENERATOR: Visual Studio 16 2019
+      COMMON_CMAKE_ARGS: -A x64
+
 before_build:
   - curl -fsSL -o release-%GTEST_VERSION%.zip https://github.com/google/googletest/archive/release-%GTEST_VERSION%.zip
   - unzip -q release-%GTEST_VERSION%.zip
   - cd googletest-release-%GTEST_VERSION%
   - cmake
       -G "%CMAKE_GENERATOR%"
       -DCVF_VERSION=%GTEST_VERSION%
+      %COMMON_CMAKE_ARGS%
       .
   - cmake --build . --config Release -- /m
 # BEGIN Enrich folder to make FindGTest.cmake happy
   - md googletest\lib
-  - copy googlemock\gtest\Release\gtest.lib googletest\lib
-  - copy googlemock\gtest\Release\gtest_main.lib googletest\lib
+  - copy lib\Release\gtest.lib googletest\lib
+  - copy lib\Release\gtest_main.lib googletest\lib
 # END
   - cd ..
   - mkdir build
@@ -89,6 +100,7 @@ before_build:
       -DURIPARSER_BUILD_DOCS=OFF
       -DURIPARSER_MSVC_RUNTIME=/MT
       -DURIPARSER_WARNINGS_AS_ERRORS=ON
+      %COMMON_CMAKE_ARGS%
       ..
 
 build:

3rd/uriparser/cmake/test_find_package/.gitignore

@@ -3,3 +3,5 @@
 /Makefile
 /cmake_install.cmake
 /hello
+/hello.exe
+/liburiparser-1.dll

3rd/uriparser/doc/preprocess.sh

@@ -1,3 +1,4 @@
-#! /bin/sh
+#! /usr/bin/env bash
 # Run GCC preprocessor and delete empty lines
-cpp -DURI_DOXYGEN -DURI_NO_UNICODE -C -I ../include $1 | sed -e '/^$/d' -e 's/COMMENT_HACK//g'
+: ${CPP:=cpp}
+"${CPP}" -DURI_DOXYGEN -DURI_NO_UNICODE -C -I ../include "$1" | sed -e '/^$/d' -e 's/COMMENT_HACK//g'

3rd/uriparser/include/uriparser/Uri.h

@@ -1,4 +1,4 @@
-/* 6db8b5726a796167bb96b3d83ff9ac6792a01474dbe3778deb3c2a25d60b3693 (0.9.5+)
+/* 0beb20dace01f4b2fa24c3bf9f7e8e616f621e4697260805a2b63a4d190e64c0 (0.9.6+)
  *
  * uriparser - RFC 3986 URI parsing library
  *
@@ -769,7 +769,7 @@ URI_PUBLIC int URI_FUNC(WindowsFilenameToUriString)(const URI_CHAR * filename,
 
 /**
  * Extracts a Unix filename from a %URI string.
- * The destination buffer must be large enough to hold len(uriString) + 1 - 7
+ * The destination buffer must be large enough to hold len(uriString) + 1 - 5
  * characters in case of an absolute %URI or len(uriString) + 1 in case
  * of a relative %URI.
  *

3rd/uriparser/include/uriparser/UriBase.h

@@ -55,7 +55,7 @@
 /* Version */
 #define URI_VER_MAJOR           0
 #define URI_VER_MINOR           9
-#define URI_VER_RELEASE         5
+#define URI_VER_RELEASE         6
 #define URI_VER_SUFFIX_ANSI     ""
 #define URI_VER_SUFFIX_UNICODE  URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI)