Skip to content

Clean: use 'msvc' requirement to detect MSVC paths #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BraveChicken1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Clean: use 'msvc' requirement to detect MSVC paths #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/bzip2/1.0.8/targets.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ size = 810029
[targets.unix]

[targets.windows]
build_requirements = ["msvc"]
32 changes: 2 additions & 30 deletions packages/bzip2/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,7 @@
cd bzip2-%PACKIT_PACKAGE_VERSION%

REM Read Visual Studio install path
for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
set VSPATH=%%i
)

if not exist "%VSPATH%" (
echo Visual Studio cannot be loaded from %VSPATH%
exit /b 1
)

REM Check if vcvarsall.bat exists
set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
if not exist "%VCVARSALL%" (
echo vcvarsall.bat cannot be loaded from %VCVARSALL%
exit /b 1
)
echo Found vcvarsall.bat at %VCVARSALL%

REM Retrieve architecture from target
if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
set ARCH=x64
) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
set ARCH=arm64
) else (
echo Target %PACKIT_TARGET% is not supported for this package
exit /b 1
)

REM Call vcvarsall.bat to set MSVC build environment
call "%VCVARSALL%" %ARCH%
REM Call vcvarsall.bat to initialize MSVC build environment
call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%

nmake -f makefile.msc
if ERRORLEVEL 1 (
Expand Down
1 change: 1 addition & 0 deletions packages/cmake/4.3.3/targets.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ source = "unix"

[targets.windows]
source = "windows"
build_requirements = ["msvc"]
32 changes: 2 additions & 30 deletions packages/cmake/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,7 @@
cd cmake-%PACKIT_PACKAGE_VERSION%

REM Read Visual Studio install path
for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
set VSPATH=%%i
)

if not exist "%VSPATH%" (
echo Visual Studio cannot be loaded from %VSPATH%
exit /b 1
)

REM Check if vcvarsall.bat exists
set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
if not exist "%VCVARSALL%" (
echo vcvarsall.bat cannot be loaded from %VCVARSALL%
exit /b 1
)
echo Found vcvarsall.bat at %VCVARSALL%

REM Retrieve architecture from target
if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
set ARCH=x64
) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
set ARCH=arm64
) else (
echo Target %PACKIT_TARGET% is not supported for this package
exit /b 1
)

REM Call vcvarsall.bat to set MSVC build environment
call "%VCVARSALL%" %ARCH%
REM Call vcvarsall.bat to initialize MSVC build environment
call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%

REM Bootstrap cmake
powershell -File .\bootstrap.ps1 -prefix "%PACKIT_PACKAGE_PATH%" -no-system-libs -no-debugger
Expand Down
1 change: 1 addition & 0 deletions packages/expat/2.8.2/targets.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ size = 818391

[targets.windows]
build_dependencies = ["cmake"]
test_requirements = ["msvc"]
31 changes: 2 additions & 29 deletions packages/expat/test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,5 @@
REM Read Visual Studio install path
for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
set VSPATH=%%i
)
if not exist "%VSPATH%" (
echo Visual Studio cannot be loaded from %VSPATH%
exit /b 1
)

REM Check if vcvarsall.bat exists
set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
if not exist "%VCVARSALL%" (
echo vcvarsall.bat cannot be loaded from %VCVARSALL%
exit /b 1
)
echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3

REM Retrieve architecture from target
if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
set ARCH=x64
) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
set ARCH=arm64
) else (
echo Target %PACKIT_TARGET% is not supported for this package
exit /b 1
)

REM Call vcvarsall.bat to set MSVC build environment
call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
REM Call vcvarsall.bat to initialize MSVC build environment
call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3

cl /I "%PACKIT_PACKAGE_PATH%\include" test.c /Fe:test.exe /link /LIBPATH:"%PACKIT_PACKAGE_PATH%\lib" libexpat.lib %PACKIT_OUTPUTS% >&3 2>&3
if ERRORLEVEL 1 exit /b %ERRORLEVEL%
Expand Down
1 change: 1 addition & 0 deletions packages/libgit2/1.9.6/targets.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ dependencies = ["openssl", "zlib-ng-compat", "pcre2"]

