diff --git a/.github/workflows/qctools.yml b/.github/workflows/qctools.yml index f38528651..21572d93d 100644 --- a/.github/workflows/qctools.yml +++ b/.github/workflows/qctools.yml @@ -39,8 +39,10 @@ jobs: - name: Install qwt-qt5 run: | - wget https://raw.githubusercontent.com/Homebrew/homebrew-core/56cd02e96876d1fb5b9ae951d605585fe8d614de/Formula/qwt.rb - brew install --ignore-dependencies ./qwt.rb + curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/56cd02e96876d1fb5b9ae951d605585fe8d614de/Formula/qwt.rb -o /opt/homebrew/Library/Taps/homebrew/homebrew-core/Formula/q/qwt.rb + git -C /opt/homebrew/Library/Taps/homebrew/homebrew-core add Formula/q/qwt.rb + git -C /opt/homebrew/Library/Taps/homebrew/homebrew-core commit -m "Formula/q/qwt.rb 6.2.0 for Qt5" + HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install qwt - name: Set Qt5 environment path run: | @@ -493,7 +495,7 @@ jobs: shell: pwsh run: | Set-Location .. - $json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest) + $json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/243719342) $ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")') $ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).browser_download_url') Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip" @@ -501,26 +503,27 @@ jobs: Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg" - name: Download and configure qwt + shell: bash run: | git clone --branch qwt-6.3 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt - copy .github\workflows\qwtconfig.pri ..\qwt + cp .github/workflows/qwtconfig.pri ../qwt cd ../qwt qmake -r - name: Build qwt - shell: cmd + shell: bash run: | cd ../qwt mingw32-make -j4 - name: Configure QCTools - shell: cmd + shell: bash run: | cd Project/QtCreator qmake - name: Build QCTools - shell: cmd + shell: bash run: | cd Project/QtCreator mingw32-make @@ -575,7 +578,7 @@ jobs: shell: pwsh run: | Set-Location .. - $json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest) + $json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/243719342) $ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")') $ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).browser_download_url') Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip" @@ -583,26 +586,27 @@ jobs: Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg" - name: Download and configure qwt + shell: bash run: | git clone --branch qwt-6.3 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt - copy .github\workflows\qwtconfig.pri ..\qwt + cp .github/workflows/qwtconfig.pri ../qwt cd ../qwt qmake -r - name: Build qwt - shell: cmd + shell: bash run: | cd ../qwt mingw32-make -j4 - name: Configure QCTools - shell: cmd + shell: bash run: | cd Project/QtCreator qmake - name: Build QCTools - shell: cmd + shell: bash run: | cd Project/QtCreator mingw32-make @@ -658,7 +662,7 @@ jobs: shell: pwsh run: | Set-Location .. - $json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest) + $json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/243719342) $ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")') $ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).browser_download_url') Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip" @@ -745,7 +749,7 @@ jobs: shell: pwsh run: | Set-Location .. - $json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest) + $json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/243719342) $ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")') $ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).browser_download_url') Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip" diff --git a/Source/Install/QCTools.nsi b/Source/Install/QCTools.nsi index 102d8be41..1cdd62e74 100644 --- a/Source/Install/QCTools.nsi +++ b/Source/Install/QCTools.nsi @@ -106,16 +106,16 @@ Section "SectionPrincipale" SEC01 File "..\..\..\output\bin\swscale-*.dll" File "..\..\..\output\bin\freetype-*.dll" File "..\..\..\output\bin\harfbuzz.dll" - File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\concrt140.dll" - File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140.dll" - File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140_1.dll" - File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140_2.dll" - File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140_atomic_wait.dll" - File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140_codecvt_ids.dll" - File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\vccorlib140.dll" - File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\vcruntime140.dll" - File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\vcruntime140_1.dll" - File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\vcruntime140_threads.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\concrt140.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\msvcp140.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\msvcp140_1.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\msvcp140_2.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\msvcp140_atomic_wait.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\msvcp140_codecvt_ids.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\vccorlib140.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\vcruntime140.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\vcruntime140_1.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\vcruntime140_threads.dll" File "..\..\Project\QtCreator\build\qctools-gui\release\Qt6Core.dll" File "..\..\Project\QtCreator\build\qctools-gui\release\Qt6Gui.dll" File "..\..\Project\QtCreator\build\qctools-gui\release\Qt6Multimedia.dll"