[internal] fix AppVeyor MinGW builds

This commit is contained in:
Pete Batard 2019-08-22 20:14:52 +01:00
parent 62dad2ef2f
commit ccbf632a7c
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
3 changed files with 55 additions and 50 deletions

View file

@ -4,6 +4,7 @@ Rufus: The Reliable USB Formatting Utility
[![Build status](https://img.shields.io/appveyor/ci/pbatard/rufus.svg?style=flat-square)](https://ci.appveyor.com/project/pbatard/rufus) [![Build status](https://img.shields.io/appveyor/ci/pbatard/rufus.svg?style=flat-square)](https://ci.appveyor.com/project/pbatard/rufus)
[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/2172.svg?style=flat-square)](https://scan.coverity.com/projects/pbatard-rufus) [![Coverity Scan Build Status](https://img.shields.io/coverity/scan/2172.svg?style=flat-square)](https://scan.coverity.com/projects/pbatard-rufus)
[![Build contributors](https://img.shields.io/github/contributors/pbatard/rufus.svg?style=flat-square)](https://github.com/pbatard/rufus/graphs/contributors) [![Build contributors](https://img.shields.io/github/contributors/pbatard/rufus.svg?style=flat-square)](https://github.com/pbatard/rufus/graphs/contributors)
[![Release](https://img.shields.io/github/release-pre/pbatard/rufus.svg?style=flat-square)](https://github.com/pbatard/rufus/releases)
[![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0.en.html) [![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0.en.html)
![Rufus logo](https://raw.githubusercontent.com/pbatard/rufus/master/res/icons/rufus-128.png) ![Rufus logo](https://raw.githubusercontent.com/pbatard/rufus/master/res/icons/rufus-128.png)

View file

@ -1,19 +1,16 @@
# The image below must be enabled in the AppVeyor settings
image: Visual Studio 2019
skip_commits: skip_commits:
# Don't run AppVeyor for commits that only modify resource or non-code files # Don't run AppVeyor for commits that only modify resource or non-code files
files: files:
- .gitignore - .gitignore
- .gitattributes - .gitattributes
- .github/ - .github/
- res/ - res/
- '**/*.cmd' - '**/*.cmd'
- '**/*.md' - '**/*.md'
- '**/*.rc' - '**/*.rc'
- '**/*.sh' - '**/*.sh'
- '**/*.txt' - '**/*.txt'
- '**/*.xml' - '**/*.xml'
environment: environment:
COVERITY_SCAN_PROJECT_NAME: "pbatard/rufus" COVERITY_SCAN_PROJECT_NAME: "pbatard/rufus"
@ -23,38 +20,45 @@ environment:
global: global:
BITS: 32 BITS: 32
matrix: matrix:
- CONFIGURATION: Debug - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
COMPILER: MSVC CONFIGURATION: Debug
PLATFORM: x86 COMPILER: MSVC
- CONFIGURATION: Debug PLATFORM: x86
COMPILER: MSVC - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
PLATFORM: x64 CONFIGURATION: Debug
- CONFIGURATION: Release COMPILER: MSVC
COMPILER: MSVC PLATFORM: x64
PLATFORM: x86 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- CONFIGURATION: Release CONFIGURATION: Release
COMPILER: MSVC COMPILER: MSVC
PLATFORM: x64 PLATFORM: x86
- CONFIGURATION: Release - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
COMPILER: MinGW CONFIGURATION: Release
PLATFORM: i686 COMPILER: MSVC
- CONFIGURATION: Release PLATFORM: x64
COMPILER: MinGW - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
PLATFORM: x86_64 CONFIGURATION: Release
- CONFIGURATION: Release COMPILER: MinGW
COMPILER: Coverity PLATFORM: i686
PLATFORM: x86 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
CONFIGURATION: Release
COMPILER: MinGW
PLATFORM: x86_64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
CONFIGURATION: Release
COMPILER: Coverity
PLATFORM: x86
init: init:
# Set the AppVeyor build version number to our tag or, if untagged, to the commit hash # Set the AppVeyor build version number to our tag or, if untagged, to the commit hash
# See https://github.com/appveyor/ci/issues/691 # See https://github.com/appveyor/ci/issues/691
# Also include the build number, to distinguish between rebuilds of the same commit # Also include the build number, to distinguish between rebuilds of the same commit
- ps: | - ps: |
if ($env:APPVEYOR_REPO_TAG -eq "true") { if ($env:APPVEYOR_REPO_TAG -eq "true") {
Update-AppveyorBuild -Version "$($env:APPVEYOR_REPO_TAG_NAME)_#$env:APPVEYOR_BUILD_NUMBER"; Update-AppveyorBuild -Version "$($env:APPVEYOR_REPO_TAG_NAME)_#$env:APPVEYOR_BUILD_NUMBER";
} else { } else {
Update-AppveyorBuild -Version "dev-$($env:APPVEYOR_REPO_COMMIT.Substring(0,8))_#$env:APPVEYOR_BUILD_NUMBER"; Update-AppveyorBuild -Version "dev-$($env:APPVEYOR_REPO_COMMIT.Substring(0,8))_#$env:APPVEYOR_BUILD_NUMBER";
} }
build: build:
project: rufus.sln project: rufus.sln
@ -62,13 +66,13 @@ build:
verbosity: detailed verbosity: detailed
install: install:
- ps: | ps: |
if ($env:PLATFORM -eq "x86_64") { if ($env:PLATFORM -eq "x86_64") {
$env:BITS = 64 $env:BITS = 64
} }
build_script: build_script:
- ps: | ps: |
$APPVEYOR_LOGGER = "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"; $APPVEYOR_LOGGER = "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll";
switch ($env:COMPILER) { switch ($env:COMPILER) {
MSVC { MSVC {

View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.7.1565" CAPTION "Rufus 3.7.1566"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -394,8 +394,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,7,1565,0 FILEVERSION 3,7,1566,0
PRODUCTVERSION 3,7,1565,0 PRODUCTVERSION 3,7,1566,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -413,13 +413,13 @@ BEGIN
VALUE "Comments", "https://akeo.ie" VALUE "Comments", "https://akeo.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.7.1565" VALUE "FileVersion", "3.7.1566"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus-3.7.exe" VALUE "OriginalFilename", "rufus-3.7.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.7.1565" VALUE "ProductVersion", "3.7.1566"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"