Merge pull request #825 from iakov/me/python38

CI changes

Author: iakov

appveyor.yml

@@ -33,7 +33,7 @@ branches:
 
 environment:
   global:
-    QTIFW: C:\Qt\Tools\QtInstallerFramework\3.1
+    PYTHON_VERSION_MINOR: 7 # Default to Python 3.7
     MSYS_DIR: C:\msys64
     APPVEYOR_SAVE_CACHE_ON_ERROR: true
     CCACHE_DIR: C:\ccache.cache
@@ -46,28 +46,53 @@ environment:
   matrix:
       - QT: 5.12
         ARCH: 32
-        PYTHON_PATH: C:\Python37
+        CONFIGURATION: release
+        QTIFW: C:\Qt\Tools\QtInstallerFramework\3.1
 
       - QT: 5.12
         ARCH: 64
-        PYTHON_PATH: C:\Python37-x64
-
-configuration:
-#  - debug
-  - release
+        CONFIGURATION: release
+        QTIFW: C:\Qt\Tools\QtInstallerFramework\3.1
 
+      - QT: 5.12
+        ARCH: 32
+        PYTHON_VERSION_MINOR: 8
+        CONFIGURATION: release
+        QTIFW: C:\Qt\Tools\QtInstallerFramework\3.1
+
+
+# Qt5.14 build takes too long (2x times) and reaches timeout
+#      - QT: 5.14
+#        ARCH: 32
+#        PYTHON_VERSION_MINOR: 8
+#        CONFIGURATION: release
+#        QTIFW: C:\Qt\Tools\QtInstallerFramework\3.2
+#        APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+
+matrix:
+  allow_failures:
+    - image: Visual Studio 2019 # build is extremally slow with this image
 #cache:
 #  - '%BUILD_DIR% -> **\*.pr?, appveyor.yml'
 #  - '%CCACHE_DIR% -> **\*.pr?, appveyor.yml'
 #  - C:\ProgramData\chocolatey\bin -> appveyor.yml
 #  - C:\ProgramData\chocolatey\lib -> appveyor.yml
 #  - '%MSYS_DIR%\var\cache\pacman\pkg -> appveyor.yml'
+#for:
+#  -
+#    matrix:
+#      only:
+#        - QT: 5.14
+#    image: Visual Studio 2019
 
 init:
+  - git config --global core.symlinks true
   - git config --global core.autocrlf true
   - if "x%appveyor_pull_request_number%" NEQ "x" set APPVEYOR_CACHE_SKIP_SAVE=true
   - if "x%appveyor_repo_branch%" NEQ "xmaster" set APPVEYOR_CACHE_SKIP_SAVE=true
   - if "%ARCH%" == "32" (set PLATFORM=i686) else (set PLATFORM=x86_64)
+  - set PYTHON_PATH=C:\Python3%PYTHON_VERSION_MINOR%
+  - if "%ARCH%" == "64" (set PYTHON_PATH=%PYTHON_PATH%-x64)
   - set NEED_AUTOZIP=false
   - set NEED_BINZIP=false
   - set NEED_INSTALLER=false
@@ -81,6 +106,8 @@ init:
   - if "x%appveyor_pull_request_number%" EQU "x" (set NEED_AUTOZIP=true)
 #this is a tagged commit build
   - if "%APPVEYOR_REPO_TAG%" EQU "true" ( set "NEED_INSTALLER=true" && set NEED_AUTOZIP=true )
+#disable artifacts for Python38
+  - if "%PYTHON_VERSION_MINOR%" NEQ "7" ( set "NEED_INSTALLER=false" && set NEED_AUTOZIP=false )
   - 'echo "Deploy installer executable: %NEED_INSTALLER%"'
   - 'echo "Deploy \\bin zip archive: %NEED_BINZIP%"'
   - 'echo "Deploy full zipped installer: %NEED_AUTOZIP%"'
