Skip to content

Commit

Permalink
moved exit code check to ponyprog.pro, where ponyprog.bat is created
Browse files Browse the repository at this point in the history
  • Loading branch information
@lancos
lancos committed Jan 24, 2025
1 parent 5910c4c commit bf1f480
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
7 changes: 1 addition & 6 deletions create_inno_package.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ call create_exe_binary.bat no_setlocal || exit /b 1

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

@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
@rem ponyprog.bat is created by make win32setup

call ponyprog.bat || exit /b 1
2 changes: 1 addition & 1 deletion ponyprog.pro
View file
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" >ponyprog.bat
win32setup.commands = echo "$$ISCC /DAPPNAME=$$APP_NAME /DAPPVERSION=$$APP_VERSION /DAPPYEAR=$$APP_YEAR $$PWD/distribution/innosetup/ponyprog.iss || exit /b 1" >ponyprog.bat

This comment has been minimized.

Sign in to view

Copy link
@mrv96

mrv96 Jan 24, 2025 •
edited
Loading

Contributor

I tried to do this several times in before submitting PR #37, however I was not able to find a solution working on both AppVeyor and local build on Windows.

AppVeyor can be fixed in this way ^|^| exit /b 1, but locally won't work.

I used that batch for cycle as a final workaround to achieve the goal after a day of attempts.

Maybe it is better to revert this commit until someone finds a more elegant solution.

This comment has been minimized.

Sign in to view

Copy link
@lancos

lancos Jan 24, 2025 •
edited
Loading

Author Owner

I see, probably | char must me escaped or something similar, the problem is that I don't have an updated Windows machine to test, my old virtual machine doesn't build anymore due to outdated tools.

QMAKE_EXTRA_TARGETS += win32setup

Expand Down

0 comments on commit bf1f480

Please sign in to comment.