From c2f2cc456d4b6d55dc33f626a67a4f35ef9771ec Mon Sep 17 00:00:00 2001 From: Frederik Seiffert Date: Fri, 20 Jan 2023 10:49:00 +0100 Subject: [PATCH] libcurl: check out release tag and install PDB --- phases/19-libcurl.bat | 7 ++++--- scripts/common.bat | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/phases/19-libcurl.bat b/phases/19-libcurl.bat index 64fd2a4..368dd1d 100644 --- a/phases/19-libcurl.bat +++ b/phases/19-libcurl.bat @@ -5,10 +5,8 @@ set PROJECT=libcurl set GITHUB_REPO=curl/curl :: get the latest release tag from GitHub -:: -:: note: The curl project tags a release different. cd %~dp0 -for /f "usebackq delims=" %%i in (`call %BASH% '../scripts/get-latest-github-release-tag.sh %GITHUB_REPO% curl'`) do ( +for /f "usebackq delims=" %%i in (`call %BASH% '../scripts/get-latest-github-release-tag.sh %GITHUB_REPO% curl-'`) do ( set TAG=%%i ) @@ -41,5 +39,8 @@ echo. echo ### Installing ninja install || exit /b 1 +:: install PDB file +xcopy /Y /F lib\libcurl*.pdb "%INSTALL_PREFIX%\bin\" || exit /b 1 + :: rename libcurl-d_imp.lib to curl.lib to allow linking using -lcurl move /y "%INSTALL_PREFIX%\lib\libcurl*.lib" "%INSTALL_PREFIX%\lib\curl.lib" || exit /b 1 diff --git a/scripts/common.bat b/scripts/common.bat index d5102d4..2166dd8 100644 --- a/scripts/common.bat +++ b/scripts/common.bat @@ -49,7 +49,7 @@ exit /b %errorlevel% echo. :: check out tag/branch if any if not "%TAG%" == "" ( - echo ### Checking out %TAG% + echo ### Checking out "%TAG%" git fetch --tags || exit /b 1 git checkout -q %TAG% || exit /b 1 )