[targets.windows]
dependencies = ["zlib-ng-compat"]
test_requirements = ["msvc"]
31 changes: 2 additions & 29 deletions packages/libgit2/test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,5 @@
REM Read Visual Studio install path
for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
set VSPATH=%%i
)
if not exist "%VSPATH%" (
echo Visual Studio cannot be loaded from %VSPATH%
exit /b 1
)

REM Check if vcvarsall.bat exists
set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
if not exist "%VCVARSALL%" (
echo vcvarsall.bat cannot be loaded from %VCVARSALL%
exit /b 1
)
echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3

REM Retrieve architecture from target
if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
set ARCH=x64
) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
set ARCH=arm64
) else (
echo Target %PACKIT_TARGET% is not supported for this package
exit /b 1
)

REM Call vcvarsall.bat to set MSVC build environment
call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
REM Call vcvarsall.bat to initialize MSVC build environment
call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3

cl /I "%PACKIT_PACKAGE_PATH%\include" test.c /Fe:test.exe /link /LIBPATH:"%PACKIT_PACKAGE_PATH%\lib" git2.lib %PACKIT_OUTPUTS% >&3 2>&3
if ERRORLEVEL 1 exit /b %ERRORLEVEL%
Expand Down
2 changes: 2 additions & 0 deletions packages/libpng/1.6.57/targets.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ dependencies = ["zlib-ng-compat"]

[targets.windows]
dependencies = ["zlib-ng-compat"]
build_requirements = ["msvc"]
test_requirements = ["msvc"]
31 changes: 2 additions & 29 deletions packages/libpng/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,7 @@
cd libpng-%PACKIT_PACKAGE_VERSION%

REM Read Visual Studio install path
for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
set VSPATH=%%i
)
if not exist "%VSPATH%" (
echo Visual Studio cannot be loaded from %VSPATH%
exit /b 1
)

REM Check if vcvarsall.bat exists
set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
if not exist "%VCVARSALL%" (
echo vcvarsall.bat cannot be loaded from %VCVARSALL%
exit /b 1
)
echo Found vcvarsall.bat at %VCVARSALL%

REM Retrieve architecture from target
if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
set ARCH=x64
) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
set ARCH=arm64
) else (
echo Target %PACKIT_TARGET% is not supported for this package
exit /b 1
)

REM Call vcvarsall.bat to set MSVC build environment
call "%VCVARSALL%" %ARCH%
REM Call vcvarsall.bat to initialize MSVC build environment
call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%

if "%PACKIT_TARGET%" == "x86_64-pc-windows-msvc" (
nmake -f scripts\makefile.vcwin32 CFLAGS="/I\"%PACKIT_PACKAGE_DEPENDENCIES_PATH%\zlib-ng-compat\include\""
Expand Down
31 changes: 2 additions & 29 deletions packages/libpng/test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,5 @@
REM Read Visual Studio install path
for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
set VSPATH=%%i
)
if not exist "%VSPATH%" (
echo Visual Studio cannot be loaded from %VSPATH%
exit /b 1
)

REM Check if vcvarsall.bat exists
set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
if not exist "%VCVARSALL%" (
echo vcvarsall.bat cannot be loaded from %VCVARSALL%
exit /b 1
)
echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3

REM Retrieve architecture from target
if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
set ARCH=x64
) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
set ARCH=arm64
) else (
echo Target %PACKIT_TARGET% is not supported for this package
exit /b 1
)

REM Call vcvarsall.bat to set MSVC build environment
call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
REM Call vcvarsall.bat to initialize MSVC build environment
call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3

cl /I "%PACKIT_PACKAGE_PATH%\include" test.c /Fe:test.exe /link /LIBPATH:"%PACKIT_PACKAGE_PATH%\lib" libpng.lib "%PACKIT_PACKAGE_DEPENDENCIES_PATH%\zlib-ng-compat\lib\zlib.lib" %PACKIT_OUTPUTS% >&3 2>&3
if ERRORLEVEL 1 exit /b %ERRORLEVEL%
Expand Down
1 change: 1 addition & 0 deletions packages/libssh2/1.11.1/targets.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ dependencies = ["zlib-ng-compat"]

[targets.windows]
build_dependencies = ["cmake@>=3.18"]
test_requirements = ["msvc"]
31 changes: 2 additions & 29 deletions packages/libssh2/test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,5 @@
REM Read Visual Studio install path
for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
set VSPATH=%%i
)
if not exist "%VSPATH%" (
echo Visual Studio cannot be loaded from %VSPATH%
exit /b 1
)

