try to build vcpkg on travis

.travis.yml

@@ -31,11 +31,41 @@ matrix:
     #     - CXX=clang++
 
     # Windows
-    # - os: windows
+    - os: windows
-    #   env:
+      env:
-    #     - CMAKE_PATH="/c/Program Files/CMake/bin"
+        - CMAKE_PATH="/c/Program Files/CMake/bin"
-    #   script: 
+      script: 
-    #     - export PATH=$CMAKE_PATH:$PATH
+        - export PATH=$CMAKE_PATH:$PATH
-    #     #  - cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 -DUSE_VENDORED_THIRD_PARTY=1 .
+        - cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 -DUSE_VENDORED_THIRD_PARTY=1 .
-    #     #  - cmake --build --parallel .
+        - cmake --build --parallel .
-    #     - python test/run.py
+        - python test/run.py
+
+install:
+  # HACK: gcc 8.0.1 is missing movdirintrin.h so just download it. We need this for GLM and Vectrexy to build.
+  - sudo wget https://raw.githubusercontent.com/gcc-mirror/gcc/gcc-8-branch/gcc/config/i386/movdirintrin.h -P /usr/lib/gcc/x86_64-linux-gnu/8/include/
+
+  # Create deps dir
+  - mkdir -p ${DEPS_DIR}
+
+  # Set compiler vars
+  - export CC=${CC_COMPILER}
+  - export CXX=${CXX_COMPILER}
+
+  # Install vcpkg and dependencies
+  - |
+    set -e
+    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
+    ./bootstrap-vcpkg.sh
+    # Only build release libs to save time. We inject a new line first since some cmake files don't end with one.
+    echo -e '\nset(VCPKG_BUILD_TYPE release)' >> ./triplets/${VCPKG_TRIPLET}.cmake
+    ./vcpkg install sdl2 sdl2-net glew glm stb imgui
+    popd
+
+cache:
+  directories:
+- ${DEPS_DIR}/vcpkg/installed

CHANGELOG.md

@@ -3,7 +3,6 @@ All notable changes to this project will be documented in this file.
 
 ## [unreleased] - 2019-06-09
 ### Changed
-- cobra_to_sentry / backtraces are reversed and line number is not extracted correctly
 - mbedtls and zlib are searched with find_package, and we use the vendored version if nothing is found
 - travis CI uses g++ on Linux
 

CMakeLists.txt

@@ -134,11 +134,6 @@ if (APPLE AND USE_TLS AND NOT USE_MBED_TLS)
   target_link_libraries(ixwebsocket "-framework foundation" "-framework security")
 endif()
 
-if (UNIX)
-  find_package(Threads)
-  target_link_libraries(ixwebsocket ${CMAKE_THREAD_LIBS_INIT})
-endif()
-
 if (USE_OPEN_SSL)
   find_package(OpenSSL REQUIRED)
   add_definitions(${OPENSSL_DEFINITIONS})

DOCKER_VERSION

@@ -1 +1 @@
-4.0.4
+4.0.0

test/run.py

@@ -99,10 +99,8 @@ def runCMake(sanitizer, buildDir):
         #generator = '"NMake Makefiles"'
         #generator = '"Visual Studio 16 2019"'
         generator = '"Visual Studio 15 2017"'
-        USE_VENDORED_THIRD_PARTY = 'ON'
     else:
         generator = '"Unix Makefiles"'
-        USE_VENDORED_THIRD_PARTY = 'OFF'
 
     CMAKE_BUILD_TYPE = BUILD_TYPE
 
@@ -112,7 +110,6 @@ def runCMake(sanitizer, buildDir):
     -DCMAKE_BUILD_TYPE={CMAKE_BUILD_TYPE} \
     -DUSE_TLS=1 \
     -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-    -DUSE_VENDORED_THIRD_PARTY={USE_VENDORED_THIRD_PARTY} \
     -G{generator}'
 
     cmakeCmd = fmt.format(**locals())

ws/IXSentryClient.cpp

@@ -72,6 +72,7 @@ namespace ix
         std::string line;
         std::stringstream tokenStream(stack);
 
+        std::stringstream ss;
         std::smatch group;
 
         while (std::getline(tokenStream, line))
@@ -83,7 +84,6 @@ namespace ix
                 const auto linenoStr = group.str(2);
                 const auto function = group.str(3);
 
-                std::stringstream ss;
                 ss << linenoStr;
                 uint64_t lineno;
                 ss >> lineno;
@@ -97,8 +97,6 @@ namespace ix
             }
         }
 
-        std::reverse(frames.begin(), frames.end());
-
         return frames;
     }