[dreimer] 43651: - Add missing headers. - Add some missing /i to make all ifs case insensitive where appropiate. - Fix my stupidity where we set the CFLAGS for the targets. THIS IS BATCH, MAN!!! - Check and generate the log folder in the make/makex process and not on startup. This fixes the broken-for-ages message for noobs showing up when the source folder is empty how to get the Source.
Author: dreimer Date: Tue Oct 20 17:52:18 2009 New Revision: 43651
URL: http://svn.reactos.org/svn/reactos?rev=43651&view=rev Log: - Add missing headers. - Add some missing /i to make all ifs case insensitive where appropiate. - Fix my stupidity where we set the CFLAGS for the targets. THIS IS BATCH, MAN!!! - Check and generate the log folder in the make/makex process and not on startup. This fixes the broken-for-ages message for noobs showing up when the source folder is empty how to get the Source.
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Basedir.cmd trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/Renv.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Tue Oct 20 17:52:18 2009 @@ -57,6 +57,9 @@ }
if ($_ROSBE_WRITELOG -eq 1) { + if (!(Test-Path "$_ROSBE_LOGDIR")) { + New-Item -path "$_ROSBE_LOGDIR" -type directory + } $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file } else {
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Tue Oct 20 17:52:18 2009 @@ -150,8 +150,8 @@ "" " all - Removes build logs and compiler output in the RosBE-Logs directory." " logs - Removes all build logs in the RosBE-Logs directory." - " All other commands will be parsed as ""make COMMAND_clean"" and cleans the" - " specific command." + " All other commands will be parsed as ""make ""module""_clean"" and cleans the" + " specific module." } elseif ("$args" -eq "config") { if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { " Usage: config [OPTIONS]" @@ -202,7 +202,7 @@ if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { " Usage: options" " Starts the RosBE configurator and sets the changes active in the current." - " RosBE session." + " RosBE session immediately." } } elseif ("$args" -eq "update") { if (Test-Path "$_ROSBE_BASEDIR\update.ps1") {
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Oct 20 17:52:18 2009 @@ -143,14 +143,6 @@ $ENV:ROS_RBUILDFLAGS = get-content "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" }
-# Check if writing logs is enabled, if so check if our log directory -# exists, if it doesn't, create it. -if ($_ROSBE_WRITELOG -eq 1) { - if (!(Test-Path "$_ROSBE_LOGDIR")) { - New-Item -path "$_ROSBE_LOGDIR" -type directory - } -} - # Load the doskey macros that serve as our commands. LoadAliases
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Basedir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Base... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Basedir.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Basedir.cmd [iso-8859-1] Tue Oct 20 17:52:18 2009 @@ -1,1 +1,15 @@ -@cd /d "%_ROSBE_ROSSOURCEDIR%" +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/Basedir.cmd +:: PURPOSE: Temporarily change the Basedir in RosBE. +:: COPYRIGHT: Copyright 2009 Colin Finck colin@reactos.org +:: + +@echo off +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 1 ( + @echo on +) + +@cd /d "%_ROSBE_ROSSOURCEDIR%"
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Buil... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Tue Oct 20 17:52:18 2009 @@ -52,6 +52,9 @@ )
if %_ROSBE_WRITELOG% == 1 ( + if not exist "%_ROSBE_LOGDIR%." ( + mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL + ) %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" ) else ( %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %*
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Clea... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Tue Oct 20 17:52:18 2009 @@ -67,7 +67,7 @@ set OUTCLEANPATH=%_ROSBE_OUTPATH% )
-if "%ROS_ARCH%" == "i386" ( +if /i "%ROS_ARCH%" == "i386" ( set MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile.auto ) else ( set MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Help... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Tue Oct 20 17:52:18 2009 @@ -156,8 +156,8 @@ echo. echo all - Removes build logs and compiler output in the RosBE-Logs directory. echo logs - Removes all build logs in the RosBE-Logs directory. - echo All other commands will be parsed as "make COMMAND_clean" and cleans the - echo specific command. + echo All other commands will be parsed as "make module_clean" and cleans the + echo specific module. ) else if /i "%1" == "config" ( if exist "%_ROSBE_BASEDIR%\Config.cmd" ( echo Usage: config [OPTIONS] @@ -208,7 +208,7 @@ if exist "%_ROSBE_BASEDIR%\options.cmd" ( echo Usage: options echo Starts the RosBE configurator and sets the changes active in the current - echo RosBE session. + echo RosBE session immediately. ) ) else if /i "%1" == "update" ( if exist "%_ROSBE_BASEDIR%\update.cmd" (
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Renv.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Renv... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Renv.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Renv.cmd [iso-8859-1] Tue Oct 20 17:52:18 2009 @@ -1,1 +1,15 @@ -@for /f "usebackq tokens=*" %%i in (`set _ROSBE_`) do @echo %%i +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/renv.cmd +:: PURPOSE: Shows RosBE's Environment Variables. +:: COPYRIGHT: Copyright 2009 Colin Finck colin@reactos.org +:: + +@echo off +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 1 ( + @echo on +) + +@for /f "usebackq tokens=*" %%i in (`set _ROSBE_`) do @echo %%i
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/RosB... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Tue Oct 20 17:52:18 2009 @@ -77,14 +77,6 @@ mkdir "%APPDATA%\RosBE" 1> NUL 2> NUL )
-:: Check if writing logs is enabled, if so check if our log directory -:: exists, if it doesn't, create it. -if %_ROSBE_WRITELOG% == 1 ( - if not exist "%_ROSBE_LOGDIR%." ( - mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL - ) -) - call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" doskey update=elevate "%_ROSBE_BASEDIR%\update.cmd" $*
Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/char... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Tue Oct 20 17:52:18 2009 @@ -32,7 +32,7 @@ endlocal & set ROS_ARCH=%ARCH%
:: Refresh all needed Params by recalling the main Path setting CMD File. -if "%ROS_ARCH%" == "i386" ( +if /i "%ROS_ARCH%" == "i386" ( if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( call "%APPDATA%\RosBE\rosbe-options.cmd" )
Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rosb... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Oct 20 17:52:18 2009 @@ -36,5 +36,5 @@
set ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%%_ROSBE_HOST_GCCTARGET%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc%_ROSBE_HOST_GCCTARGET%%_ROSBE_HOST_GCCVERSION%\include" set ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%%_ROSBE_HOST_GCCTARGET%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc%_ROSBE_HOST_GCCTARGET%%_ROSBE_HOST_GCCVERSION%\include\c++" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc%_ROSBE_HOST_GCCTARGET%%_ROSBE_HOST_GCCVERSION%\include" -set ROSBE_TARGET_CFLAGS = -I"%_ROSBE_TARGET_MINGWPATH%%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc%_ROSBE_TARGET_GCCTARGET%%_ROSBE_TARGET_GCCVERSION%\include" -set ROSBE_TARGET_CXXFLAGS = -I"%_ROSBE_TARGET_MINGWPATH%%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++%_ROSBE_TARGET_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++%_ROSBE_TARGET_GCCVERSION%%_ROSBE_TARGET_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc%_ROSBE_TARGET_GCCTARGET%%_ROSBE_TARGET_GCCVERSION%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc%_ROSBE_TARGET_GCCTARGET%%_ROSBE_TARGET_GCCVERSION%\include\c++" +set ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc%_ROSBE_TARGET_GCCTARGET%%_ROSBE_TARGET_GCCVERSION%\include" +set ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++%_ROSBE_TARGET_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++%_ROSBE_TARGET_GCCVERSION%%_ROSBE_TARGET_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc%_ROSBE_TARGET_GCCTARGET%%_ROSBE_TARGET_GCCVERSION%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc%_ROSBE_TARGET_GCCTARGET%%_ROSBE_TARGET_GCCVERSION%\include\c++"
-
dreimer＠svn.reactos.org