diff --git a/scripts/win/build_remaken_project.bat b/scripts/win/build_remaken_project.bat index 0bfd697..6992984 100644 --- a/scripts/win/build_remaken_project.bat +++ b/scripts/win/build_remaken_project.bat @@ -66,25 +66,25 @@ if not exist %BUILDROOTFOLDER%\%MODE%\release mkdir %BUILDROOTFOLDER%\%MODE%\rel echo "===========> building %PROJECTNAME% %MODE% debug <===========" pushd %BUILDROOTFOLDER%\%MODE%\debug %QMAKE_PATH%\qmake.exe %PROJECTROOT%/%PROJECTNAME%.pro -spec win32-msvc CONFIG+=debug %QMAKEMODE% -if not %errorlevel%==0 ( exit %errorlevel% ) +if not %errorlevel%==0 ( exit /b %errorlevel% ) echo "====> qmake ok" %JOM_PATH%\jom.exe -if not %errorlevel%==0 ( exit %errorlevel% ) +if not %errorlevel%==0 ( exit /b %errorlevel% ) echo "====> jom ok" %JOM_PATH%\jom.exe install -if not %errorlevel%==0 ( exit %errorlevel% ) +if not %errorlevel%==0 ( exit /b %errorlevel% ) echo "====> jom install ok" popd echo "===========> building %PROJECTNAME% %MODE% release <===========" pushd %BUILDROOTFOLDER%\\%MODE%\release %QMAKE_PATH%\qmake.exe %PROJECTROOT%/%PROJECTNAME%.pro -spec win32-msvc %QMAKEMODE% -if not %errorlevel%==0 ( exit %errorlevel% ) +if not %errorlevel%==0 ( exit /b %errorlevel% ) echo "====> qmake ok" %JOM_PATH%\jom.exe -if not %errorlevel%==0 ( exit %errorlevel% ) +if not %errorlevel%==0 ( exit /b %errorlevel% ) echo "====> jom ok" %JOM_PATH%\jom.exe install -if not %errorlevel%==0 ( exit %errorlevel% ) +if not %errorlevel%==0 ( exit /b %errorlevel% ) echo "====> jom install ok" popd diff --git a/scripts/win/build_remaken_project_package.bat b/scripts/win/build_remaken_project_package.bat index 5fff201..8a94fbb 100644 --- a/scripts/win/build_remaken_project_package.bat +++ b/scripts/win/build_remaken_project_package.bat @@ -65,14 +65,26 @@ if not exist %BUILDROOTFOLDER%\%MODE%\release mkdir %BUILDROOTFOLDER%\%MODE%\rel echo "===========> building %PROJECTNAME% %MODE% debug <===========" pushd %BUILDROOTFOLDER%\%MODE%\debug %QMAKE_PATH%\qmake.exe %PROJECTROOT%/%PROJECTNAME%.pro -spec win32-msvc CONFIG+=debug %QMAKEMODE% CONFIG+=package_remaken +if not %errorlevel%==0 ( exit /b %errorlevel% ) +echo "====> qmake ok" %JOM_PATH%\jom.exe +if not %errorlevel%==0 ( exit /b %errorlevel% ) +echo "====> jom ok" %JOM_PATH%\jom.exe install +if not %errorlevel%==0 ( exit /b %errorlevel% ) +echo "====> jom install ok" popd echo "===========> building %PROJECTNAME% %MODE% release <===========" pushd %BUILDROOTFOLDER%\\%MODE%\release %QMAKE_PATH%\qmake.exe %PROJECTROOT%/%PROJECTNAME%.pro -spec win32-msvc %QMAKEMODE% CONFIG+=package_remaken +if not %errorlevel%==0 ( exit /b %errorlevel% ) +echo "====> qmake ok" %JOM_PATH%\jom.exe +if not %errorlevel%==0 ( exit /b %errorlevel% ) +echo "====> jom ok" %JOM_PATH%\jom.exe install +if not %errorlevel%==0 ( exit /b %errorlevel% ) +echo "====> jom install ok" popd endlocal