root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Updated Windows build environment

Browse Source 
(Qt 5.14, MSVC 2017, OpenSSL 1.1.1)
This commit is contained in:
Martin Tůma 2020-01-26 11:27:48 +01:00
parent 2e84901e43
commit 81b5631de4
3 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.appveyor.yml
View File

@ -4,19 +4,23 @@ platform: Any CPU
environment: environment:
NSISDIR: C:\Program Files (x86)\NSIS NSISDIR: C:\Program Files (x86)\NSIS
matrix: matrix:
- QTDIR: C:\Qt\5.11\msvc2015 - QTDIR: C:\Qt\5.14\msvc2017
PLATFORM: x86 PLATFORM: x86
NSI: gpxsee.nsi NSI: gpxsee.nsi
OPENSSLDIR: C:\OpenSSL-Win32\bin OPENSSLDIR: C:\OpenSSL-v111-Win32\bin
- QTDIR: C:\Qt\5.11\msvc2015_64 LIBCRYPTO: libssl-1_1.dll
LIBSSL: libcrypto-1_1.dll
- QTDIR: C:\Qt\5.14\msvc2017_64
PLATFORM: x86_amd64 PLATFORM: x86_amd64
NSI: gpxsee64.nsi NSI: gpxsee64.nsi
OPENSSLDIR: C:\OpenSSL-Win64\bin OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
LIBCRYPTO: libssl-1_1-x64.dll
LIBSSL: libcrypto-1_1-x64.dll
install: install:
- cmd: >- - cmd: >-
set PATH=%QTDIR%\bin;%NSISDIR%;%PATH% set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM% call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%
build_script: build_script:
- cmd: >- - cmd: >-
lrelease gpxsee.pro lrelease gpxsee.pro
@ -44,9 +48,9 @@ build_script:
copy licence.txt installer copy licence.txt installer
copy %OPENSSLDIR%\libeay32.dll installer copy %OPENSSLDIR%\%LIBCRYPTO% installer
copy %OPENSSLDIR%\ssleay32.dll installer copy %OPENSSLDIR%\%LIBSSL% installer
makensis.exe installer\%NSI% makensis.exe installer\%NSI%

22
pkg/gpxsee.nsi
View File

@ -148,30 +148,28 @@ Section "MSVC runtime" SEC_MSVC
SectionIn RO SectionIn RO
DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..." DetailPrint "Checking whether Visual C++ 2017 runtime is already installed..."
${If} ${RunningX64} ${If} ${RunningX64}
ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed" ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Version"
${Else} ${Else}
ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed" ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
${EndIf} ${EndIf}
StrCmp $R0 "1" 0 +3 ${If} $R0 >= "v14.24.28127.04"
DetailPrint "Visual C++ 2015 Redistributable is already installed, skipping install." DetailPrint "Visual C++ 2017 runtime is already installed, skipping install."
Goto done ${Else}
DetailPrint "Installing Visual C++ 2017 Redistributable..."
DetailPrint "Installing Visual C++ 2015 Redistributable..."
SetOutPath $TEMP SetOutPath $TEMP
File "vcredist_x86.exe" File "vcredist_x86.exe"
ExecWait '"$TEMP\vcredist_x86.exe" /install /quiet /norestart' ExecWait '"$TEMP\vcredist_x86.exe" /install /quiet /norestart'
SetOutPath $INSTDIR SetOutPath $INSTDIR
${EndIf}
done:
SectionEnd SectionEnd
Section "OpenSSL" SEC_OPENSSL Section "OpenSSL" SEC_OPENSSL
File "libeay32.dll" File "libcrypto-1_1.dll"
File "ssleay32.dll" File "libssl-1_1.dll"
SectionEnd SectionEnd
@ -246,7 +244,7 @@ SectionEnd
LangString DESC_QT ${LANG_ENGLISH} \ LangString DESC_QT ${LANG_ENGLISH} \
"QT cross-platform application framework." "QT cross-platform application framework."
LangString DESC_MSVC ${LANG_ENGLISH} \ LangString DESC_MSVC ${LANG_ENGLISH} \
"Visual C++ 2015 runtime components. If already installed, will be skipped." "Microsoft Visual C++ 2017 runtime. If already installed, will be skipped."
LangString DESC_OPENSSL ${LANG_ENGLISH} \ LangString DESC_OPENSSL ${LANG_ENGLISH} \
"OpenSSL library. Required for HTTPS to work." "OpenSSL library. Required for HTTPS to work."
LangString DESC_ANGLE ${LANG_ENGLISH} \ LangString DESC_ANGLE ${LANG_ENGLISH} \

22
pkg/gpxsee64.nsi
View File

@ -155,25 +155,23 @@ Section "MSVC runtime" SEC_MSVC
SectionIn RO SectionIn RO
DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..." DetailPrint "Checking whether Visual C++ 2017 runtime is already installed..."
ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed" ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Version"
StrCmp $R0 "1" 0 +3 ${If} $R0 >= "v14.24.28127.04"
DetailPrint "Visual C++ 2015 Redistributable is already installed, skipping install." DetailPrint "Visual C++ 2017 runtime is already installed, skipping install."
Goto done ${Else}
DetailPrint "Installing Visual C++ 2017 runtime..."
DetailPrint "Installing Visual C++ 2015 Redistributable..."
SetOutPath $TEMP SetOutPath $TEMP
File "vcredist_x64.exe" File "vcredist_x64.exe"
ExecWait '"$TEMP\vcredist_x64.exe" /install /quiet /norestart' ExecWait '"$TEMP\vcredist_x64.exe" /install /quiet /norestart'
SetOutPath $INSTDIR SetOutPath $INSTDIR
${EndIf}
done:
SectionEnd SectionEnd
Section "OpenSSL" SEC_OPENSSL Section "OpenSSL" SEC_OPENSSL
File "libeay32.dll" File "libcrypto-1_1-x64.dll"
File "ssleay32.dll" File "libssl-1_1-x64.dll"
SectionEnd SectionEnd
@ -249,7 +247,7 @@ SectionEnd
LangString DESC_QT ${LANG_ENGLISH} \ LangString DESC_QT ${LANG_ENGLISH} \
"QT cross-platform application framework." "QT cross-platform application framework."
LangString DESC_MSVC ${LANG_ENGLISH} \ LangString DESC_MSVC ${LANG_ENGLISH} \
"Visual C++ 2015 runtime components. If already installed, will be skipped." "Microsoft Visual C++ 2017 runtime. If already installed, will be skipped."
LangString DESC_OPENSSL ${LANG_ENGLISH} \ LangString DESC_OPENSSL ${LANG_ENGLISH} \
"OpenSSL library. Required for HTTPS to work." "OpenSSL library. Required for HTTPS to work."
LangString DESC_ANGLE ${LANG_ENGLISH} \ LangString DESC_ANGLE ${LANG_ENGLISH} \