Skip to content

Commit

Permalink
Revert "moved exit code check to ponyprog.pro, where ponyprog.bat is …
Browse files Browse the repository at this point in the history
…created"

This reverts commit bf1f480.
  • Loading branch information
lancos committed Jan 24, 2025
1 parent bf1f480 commit 1e88a4c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion create_inno_package.bat
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ call create_exe_binary.bat no_setlocal || exit /b 1

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

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

call ponyprog.bat || exit /b 1
2 changes: 1 addition & 1 deletion ponyprog.pro
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ win32 {

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

QMAKE_EXTRA_TARGETS += win32setup

Expand Down

0 comments on commit 1e88a4c

Please sign in to comment.