Update CI scripts (#41)

* Updated Travis script

* Simplified build scripts and updated Travis configuration.

* Fixed warning when building with optimizations using GCC

* Updated .travis.yml and CMakeLists.txt to make CI work

* Fixed bug in build script when using LLVM libcxx and clang

* Updated appveyor.yml

Author: glynos

.appveyor.yml

@@ -9,6 +9,10 @@ configuration:
   - Debug
   - Release
 
+environment:
+  matrix:
+    - SHARED_LIB: OFF
+
 install:
   - cd C:\Tools\vcpkg
   - git pull
@@ -22,7 +26,7 @@ build_script:
   - git submodule update
   - mkdir build
   - cd build
-  - cmake .. -A x64 -DCMAKE_TOOLCHAIN_FILE=C:\Tools\vcpkg\scripts\buildsystems\vcpkg.cmake
+  - cmake -B . -A x64 -DCMAKE_TOOLCHAIN_FILE=C:\Tools\vcpkg\scripts\buildsystems\vcpkg.cmake -DBUILD_SHARED_LIBS=%SHARED_LIB% ..
   - cmake --build .
   - ctest
 

.travis.yml

@@ -1,61 +1,43 @@
 sudo: false
 
 language: c++
-
 dist: bionic
 
+compiler:
+  - gcc
+  - clang
+os:
+  - linux
+
 env:
   global:
     - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps_"
     - INSTALL_DIR="${TRAVIS_BUILD_DIR}/install"
+  jobs:
+    - SHARED_LIB=OFF BUILD_TYPE=Debug
+    - SHARED_LIB=OFF BUILD_TYPE=Release
+    - SHARED_LIB=ON BUILD_TYPE=Debug
+    - SHARED_LIB=ON BUILD_TYPE=Release
 
-matrix:
-  include:
-    - os: linux
-      compiler: gcc
-      addons: &gcc8
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-8']
-      env: [COMPILER='g++-8', VCPKG_TRIPLET='x64-linux', BUILD_WITH_LLVM_LIBCXX='OFF']
-
-    - os: linux
-      compiler: gcc
-      addons: &gcc9
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-9']
-      env: [COMPILER='g++-9', VCPKG_TRIPLET='x64-linux', BUILD_WITH_LLVM_LIBCXX='OFF']
-
-    - os: linux
-      compiler: clang
-      addons: &clang7
-        apt:
-          sources: ['llvm-toolchain-bionic-7']
-          packages: ['clang++-7', 'libc++-7-dev', 'libc++abi-7-dev']
-      env: [COMPILER='clang++-7', VCPKG_TRIPLET='x64-linux', BUILD_WITH_LLVM_LIBCXX='ON']
-
-    - os: linux
-      compiler: clang
-      addons: &clang8
-        apt:
-          sources: ['llvm-toolchain-bionic-8']
-          packages: ['clang++-8', 'libc++-8-dev', 'libc++abi-8-dev']
-      env: [COMPILER='clang++-8', VCPKG_TRIPLET='x64-linux', BUILD_WITH_LLVM_LIBCXX='ON']
-
-    - os: linux
-      compiler: clang
-      addons: &clang9
-        apt:
-          sources: ['llvm-toolchain-bionic-9']
-          packages: ['clang++-9', 'libc++-9-dev', 'libc++abi-9-dev']
-      env: [COMPILER='clang++-9', VCPKG_TRIPLET='x64-linux', BUILD_WITH_LLVM_LIBCXX='ON']
-
-#    # 3/ OSX Clang Builds
-#    - os: osx
-#      osx_image: xcode10
-#      compiler: clang
-#      env: [COMPILER='clang', VCPKG_TRIPLET='x64-osx', BUILD_WITH_LLVM_LIBCXX='ON']
+addons:
+  apt:
+    sources:
+      - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
+        key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+      - sourceline: 'ppa:ubuntu-toolchain-r/test'
+    packages:
+      - clang-9
+      - cmake
+      - gcc-9
+      - g++-9
+      - ninja-build
+  homebrew:
+    packages:
+      - cmake
+      - gcc@9
+      - llvm@9
+      - ninja
+    update: true
 
 before_install:
   - echo ${DEPS_DIR}
@@ -67,37 +49,44 @@ before_install:
       CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz"
       mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
       export PATH=${DEPS_DIR}/cmake/bin:${PATH}
-    elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-      which cmake || brew install cmake
-    fi
-  - |
-    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
       which ninja || sudo apt-get install ninja-build
     elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
+      which cmake || brew install cmake
       which ninja || brew install ninja
     fi
   - popd
   - echo ${INSTALL_DIR}
   - mkdir -p ${INSTALL_DIR}
-  - |
-    if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-      brew install gcc
-      brew upgrade gcc
-      export CXX=`which g++`
-    else
-      export CXX=${COMPILER}
-    fi
   - echo ${CXX}
   - ${CXX} --version
 
 install:
+  # The following Homebrew packages aren't linked by default, and need to be
+  # prepended to the path explicitly.
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    export PATH="$(brew --prefix llvm)/bin:$PATH";
+    fi
+  # /usr/bin/gcc points to an older compiler on both Linux and macOS.
+  - if [ "$CXX" = "g++" ]; then export CXX="g++-9" CC="gcc-9"; fi
+  # /usr/bin/clang points to an older compiler on both Linux and macOS.
+  #
+  # Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values
+  # below don't work on macOS. Fortunately, the path change above makes the
+  # default values (clang and clang++) resolve to the correct compiler on macOS.
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+    if [ "$CXX" = "clang++" ]; then export CXX="clang++-9" CC="clang-9"; fi;
+    fi
+  - echo ${CC}
+  - echo ${CXX}
+  - ${CXX} --version
+  - cmake --version
+  # Update dependencies directory
   - mkdir -p ${DEPS_DIR}/vcpkg
   - pushd ${DEPS_DIR}/vcpkg
   - git init
   - git remote add origin https://github.com/Microsoft/vcpkg.git
   - git fetch origin master
   - git checkout -b master origin/master
-  - ${CXX} --version
   - export
   - ./bootstrap-vcpkg.sh
   - ./vcpkg install tl-expected catch2 nlohmann-json
@@ -108,24 +97,24 @@ cache:
     - ${DEPS_DIR}/vcpkg/installed
 
 before_script:
-  - export CXX=${COMPILER}
   - mkdir _build
   - cmake
     -B_build
     -GNinja
+    -DSkyr_WARNINGS_AS_ERRORS=OFF
     -DSkyr_BUILD_TESTS=ON
     -DSkyr_BUILD_DOCS=OFF
     -DSkyr_BUILD_EXAMPLES=OFF
-    -DSkyr_BUILD_WITH_LLVM_LIBCXX=${BUILD_WITH_LLVM_LIBCXX}
+    -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
+    -DBUILD_SHARED_LIBS=${SHARED_LIB}
     -DCMAKE_TOOLCHAIN_FILE=${DEPS_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake
     -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
     .
 
 script:
   - pushd _build
-  - ninja
-  - ninja test
-  - ninja install
+  - cmake --build . --target install -- -v
+  - ctest
   - popd
 
 after_failure:

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.4.4] - 2020-03-28
+
+## Fixed
+
+- Minor fix to the parser (#37)
+
+## Updated
+
+- Updated the coverage of the web platform tests (#39)
+
 ## [1.4.3] - 2020-03-18
 
 ### Fixed

CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.14)
 
 project(
         Skyr
-        VERSION 1.4.3
+        VERSION 1.4.4
         HOMEPAGE_URL https://cpp-netlib.github.io/url
         DESCRIPTION "A C++ library that implements the WhatWG URL specification"
         LANGUAGES CXX
@@ -22,7 +22,6 @@ option(Skyr_FULL_WARNINGS "Build the library with all warnings turned on." ON)
 option(Skyr_WARNINGS_AS_ERRORS "Treat warnings as errors." ON)
 option(Skyr_BUILD_WITHOUT_EXCEPTIONS "Build without exceptions." OFF)
 option(Skyr_USE_STATIC_CRT "Use static C Runtime library (/MT or MTd)." ON)
-option(Skyr_BUILD_FILESYSTEM_PATH_FUNCTIONS "Build the filesystem path functions" ON)
 option(Skyr_BUILD_WITH_LLVM_LIBCXX "Instruct Clang to use LLVM's implementation of C++ standard library" OFF)
 
 set(Skyr_WPT_TAG "merge_pr_22329" CACHE STRING "The Git tag for the WPT test data" )

include/skyr/unicode/ranges/views/u16_view.hpp

@@ -180,7 +180,7 @@ class view_u16_range {
   ///
   /// \return
   [[nodiscard]] constexpr size_type size() const noexcept {
-    return std::distance(begin(), end());
+    return static_cast<size_type>(end() - begin());
   }
 
  private:

include/skyr/unicode/ranges/views/u8_view.hpp

@@ -186,7 +186,7 @@ class view_u8_range {
 
   ///
   /// \return
-  [[nodiscard]] size_type size() const noexcept {
+  [[nodiscard]] constexpr size_type size() const noexcept {
     return static_cast<size_type>(std::distance(begin(), end()));
   }
 

include/skyr/version.hpp

@@ -13,7 +13,7 @@
 
 #define SKYR_VERSION_MAJOR 1
 #define SKYR_VERSION_MINOR 4
-#define SKYR_VERSION_PATCH 3
+#define SKYR_VERSION_PATCH 4
 
 #define SKYR_VERSION_STRING \
   SKYR_PREPROCESSOR_TO_STRING(SKYR_VERSION_MAJOR) "." \

src/CMakeLists.txt

@@ -28,6 +28,7 @@ set(Skyr_SRCS
         url/url.cpp
         url/url_error.cpp
         url/url_search_parameters.cpp
+        url/filesystem.cpp
         url/percent_encoding/errors.cpp
 
         ${Skyr_SOURCE_DIR}/include/skyr/config.hpp
@@ -56,24 +57,18 @@ set(Skyr_SRCS
         ${Skyr_SOURCE_DIR}/include/skyr/url/url_serialize.hpp
         ${Skyr_SOURCE_DIR}/include/skyr/url/url_error.hpp
         ${Skyr_SOURCE_DIR}/include/skyr/url/url_search_parameters.hpp
+        ${Skyr_SOURCE_DIR}/include/skyr/url/filesystem.hpp
         ${Skyr_SOURCE_DIR}/include/skyr/url.hpp)
 
-if (Skyr_BUILD_FILESYSTEM_PATH_FUNCTIONS)
-        LIST(APPEND Skyr_SRCS url/filesystem.cpp)
-        LIST(APPEND Skyr_SRCS ${Skyr_SOURCE_DIR}/include/skyr/url/filesystem.hpp)
-endif()
-
 add_library(skyr-url ${Skyr_SRCS})
 
 target_link_libraries(skyr-url PUBLIC tl::expected)
 if(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
-    if (NOT Skyr_DISABLE_LIBCXX)
+    if (Skyr_BUILD_WITH_LLVM_LIBCXX)
         target_link_libraries(skyr-url PUBLIC "c++")
     endif()
 elseif(${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
-    if (Skyr_BUILD_FILESYSTEM_PATH_FUNCTIONS)
-        target_link_libraries(skyr-url PUBLIC "stdc++fs")
-    endif()
+    target_link_libraries(skyr-url PUBLIC "stdc++fs")
 endif()
 
 set_target_properties(skyr-url PROPERTIES

tests/url/CMakeLists.txt

@@ -19,14 +19,9 @@ set(
         ipv4_address_tests.cpp
         ipv6_address_tests.cpp
         url_literal_tests.cpp
+        filesystem_path_tests.cpp
     )
 
-if (Skyr_BUILD_FILESYSTEM_PATH_FUNCTIONS)
-    LIST(APPEND
-            URL_TESTS
-            filesystem_path_tests.cpp)
-endif()
-
 if (NOT Skyr_BUILD_WITHOUT_EXCEPTIONS)
     LIST(APPEND URL_TESTS
             url_tests_with_exceptions.cpp

tests/url/wpt/CMakeLists.txt

@@ -11,7 +11,6 @@ FetchContent_Declare(
         GIT_TAG ${Skyr_WPT_TAG}
 )
 FetchContent_MakeAvailable(wpt)
-message(STATUS "${wpt_SOURCE_DIR}")
 
 SET(WPT_TESTS
         url_web_platform_tests.cpp