[ros-diffs] [peterw] 31020: - Make 'chdefgcc' available in the MinGW prompt as well.

Author: peterw
Date: Wed Dec  5 22:12:25 2007
New Revision: 31020

URL: http://svn.reactos.org/svn/reactos?rev=31020&view=rev
Log:
- Make 'chdefgcc' available in the MinGW prompt as well.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Wed Dec  5 22:12:25 2007
@@ -38,6 +38,7 @@
 ::
 for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe"
-x1`) do set CPUCOUNT=%%i
 
+doskey CHDEFGCC = "%_ROSBE_BASEDIR%\chdefgcc.cmd" $*
 doskey MAKE = "%_ROSBE_MINGWMAKE%" $*
 doskey MAKEX = "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% $*
 

Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Wed Dec  5 22:12:25 2007
@@ -8,7 +8,9 @@
 ::
 @echo off
 
-title Change the current MinGW/GCC directory...
+if "%_ROSBE_MODE%" == "RosBE" (
+    title Change the current MinGW/GCC directory...
+)
 
 ::
 :: Parse the command line arguments.
@@ -38,7 +40,9 @@
 goto :EOF
 
 :EOC
-title ReactOS Build Environment %_ROSBE_VERSION%
+if defined _ROSBE_VERSION (
+    title ReactOS Build Environment %_ROSBE_VERSION%
+)
 
 ::
 :: Unload all used Vars.

Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Wed Dec  5 22:12:25 2007
@@ -40,6 +40,12 @@
 :: Display the current version of GCC, NASM, ld and make.
 ::
 gcc -v 2>&1 | find "gcc version"
-nasm -v
+if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" (
+    nasm -v
+) else (
+    if "%_ROSBE_MODE%" == "RosBE" (
+        echo ERROR: NASM is required to build ReactOS, none found in the current
MinGW/GCC.
+    )
+)
 ld -v
 mingw32-make -v | find "GNU Make"