Update appveyor file and turn off /WX for clang-msvc
win32-clang-msvc has an error when compiling with /WX. The moc_predefs.h file is not being built correctly, while without /WX it works. The change should be reverted to enabling /WX for all msvc compilers when the clang-msvc issue is fixed. Update path to clang-format in appveyor file Retry CI on Python script Python script failed on CI due to run-clang-format.py: error: [Error 5] Access is denied. Research says attempting again might solve the problem.
This commit is contained in:
+14
-7
@@ -6,10 +6,17 @@ environment:
|
|||||||
VS_LOC: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"'
|
VS_LOC: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"'
|
||||||
JOM_LOC: '"C:\Qt\Tools\QtCreator\bin\jom.exe"'
|
JOM_LOC: '"C:\Qt\Tools\QtCreator\bin\jom.exe"'
|
||||||
NSIS_LOC: '"C:\Program Files (x86)\NSIS\"'
|
NSIS_LOC: '"C:\Program Files (x86)\NSIS\"'
|
||||||
ZIP_LOC: 7z
|
ZIP_LOC: '"C:\Program Files\7-zip\7z.exe"'
|
||||||
CLANG_FORMAT_LOC: '"C:\Program Files\LLVM\bin\clang-format.exe"'
|
LLVM_LOC: '"C:\Program Files\LLVM\bin\"'
|
||||||
COMPILER: msvc
|
BUILD_PACKAGE: "1"
|
||||||
VSVER: 14
|
|
||||||
|
- QT_LOC: '"C:\Qt\5.11.2\msvc2017_64\bin\"'
|
||||||
|
VS_LOC: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"'
|
||||||
|
JOM_LOC: '"C:\Qt\Tools\QtCreator\bin\jom.exe"'
|
||||||
|
NSIS_LOC: '"C:\Program Files (x86)\NSIS\"'
|
||||||
|
ZIP_LOC: '"C:\Program Files\7-zip\7z.exe"'
|
||||||
|
LLVM_LOC: '"C:\Program Files\LLVM\bin\"'
|
||||||
|
BUILD_CLANG: '"1"'
|
||||||
|
|
||||||
|
|
||||||
clone_depth: 1
|
clone_depth: 1
|
||||||
@@ -18,11 +25,11 @@ init:
|
|||||||
- set TAG_NAME=%APPVEYOR_REPO_TAG_NAME%
|
- set TAG_NAME=%APPVEYOR_REPO_TAG_NAME%
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- python ./build_scripts/run-clang-format.py ./src -r --clang-format-executable %CLANG_FORMAT_LOC% --color always
|
- python ./build_scripts/run-clang-format.py ./src -r --clang-format-executable "C:\Program Files\LLVM\bin\clang-format.exe" --color always
|
||||||
- call "build_windows.cmd"
|
- call "build_windows.cmd"
|
||||||
|
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: bin\win64\AdvancedSettings.zip
|
- path: bin\win64\AdvancedSettings*.7z
|
||||||
name: portable
|
name: portable
|
||||||
- path: installer\AdvancedSettings-Installer.exe
|
- path: installer\AdvancedSettings*.exe
|
||||||
name: installer
|
name: installer
|
||||||
|
|||||||
@@ -22,8 +22,13 @@ TEMPLATE = app
|
|||||||
QMAKE_CXXFLAGS_WARN_ON -= -W3
|
QMAKE_CXXFLAGS_WARN_ON -= -W3
|
||||||
#C4127 was in a third party file with no way to turn off.
|
#C4127 was in a third party file with no way to turn off.
|
||||||
QMAKE_CXXFLAGS += /W4 /wd4127
|
QMAKE_CXXFLAGS += /W4 /wd4127
|
||||||
QMAKE_CXXFLAGS += /WX
|
!*clang-msvc {
|
||||||
|
#win32-clang-msvc is unable to correctly build the first time
|
||||||
|
#with warnings as errors on. There seems to be an issue with the moc_predefs.h
|
||||||
|
#file not being built correctly when /WX is on. Until the issue is fixed,
|
||||||
|
#win32-clang-msvc is built without /WX.
|
||||||
|
QMAKE_CXXFLAGS += /WX
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
*g++* {
|
*g++* {
|
||||||
|
|||||||
Reference in New Issue
Block a user