Skip to content

Commit 1e88a4c

Browse files
committed
Revert "moved exit code check to ponyprog.pro, where ponyprog.bat is created"
This reverts commit bf1f480.
1 parent bf1f480 commit 1e88a4c

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

create_inno_package.bat

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ call create_exe_binary.bat no_setlocal || exit /b 1
99

1010
mingw32-make -j%NUMBER_OF_PROCESSORS% win32setup || exit /b 1
1111

12-
@rem ponyprog.bat is created by make win32setup
12+
@rem Append exit code check to commands
13+
echo. > build/ponyprog.bat
14+
for /f "delims=" %%i in (ponyprog.bat) do (
15+
echo %%i ^|^| exit /b 1 >> build/ponyprog.bat
16+
)
17+
move /y build\ponyprog.bat ponyprog.bat
1318

1419
call ponyprog.bat || exit /b 1

ponyprog.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ win32 {
380380

381381
win32setup.depends = install
382382
win32setup.target = win32setup
383-
win32setup.commands = echo "$$ISCC /DAPPNAME=$$APP_NAME /DAPPVERSION=$$APP_VERSION /DAPPYEAR=$$APP_YEAR $$PWD/distribution/innosetup/ponyprog.iss || exit /b 1" >ponyprog.bat
383+
win32setup.commands = echo "$$ISCC /DAPPNAME=$$APP_NAME /DAPPVERSION=$$APP_VERSION /DAPPYEAR=$$APP_YEAR $$PWD/distribution/innosetup/ponyprog.iss" >ponyprog.bat
384384

385385
QMAKE_EXTRA_TARGETS += win32setup
386386

0 commit comments

Comments
 (0)