Release v0.9.4

arobenko · Sep 25, 2018 · 93e0d61 · 93e0d61
2 parents 387424b + 31ca0f8
commit 93e0d61
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 18 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,4 +1,6 @@
-image: Visual Studio 2015 
+image:
+ - Visual Studio 2015
+ - Visual Studio 2017
 
 init:
  - git config --global core.autocrlf input
@@ -19,15 +21,18 @@ configuration:
 
 environment:
  matrix:
- - TOOLCHAIN: msvc14
+ - CPP_STD: 11
+ QT_VER: 5.6.3
+ - CPP_STD: 14
+ QT_VER: 5.6.3
 
 install:
  - call script\appveyor_install.bat
  - set PATH=%PATH%;%QTDIR%\bin
 
 build_script:
- - mkdir build.%PLATFORM%.%CONFIGURATION%
- - cd build.%PLATFORM%.%CONFIGURATION%
+ - mkdir build.%PLATFORM%.%CONFIGURATION%.%TOOLCHAIN%
+ - cd build.%PLATFORM%.%CONFIGURATION%.%TOOLCHAIN%
  - cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "NMake Makefiles" -DCC_UBLOX_QT_DIR=%QTDIR% -DCC_UBLOX_FULL_SOLUTION=ON -DCC_UBLOX_PLUGIN_ALL=OFF -DCC_UBLOX_PLUGIN_UBLOX8=%UBLOX8_OPT% -DCC_UBLOX_PLUGIN_UBLOX7=ON -DCC_UBLOX_PLUGIN_UBLOX6=ON -DCC_UBLOX_PLUGIN_UBLOX5=ON
  - nmake install
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,7 +68,7 @@ set (CC_EXTERNAL_TGT "comms_champion_external")
 macro (externals install_dir build_cc)
  include(ExternalProject)
 
- set (cc_tag "v0.25.1")
+ set (cc_tag "v0.27")
  set (cc_main_dir "${CMAKE_BINARY_DIR}/comms_champion")
  set (cc_src_dir "${cc_main_dir}/src")
  set (cc_bin_dir "${cc_main_dir}/build")

diff --git a/include/ublox/version.h b/include/ublox/version.h
@@ -30,7 +30,7 @@
 #define UBLOX_MINOR_VERSION 9U
 
 /// @brief Patch level of the library
-#define UBLOX_PATCH_VERSION 2U
+#define UBLOX_PATCH_VERSION 4U
 
 /// @brief Version of the UBLOX library as single numeric value
 #define UBLOX_VERSION \

diff --git a/script/appveyor_install.bat b/script/appveyor_install.bat
@@ -1,20 +1,39 @@
-IF NOT "%TOOLCHAIN%"=="msvc14" (
+IF "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (
+ set TOOLCHAIN=msvc14
+ set QT_SUBDIR=msvc2015
+ IF "%PLATFORM%"=="x86" (
+ echo Performing x86 build in VS2015
+ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+ ) ELSE (
+ echo Performing amd64 build in VS2015
+ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+ )
+) ELSE IF "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (
+ set TOOLCHAIN=msvc15
+ set QT_SUBDIR=msvc2017
+ IF "%PLATFORM%"=="x86" (
+ echo Performing x86 build in VS2017
+ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+ ) ELSE (
+ echo Performing amd64 build in VS2017
+ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+ )
+) ELSE (
  echo Toolchain %TOOLCHAIN% is not supported
  exit -1
 )
 
-set UBLOX8_OPT="OFF"
+set QTDIR_PREFIX=C:\Qt\%QT_VER%
 IF "%PLATFORM%"=="x86" (
- echo Performing x86 build
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
- set QTDIR="C:\Qt\5.6.3\msvc2015"
+ set QTDIR_SUFFIX=
 ) ELSE (
- echo Performing amd64 build
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
- set QTDIR="C:\Qt\5.6.3\msvc2015_64"
- 
- if "%CONFIGURATION%"=="Release" (
-  set UBLOX8_OPT="ON"
- )
+ set QTDIR_SUFFIX=_64
+)
+
+set QTDIR=%QTDIR_PREFIX%\%QT_SUBDIR%%QTDIR_SUFFIX%
+IF NOT EXIST %QTDIR% (
+ echo WARNING: %QTDIR% does not exist!!!
+ set QTDIR=%QTDIR_PREFIX%\msvc2015%QTDIR_SUFFIX%
 )
 
+echo Using Qt5 from %QTDIR%