[ros-diffs] [dreimer] 27125: - Remove the need of a config.rbuild in the RosBE tree. Just copy the one of ReactOS Tree at first use. - Update Help to really help on the new commands - Add cut/grep to info.txt - Update a Setup Phrase to show that you don't need a Tree before you install.

Author: dreimer
Date: Sun Jun 10 23:08:35 2007
New Revision: 27125
URL: http://svn.reactos.org/svn/reactos?rev=27125&view=rev
Log:
- Remove the need of a config.rbuild in the RosBE
  tree. Just copy the one of ReactOS Tree at first use.
- Update Help to really help on the new commands
- Add cut/grep to info.txt
- Update a Setup Phrase to show that you don't need a
  Tree before you install.
Removed:
    trunk/tools/RosBE-Windows/Tools/config.rbuild
Modified:
    trunk/tools/RosBE-Windows/Root/Config.cmd
    trunk/tools/RosBE-Windows/Root/Help.cmd
    trunk/tools/RosBE-Windows/RosSourceDir.ini
    trunk/tools/RosBE-Windows/Tools/info.txt
Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Jun 10 23:08:35 2007
@@ -6,8 +6,29 @@
 title ReactOS Build Configurator
-cd ""
+if not exist "%ROSBEBASEDIR%\Tools\config.rbuild" (
+    copy "%_ROSSOURCEDIR%\config.template.rbuild"
"%ROSBEBASEDIR%\Tools\config.rbuild"
+)
+if "%1" == "delete" (
+    del %_ROSSOURCEDIR%\config.rbuild
+    del %ROSBEBASEDIR%\Tools\config.rbuild
+    goto :NOK
+)
+
+echo WARNING:
+echo Non-Default-Configurations are not useable for pasteing Bugs to Bugzilla
+echo or asking quesions about in Forum/Chat!
+echo.
+echo DID YOU UNDERSTAND?
+
+SET /P XY=(yes), (no)
+
+if /I "%XY%"=="yes" goto :OK
+if /I "%XY%"=="no" goto :NOK
+goto :NOK
+
+:OK
 echo Architecture to build for. Not Editable.
 echo.
 echo Right now
@@ -122,5 +143,6 @@
 del %ROSBEBASEDIR%\Tools\*.rbuild
 copy %ROSBEBASEDIR%\Tools\config.tmp %ROSBEBASEDIR%\Tools\config.rbuild
 del %ROSBEBASEDIR%\Tools\*.tmp
-copy %ROSBEBASEDIR%\Tools\config.rbuild _ROSSOURCEDIR\config.rbuild
-cd..
+copy %ROSBEBASEDIR%\Tools\config.rbuild %_ROSSOURCEDIR%\config.rbuild
+
+:NOK
Modified: trunk/tools/RosBE-Windows/Root/Help.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Help.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Help.cmd Sun Jun 10 23:08:35 2007
@@ -21,15 +21,15 @@
     echo                      specific command.
     echo    svn [OPTIONS]   - Create, Update or clean up your ReactOS Source
     echo                      tree.
-    echo    config          - Configures the way, ReactOS will be built.
-    echo
+    echo    config [OPTIONS]- Configures the way, ReactOS will be built.
+    echo.
     echo    basedir         - Switch back to the ReactOS source directory.
     goto :EOF
 )
 if "%1" == "make" (
     echo Usage: make [OPTIONS]
     echo make, without options does a standard build of ReactOS. OPTIONS
-    echo are the standard ReactOS build options ie. bootcd.
+    echo are the standard ReactOS build options ie. bootcd, livecd, etc.
     goto :EOF
 )
 if "%1" == "makex" (
@@ -56,6 +56,15 @@
 if "%1" == "svn" (
     echo Usage: svn [OPTIONS]
     echo Creates, Updates or cleans up your ReactOS Source tree.
+    echo    update - Updates to HEAD Revision.
+    echo    create - Creates a new ReactOS Tree.
+    echo    cleanup - Cleans up and fixes errors in Tree.
+    goto :EOF
+)
+if "%1" == "config" (
+    echo Usage: config [OPTIONS]
+    echo Creates a Configuration File, which tells RosBE how to build the Tree.
+    echo    delete - Deletes the configuration File and so sets back to default
     goto :EOF
 )
 if "%1" == "basedir" (
Modified: trunk/tools/RosBE-Windows/RosSourceDir.ini
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosSourceDir.i…
==============================================================================
--- trunk/tools/RosBE-Windows/RosSourceDir.ini (original)
+++ trunk/tools/RosBE-Windows/RosSourceDir.ini Sun Jun 10 23:08:35 2007
@@ -19,7 +19,7 @@
 [Field 3]
 Type=Label
-Text=Select the directory where the ReactOS sources are located. This directory is
required for the RosBE to work correctly. If you accept the default here then you must
modify the shortcut (The 'Start in:' field) in the start menu later to point to
the ReactOS source directory.
+Text=Select the directory where the ReactOS sources are located or will be checked out to
later. This directory is required for the RosBE to work correctly. If you accept the
default here then you must modify the shortcut (The 'Start in:' field) in the
start menu later to point to the ReactOS source directory.
 Left=0
 Right=-1
 Top=6
Removed: trunk/tools/RosBE-Windows/Tools/config.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config.r…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config.rbuild (original)
+++ trunk/tools/RosBE-Windows/Tools/config.rbuild (removed)
@@ -1,16 +1,0 @@
-<?xml version="1.0"?>
-<rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<property name="ARCH" value="i386" />
-<property name="SARCH" value="" />
-<property name="OARCH" value="pentium" />
-<property name="OPTIMIZE" value="1" />
-<property name="MP" value="0" />
-<property name="KDBG" value="0" />
-<property name="DBG" value="1" />
-<property name="GDB" value="0" />
-<property name="NSWPAT" value="0" />
-<property name="NTLPC" value="1" />
-<property name="_WINKD_" value="0" />
-
-</rbuild>
Modified: trunk/tools/RosBE-Windows/Tools/info.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/info.txt (original)
+++ trunk/tools/RosBE-Windows/Tools/info.txt Sun Jun 10 23:08:35 2007
@@ -1,11 +1,14 @@
 Additional Tools needed:
 tee:      http://gnuwin32.sourceforge.net/packages/coreutils.htm
 test:     http://gnuwin32.sourceforge.net/packages/coreutils.htm
+cut:      http://gnuwin32.sourceforge.net/packages/coreutils.htm
 sed:      http://gnuwin32.sourceforge.net/packages/sed.htm
+grep:     http://gnuwin32.sourceforge.net/packages/grep.htm
 svn:      http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91
 Additional Libs needed:
 LibIntl:  http://gnuwin32.sourceforge.net/packages/libintl.htm
 LibIconv: http://gnuwin32.sourceforge.net/packages/libiconv.htm
+Pcre:     http://gnuwin32.sourceforge.net/packages/pcre.htm
 Built Tools and Rest needs to be copied to /Root/Tools/