[dreimer] 29757: - Updated ChangeLog.txt and readme.txt - Completely rewrote scut to work without grep sed cut and co and added a edit function. thx to Peter Ward for his help. - Updated help. - Successfully removed two of three workarounds in cutz.cmd.
Author: dreimer Date: Mon Oct 22 02:37:16 2007 New Revision: 29757
URL: http://svn.reactos.org/svn/reactos?rev=29757&view=rev Log: - Updated ChangeLog.txt and readme.txt - Completely rewrote scut to work without grep sed cut and co and added a edit function. thx to Peter Ward for his help. - Updated help. - Successfully removed two of three workarounds in cutz.cmd.
Added: trunk/tools/RosBE-Windows/Root/srclist.txt (with props) Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE-Windows/Tools/cutz.cmd
Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog.... ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Mon Oct 22 02:37:16 2007 @@ -1,6 +1,6 @@ *** XXX XXth, 200X - RosBE 0.X.X.X Released
-- Updated RosBE COnfiguration Tool. (Pierre Schweitzer) +- Updated RosBE Configuration Tool. (Pierre Schweitzer) - Added French translation. - Added the possibility to choose MingW directory. - Added check to see if MingW dir is right (look up gcc) @@ -14,7 +14,32 @@ - Added check to test if log dir exists and if it doesn't, it's created - Added check to avoid writing in a non-existant file - Updated todo list + - Reorganized resources + - Added a basic font preview + - Continue dralnix code cleanup. + - Added checks to avoid buffers overflow. + +- Added a very simple makefile for the RosBE tools. (Peter Ward) +- Fix a warning in echoh.c. (Peter Ward) +- Fix options.exe compile with RosBE 0.3.8.1 (Peter Ward) +- Merge the three build.cmd files into one. (Peter Ward) +- Heaviliy cleaning up the .cmd files. (Peter Ward) +- remove typos. (Peter Ward) +- Make variable names more consistent. (Peter Ward) +- Merged the NSIS files back together. (Peter Ward) +- Renamed options.cmd -> rosbe-options.cmd. (Peter Ward) +- Completely rewrote scut to work without *nix tools + and added a edit function (Parter Ward, Daniel Reimer) +- Updated to NASM 0.99.05 (Daniel Reimer) +- Make helpfile entries dependant on the installed optional files. (Daniel Reimer) +- Readd chdefdir due to popular Demand. (Daniel Reimer) +- Make options.exe startable from cmd window. After exiting rosbe resets to use the new settings. (Daniel Reimer) - Added ccache 2.4 to RosBE. (Daniel Reimer) +- Remove trailing Spaces. (Daniel Reimer) +- Modify options.exe to enable and disable strpping and ccache. (Daniel Reimer) +- Fixed German RC File of Options.exe (Daniel Reimer) + +- Fixed Russian RC File of options.exe (towerr)
*** Sep 24th, 2007 - RosBE 0.3.8.1 Released
Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?r... ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Mon Oct 22 02:37:16 2007 @@ -31,8 +31,8 @@ echo.
if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - echo scut - Define, Remove, Switch and Default to Shortcutted - echo Source-Directories. + echo scut - Define, Edit, Remove, Switch and Default to + echo Shortcutted Source-Directories. )
if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( @@ -155,14 +155,16 @@ ) if "%1" == "scut" ( echo Usage: scut [OPTIONS] - echo Defines, Removes, Switches and Defaults to Shortcutted Source Directories. - echo scut started without a parameter or with the name of a Shortcut as - echo parameter sets this Shortcut active. + echo Defines, Edits, Removes, Switches and Defaults to Shortcutted Source + echo Directories. scut started without a parameter or with the name of a + echo Shortcut as parameter sets this Shortcut active. echo. echo add - Adds a Shortcut. echo (Optional: "Shortcut" "Directory" as second and third parameter) - echo remove - Removes a shortcut. + echo rem - Removes a shortcut. echo (Optional: "Shortcut" as second parameter) + echo edit - Edits a shortcut. + echo (Optional: "Shortcut" "Directory" as second and third parameter) echo def - Chooses Default Shortcut which is enabled on echo every start of RosBE. "Default" is the Source echo Directory as you know it from previous Versions
Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.txt... ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Mon Oct 22 02:37:16 2007 @@ -11,12 +11,12 @@
The ReactOS Build Environment v0.X.X.X contains the following packages:
-binutils-2.17.50-20070806 +binutils-2.18.50-20071015 mingw-runtime-3.13 w32api-3.10 mingw32-make-3.81-2 -nasm-0.99.04-win32 -mingw-4.1.3-20070829-prerelease +nasm-0.99.05-win32 +mingw-4.1.3-20071015-prerelease - Patched to fix a GCC bug concerning decorating virtual methods with stdcall in C++, see GCC issue:
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 02:37:16 2007 @@ -30,8 +30,8 @@ :: Check if the user has used the options utility and :: if so, load their options. :: -if exist %_ROSBE_BASEDIR%\rosbe-options.cmd ( - call %_ROSBE_BASEDIR%\rosbe-options.cmd +if exist "%_ROSBE_BASEDIR%\rosbe-options.cmd" ( + call "%_ROSBE_BASEDIR%\rosbe-options.cmd" )
title ReactOS Build Environment %_ROSBE_VERSION% @@ -61,9 +61,7 @@ :: Source Directory and add PATH for Tools Folder. :: set PATH=%_ROSBE_BASEDIR%\Tools;%PATH% -for /f "usebackq" %%i in (`"grep base= "%_ROSBE_BASEDIR%\srclist.xml"|cutz main"`) do set scut=%%i -echo Used Shortcut: %scut% -echo. +if exist "%_ROSBE_BASEDIR%\scut.cmd" (call "%_ROSBE_BASEDIR%\scut.cmd" run)
:: :: Display the current version of GCC, NASM, ld and make. @@ -85,13 +83,6 @@ :: Load the doskey macros that serve as our commands. :: doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac" - -:: -:: Set new source directory, if needed. -:: -if not "%scut%" == "Default" ( - call %_ROSBE_BASEDIR%\scut %scut% -)
:: :: Look if the Source Folder is empty. If so, ask for using "svn create".
Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.c... ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Mon Oct 22 02:37:16 2007 @@ -12,8 +12,8 @@
if /i "%1" == "" ( goto :INTERACTIVE -) -if /i "%1" == "default" ( +) +if /i "%1" == "default" ( set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% ) else ( set _ROSBE_ROSSOURCEDIR=%1 @@ -26,8 +26,8 @@
if /i "%XY%" == "" ( goto :END -) -if /i "%XY%"=="default" ( +) +if /i "%XY%"=="default" ( set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% ) else ( set _ROSBE_ROSSOURCEDIR=%XY%
Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?r... ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Mon Oct 22 02:37:16 2007 @@ -22,8 +22,26 @@ if /I "%1"=="rem" ( goto :REM ) +if /I "%1"=="edit" ( + goto :EDIT +) if /I "%1"=="def" ( goto :DEF2 +) +if /I "%1"=="run" ( + for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if %%i == Base ( + echo Used Shortcut: %%j + echo. + :: + : Set new source directory, if needed. + :: + if not "%%j" == "Default" ( + call "%_ROSBE_BASEDIR%\scut.cmd" %%j + ) + ) + ) + goto :END ) else ( set XY=%1 goto :RUN @@ -37,18 +55,14 @@ echo Choose your Source Folder: set /P XY= :RUN -grep name="%XY%" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" -test -s "%_ROSBE_BASEDIR%\aaa.tmp" -if errorlevel 1 ( - echo Shortcut with that name does not exist. - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END -) else ( - set /P dir=<"%_ROSBE_BASEDIR%\aaa.tmp" - call cd /D %dir% - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END +for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if %%i == %XY% ( + cd /d %%j + goto :END + ) ) +echo ERROR: This Shortcut (%XY%) does not exist. +goto :END
:: :: Add new Shortcut to XML. @@ -74,11 +88,13 @@ echo Choose your Source Folder: set /P DIR= :ADD23 -echo ^<property name="%CUT%" value="%DIR%" /^> > "%_ROSBE_BASEDIR%\aaa.tmp" -copy "%_ROSBE_BASEDIR%\srclist.xml" + "%_ROSBE_BASEDIR%\aaa.tmp" "%_ROSBE_BASEDIR%\srclist2.xml" -del "%_ROSBE_BASEDIR%\srclist.xml" -ren "%_ROSBE_BASEDIR%\srclist2.xml" srclist.xml -del "%_ROSBE_BASEDIR%\aaa.tmp" +for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if %%i == %CUT% ( + echo ERROR: A Shortcut with the name %CUT% does already exists. + goto :END + ) +) +echo %CUT%,%DIR%>> "%_ROSBE_BASEDIR%\srclist.txt" goto :END
:: @@ -92,47 +108,78 @@ echo Choose your Shortcut: set /P CUTREM= :REM1 -grep name="%CUTREM%" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" -test -s "%_ROSBE_BASEDIR%\aaa.tmp" -if errorlevel 1 ( - echo Shortcut with that name does not exist. - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END -) else ( - grep -v name="%CUTREM%" "%_ROSBE_BASEDIR%\srclist.xml" > "%_ROSBE_BASEDIR%\srclist2.xml" - del "%_ROSBE_BASEDIR%\srclist.xml" - ren "%_ROSBE_BASEDIR%\srclist2.xml" srclist.xml - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END +set _ROSBE_REM=0 +for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if not %%i == %CUTREM% ( + echo %%i,%%j>> "%_ROSBE_BASEDIR%\srclist2.txt" + ) else ( + set _ROSBE_REM=1 + ) ) +del "%_ROSBE_BASEDIR%\srclist.txt" +ren "%_ROSBE_BASEDIR%\srclist2.txt" srclist.txt +if %_ROSBE_REM% == 0 ( + echo ERROR: The Shortcut %CUTREM% does not exist. +) +goto :END +
:: :: Set Default Shortcut. :: :DEF2 if not "%2" == "" ( - set DEF=%2 + set DIR=%2 goto :DEF1 ) echo Choose your new Default Shortcut: -set /P DEF= +set /P DIR= :DEF1 -grep name="%DEF%" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" -test -s "%_ROSBE_BASEDIR%\aaa.tmp" -if errorlevel 1 ( - echo Shortcut with that name does not exist. - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END +call "%_ROSBE_BASEDIR%\scut.cmd" edit Base %DIR% + +:EDIT +if not "%2" == "" ( + if not "%3" == "" ( + set CUT=%2 + set DIR=%3 + goto :EDIT23 + ) else ( + set CUT=%2 + goto :EDIT2 + ) ) else ( - sed "s/base=".*"/base="%DEF%"/g" "%_ROSBE_BASEDIR%\srclist.xml" > "%_ROSBE_BASEDIR%\srclist2.xml" - del "%_ROSBE_BASEDIR%\srclist.xml" - ren "%_ROSBE_BASEDIR%\srclist2.xml" srclist.xml - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :PREEND + goto :EDIT1 )
-:PREEND -call "%_ROSBE_BASEDIR%\RosBE.cmd" +:EDIT1 +echo Choose your Shortcut: +set /P CUT= +:EDIT2 +echo Choose your Source Folder: +set /P DIR= +:EDIT23 +set _ROSBE_EDIT=0 +for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if %%i == %CUT% ( + set _ROSBE_EDIT=1 + if exist "%_ROSBE_BASEDIR%\temporaryfile.tmp" ( + echo %%i,%DIR%>> "%_ROSBE_BASEDIR%\temporaryfile.tmp" + ) else ( + echo %%i,%DIR%> "%_ROSBE_BASEDIR%\temporaryfile.tmp" + ) + ) else ( + if exist "%_ROSBE_BASEDIR%\temporaryfile.tmp" ( + echo %%i,%%j>> "%_ROSBE_BASEDIR%\temporaryfile.tmp" + ) else ( + echo %%i,%%j> "%_ROSBE_BASEDIR%\temporaryfile.tmp" + ) + ) +) +del "%_ROSBE_BASEDIR%\srclist.txt" +ren "%_ROSBE_BASEDIR%\temporaryfile.tmp" srclist.txt +if %_ROSBE_EDIT% == 0 ( + echo ERROR: The Shortcut %CUT% does not exist. +)
:END title ReactOS Build Environment %_ROSBE_VERSION%
Added: trunk/tools/RosBE-Windows/Root/srclist.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/srclist.tx... ============================================================================== --- trunk/tools/RosBE-Windows/Root/srclist.txt (added) +++ trunk/tools/RosBE-Windows/Root/srclist.txt Mon Oct 22 02:37:16 2007 @@ -1,0 +1,2 @@ +Base,Default +Default,C:\RosBE\Source
Propchange: trunk/tools/RosBE-Windows/Root/srclist.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/tools/RosBE-Windows/Tools/cutz.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cutz.cmd?... ============================================================================== --- trunk/tools/RosBE-Windows/Tools/cutz.cmd (original) +++ trunk/tools/RosBE-Windows/Tools/cutz.cmd Mon Oct 22 02:37:16 2007 @@ -7,12 +7,6 @@ :: :: @echo off -if "%1" == "dir" ( - cut -d """ -f 4 -) if "%1" == "svn" ( cut -d " " -f 2 ) -if "%1" == "main" ( - cut -d """ -f 2 -)
-
dreimer＠svn.reactos.org