1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00

[appveyor] fix AppVeyor script

* This should build for all of the VS2015 targets as well as MinGW32 + MinGW-w64
This commit is contained in:
Pete Batard 2016-08-05 23:58:23 +02:00
parent 1e9aa1e646
commit 6a4cc1acb5
4 changed files with 39 additions and 33 deletions

View file

@ -1,14 +0,0 @@
echo on
SetLocal EnableDelayedExpansion
if [%configuration%] == [Debug] exit 0
set bash=C:\msys64\usr\bin\bash
set arch=i686
if [%platform%] == [x86_64] set arch=x86_64
%bash% -e -l -c "mkdir %platform%"
%bash% -e -l -c ./bootstrap.sh
%bash% -e -l -c "cd %platform%"
%bash% -e -l -c "./configure --prefix=/mingw32 --build=%arch%-w64-mingw32 --host=%arch%-w64-mingw32"
%bash% -e -l -c "make -j4"

View file

@ -1,4 +0,0 @@
echo on
SetLocal EnableDelayedExpansion
msbuild rufus.sln /m /p:Configuration=%configuration%,Platform=%platform% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

View file

@ -1,16 +1,40 @@
version: 1.0.{build} version: appveyor_build{build}
configuration:
- Debug os: Visual Studio 2015
- Release
platform: environment:
- x86_32 global:
- x86_64 PLATFORMTOOLSET: v140
BITS: 32
matrix:
- CONFIGURATION: Debug
COMPILER: MSVC15
PLATFORM: x86_32
- CONFIGURATION: Debug
COMPILER: MSVC15
PLATFORM: x86_64
- CONFIGURATION: Release
COMPILER: MSVC15
PLATFORM: x86_32
- CONFIGURATION: Release
COMPILER: MSVC15
PLATFORM: x86_64
- CONFIGURATION: Release
COMPILER: MinGW
PLATFORM: i686
- CONFIGURATION: Release
COMPILER: MinGW
PLATFORM: x86_64
build: build:
project: rufus.sln project: rufus.sln
parallel: true parallel: true
verbosity: detailed verbosity: detailed
install: install:
- cmd: xcopy /S C:\projects\rufus C:\msys64\home\appveyor\ - if [%COMPILER%]==[MinGW] xcopy /SQ C:\projects\rufus C:\msys64\home\appveyor\
- if [%PLATFORM%]==[x86_64] set BITS=64
build_script: build_script:
- cmd: _appveyor_msvc.cmd - if [%COMPILER%]==[MSVC15] msbuild rufus.sln /m /p:Configuration=%CONFIGURATION%,Platform=%PLATFORM% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
- cmd: _appveyor_mingw.cmd - if [%COMPILER%]==[MinGW] C:\msys64\usr\bin\bash -lc "export PATH=/mingw%BITS%/bin:$PATH; ./configure --build=%PLATFORM%-w64-mingw32 --host=%PLATFORM%-w64-mingw32 --disable-debug; make -j4"

View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376 IDD_DIALOG DIALOGEX 12, 12, 242, 376
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 2.10.978" CAPTION "Rufus 2.10.979"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -320,8 +320,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,10,978,0 FILEVERSION 2,10,979,0
PRODUCTVERSION 2,10,978,0 PRODUCTVERSION 2,10,979,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -338,13 +338,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.10.978" VALUE "FileVersion", "2.10.979"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.10.978" VALUE "ProductVersion", "2.10.979"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"