git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-28 02:23:48 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

vcbuild: install ARM64 dependencies when building ARM64 binaries

Browse Source 
Co-authored-by: Dennis Ameling <dennis@dennisameling.com>
Signed-off-by: Ian Bearman <ianb@microsoft.com>
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Ian Bearman
2020-01-31 16:00:25 -08:00
committed by Johannes Schindelin
parent b07c00c636
commit d609b857ec
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compat/vcbuild/README
View File

@@ -6,7 +6,11 @@ The Steps to Build Git with VS2015 or VS2017 from the command line.
Prompt or from an SDK bash window: Prompt or from an SDK bash window:
$ cd <repo_root> $ cd <repo_root>
$ ./compat/vcbuild/vcpkg_install.bat $ ./compat/vcbuild/vcpkg_install.bat x64-windows
or
$ ./compat/vcbuild/vcpkg_install.bat arm64-windows
The vcpkg tools and all of the third-party sources will be installed The vcpkg tools and all of the third-party sources will be installed
in this folder: in this folder:

7
compat/vcbuild/vcpkg_copy_dlls.bat
View File

@@ -15,7 +15,12 @@ REM ================================================================
@FOR /F "delims=" %%D IN ("%~dp0") DO @SET cwd=%%~fD @FOR /F "delims=" %%D IN ("%~dp0") DO @SET cwd=%%~fD
cd %cwd% cd %cwd%
SET arch=x64-windows SET arch=%2
IF NOT DEFINED arch (
echo defaulting to 'x64-windows`. Invoke %0 with 'x86-windows', 'x64-windows', or 'arm64-windows'
set arch=x64-windows
)
SET inst=%cwd%vcpkg\installed\%arch% SET inst=%cwd%vcpkg\installed\%arch%
IF [%1]==[release] ( IF [%1]==[release] (

9
compat/vcbuild/vcpkg_install.bat
View File

@@ -31,6 +31,12 @@ REM ================================================================
SETLOCAL EnableDelayedExpansion SETLOCAL EnableDelayedExpansion
SET arch=%1
IF NOT DEFINED arch (
echo defaulting to 'x64-windows`. Invoke %0 with 'x86-windows', 'x64-windows', or 'arm64-windows'
set arch=x64-windows
)
@FOR /F "delims=" %%D IN ("%~dp0") DO @SET cwd=%%~fD @FOR /F "delims=" %%D IN ("%~dp0") DO @SET cwd=%%~fD
cd %cwd% cd %cwd%
@@ -55,9 +61,8 @@ REM ================================================================
echo Successfully installed %cwd%vcpkg\vcpkg.exe echo Successfully installed %cwd%vcpkg\vcpkg.exe
:install_libraries :install_libraries
SET arch=x64-windows
echo Installing third-party libraries... echo Installing third-party libraries(%arch%)...
FOR %%i IN (zlib expat libiconv openssl libssh2 curl) DO ( FOR %%i IN (zlib expat libiconv openssl libssh2 curl) DO (
cd %cwd%vcpkg cd %cwd%vcpkg
IF NOT EXIST "packages\%%i_%arch%" CALL :sub__install_one %%i IF NOT EXIST "packages\%%i_%arch%" CALL :sub__install_one %%i

2
contrib/buildsystems/Generators/Vcxproj.pm
View File

@@ -193,7 +193,7 @@ EOM
<PreBuildEvent Condition="!Exists('$cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch)\\include\\openssl\\ssl.h')"> <PreBuildEvent Condition="!Exists('$cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch)\\include\\openssl\\ssl.h')">
<Message>Initialize VCPKG</Message> <Message>Initialize VCPKG</Message>
<Command>del "$cdup\\compat\\vcbuild\\vcpkg"</Command> <Command>del "$cdup\\compat\\vcbuild\\vcpkg"</Command>
<Command>call "$cdup\\compat\\vcbuild\\vcpkg_install.bat"</Command> <Command>call "$cdup\\compat\\vcbuild\\vcpkg_install.bat" \$(VCPKGArch)</Command>
</PreBuildEvent> </PreBuildEvent>
EOM EOM
} }