From 865f2f4d9b23fb7cfdbd6249e6f83dfba45c28e8 Mon Sep 17 00:00:00 2001 From: Kenny Kerr Date: Thu, 17 Oct 2019 08:55:25 -0700 Subject: [PATCH 1/2] build --- build_tools.cmd | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 build_tools.cmd diff --git a/build_tools.cmd b/build_tools.cmd new file mode 100644 index 000000000..cf32b2a38 --- /dev/null +++ b/build_tools.cmd @@ -0,0 +1,14 @@ +set target_platform=%1 +set target_configuration=%2 +set target_version=%3 + +if "%target_platform%"=="" set target_platform=x64 +if "%target_configuration%"=="" set target_configuration=Release +if "%target_version%"=="" set target_version=1.2.3.4 + +msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:cppwinrt +build_projection %target_platform% %target_configuration% +msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test + +nuget restore natvis\cppwinrtvisualizer.sln +msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln From cfd2cfa1c25de27f90e9939381cb3a0e5b88a547 Mon Sep 17 00:00:00 2001 From: Kenny Kerr Date: Thu, 17 Oct 2019 09:00:12 -0700 Subject: [PATCH 2/2] build --- build_tools.cmd | 13 ++++++++----- nuget/build.cmd | 25 ------------------------- 2 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 nuget/build.cmd diff --git a/build_tools.cmd b/build_tools.cmd index cf32b2a38..7d3180b19 100644 --- a/build_tools.cmd +++ b/build_tools.cmd @@ -1,3 +1,5 @@ +@echo off + set target_platform=%1 set target_configuration=%2 set target_version=%3 @@ -6,9 +8,10 @@ if "%target_platform%"=="" set target_platform=x64 if "%target_configuration%"=="" set target_configuration=Release if "%target_version%"=="" set target_version=1.2.3.4 -msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:cppwinrt -build_projection %target_platform% %target_configuration% -msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test +call nuget restore cppwinrt.sln +call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:cppwinrt +call build_projection %target_platform% %target_configuration% +call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test -nuget restore natvis\cppwinrtvisualizer.sln -msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln +call nuget restore natvis\cppwinrtvisualizer.sln +call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln diff --git a/nuget/build.cmd b/nuget/build.cmd deleted file mode 100644 index 597f19856..000000000 --- a/nuget/build.cmd +++ /dev/null @@ -1,25 +0,0 @@ -@echo off - -setlocal -set my_dir=%~dp0 -set build_dir=%my_dir%..\build - -set configuration=%1 -if "%configuration%" == "" ( - set configuration=Release -) - -set package_version=%2 -if "%package_version%" == "" ( - set package_version=2.3.4.5 -) - -if not exist "%build_dir%\nuget.exe" ( - echo Downloading NuGet.exe... - curl.exe -L# -o %build_dir%\nuget.exe "https://dist.nuget.org/win-x86-commandline/v5.3.0/nuget.exe" -) - -rem Yes, this must be all on one line. -%build_dir%\nuget.exe pack Microsoft.Windows.CppWinRT.nuspec -Version %package_version% -Properties cppwinrt_exe=%build_dir%\x86\%configuration%\cppwinrt.exe;cppwinrt_fast_fwd_x86=%build_dir%\x86\%configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%build_dir%\x64\%configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=%build_dir%\ARM\%configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%build_dir%\ARM64\%configuration%\cppwinrt_fast_forwarder.lib - -endlocal