@@ -95,12 +122,14 @@ clone_script:
 
 install:
   - set PYTHON_LIB=%PYTHON_PATH%\libs
-  - set QTDIR=C:\Qt\5.12\mingw73_%ARCH%
-  - set MINGW=%QTDIR%\..\..\Tools\mingw730_%ARCH%
+  - set QTDIR=C:\Qt\%QT%\mingw73_%ARCH%
+  - set MINGW=C:\Qt\Tools\mingw730_%ARCH%
   - set PATH=%QTDIR%\bin;%MINGW%\bin;C:\msys64\mingw%ARCH%\bin;C:\msys64\usr\bin;%PATH%
+  - 'qmake -v && qmake -query'
   - 'dir %PYTHON_PATH% %MINGW% %QTDIR% %QTIFW% %MSYS_DIR% /w'
 # need to reconfigure because it is anouther one git
   - git config --global core.autocrlf true
+  - git config --global core.symlinks true
   - pacman --verbose --noconfirm --sync ccache rsync curl unzip
   - pacman -Su --noconfirm mingw%ARCH%/mingw-w64-%PLATFORM%-libusb mingw%ARCH%/mingw-w64-%PLATFORM%-zlib mingw%ARCH%/mingw-w64-%PLATFORM%-pkg-config
 #--refresh --sysupgrade --ask=20
@@ -141,29 +170,31 @@ test_script:
 
 after_test:
 # zip binaries
-  - cd %BUILD_DIR%/bin/release
+  - cd %BUILD_DIR%/bin/%CONFIGURATION%
   - bash -c "env LC_ALL=C date -u"
-  - for %%f in (*.exe) do windeployqt --release %%f
-  - xcopy /I /Y %QTDIR%\plugins\platforms %BUILD_DIR%\bin\release\platforms
+  - for %%f in (*.exe) do windeployqt --%CONFIGURATION% %%f
+  - xcopy /I /Y %QTDIR%\plugins\platforms %BUILD_DIR%\bin\%CONFIGURATION%\platforms
   - set ZIP_NAME=trik-studio
   - set APPVEYOR_REPO_BRANCH_SAFE=%APPVEYOR_REPO_BRANCH:/=-%
   - if %APPVEYOR_REPO_TAG%==true (set ZIP_NAME=%ZIP_NAME%_%APPVEYOR_REPO_TAG_NAME%) else (set ZIP_NAME=%ZIP_NAME%-%APPVEYOR_REPO_BRANCH_SAFE%)
-  - set ZIP_NAME=%ZIP_NAME%_qt%QT%_%PLATFORM%.zip
+  - set ZIP_NAME=%ZIP_NAME%_qt%QT%_%PLATFORM%_%CONFIGURATION%.zip
   - bash -c "env LC_ALL=C date -u"
   - echo "ZipName:%ZIP_NAME%"
-  - cd %BUILD_DIR%/bin/release
+  - cd %BUILD_DIR%/bin/%CONFIGURATION%
   - 7z a -- %APPVEYOR_BUILD_FOLDER%\%ZIP_NAME% .
   - cd %APPVEYOR_BUILD_FOLDER%
   - if "%NEED_BINZIP%" EQU "true" (appveyor PushArtifact %ZIP_NAME%)
+  - if "%CONFIGURATION%" NEQ "release" ( exit /b 0 )
 # build installer
   - cd %APPVEYOR_BUILD_FOLDER%/installer
   - bash -c "env LC_ALL=C date -u"
   - build-trik-studio.sh %QTDIR%\bin %QTIFW%\bin %BUILD_DIR%
-  - set INSTALLER_NAME=trik-studio-installer
+  - set INSTALLER_NAME=trik-studio
   - if %APPVEYOR_REPO_TAG%==true (set INSTALLER_NAME=%INSTALLER_NAME%_%APPVEYOR_REPO_TAG_NAME%) else (set INSTALLER_NAME=%INSTALLER_NAME%-%APPVEYOR_REPO_BRANCH_SAFE%)
