From 97fdab874b16ff668f84ff4928dfba8d60a3e4c8 Mon Sep 17 00:00:00 2001 From: zeffy Date: Sat, 17 Jun 2017 00:25:03 -0700 Subject: [PATCH] cont. apply appveyor build version to artifacts --- appveyor.yml | 14 +- wufuc/version.rc | Bin 2152 -> 2276 bytes wufuc/wufuc.vcxproj | 400 ++++++++++++++++++++++---------------------- 3 files changed, 204 insertions(+), 210 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 97b15c7..dc57dfa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,13 +8,9 @@ platform: - x86 - x64 environment: - _VERSION: '%APPVEYOR_BUILD_VERSION%-%APPVEYOR_REPO_COMMIT:~0,8%' - _VERSION2: '%APPVEYOR_BUILD_VERSION:.=,%' - _ZIPFILE: '%APPVEYOR_BUILD_FOLDER%\%APPVEYOR_PROJECT_NAME%_v%_VERSION%_%PLATFORM%.zip' -build_script: -- cmd: >- - msbuild "%APPVEYOR_BUILD_FOLDER%\%APPVEYOR_PROJECT_NAME%.sln" /verbosity:minimal /logger:"%PROGRAMFILES%\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:_VERSION="%_VERSION%" /p:_VERSION2="%_VERSION2%" - + BUILD_VERSION: '%APPVEYOR_BUILD_VERSION%-%APPVEYOR_REPO_COMMIT:~0,8%' + BUILD_VERSION_COMMA_SEP: '%APPVEYOR_BUILD_VERSION:.=,%' + BUILD_ZIPFILE: '%APPVEYOR_BUILD_FOLDER%\%APPVEYOR_PROJECT_NAME%_v%BUILD_VERSION%_%PLATFORM%.zip' after_build: - cmd: >- @@ -24,9 +20,9 @@ after_build: for /R %%G in (*.bat) do unix2dos "%%G" - 7z a "%_ZIPFILE%" "..\install" + 7z a "%BUILD_ZIPFILE%" "..\install" - 7z rn "%_ZIPFILE%" "install" "%APPVEYOR_PROJECT_NAME%" + 7z rn "%BUILD_ZIPFILE%" "install" "%APPVEYOR_PROJECT_NAME%" artifacts: - path: '*.zip' diff --git a/wufuc/version.rc b/wufuc/version.rc index 01379dd9c61bccaf2aa943d164352f8c8184d6e9..b22d1d9046881d54ff77f787b2227120f62be2ae 100644 GIT binary patch delta 543 zcmaDM@I+Ac|377hOolWD1qMZi6oynFE0ZA)NT)DpFgP)UGI%ohFt|*Vl$ORLJ(-bF z*wLB6pTQRh9U0;of*D*H0vI$Icp11Dlu?XTKo|;C7Y0-p1XS$_)ay6-BD1)*0fQcc z84w!+u>pSlAX^17Y@M9Qs9KM1XD~wu&>l|)KL&Ro83nY}20cd>tkAp6g%hv$)Gt|kX3v03f4`G PWM~wfyo_B4hz|h(A0Jy? delta 378 zcmaDN_(CA`|377hOolWD1%?!cR3M$nkO!nw7&I8-8NwJ`8G;ys89W*M8T=SDfojx% zkg!UliS^k1IZ|$X)ZwB%IGFfY!o#{x6BBr5L1kofeWZTl_7_r zm?0IY4Ywsq3 - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {00F96695-CE41-4C2F-A344-6219DFB4F887} - Win32Proj - wufuc - 10.0.15063.0 - - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)bin\$(Configuration)\$(PlatformShortName)\ - $(ProjectDir)$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformShortName)\ - $(ProjectName)$(PlatformArchitecture) - false - - - true - $(ProjectDir)bin\$(Configuration)\$(PlatformShortName)\ - $(ProjectDir)$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformShortName)\ - $(ProjectName)$(PlatformArchitecture) - false - - - false - $(ProjectDir)bin\$(Configuration)\$(PlatformShortName)\ - $(ProjectDir)$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformShortName)\ - $(ProjectName)$(PlatformArchitecture) - false - - - false - $(ProjectDir)bin\$(Configuration)\$(PlatformShortName)\ - $(ProjectDir)$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformShortName)\ - $(ProjectName)$(PlatformArchitecture) - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;WUFUC_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - exports.def - Shlwapi.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - _DEBUG;_WINDOWS;_USRDLL;WUFUC_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - exports.def - Shlwapi.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;WUFUC_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - exports.def - false - Shlwapi.lib;%(AdditionalDependencies) - - - copy /Y "$(TargetPath)" "$(SolutionDir)install\$(TargetFileName)" - - - - - Level3 - - - MaxSpeed - true - true - NDEBUG;_WINDOWS;_USRDLL;WUFUC_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - exports.def - false - Shlwapi.lib;%(AdditionalDependencies) - - - copy /Y "$(TargetPath)" "$(SolutionDir)install\$(TargetFileName)" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {00F96695-CE41-4C2F-A344-6219DFB4F887} + Win32Proj + wufuc + 10.0.15063.0 + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)bin\$(Configuration)\$(PlatformShortName)\ + $(ProjectDir)$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformShortName)\ + $(ProjectName)$(PlatformArchitecture) + false + + + true + $(ProjectDir)bin\$(Configuration)\$(PlatformShortName)\ + $(ProjectDir)$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformShortName)\ + $(ProjectName)$(PlatformArchitecture) + false + + + false + $(ProjectDir)bin\$(Configuration)\$(PlatformShortName)\ + $(ProjectDir)$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformShortName)\ + $(ProjectName)$(PlatformArchitecture) + false + + + false + $(ProjectDir)bin\$(Configuration)\$(PlatformShortName)\ + $(ProjectDir)$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformShortName)\ + $(ProjectName)$(PlatformArchitecture) + false + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;WUFUC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + exports.def + Shlwapi.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + _DEBUG;_WINDOWS;_USRDLL;WUFUC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + exports.def + Shlwapi.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;WUFUC_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + BUILD_VERSION=$(BUILD_VERSION);BUILD_VERSION_COMMA_SEP=$(BUILD_VERSION_COMMA_SEP);$(PreprocessorDefinitions) + + + Windows + true + true + exports.def + false + Shlwapi.lib;%(AdditionalDependencies) + + + copy /Y "$(TargetPath)" "$(SolutionDir)install\$(TargetFileName)" + + + + + Level3 + MaxSpeed + true + true + NDEBUG;_WINDOWS;_USRDLL;WUFUC_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + BUILD_VERSION=$(BUILD_VERSION);BUILD_VERSION_COMMA_SEP=$(BUILD_VERSION_COMMA_SEP);$(PreprocessorDefinitions) + + + Windows + true + true + exports.def + false + Shlwapi.lib;%(AdditionalDependencies) + + + copy /Y "$(TargetPath)" "$(SolutionDir)install\$(TargetFileName)" + + + + + + + + + + + + + + + + + + + + + + + + + + + + +