Skip to content

Commit 7deb374

Browse files
committed
Deps: Hopefully work around path length limits
1 parent 33a3427 commit 7deb374

File tree

6 files changed

+25
-11
lines changed

6 files changed

+25
-11
lines changed

.github/workflows/linux-appimage-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
linux-appimage-build:
99
name: "${{ matrix.name }}"
1010
runs-on: ubuntu-22.04
11-
timeout-minutes: 120
11+
timeout-minutes: 240
1212
strategy:
1313
matrix:
1414
include:

.github/workflows/linux-cross-appimage-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
container:
1717
image: ghcr.io/duckstation/cross-build-${{ matrix.arch }}:latest
1818

19-
timeout-minutes: 120
19+
timeout-minutes: 240
2020
steps:
2121
- uses: actions/checkout@v5
2222
with:

.github/workflows/macos-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
macos-build:
99
name: "Universal"
1010
runs-on: macos-15
11-
timeout-minutes: 120
11+
timeout-minutes: 240
1212
steps:
1313
- uses: actions/checkout@v5
1414
with:

.github/workflows/windows-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
windows-build:
99
name: "${{ matrix.name }}"
1010
runs-on: windows-2022
11-
timeout-minutes: 120
11+
timeout-minutes: 240
1212
strategy:
1313
matrix:
1414
include:

scripts/deps/build-dependencies-windows-arm64.bat

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,16 +244,23 @@ ninja install || goto error
244244
cd ..\.. || goto error
245245
rmdir /S /Q "qtshadertools-everywhere-src-%QT%"
246246

247+
rem This mess with the junction is to work around path length limits in cmake/MSVC.
247248
echo Building Qt Declarative...
248249
rmdir /S /Q "qtdeclarative-everywhere-src-%QT%"
249250
%SEVENZIP% x "qtdeclarative-everywhere-src-%QT%.zip" || goto error
250251
cd "qtdeclarative-everywhere-src-%QT%" || goto error
252+
set QTDECLARATIVEDIR=%CD%
251253
mkdir build || goto error
252-
cd build || goto error
253-
call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error
254+
pushd ..\..\..\.. || goto error
255+
mklink /J b "%QTDECLARATIVEDIR%\build" || goto error
256+
cd b || goto error
257+
call "%INSTALLDIR%\bin\qt-configure-module.bat" %QTDECLARATIVEDIR% -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error
254258
cmake --build . --parallel || goto error
255259
ninja install || goto error
256-
cd ..\.. || goto error
260+
cd .. || goto error
261+
rmdir b || goto error
262+
popd || goto error
263+
cd .. || goto error
257264
rmdir /S /Q "qtdeclarative-everywhere-src-%QT%"
258265

259266
echo Building Qt Tools...

scripts/deps/build-dependencies-windows-x64.bat

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST
161161
cmake --build build --parallel || goto error
162162
ninja -C build install || goto error
163163
cd .. || goto error
164-
tar -xf "freetype-%FREETYPE%.tar.gz" || goto error
164+
rmdir /S /Q "freetype-%FREETYPE%"
165165

166166
echo Building HarfBuzz...
167167
rmdir /S /Q "harfbuzz-%HARFBUZZ%"
@@ -244,16 +244,23 @@ ninja install || goto error
244244
cd ..\.. || goto error
245245
rmdir /S /Q "qtshadertools-everywhere-src-%QT%"
246246

247+
rem This mess with the junction is to work around path length limits in cmake/MSVC.
247248
echo Building Qt Declarative...
248249
rmdir /S /Q "qtdeclarative-everywhere-src-%QT%"
249250
%SEVENZIP% x "qtdeclarative-everywhere-src-%QT%.zip" || goto error
250251
cd "qtdeclarative-everywhere-src-%QT%" || goto error
252+
set QTDECLARATIVEDIR=%CD%
251253
mkdir build || goto error
252-
cd build || goto error
253-
call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error
254+
pushd ..\..\..\.. || goto error
255+
mklink /J b "%QTDECLARATIVEDIR%\build" || goto error
256+
cd b || goto error
257+
call "%INSTALLDIR%\bin\qt-configure-module.bat" %QTDECLARATIVEDIR% -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error
254258
cmake --build . --parallel || goto error
255259
ninja install || goto error
256-
cd ..\.. || goto error
260+
cd .. || goto error
261+
rmdir b || goto error
262+
popd || goto error
263+
cd .. || goto error
257264
rmdir /S /Q "qtdeclarative-everywhere-src-%QT%"
258265

259266
echo Building Qt Tools...

0 commit comments

Comments
 (0)