Author: dreimer Date: Thu Jul 26 23:30:29 2007 New Revision: 27882
URL: http://svn.reactos.org/svn/reactos?rev=27882&view=rev Log: - Make DrFred's Config Tool Useable in RosBE.cmd. - Fix a bug in DrFred's Config Tool.
Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Tools/config/options.c
Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Shar... ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Thu Jul 26 23:30:29 2007 @@ -29,16 +29,28 @@ :: :: Check if our log directory exists, if it doesn't, create it. :: +if %ROSBE_LOGPATH% == %CD%\RosBE-Logs ( +echo 1 if not exist "%CD%\RosBE-Logs." ( - if not exist "%CD%.svn." ( - echo Folder is empty. No Build can be performed. - goto :EOB + if not exist "%CD%.svn." ( + echo Folder is empty. No Build can be performed. + goto :EOB + ) else ( + mkdir "%CD%\RosBE-Logs" + set _ROSBELOGDIR=%CD%\RosBE-Logs + ) ) else ( - mkdir "%CD%\RosBE-Logs" set _ROSBELOGDIR=%CD%\RosBE-Logs ) + ) else ( - set _ROSBELOGDIR=%CD%\RosBE-Logs +echo 2 + if not exist "%ROSBE_LOGPATH%." ( + echo LogFolder does not exist. + ) else ( + set _ROSBELOGDIR=%ROSBE_LOGPATH% + ) +) )
:: @@ -65,7 +77,22 @@ :: :: Now use mingw32-make to build ReactOS, passing along options, if any. :: -call buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" +if %ROSBE_SHOWTIME% == 1 ( + if %ROSBE_WRITELOG% == 1 ( + call buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + ) + if %ROSBE_WRITELOG% == 0 ( + call buildtime "%MAKE_COMMAND%" 2>&1 + ) +) +if %ROSBE_SHOWTIME% == 0 ( + if %ROSBE_WRITELOG% == 1 ( + call "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + ) + if %ROSBE_WRITELOG% == 0 ( + call "%MAKE_COMMAND%" 2>&1 + ) +)
:: :: Highlight the fact that building has ended.
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 Thu Jul 26 23:30:29 2007 @@ -10,19 +10,26 @@ :: @echo off
+:: +:: Set Defaults to work with and override if needed. +:: +color 0A set _VER=0.3.7.1 set ROSBEBASEDIR=%~dp0 +set ROSBE_SHOWTIME=1 +set ROSBE_WRITELOG=1 +set ROSBE_LOGPATH=%CD%\RosBE-Logs + +call %ROSBEBASEDIR%\options.cmd
title ReactOS Build Environment %_VER%
if "%1" == "" ( - color 0A cls call :RosBE4 goto :EndCommandParse ) if not "%1" == "" ( - color 0A cls echo Unknown parameter specified. Exiting. goto :ExitRosBE
Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/op... ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Thu Jul 26 23:30:29 2007 @@ -79,8 +79,8 @@ SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); } - SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0, 0); - SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0xA, 0); + SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0xA, 0); + SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0, 0); EnableWindow(GetDlgItem(Dlg, ID_BROWSE), FALSE); EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), FALSE); return TRUE;