Author: peterw
Date: Mon Oct 22 15:07:34 2007
New Revision: 29774
URL:
http://svn.reactos.org/svn/reactos?rev=29774&view=rev
Log:
- Make options actually wait for the options dialog to finish.
Modified:
trunk/tools/RosBE-Windows/Root/RosBE.cmd
trunk/tools/RosBE-Windows/Root/options.cmd
Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Oct 22 15:07:34 2007
@@ -67,7 +67,7 @@
::
:: Display the current version of GCC, NASM, ld and make.
::
-echo %_ROSBE_GCCVER%
+gcc -v 2>&1 | find "gcc version"
nasm -v
ld -v
mingw32-make -v | find "GNU Make"
@@ -105,9 +105,6 @@
::
set _ROSBE_GCCVERSION=4.1.3
set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\mingw32\4.1.3;%PATH%
- gcc -v 2>&1 | find "gcc version" >
"%_ROSBE_BASEDIR%\bla.tmp"
- set /p _ROSBE_GCCVER=<"%_ROSBE_BASEDIR%\bla.tmp"
- del "%_ROSBE_BASEDIR%\bla.tmp"
set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe
if defined _ROSBE_OLDMODE (
set
C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include
Modified: trunk/tools/RosBE-Windows/Root/options.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/options.c…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/options.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/options.cmd Mon Oct 22 15:07:34 2007
@@ -14,9 +14,7 @@
:: Run options.exe
::
if exist "%_ROSBE_BASEDIR%\options.exe" (
- "%_ROSBE_BASEDIR%\options.exe"
- echo Press any Button to reset RosBE with the new Settings.
- pause
+ call "%_ROSBE_BASEDIR%\options.exe"
"%_ROSBE_BASEDIR%\RosBE.cmd"
) else (
echo ERROR: options.exe was not found.