GH-19: Renamed msvc to msbuild

negrutiu · May 30, 2024 · 762948e · 762948e
1 parent 38ddf40
commit 762948e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -16,8 +16,8 @@
     <NsisCharacterSet Condition="'$(CharacterSet)'=='MultiByte'">ansi</NsisCharacterSet>
     <NsisCharacterSet Condition="'$(CharacterSet)'!='MultiByte'">unicode</NsisCharacterSet>
 
-    <OutDir>$(SolutionDir)$(Configuration)-msvc-$(NsisPlatform)-$(NsisCharacterSet)\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)-msvc-$(NsisPlatform)-$(NsisCharacterSet)\IntDir\$(MSBuildProjectName)\</IntDir>
+    <OutDir>$(SolutionDir)$(Configuration)-msbuild-$(NsisPlatform)-$(NsisCharacterSet)\</OutDir>
+    <IntDir>$(SolutionDir)$(Configuration)-msbuild-$(NsisPlatform)-$(NsisCharacterSet)\IntDir\$(MSBuildProjectName)\</IntDir>
   </PropertyGroup>
 
   <ItemDefinitionGroup Condition="$(MSBuildProjectExtension) == '.vcxproj'">

diff --git a/_build.bat b/_build.bat
@@ -7,7 +7,7 @@ echo.
 cd /d "%~dp0"
 set original_path=%PATH%
 
-REM | build.bat [mingw|msvc] [debug|release] [win32|amd64|x86|x64] [unicode|ansi]
+REM | build.bat [mingw|msbuild] [debug|release] [win32|amd64|x86|x64] [unicode|ansi]
 
 set compiler=mingw
 set configuration=Release
@@ -17,7 +17,7 @@ set charset=unicode
 :arg
     if "%~1" equ "" goto :arg_end
     if /i "%~1" equ "mingw"     set compiler=mingw
-    if /i "%~1" equ "msvc"      set compiler=msvc
+    if /i "%~1" equ "msbuild"   set compiler=msbuild
     if /i "%~1" equ "debug"     set configuration=Debug
     if /i "%~1" equ "release"   set configuration=Release
     if /i "%~1" equ "win32"     set platform=x86
@@ -39,7 +39,7 @@ echo --- platform = %platform%
 echo --- charset = %charset%
 
 if "%compiler%" equ "mingw" goto :mingw
-if "%compiler%" equ "msvc" goto :msvc
+if "%compiler%" equ "msbuild" goto :msbuild
 
 :: -------------------------------------------------------------------------------
 
@@ -67,7 +67,7 @@ goto :end
 
 :: -------------------------------------------------------------------------------
 
-:msvc
+:msbuild
 set solution=%CD%\NScurl.sln
 set verbosity=normal
 

diff --git a/_build_msbuild.bat b/_build_msbuild.bat
@@ -0,0 +1,8 @@
+REM :: Marius Negrutiu (marius.negrutiu@protonmail.com)
+
+@echo off
+setlocal enabledelayedexpansion
+
+call "%~dp0_build.bat" msbuild release x86 unicode || exit /b !errorlevel!
+call "%~dp0_build.bat" msbuild release x86 ansi    || exit /b !errorlevel!
+call "%~dp0_build.bat" msbuild release x64 unicode || exit /b !errorlevel!
diff --git a/_build_msvc.bat b/_build_msvc.bat
diff --git a/_build_vcpkg.bat b/_build_vcpkg.bat
@@ -2,7 +2,7 @@ REM | marius.negrutiu@protonmail.com
 @echo off
 setlocal EnableDelayedExpansion
 
-REM | script.bat <Win32|x64|arm64> <msvc|mingw> <static|dynamic>
+REM | script.bat <Win32|x64|arm64> <msbuild|mingw> <static|dynamic>
 set arch=%~1
 set compiler=%~2
 set runtime=%~3
@@ -15,16 +15,16 @@ echo _x86_x64_arm64_ | findstr /I "_%arch%_" > nul
 if %errorlevel% neq 0 echo ERROR: Unexpected architecture. Use Win32^|x64^|arm64&& exit /b -57
 
 if "%compiler%" equ "" set compiler=mingw
-echo _msvc_mingw_ | findstr /I "_%compiler%_" > nul
-if %errorlevel% neq 0 echo ERROR: Unexpected compiler. Use msvc^|mingw&& exit /b -57
+echo _msbuild_mingw_ | findstr /I "_%compiler%_" > nul
+if %errorlevel% neq 0 echo ERROR: Unexpected compiler. Use msbuild^|mingw&& exit /b -57
 
 if "%runtime%" equ "" set runtime=static
 echo _static_dynamic_ | findstr /I "_%runtime%_" > nul
 if %errorlevel% neq 0 echo ERROR: Unexpected linkage type. Use static^|dynamic&& exit /b -57
 
 if /i "%compiler%" equ "mingw" set vcpkg_triplet=%arch%-mingw-%runtime%
-if /i "%compiler%" equ "msvc" if /i "%runtime%" equ "static"  set vcpkg_triplet=%arch%-windows-%runtime%
-if /i "%compiler%" equ "msvc" if /i "%runtime%" equ "dynamic" set vcpkg_triplet=%arch%-windows
+if /i "%compiler%" equ "msbuild" if /i "%runtime%" equ "static"  set vcpkg_triplet=%arch%-windows-%runtime%
+if /i "%compiler%" equ "msbuild" if /i "%runtime%" equ "dynamic" set vcpkg_triplet=%arch%-windows
 
 set vcpkg_dir=%~dp0vcpkg\%vcpkg_triplet%
 

diff --git a/src/nscurl/NScurl.vcxproj b/src/nscurl/NScurl.vcxproj
@@ -88,7 +88,7 @@
       <AdditionalDependencies>version.lib;libcurl-d.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlibd.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_build_vcpkg.bat" $(Platform) msvc static
+      <Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_build_vcpkg.bat" $(Platform) msbuild static
 </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -105,7 +105,7 @@
       <AdditionalDependencies>version.lib;libcurl-d.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlibd.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_build_vcpkg.bat" $(Platform) msvc static
+      <Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_build_vcpkg.bat" $(Platform) msbuild static
 </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -125,7 +125,7 @@
       <AdditionalDependencies>version.lib;libcurl.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlib.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_build_vcpkg.bat" $(Platform) msvc static
+      <Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_build_vcpkg.bat" $(Platform) msbuild static
 </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -144,7 +144,7 @@
       <AdditionalDependencies>version.lib;libcurl.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlib.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_build_vcpkg.bat" $(Platform) msvc static
+      <Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_build_vcpkg.bat" $(Platform) msbuild static
 </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>