+  - if "%PYTHON_VERSION_MINOR%" NEQ "7" (set INSTALLER_NAME=%INSTALLER_NAME%-Python3%PYTHON_VERSION_MINOR%)
   - set INSTALLER_NAME=%INSTALLER_NAME%-%PLATFORM%
   - set AUTOINSTALLER_ZIP_NAME=%INSTALLER_NAME%-auto.zip
-  - set INSTALLER_NAME=%INSTALLER_NAME%.exe
+  - set INSTALLER_NAME=%INSTALLER_NAME%-installer.exe
   - echo "Installer:%INSTALLER_NAME%"
   - ren trik-studio*installer*.exe %INSTALLER_NAME%
   - cd %APPVEYOR_BUILD_FOLDER%
@@ -202,6 +233,8 @@ deploy:
     github_release_artifact: installer\$(AUTOINSTALLER_ZIP_NAME)
     on:
       ARCH: 32
+      QT: 5.12
+      CONFIGURATION: release
       APPVEYOR_REPO_TAG: true
       APPVEYOR_PROJECT_SLUG: $(master_ci)
 

buildScripts/travis/build_installer.sh

@@ -4,7 +4,6 @@ QTBIN=${QTBIN:-$($EXECUTOR  bash -c "make qmake -n | sed 's#/qmake.*\$##g'")}
 case $TRAVIS_OS_NAME in
   osx)
     QTIFWBIN=$QTBIN/../../../Tools/QtInstallerFramework/3.2/bin
-    ls $QTBIN/../../../Tools/QtInstallerFramework/*
     TSNAME=trik-studio-installer-mac-$TRAVIS_BRANCH.dmg
     ;;
   linux)
@@ -29,7 +28,8 @@ then
       || false \
 "
       fi
-
+#
+#	ls $QTBIN/../../../Tools/QtInstallerFramework/*
 #      $EXECUTOR bash -ic "\
 #      echo Start build installer \
 #      && installer/build-trik-studio.sh $QTBIN $QTIFWBIN . \

buildScripts/travis/runVera++.sh

@@ -1,3 +1,8 @@
-#!/bin/sh
+#!/bin/bash
+set -xueo pipefail
 tclsh buildScripts/vera++/generatePaths.tcl
 vera++ --error -p allRules --root buildScripts/vera++ <buildScripts/vera++/params
+git_diff=$( { git diff --diff-filter=d --name-only ${TRAVIS_COMMIT_RANGE:-upstream/master HEAD} || true ; } \
+  | xargs -r file -i | sed -e "s|\(.*\):.*text/x-c.*|\1|g" -e "/:/d")
+  [[ -z "${git_diff}" ]] || vera++ --error --root buildScripts/vera++ --profile strict <<< "$git_diff"
+

buildScripts/travis/vera_translation.sh

@@ -2,10 +2,6 @@
 set -xuevo pipefail
 TRIK_LINTER_OK=true
 $EXECUTOR buildScripts/travis/runVera++.sh || TRIK_LINTER_OK=false
-git_diff=$( { git diff --diff-filter=d --name-only "${TRAVIS_COMMIT_RANGE}" || true ; } \
-  | xargs -r file -i | sed -e "s|\(.*\):.*text/x-c.*|\1|g" -e "/:/d")
-[[ -z "${git_diff}" ]] || $EXECUTOR bash -lic 'vera++ --error --root buildScripts/vera++ --profile strict' <<< "$git_diff" || TRIK_LINTER_OK=false
-
 $EXECUTOR bash -lic 'lupdate studio.pro plugins/robots/editor/*/translations.pro' && $EXECUTOR buildScripts/travis/checkStatus.sh || TRIK_LINTER_OK=false
 
 "$TRIK_LINTER_OK"

global.pri