REM Check if vcvarsall.bat exists
set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
if not exist "%VCVARSALL%" (
echo vcvarsall.bat cannot be loaded from %VCVARSALL%
exit /b 1
)
echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3

REM Retrieve architecture from target
if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
set ARCH=x64
) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
set ARCH=arm64
) else (
echo Target %PACKIT_TARGET% is not supported for this package
exit /b 1
)

REM Call vcvarsall.bat to set MSVC build environment
call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
REM Call vcvarsall.bat to initialize MSVC build environment
call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3

cl /I "%PACKIT_PACKAGE_PATH%\include" test.c /Fe:test.exe /link /LIBPATH:"%PACKIT_PACKAGE_PATH%\lib" libssh2.lib %PACKIT_OUTPUTS% >&3 2>&3
if ERRORLEVEL 1 exit /b %ERRORLEVEL%
Expand Down
1 change: 1 addition & 0 deletions packages/llhttp/9.4.1/targets.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ size = 40396
[targets.unix]

[targets.windows]
test_requirements = ["msvc"]
31 changes: 2 additions & 29 deletions packages/llhttp/test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,5 @@
REM Read Visual Studio install path
for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
set VSPATH=%%i
)
if not exist "%VSPATH%" (
echo Visual Studio cannot be loaded from %VSPATH%
exit /b 1
)

REM Check if vcvarsall.bat exists
set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
if not exist "%VCVARSALL%" (
echo vcvarsall.bat cannot be loaded from %VCVARSALL%
exit /b 1
)
echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3

REM Retrieve architecture from target
if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
set ARCH=x64
) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
set ARCH=arm64
) else (
echo Target %PACKIT_TARGET% is not supported for this package
exit /b 1
)

REM Call vcvarsall.bat to set MSVC build environment
call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
REM Call vcvarsall.bat to initialize MSVC build environment
call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3

cl /I "%PACKIT_PACKAGE_PATH%\include" test.c /Fe:test.exe /link /LIBPATH:"%PACKIT_PACKAGE_PATH%\lib" llhttp.lib %PACKIT_OUTPUTS% >&3 2>&3
if ERRORLEVEL 1 exit /b %ERRORLEVEL%
Expand Down
1 change: 1 addition & 0 deletions packages/make/4.4.1/targets.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ size = 2348200
build_script = "macos_build"

[targets.windows]
build_requirements = ["msvc"] # The build_w32.bat script expects to find MSVC
1 change: 1 addition & 0 deletions packages/make/4.4/targets.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ size = 2307891
build_script = "macos_build"

[targets.windows]
build_requirements = ["msvc"] # The build_w32.bat script expects to find MSVC
3 changes: 3 additions & 0 deletions packages/make/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
cd make-%PACKIT_PACKAGE_VERSION%

REM Call vcvarsall.bat to initialize MSVC build environment (the automatic detection does not always work reliably)
call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3

call build_w32.bat --without-guile
if ERRORLEVEL 1 exit /b %ERRORLEVEL%

Expand Down
2 changes: 2 additions & 0 deletions packages/mpdecimal/4.0.1/targets.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ size = 316268

[targets.windows]
build_dependencies = ["cmake"]
build_requirements = ["msvc"]
test_requirements = ["msvc"]
32 changes: 2 additions & 30 deletions packages/mpdecimal/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,7 @@
cd mpdecimal-%PACKIT_PACKAGE_VERSION%

REM Read Visual Studio install path
for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
set VSPATH=%%i
)

if not exist "%VSPATH%" (
echo Visual Studio cannot be loaded from %VSPATH%
exit /b 1
)

REM Check if vcvarsall.bat exists
set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
if not exist "%VCVARSALL%" (
echo vcvarsall.bat cannot be loaded from %VCVARSALL%
exit /b 1
)
echo Found vcvarsall.bat at %VCVARSALL%

REM Retrieve architecture from target
if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
set ARCH=x64
) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
set ARCH=arm64
) else (
echo Target %PACKIT_TARGET% is not supported for this package
exit /b 1
)

REM Call vcvarsall.bat to set MSVC build environment
call "%VCVARSALL%" %ARCH%
REM Call vcvarsall.bat to initialize MSVC build environment
call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%

set "MACHINE=x64"
if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
Expand Down
Loading