@@ -59,7 +59,7 @@ if /i "%Platform%" == "x64" (
5959)
6060
6161cd /D %BASEDIR%
62- rd /Q /S %APPNAME%
62+ rd /Q /S %APPNAME% > nul 2 > nul
6363tspawn new %APPNAME%
6464if " %SQLITE% " == " " (
6565 echo;
@@ -73,40 +73,29 @@ cd %APPDIR%
7373echo n | tspawn s blog
7474tspawn 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
9182call :QMakeBuild debug
9283if ERRORLEVEL 1 exit /B %ERRORLEVEL%
9384call :CheckWebApp treefrogd.exe
9485if 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
10594call :QMakeBuild release
10695if ERRORLEVEL 1 exit /B %ERRORLEVEL%
10796call :CheckWebApp treefrog.exe
10897if ERRORLEVEL 1 exit /B %ERRORLEVEL%
109- %MAKE% distclean > nul 2 > nul
98+ nmake distclean > nul 2 > nul
11099
111100echo;
112101echo Test OK
@@ -145,7 +134,7 @@ exit /B 0
145134:QMakeBuild
146135cd /D %APPDIR%
147136del /Q /F lib\*.*
148- qmake -r CONFIG+=%1
137+ " %QMAKE% " -r CONFIG+=%1
149138%MAKE%
150139if 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
173165if ERRORLEVEL 1 (
174166 echo App Error!
175167 exit /B 1
176168)
177169echo;
178170
179- " %1 " --settings
171+ echo " %TREEFROG% " --settings
172+ " %TREEFROG% " --settings
180173if ERRORLEVEL 1 (
181174 echo App Error!
182175 type log\treefrog.log
@@ -218,7 +211,7 @@ exit /B 0
218211::
219212:CleanUp
220213cd /D %BASEDIR%
221- rd /Q /S %APPNAME%
214+ rd /Q /S %APPNAME% > nul 2 > nul
222215exit /B 0
223216
224217:: which cmd
0 commit comments