From 5ed09da80c47dd611254dca12edd0bf1e8a6c203 Mon Sep 17 00:00:00 2001 From: dos Date: Mon, 13 Jul 2020 13:34:02 -0300 Subject: [PATCH] Copy wxwidgets.props to root of *Dev.7z packages; use full source path with fciv command. --- build/tools/msvs/package.bat | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build/tools/msvs/package.bat b/build/tools/msvs/package.bat index 3024911e21..c44067eb94 100755 --- a/build/tools/msvs/package.bat +++ b/build/tools/msvs/package.bat @@ -79,22 +79,20 @@ rem included from it. 7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z build\msw\wx_setup.props 7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z build\msw\wx_setup.props -rem Create a modified copy of wxwidgets.props suitable for use with our -rem binaries: we need to enable automatic ABI-compatible MSVC version detection -rem for this, so we define it in the same place where WXUSINGDLL is defined (as -rem we only provide DLLs, this is sufficient). -powershell -noprofile -command "& { (Get-Content wxwidgets.props).Replace('WXUSINGDLL','WXUSINGDLL;wxMSVC_VERSION_ABI_COMPAT') | Set-Content %packagePath%\%VCver%\wxwidgets.props }" +copy wxwidgets.props %packagePath%\%VCver%\wxwidgets.props rem Change to the directory containing wxwidgets.props in order to include it rem into the archive without any path. cd %packagePath%\%VCver% + 7z a -t7z wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z wxwidgets.props 7z a -t7z wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z wxwidgets.props del wxwidgets.props del sha1.txt -fciv . -type *.7z -sha1 -wp >> sha1.txt +rem fciv requies a complete path to files +fciv %cd%\. -type *.7z -sha1 -wp >> sha1.txt goto End