Skip to content

Commit 57bce8f

Browse files
update configure.bat
1 parent e5c5064 commit 57bce8f

File tree

2 files changed

+22
-30
lines changed

2 files changed

+22
-30
lines changed

configure.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ echo set TreeFrog_DIR=%TFDIR%>> %TFENV%
130130
echo set QMAKESPEC=%QMAKESPEC%>> %TFENV%
131131
echo set QTENV="%QTENV%">> %TFENV%
132132
echo set VCVARSBAT="">> %TFENV%
133-
echo set VSVER=2022 2019 2017>> %TFENV%
133+
echo set VSVER=2022 2019>> %TFENV%
134134
echo set VSWHERE="%%ProgramFiles(x86)%%\Microsoft Visual Studio\Installer\vswhere.exe">> %TFENV%
135135
echo;>> %TFENV%
136136
echo if exist %%QTENV%% call %%QTENV%%>> %TFENV%
@@ -157,7 +157,6 @@ echo set VSWHERE=>> %TFENV%
157157
echo set PATH=%%TFDIR^%%\bin;%%PATH%%>> %TFENV%
158158
echo echo Setup a TreeFrog/Qt environment.>> %TFENV%
159159
echo echo -- TFDIR set to %%TFDIR%%>> %TFENV%
160-
echo cd /D %%HOMEDRIVE%%%%HOMEPATH%%>> %TFENV%
161160

162161
set TFDIR=%TFDIR:\=/%
163162
del /f /q .qmake.stash src\.qmake.stash tools\.qmake.stash >nul 2>&1

tools/test/releasetest/releasetest.bat

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ if /i "%Platform%" == "x64" (
5959
)
6060

6161
cd /D %BASEDIR%
62-
rd /Q /S %APPNAME%
62+
rd /Q /S %APPNAME% >nul 2>nul
6363
tspawn new %APPNAME%
6464
if "%SQLITE%" == "" (
6565
echo;
@@ -73,40 +73,29 @@ cd %APPDIR%
7373
echo n | tspawn s blog
7474
tspawn w foo
7575

76-
:: Set ExecutionPolicy
77-
@REM for %%I in (tadpoled.exe) do if exist %%~$path:I set TADPOLED=%%~$path:I
78-
@REM for %%I in (tadpole.exe) do if exist %%~$path:I set TADPOLE=%%~$path:I
79-
powershell -Command "Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope CurrentUser -Force"
80-
@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
81-
@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
82-
8376
:: Test in debug mode
84-
if not "%CMAKE%" == "" (
85-
call :CMakeBuild Debug
86-
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
87-
call :CheckWebApp treefrogd.exe
88-
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
89-
)
77+
call :CMakeBuild Debug
78+
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
79+
call :CheckWebApp treefrogd.exe
80+
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
9081

9182
call :QMakeBuild debug
9283
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
9384
call :CheckWebApp treefrogd.exe
9485
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
95-
%MAKE% distclean >nul 2>nul
86+
nmake distclean >nul 2>nul
9687

9788
:: Test in release mode
98-
if not "%CMAKE%" == "" (
99-
call :CMakeBuild Release
100-
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
101-
call :CheckWebApp treefrog.exe
102-
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
103-
)
89+
call :CMakeBuild Release
90+
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
91+
call :CheckWebApp treefrog.exe
92+
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
10493

10594
call :QMakeBuild release
10695
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
10796
call :CheckWebApp treefrog.exe
10897
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
109-
%MAKE% distclean >nul 2>nul
98+
nmake distclean >nul 2>nul
11099

111100
echo;
112101
echo Test OK
@@ -145,7 +134,7 @@ exit /B 0
145134
:QMakeBuild
146135
cd /D %APPDIR%
147136
del /Q /F lib\*.*
148-
qmake -r CONFIG+=%1
137+
"%QMAKE%" -r CONFIG+=%1
149138
%MAKE%
150139
if ERRORLEVEL 1 (
151140
echo;
@@ -167,16 +156,20 @@ if "%TREEFROG%" == "" (
167156
exit /B 1
168157
)
169158

170-
"%1" -v
171-
"%1" -l
172-
"%1" --show-routes
159+
echo "%TREEFROG%" -v
160+
"%TREEFROG%" -v
161+
echo "%TREEFROG%" -l
162+
"%TREEFROG%" -l
163+
echo "%TREEFROG%" --show-routes
164+
"%TREEFROG%" --show-routes
173165
if ERRORLEVEL 1 (
174166
echo App Error!
175167
exit /B 1
176168
)
177169
echo;
178170

179-
"%1" --settings
171+
echo "%TREEFROG%" --settings
172+
"%TREEFROG%" --settings
180173
if ERRORLEVEL 1 (
181174
echo App Error!
182175
type log\treefrog.log
@@ -218,7 +211,7 @@ exit /B 0
218211
::
219212
:CleanUp
220213
cd /D %BASEDIR%
221-
rd /Q /S %APPNAME%
214+
rd /Q /S %APPNAME% >nul 2>nul
222215
exit /B 0
223216

224217
:: which cmd

0 commit comments

Comments
 (0)