@@ -185,7 +185,7 @@ INCLUDEPATH += $$absolute_path($$_PRO_FILE_PWD_) \
 	$$absolute_path($$PWD) \
 
 
-CONFIG += c++11
+CONFIG *= c++14
 
 DEFINES *= QT_FORCE_ASSERTS
 

installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-linux-gnu.sh

@@ -10,7 +10,6 @@ mkdir -p $PWD/../data/lib/plugins/tools/kitPlugins/
 cp     $BIN_DIR/plugins/editors/libnxtMetamodel.so                                  $PWD/../data/lib/plugins/editors/
 cp     $BIN_DIR/plugins/tools/kitPlugins/librobots-nxt-interpreter.so            $PWD/../data/lib/plugins/tools/kitPlugins/
 cp     $BIN_DIR/plugins/tools/kitPlugins/librobots-nxt-osek-c-generator.so       $PWD/../data/lib/plugins/tools/kitPlugins/
-cp     $BIN_DIR/plugins/tools/kitPlugins/librobots-nxt-russian-c-generator.so    $PWD/../data/lib/plugins/tools/kitPlugins/
 cp -pr $BIN_DIR/librobots-nxt-generator-base.so*                                 $PWD/../data/lib
 cp -pr $BIN_DIR/librobots-nxt-kit.so*                                            $PWD/../data/lib
 cp -pr $BIN_DIR/libqextserialport.so*                                            $PWD/../data/lib

installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-mac.sh

@@ -11,15 +11,13 @@ mkdir -p "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/"
 cp     $BIN_DIR/plugins/editors/libnxtMetamodel.dylib                                      "$BUNDLE_CONTENTS/Lib/plugins/editors/"
 cp     $BIN_DIR/plugins/tools/kitPlugins/librobots-nxt-interpreter.dylib                   "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/"
 cp     $BIN_DIR/plugins/tools/kitPlugins/librobots-nxt-osek-c-generator.dylib              "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/"
-cp     $BIN_DIR/plugins/tools/kitPlugins/librobots-nxt-russian-c-generator.dylib           "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/"
 cp -pR $BIN_DIR/librobots-nxt-generator-base*.dylib                                        "$BUNDLE_CONTENTS/Lib"
 cp -pR $BIN_DIR/librobots-nxt-kit*.dylib                                                   "$BUNDLE_CONTENTS/Lib"
 cp -pR $BIN_DIR/libqextserialport*.dylib                                                   "$BUNDLE_CONTENTS/Lib"
 
 fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/editors/libnxtMetamodel.dylib"
 fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/librobots-nxt-interpreter.dylib"
 fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/librobots-nxt-osek-c-generator.dylib"
-fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/kitPlugins/librobots-nxt-russian-c-generator.dylib"
 fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-nxt-generator-base.1.0.0.dylib"
 fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-nxt-kit.1.0.0.dylib"
 fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libqextserialport.1.0.0.dylib"

installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-win32.sh

@@ -8,7 +8,6 @@ cd "$(dirname "$0")"
 cp    $BIN_DIR/plugins/editors/nxtMetamodel.dll                             $PWD/../data/plugins/editors/
 cp    $BIN_DIR/plugins/tools/kitPlugins/robots-nxt-interpreter.dll          $PWD/../data/plugins/tools/kitPlugins/
 cp    $BIN_DIR/plugins/tools/kitPlugins/robots-nxt-osek-c-generator.dll     $PWD/../data/plugins/tools/kitPlugins/
-cp    $BIN_DIR/plugins/tools/kitPlugins/robots-nxt-russian-c-generator.dll  $PWD/../data/plugins/tools/kitPlugins/
 cp    $BIN_DIR/robots-nxt-generator-base.dll                                $PWD/../data/
 cp    $BIN_DIR/robots-nxt-kit.dll                                           $PWD/../data/
 cp    $BIN_DIR/qextserialport.dll                                           $PWD/../data/