From 57bce8fb7e5030ddcbf1d31440539a90bff43caa Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sat, 23 Nov 2024 11:03:15 +0900 Subject: [PATCH 01/10] update configure.bat --- configure.bat | 3 +- tools/test/releasetest/releasetest.bat | 49 +++++++++++--------------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/configure.bat b/configure.bat index cad06a6f0..977c966b8 100644 --- a/configure.bat +++ b/configure.bat @@ -130,7 +130,7 @@ echo set TreeFrog_DIR=%TFDIR%>> %TFENV% echo set QMAKESPEC=%QMAKESPEC%>> %TFENV% echo set QTENV="%QTENV%">> %TFENV% echo set VCVARSBAT="">> %TFENV% -echo set VSVER=2022 2019 2017>> %TFENV% +echo set VSVER=2022 2019>> %TFENV% echo set VSWHERE="%%ProgramFiles(x86)%%\Microsoft Visual Studio\Installer\vswhere.exe">> %TFENV% echo;>> %TFENV% echo if exist %%QTENV%% call %%QTENV%%>> %TFENV% @@ -157,7 +157,6 @@ echo set VSWHERE=>> %TFENV% echo set PATH=%%TFDIR^%%\bin;%%PATH%%>> %TFENV% echo echo Setup a TreeFrog/Qt environment.>> %TFENV% echo echo -- TFDIR set to %%TFDIR%%>> %TFENV% -echo cd /D %%HOMEDRIVE%%%%HOMEPATH%%>> %TFENV% set TFDIR=%TFDIR:\=/% del /f /q .qmake.stash src\.qmake.stash tools\.qmake.stash >nul 2>&1 diff --git a/tools/test/releasetest/releasetest.bat b/tools/test/releasetest/releasetest.bat index 38e011d2f..2b792ffa4 100644 --- a/tools/test/releasetest/releasetest.bat +++ b/tools/test/releasetest/releasetest.bat @@ -59,7 +59,7 @@ if /i "%Platform%" == "x64" ( ) cd /D %BASEDIR% -rd /Q /S %APPNAME% +rd /Q /S %APPNAME% >nul 2>nul tspawn new %APPNAME% if "%SQLITE%" == "" ( echo; @@ -73,40 +73,29 @@ cd %APPDIR% echo n | tspawn s blog tspawn w foo -:: Set ExecutionPolicy -@REM for %%I in (tadpoled.exe) do if exist %%~$path:I set TADPOLED=%%~$path:I -@REM for %%I in (tadpole.exe) do if exist %%~$path:I set TADPOLE=%%~$path:I -powershell -Command "Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope CurrentUser -Force" -@REM powershell -command "New-NetFirewallRule -DisplayName MyAppAccess1 -Direction Inbound -Action Allow -Profile Public,Private -Program '%TADPOLED%' -Protocol TCP -LocalPort %PORT% -RemoteAddress 127.0.0.1" >nul 2>&1 -@REM powershell -command "New-NetFirewallRule -DisplayName MyAppAccess2 -Direction Inbound -Action Allow -Profile Public,Private -Program '%TADPOLE%' -Protocol TCP -LocalPort %PORT% -RemoteAddress 127.0.0.1" >nul 2>&1 - :: Test in debug mode -if not "%CMAKE%" == "" ( - call :CMakeBuild Debug - if ERRORLEVEL 1 exit /B %ERRORLEVEL% - call :CheckWebApp treefrogd.exe - if ERRORLEVEL 1 exit /B %ERRORLEVEL% -) +call :CMakeBuild Debug +if ERRORLEVEL 1 exit /B %ERRORLEVEL% +call :CheckWebApp treefrogd.exe +if ERRORLEVEL 1 exit /B %ERRORLEVEL% call :QMakeBuild debug if ERRORLEVEL 1 exit /B %ERRORLEVEL% call :CheckWebApp treefrogd.exe if ERRORLEVEL 1 exit /B %ERRORLEVEL% -%MAKE% distclean >nul 2>nul +nmake distclean >nul 2>nul :: Test in release mode -if not "%CMAKE%" == "" ( - call :CMakeBuild Release - if ERRORLEVEL 1 exit /B %ERRORLEVEL% - call :CheckWebApp treefrog.exe - if ERRORLEVEL 1 exit /B %ERRORLEVEL% -) +call :CMakeBuild Release +if ERRORLEVEL 1 exit /B %ERRORLEVEL% +call :CheckWebApp treefrog.exe +if ERRORLEVEL 1 exit /B %ERRORLEVEL% call :QMakeBuild release if ERRORLEVEL 1 exit /B %ERRORLEVEL% call :CheckWebApp treefrog.exe if ERRORLEVEL 1 exit /B %ERRORLEVEL% -%MAKE% distclean >nul 2>nul +nmake distclean >nul 2>nul echo; echo Test OK @@ -145,7 +134,7 @@ exit /B 0 :QMakeBuild cd /D %APPDIR% del /Q /F lib\*.* -qmake -r CONFIG+=%1 +"%QMAKE%" -r CONFIG+=%1 %MAKE% if ERRORLEVEL 1 ( echo; @@ -167,16 +156,20 @@ if "%TREEFROG%" == "" ( exit /B 1 ) -"%1" -v -"%1" -l -"%1" --show-routes +echo "%TREEFROG%" -v +"%TREEFROG%" -v +echo "%TREEFROG%" -l +"%TREEFROG%" -l +echo "%TREEFROG%" --show-routes +"%TREEFROG%" --show-routes if ERRORLEVEL 1 ( echo App Error! exit /B 1 ) echo; -"%1" --settings +echo "%TREEFROG%" --settings +"%TREEFROG%" --settings if ERRORLEVEL 1 ( echo App Error! type log\treefrog.log @@ -218,7 +211,7 @@ exit /B 0 :: :CleanUp cd /D %BASEDIR% -rd /Q /S %APPNAME% +rd /Q /S %APPNAME% >nul 2>nul exit /B 0 :: which cmd From 5aef19657dd1b3c396c1b06e4bd598c5a30b564a Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sat, 23 Nov 2024 13:17:23 +0900 Subject: [PATCH 02/10] updated --- tools/test/releasetest/releasetest.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/test/releasetest/releasetest.bat b/tools/test/releasetest/releasetest.bat index 2b792ffa4..4df276c97 100644 --- a/tools/test/releasetest/releasetest.bat +++ b/tools/test/releasetest/releasetest.bat @@ -157,11 +157,11 @@ if "%TREEFROG%" == "" ( ) echo "%TREEFROG%" -v -"%TREEFROG%" -v +"%TREEFROG%" -v 2>&1 echo "%TREEFROG%" -l -"%TREEFROG%" -l +"%TREEFROG%" -l 2>&1 echo "%TREEFROG%" --show-routes -"%TREEFROG%" --show-routes +"%TREEFROG%" --show-routes 2>&1 if ERRORLEVEL 1 ( echo App Error! exit /B 1 @@ -169,7 +169,7 @@ if ERRORLEVEL 1 ( echo; echo "%TREEFROG%" --settings -"%TREEFROG%" --settings +"%TREEFROG%" --settings 2>&1 if ERRORLEVEL 1 ( echo App Error! type log\treefrog.log From e526a72c60a8a1767a6e494bbcd59237d81c53f7 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sat, 23 Nov 2024 14:05:46 +0900 Subject: [PATCH 03/10] updated --- .github/workflows/actions.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 7f14bf654..9f3a2f4ff 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -236,9 +236,9 @@ jobs: nmake nmake install - name: Test release - shell: cmd + shell: powershell + working-directory: tools\test\releasetest run: | - cd tools\test\releasetest .\releasetest.bat build-windows-qt67-msvc2019: @@ -287,9 +287,9 @@ jobs: nmake nmake install - name: Test release - shell: cmd + shell: powershell + working-directory: tools\test\releasetest run: | - cd tools\test\releasetest .\releasetest.bat build-windows-qt65-msvc2019: @@ -338,7 +338,7 @@ jobs: nmake nmake install - name: Test release - shell: cmd + shell: powershell + working-directory: tools\test\releasetest run: | - cd tools\test\releasetest .\releasetest.bat From 13d82d51325889a4a177e3b45f8d76b0236be63e Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sat, 23 Nov 2024 15:08:08 +0900 Subject: [PATCH 04/10] updated --- tools/test/releasetest/releasetest.bat | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/test/releasetest/releasetest.bat b/tools/test/releasetest/releasetest.bat index 4df276c97..428ae078e 100644 --- a/tools/test/releasetest/releasetest.bat +++ b/tools/test/releasetest/releasetest.bat @@ -73,17 +73,17 @@ cd %APPDIR% echo n | tspawn s blog tspawn w foo -:: Test in debug mode -call :CMakeBuild Debug -if ERRORLEVEL 1 exit /B %ERRORLEVEL% -call :CheckWebApp treefrogd.exe -if ERRORLEVEL 1 exit /B %ERRORLEVEL% - -call :QMakeBuild debug -if ERRORLEVEL 1 exit /B %ERRORLEVEL% -call :CheckWebApp treefrogd.exe -if ERRORLEVEL 1 exit /B %ERRORLEVEL% -nmake distclean >nul 2>nul +@REM :: Test in debug mode +@REM call :CMakeBuild Debug +@REM if ERRORLEVEL 1 exit /B %ERRORLEVEL% +@REM call :CheckWebApp treefrogd.exe +@REM if ERRORLEVEL 1 exit /B %ERRORLEVEL% + +@REM call :QMakeBuild debug +@REM if ERRORLEVEL 1 exit /B %ERRORLEVEL% +@REM call :CheckWebApp treefrogd.exe +@REM if ERRORLEVEL 1 exit /B %ERRORLEVEL% +@REM nmake distclean >nul 2>nul :: Test in release mode call :CMakeBuild Release From b140afc99a8be28ccb628fd86b96c28d63127286 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sat, 23 Nov 2024 16:54:00 +0900 Subject: [PATCH 05/10] Update --- .github/workflows/actions.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 9f3a2f4ff..b9900e62e 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -205,6 +205,7 @@ jobs: choco install visualstudio2022community -y choco install visualstudio2022-workload-nativedesktop -y choco install sqlite -y + choco install cmake -y - name: Build for debug mode shell: cmd run: | @@ -256,6 +257,7 @@ jobs: choco install visualstudio2019community -y choco install visualstudio2019-workload-nativedesktop -y choco install sqlite -y + choco install cmake -y - name: Build for debug mode shell: cmd run: | @@ -307,6 +309,7 @@ jobs: choco install visualstudio2019community -y choco install visualstudio2019-workload-nativedesktop -y choco install sqlite -y + choco install cmake -y - name: Build for debug mode shell: cmd run: | From 4515a7ecda6804a945eb60b207334da773cb8c70 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sat, 23 Nov 2024 17:58:28 +0900 Subject: [PATCH 06/10] updated --- .github/workflows/actions.yml | 9 +++------ configure.bat | 5 ++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index b9900e62e..179d31fa4 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -143,8 +143,8 @@ jobs: - uses: actions/checkout@main - name: Homebrew run: | - brew install qt6 jq - brew link qt + brew install qt6 pkg-config jq + brew link --overwrite qt - name: configure run: ./configure --prefix=/usr/local - name: build @@ -165,7 +165,7 @@ jobs: - name: Homebrew run: | brew install qt6 pkg-config jq mongo-c-driver gflags glog lz4 - brew link qt + brew link --overwrite qt - name: configure run: ./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-glog --enable-shared-lz4 - name: build @@ -237,7 +237,6 @@ jobs: nmake nmake install - name: Test release - shell: powershell working-directory: tools\test\releasetest run: | .\releasetest.bat @@ -289,7 +288,6 @@ jobs: nmake nmake install - name: Test release - shell: powershell working-directory: tools\test\releasetest run: | .\releasetest.bat @@ -341,7 +339,6 @@ jobs: nmake nmake install - name: Test release - shell: powershell working-directory: tools\test\releasetest run: | .\releasetest.bat diff --git a/configure.bat b/configure.bat index 977c966b8..845b55308 100644 --- a/configure.bat +++ b/configure.bat @@ -100,14 +100,17 @@ if /i "%Platform%" == "x64" ( :: Visual Studio 2017 set VCVARSOPT=amd64 set CMAKEOPT=-A x64 -T v141 + set MSVSVER=2017 ) else if "%VisualStudioVersion%" == "16.0" ( :: Visual Studio 2019 set VCVARSOPT=amd64 set CMAKEOPT=-A x64 -T v142 + set MSVSVER=2019 ) else ( :: Visual Studio 2022 set VCVARSOPT=amd64 set CMAKEOPT=-A x64 + set MSVSVER=2022 ) ) else ( set VCVARSOPT=x86 @@ -130,7 +133,7 @@ echo set TreeFrog_DIR=%TFDIR%>> %TFENV% echo set QMAKESPEC=%QMAKESPEC%>> %TFENV% echo set QTENV="%QTENV%">> %TFENV% echo set VCVARSBAT="">> %TFENV% -echo set VSVER=2022 2019>> %TFENV% +echo set VSVER=%MSVSVER%>> %TFENV% echo set VSWHERE="%%ProgramFiles(x86)%%\Microsoft Visual Studio\Installer\vswhere.exe">> %TFENV% echo;>> %TFENV% echo if exist %%QTENV%% call %%QTENV%%>> %TFENV% From 9bf5e42a5b5e7f41c8c418165fd90c46ac70c669 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sat, 23 Nov 2024 21:23:16 +0900 Subject: [PATCH 07/10] update --- .github/workflows/actions.yml | 10 ++-- configure.bat | 18 +++---- tools/test/releasetest/releasetest.bat | 68 +++++++++++++------------- 3 files changed, 49 insertions(+), 47 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 179d31fa4..b2921a45c 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -143,8 +143,9 @@ jobs: - uses: actions/checkout@main - name: Homebrew run: | - brew install qt6 pkg-config jq - brew link --overwrite qt + brew install qt6 pkgconf jq + brew link --overwrite pkgconf + brew link qt - name: configure run: ./configure --prefix=/usr/local - name: build @@ -164,8 +165,9 @@ jobs: - uses: actions/checkout@main - name: Homebrew run: | - brew install qt6 pkg-config jq mongo-c-driver gflags glog lz4 - brew link --overwrite qt + brew install qt6 pkgconf jq mongo-c-driver gflags glog lz4 + brew link --overwrite pkgconf + brew link qt - name: configure run: ./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-glog --enable-shared-lz4 - name: build diff --git a/configure.bat b/configure.bat index 845b55308..171d669c0 100644 --- a/configure.bat +++ b/configure.bat @@ -1,4 +1,4 @@ -@echo OFF +@echo ON @setlocal set VERSION=2.10.0 @@ -58,9 +58,9 @@ if "%DEBUG%" == "yes" ( :: :: Generates tfenv.bat :: -for %%I in (nmake.exe) do if exist %%~$path:I set MAKE=%%~$path:I +for %%I in (nmake.exe) do if exist %%~$path:I set NMAKE=%%~$path:I if "%MAKE%" == "" ( - for %%I in (jom.exe) do if exist %%~$path:I set MAKE=%%~$path:I + for %%I in (jom.exe) do if exist %%~$path:I set NMAKE=%%~$path:I ) for %%I in (qmake.exe) do if exist %%~$path:I set QMAKE=%%~$path:I for %%I in (cmake.exe) do if exist %%~$path:I set CMAKE=%%~$path:I @@ -81,7 +81,7 @@ if "%CMAKE%" == "" ( ) cmake --version -if "%MAKE%" == "" ( +if "%NMAKE%" == "" ( echo Make not found pause exit @@ -238,17 +238,17 @@ if ERRORLEVEL 1 ( :: Builds TreeFrog cd %BASEDIR%src -if exist Makefile ( "%MAKE%" -k distclean >nul 2>&1 ) +if exist Makefile ( nmake distclean >nul 2>&1 ) qmake %OPT% target.path='%TFDIR%/bin' header.path='%TFDIR%/include' %USE_GUI% cd %BASEDIR%tools -if exist Makefile ( "%MAKE%" -k distclean >nul 2>&1 ) +if exist Makefile ( nmake distclean >nul 2>&1 ) qmake -recursive %OPT% target.path='%TFDIR%/bin' header.path='%TFDIR%/include' datadir='%TFDIR%' -"%MAKE%" qmake +nmake qmake echo; -echo First, run "%MAKE% install" in src directory. -echo Next, run "%MAKE% install" in tools directory. +echo First, run "nmake install" in src directory. +echo Next, run "nmake install" in tools directory. :exit exit /b diff --git a/tools/test/releasetest/releasetest.bat b/tools/test/releasetest/releasetest.bat index 428ae078e..1539f6ad9 100644 --- a/tools/test/releasetest/releasetest.bat +++ b/tools/test/releasetest/releasetest.bat @@ -16,21 +16,21 @@ if not "%TFENV%" == "" ( call "..\..\..\tfenv.bat" ) -for %%I in (nmake.exe) do if exist %%~$path:I set MAKE=%%~$path:I -if "%MAKE%" == "" ( - for %%I in (jom.exe) do if exist %%~$path:I set MAKE=%%~$path:I - if not "%MAKE%" == "" ( - set MAKE=jom +for %%I in (nmake.exe) do if exist %%~$path:I set NMAKE=%%~$path:I +if "%NMAKE%" == "" ( + for %%I in (jom.exe) do if exist %%~$path:I set NMAKE=%%~$path:I + if not "%NMAKE%" == "" ( + set NMAKE=jom ) ) else ( - set MAKE=nmake VERBOSE=1 + set NMAKE=nmake VERBOSE=1 ) for %%I in (qmake.exe) do if exist %%~$path:I set QMAKE=%%~$path:I for %%I in (cmake.exe) do if exist %%~$path:I set CMAKE=%%~$path:I for %%I in (sqlite3.exe) do if exist %%~$path:I set SQLITE=%%~$path:I if "%SQLITE%" == "" for %%I in (sqlite3-bin.exe) do if exist %%~$path:I set SQLITE=%%~$path:I -if "%MAKE%" == "" ( +if "%NMAKE%" == "" ( echo; echo nmake.exe not found. call :CleanUp @@ -135,7 +135,7 @@ exit /B 0 cd /D %APPDIR% del /Q /F lib\*.* "%QMAKE%" -r CONFIG+=%1 -%MAKE% +%NMAKE% if ERRORLEVEL 1 ( echo; echo Build Error! @@ -177,32 +177,32 @@ if ERRORLEVEL 1 ( ) echo; -@REM echo Starting webapp.. -@REM set RES=1 -@REM "%1" -e dev -d -p %PORT% %APPDIR% -@REM if ERRORLEVEL 1 ( -@REM echo App Start Error! -@REM exit /B 1 -@REM ) - -@REM timeout 1 /nobreak >nul -@REM set URL=http://localhost:%PORT%/blog -@REM set CMD=curl -s "%URL%" -w "%%{http_code}" -o nul -@REM set RESCODE=0 -@REM for /f "usebackq delims=" %%a in (`%CMD%`) do set RESCODE=%%a -@REM "%1" -k stop %APPDIR% -@REM if ERRORLEVEL 1 ( -@REM "%1" -k abort %APPDIR% -@REM ) -@REM timeout 1 /nobreak >nul -@REM if not "%RESCODE%"=="200" ( -@REM echo HTTP request failed -@REM echo; -@REM echo App Test Error! -@REM call :CleanUp -@REM exit /B 1 -@REM ) -@REM echo HTTP request success "%URL%" +echo Starting webapp.. +set RES=1 +"%1" -e dev -d -p %PORT% %APPDIR% +if ERRORLEVEL 1 ( + echo App Start Error! + exit /B 1 +) + +timeout 1 /nobreak >nul +set URL=http://localhost:%PORT%/blog +set CMD=curl -s "%URL%" -w "%%{http_code}" -o nul +set RESCODE=0 +for /f "usebackq delims=" %%a in (`%CMD%`) do set RESCODE=%%a +"%1" -k stop %APPDIR% +if ERRORLEVEL 1 ( + "%1" -k abort %APPDIR% +) +timeout 1 /nobreak >nul +if not "%RESCODE%"=="200" ( + echo HTTP request failed + echo; + echo App Test Error! + call :CleanUp + exit /B 1 +) +echo HTTP request success "%URL%" exit /B 0 From f399abcff2dc96cf8d0def764015b4b74b1fa625 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sat, 23 Nov 2024 22:05:22 +0900 Subject: [PATCH 08/10] updated --- .github/workflows/actions.yml | 4 ---- configure.bat | 2 +- tools/test/releasetest/releasetest.bat | 22 +++++++++++----------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index b2921a45c..8347a985b 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -144,8 +144,6 @@ jobs: - name: Homebrew run: | brew install qt6 pkgconf jq - brew link --overwrite pkgconf - brew link qt - name: configure run: ./configure --prefix=/usr/local - name: build @@ -166,8 +164,6 @@ jobs: - name: Homebrew run: | brew install qt6 pkgconf jq mongo-c-driver gflags glog lz4 - brew link --overwrite pkgconf - brew link qt - name: configure run: ./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-glog --enable-shared-lz4 - name: build diff --git a/configure.bat b/configure.bat index 171d669c0..e19f296ba 100644 --- a/configure.bat +++ b/configure.bat @@ -1,4 +1,4 @@ -@echo ON +@echo off @setlocal set VERSION=2.10.0 diff --git a/tools/test/releasetest/releasetest.bat b/tools/test/releasetest/releasetest.bat index 1539f6ad9..e55f7d8e9 100644 --- a/tools/test/releasetest/releasetest.bat +++ b/tools/test/releasetest/releasetest.bat @@ -73,17 +73,17 @@ cd %APPDIR% echo n | tspawn s blog tspawn w foo -@REM :: Test in debug mode -@REM call :CMakeBuild Debug -@REM if ERRORLEVEL 1 exit /B %ERRORLEVEL% -@REM call :CheckWebApp treefrogd.exe -@REM if ERRORLEVEL 1 exit /B %ERRORLEVEL% - -@REM call :QMakeBuild debug -@REM if ERRORLEVEL 1 exit /B %ERRORLEVEL% -@REM call :CheckWebApp treefrogd.exe -@REM if ERRORLEVEL 1 exit /B %ERRORLEVEL% -@REM nmake distclean >nul 2>nul +:: Test in debug mode +call :CMakeBuild Debug +if ERRORLEVEL 1 exit /B %ERRORLEVEL% +call :CheckWebApp treefrogd.exe +if ERRORLEVEL 1 exit /B %ERRORLEVEL% + +call :QMakeBuild debug +if ERRORLEVEL 1 exit /B %ERRORLEVEL% +call :CheckWebApp treefrogd.exe +if ERRORLEVEL 1 exit /B %ERRORLEVEL% +nmake distclean >nul 2>nul :: Test in release mode call :CMakeBuild Release From 97975f3fe86dff190ae432be483a65174fcfd9f2 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sat, 23 Nov 2024 22:18:52 +0900 Subject: [PATCH 09/10] update --- .github/workflows/actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 8347a985b..ccdab6c98 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -143,7 +143,7 @@ jobs: - uses: actions/checkout@main - name: Homebrew run: | - brew install qt6 pkgconf jq + brew install qt6 pkgconf@1 jq - name: configure run: ./configure --prefix=/usr/local - name: build @@ -163,7 +163,7 @@ jobs: - uses: actions/checkout@main - name: Homebrew run: | - brew install qt6 pkgconf jq mongo-c-driver gflags glog lz4 + brew install qt6 pkgconf@1 jq mongo-c-driver gflags glog lz4 - name: configure run: ./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-glog --enable-shared-lz4 - name: build From 97cfb050216ffe19e4c0b347b8c3ca85888c4e95 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sat, 23 Nov 2024 22:30:21 +0900 Subject: [PATCH 10/10] update --- .github/workflows/actions.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index ccdab6c98..344156dca 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -143,7 +143,8 @@ jobs: - uses: actions/checkout@main - name: Homebrew run: | - brew install qt6 pkgconf@1 jq + which pkg-config || brew install pkg-config + brew install qt6 jq - name: configure run: ./configure --prefix=/usr/local - name: build @@ -163,7 +164,8 @@ jobs: - uses: actions/checkout@main - name: Homebrew run: | - brew install qt6 pkgconf@1 jq mongo-c-driver gflags glog lz4 + which pkg-config || brew install pkg-config + brew install qt6 jq mongo-c-driver gflags glog lz4 - name: configure run: ./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-glog --enable-shared-lz4 - name: build