mirror of
				https://github.com/pbatard/rufus.git
				synced 2024-08-14 23:57:05 +00:00 
			
		
		
		
	[internal] fix AppVeyor MinGW builds
This commit is contained in:
		
							parent
							
								
									62dad2ef2f
								
							
						
					
					
						commit
						ccbf632a7c
					
				
					 3 changed files with 55 additions and 50 deletions
				
			
		|  | @ -4,6 +4,7 @@ Rufus: The Reliable USB Formatting Utility | ||||||
| [](https://ci.appveyor.com/project/pbatard/rufus) | [](https://ci.appveyor.com/project/pbatard/rufus) | ||||||
| [](https://scan.coverity.com/projects/pbatard-rufus) | [](https://scan.coverity.com/projects/pbatard-rufus) | ||||||
| [](https://github.com/pbatard/rufus/graphs/contributors) | [](https://github.com/pbatard/rufus/graphs/contributors) | ||||||
|  | [](https://github.com/pbatard/rufus/releases) | ||||||
| [](https://www.gnu.org/licenses/gpl-3.0.en.html) | [](https://www.gnu.org/licenses/gpl-3.0.en.html) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  |  | ||||||
							
								
								
									
										28
									
								
								appveyor.yml
									
										
									
									
									
								
							
							
						
						
									
										28
									
								
								appveyor.yml
									
										
									
									
									
								
							|  | @ -1,6 +1,3 @@ | ||||||
| # 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: | ||||||
|  | @ -23,25 +20,32 @@ environment: | ||||||
|   global: |   global: | ||||||
|     BITS: 32 |     BITS: 32 | ||||||
|   matrix: |   matrix: | ||||||
|     - CONFIGURATION: Debug |   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 | ||||||
|  |     CONFIGURATION: Debug | ||||||
|     COMPILER: MSVC |     COMPILER: MSVC | ||||||
|     PLATFORM: x86 |     PLATFORM: x86 | ||||||
|     - CONFIGURATION: Debug |   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 | ||||||
|  |     CONFIGURATION: Debug | ||||||
|     COMPILER: MSVC |     COMPILER: MSVC | ||||||
|     PLATFORM: x64 |     PLATFORM: x64 | ||||||
|     - CONFIGURATION: Release |   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 | ||||||
|  |     CONFIGURATION: Release | ||||||
|     COMPILER: MSVC |     COMPILER: MSVC | ||||||
|     PLATFORM: x86 |     PLATFORM: x86 | ||||||
|     - CONFIGURATION: Release |   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 | ||||||
|  |     CONFIGURATION: Release | ||||||
|     COMPILER: MSVC |     COMPILER: MSVC | ||||||
|     PLATFORM: x64 |     PLATFORM: x64 | ||||||
|     - CONFIGURATION: Release |   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 | ||||||
|  |     CONFIGURATION: Release | ||||||
|     COMPILER: MinGW |     COMPILER: MinGW | ||||||
|     PLATFORM: i686 |     PLATFORM: i686 | ||||||
|     - CONFIGURATION: Release |   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 | ||||||
|  |     CONFIGURATION: Release | ||||||
|     COMPILER: MinGW |     COMPILER: MinGW | ||||||
|     PLATFORM: x86_64 |     PLATFORM: x86_64 | ||||||
|     - CONFIGURATION: Release |   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 | ||||||
|  |     CONFIGURATION: Release | ||||||
|     COMPILER: Coverity |     COMPILER: Coverity | ||||||
|     PLATFORM: x86 |     PLATFORM: x86 | ||||||
| 
 | 
 | ||||||
|  | @ -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 { | ||||||
|  |  | ||||||
							
								
								
									
										10
									
								
								src/rufus.rc
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								src/rufus.rc
									
										
									
									
									
								
							|  | @ -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" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue