Author: dreimer
Date: Tue Jun 12 23:21:12 2007
New Revision: 27159
URL:
http://svn.reactos.org/svn/reactos?rev=27159&view=rev
Log:
- Added new GCC to ChangeLog.txt and explained that the Vista makex bug still persists
- Whitespace trim and Coding Style fixing
- Fixed a wrong set ")" in SVN.cmd. Strange that it ran well with it...
Modified:
trunk/tools/RosBE-Windows/Root/Build-Multi.cmd
trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
trunk/tools/RosBE-Windows/Root/Build.cmd
trunk/tools/RosBE-Windows/Root/ChangeLog.txt
trunk/tools/RosBE-Windows/Root/Config.cmd
trunk/tools/RosBE-Windows/Root/Help.cmd
trunk/tools/RosBE-Windows/Root/RosBE.cmd
trunk/tools/RosBE-Windows/Root/SVN.cmd
Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Mul…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Build-Multi.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Build-Multi.cmd Tue Jun 12 23:21:12 2007
@@ -1,8 +1,8 @@
:: Copyright (c) Peter Ward, Colin Finck and Daniel Reimer. All rights reserved.
::
-:: Perform the build of ReactOS, but use the -j option
-:: with the appropriate number for the number of CPUs
-:: in the system.
+:: Perform the build of ReactOS, but use the -j option with the appropriate
+:: number for the number of CPUs in the system.
+::
@echo off
title Building...
@@ -13,12 +13,12 @@
set CPUCOUNT=
::
-:: Get the number of CPUs in the system so we know how
-:: many jobs to execute.
+:: Get the number of CPUs in the system so we know how many jobs to execute.
:: To modify the number used alter the options used with cpucount:
:: No Option - Number of CPUs.
:: -x1 - Number of CPUs, Plus 1.
:: -x2 - Number of CPUs, Doubled.
+::
for /f "usebackq" %%i in (`"%ROSBEBASEDIR%\Tools\cpucount.exe" -x1`)
do set CPUCOUNT=%%i
::
Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Tue Jun 12 23:21:12 2007
@@ -7,8 +7,8 @@
title Building...
::
-:: Check if config.template.rbuild is newer than config.rbuild,
-:: if it is then abort the build and inform the user.
+:: Check if config.template.rbuild is newer than config.rbuild, if it is then
+:: abort the build and inform the user.
::
if exist "%_ROSSOURCEDIR%\config.rbuild" (
%ROSBEBASEDIR%\Tools\test.exe "%_ROSSOURCEDIR%\config.template.rbuild" -nt
"%_ROSSOURCEDIR%\config.rbuild"
@@ -23,8 +23,7 @@
)
::
-:: Get the current date and time for use in
-:: in our build log's file name.
+:: Get the current date and time for use in in our build log's file name.
::
call "%ROSBEBASEDIR%\TimeDate.cmd"
Modified: trunk/tools/RosBE-Windows/Root/Build.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Build.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Build.cmd Tue Jun 12 23:21:12 2007
@@ -1,6 +1,7 @@
:: Copyright (c) Peter Ward, Colin Finck and Daniel Reimer. All rights reserved.
::
-:: Perform the build of ReactOS.
+:: Perform the build of ReactOS.
+::
@echo off
title Building...
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 Tue Jun 12 23:21:12 2007
@@ -1,10 +1,12 @@
*** Juni 21th, 2007 - RosBE 0.3.7 Released
+- Updated: GCC 4.1.3 Build 200706XX
+ (Here is the reason why the installer got smaller between .3.6 and .3.7, my bins are
stripped, w3seeks were not)
- Added a SVN Client
- Added a Build Configurator.
-- Added grep/cut/sed Tools for the two new commands
+- Added grep/cut/sed Tools for the new Configurator
- Added SVN 1.4.4 for the SVN Feature
-- Readded makex. If theres a Bug in Vista, it's a GCC Bug.
+- Readded makex. Sorry, bug in Vista still persists... its a GCC bug
*** May 21th, 2007 - RosBE 0.3.6 Released
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 Tue Jun 12 23:21:12 2007
@@ -17,8 +17,8 @@
)
echo WARNING:
-echo Non-Default-Configurations are not useable for pasteing Bugs to Bugzilla
-echo or asking quesions about in Forum/Chat!
+echo Non-Default-Configurations are not useable for pasteing Bugs to
+echo Bugzilla or asking quesions about in Forum/Chat!
echo.
echo DID YOU UNDERSTAND?
@@ -40,33 +40,33 @@
echo.
echo Right now
call "%ROSBEBASEDIR%\Tools\grep.exe" \"SARCH\"
%ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d
"\"" -f 4
-SET /P X= (), (xbox)
+SET /P X= (), (xbox)
call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"SARCH\"
value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\"
value=\"xbox\"/\"SARCH\" value=\"%X%\"/g"
%ROSBEBASEDIR%\Tools\config.rbuild > %ROSBEBASEDIR%\Tools\config2.rbuild
cls
echo Which CPU ReactOS should be optimized for.
echo.
-echo Examples: i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp,
-echo athlon-mp, k6-2
+echo Examples: i486, i586, pentium, pentium2, pentium3, pentium4,
+echo athlon-xp, athlon-mp, k6-2
echo See GCC manual for more CPU names and which CPUs GCC can optimize for.
echo Default is: pentium
echo.
echo Right now
call "%ROSBEBASEDIR%\Tools\grep.exe" \"OARCH\"
%ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d
"\"" -f 4
-SET /P XX=
+SET /P XX=
call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"OARCH\"
value=\".*\"/\"OARCH\" value=\"%XX%\"/g"
%ROSBEBASEDIR%\Tools\config2.rbuild > %ROSBEBASEDIR%\Tools\config21.rbuild
cls
echo What level do you want ReactOS to be optimized at.
-echo this setting does not work if GDB is set
+echo This setting does not work if GDB is set.
echo 0 = off
-echo 1 = Normal compiling. Recommended, it is default setting in
-echo official build and debug build.
-echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk.
+echo 1 = Normal compiling. Recommended. It is the default setting in
+echo official release builds and debug builds.
+echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk.
echo.
echo Right now
call "%ROSBEBASEDIR%\Tools\grep.exe" \"OPTIMIZE\"
%ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d
"\"" -f 4
-SET /P Y= (0), (1), (2), (3), (4), (5)
+SET /P Y= (0), (1), (2), (3), (4), (5)
call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"OPTIMIZE\"
value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g"
%ROSBEBASEDIR%\Tools\config21.rbuild > %ROSBEBASEDIR%\Tools\config3.rbuild
cls
@@ -98,8 +98,8 @@
call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"DBG\"
value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g"
%ROSBEBASEDIR%\Tools\config5.rbuild > %ROSBEBASEDIR%\Tools\config6.rbuild
cls
-echo Whether to compile for debugging with GDB. If you don't use GDB, don't
-echo enable this.
+echo Whether to compile for debugging with GDB. If you don't use GDB,
+echo don't enable this.
echo Default is: 0
echo.
echo Right now
@@ -108,9 +108,10 @@
call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"GDB\"
value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g"
%ROSBEBASEDIR%\Tools\config6.rbuild > %ROSBEBASEDIR%\Tools\config7.rbuild
cls
-echo Whether to compile apps/libs with features covered software patents or not.
-echo If you live in a country where software patents are valid/apply, don't
-echo enable this (except they/you purchased a license from the patent owner).
+echo Whether to compile apps/libs with features covered software patents
+echo or not. If you live in a country where software patents are
+echo valid/apply, don't enable this (except they/you purchased a license
+echo from the patent owner).
echo Default is: 0
echo.
echo Right now
@@ -119,7 +120,8 @@
call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"NSWPAT\"
value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g"
%ROSBEBASEDIR%\Tools\config7.rbuild > %ROSBEBASEDIR%\Tools\config8.rbuild
cls
-echo Whether to compile with NT-compatible LPC Semantics. This should always be 1.
+echo Whether to compile with NT-compatible LPC Semantics. This should
+echo always be 1.
echo.
echo Right now
call "%ROSBEBASEDIR%\Tools\grep.exe" \"NTLPC\"
%ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d
"\"" -f 4
@@ -127,11 +129,12 @@
call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"NTLPC\"
value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g"
%ROSBEBASEDIR%\Tools\config8.rbuild > %ROSBEBASEDIR%\Tools\config9.rbuild
cls
-echo Whether to compile with the KD protocol. This will disable support for KDBG
-echo as well as rossym and symbol lookups, and allow WinDBG to connect to ReactOS.
-echo This is currently not fully working, and requires kdcom from Windows 2003 or
-echo TinyKRNL. Booting into debug mode with this flag enabled will result in a
-echo failure to enter GUI mode. Do not enable unless you know what you're doing.
+echo Whether to compile with the KD protocol. This will disable support for
+echo KDBG as well as rossym and symbol lookups, and allow WinDBG to connect
+echo to ReactOS. This is currently not fully working, and requires kdcom
+echo from Windows 2003 or TinyKRNL. Booting into debug mode with this flag
+echo enabled will result in a failure to enter GUI mode. Do not enable
+echo unless you know what you're doing.
echo Default is: 0
echo.
echo Right now
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 Tue Jun 12 23:21:12 2007
@@ -13,8 +13,8 @@
echo ReactOS. OPTIONS are the standard ReactOS build
echo options ie. bootcd.
echo makex [OPTIONS] - Same as 'make' but automatically determines the
- echo number of CPUs in the system and uses -j with
- echo the appropriate number.
+ echo number of CPUs in the system and uses -j with the
+ echo appropriate number.
echo clean [logs] - Fully clean the ReactOS source directory or the
echo RosBE build logs.
echo help [COMMAND] - Display the available commands or help on a
@@ -28,24 +28,24 @@
)
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, livecd, etc.
+ echo make, without options does a standard build of ReactOS. OPTIONS are
+ echo the standard ReactOS build options ie. bootcd, livecd, etc.
goto :EOF
)
if "%1" == "makex" (
echo Usage: makex [OPTIONS]
- echo Same as 'make' but automatically determines the number of CPUs
- echo in the system and uses -j with the appropriate number.
- echo NOTE: The number makex uses can be modified by editing
- echo Build-Multi.cmd located in the RosBE directory,
- echo instructions for doing so are contained within the file.
+ echo Same as 'make' but automatically determines the number of CPUs in the
+ echo system and uses -j with the appropriate number.
+ echo NOTE: The number makex uses can be modified by editing Build-Multi.cmd
+ echo located in the RosBE directory, instructions for doing so are
+ echo contained within the file.
goto :EOF
)
if "%1" == "clean" (
echo Usage: clean [logs]
echo Fully clean the ReactOS source directory.
echo.
- echo logs - Removes all build logs in the RosBE-Logs directory.
+ echo logs - Removes all build logs in the RosBE-Logs directory.
goto :EOF
)
if "%1" == "help" (
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 Tue Jun 12 23:21:12 2007
@@ -57,7 +57,8 @@
goto :ExitRosBE
::
-:: Display the banner and set up the environment for the GCC 4.x.x build environment.
+:: Display the banner and set up the environment for the GCC 4.x.x build
+:: environment.
::
:RosBE4
::
Modified: trunk/tools/RosBE-Windows/Root/SVN.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/SVN.cmd?r…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/SVN.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/SVN.cmd Tue Jun 12 23:21:12 2007
@@ -11,7 +11,7 @@
title Updating...
%ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% %2
goto :ExitSVN
-)
+)
if "%1" == "cleanup" (
title Cleaning...
%ROSBEBASEDIR%\Tools\svn.exe cleanup %_ROSSOURCEDIR%
@@ -19,9 +19,10 @@
)
if "%1" == "create" (
title Creating...
-if not exist "%_ROSSOURCEDIR%\." (
- mkdir %_ROSSOURCEDIR%
- goto :SVN
+ if not exist "%_ROSSOURCEDIR%\." (
+ mkdir %_ROSSOURCEDIR%
+ goto :SVN
+ )
)
if exist "%_ROSSOURCEDIR%\.svn\." (
echo Folder already cotains a Reposority. Exiting
@@ -31,7 +32,6 @@
echo Folder is not empty. Continuing is dangerous and can cause errors.
goto :SVN
)
-)
:SVN
%ROSBEBASEDIR%\Tools\svn.exe checkout
svn://svn.reactos.org/reactos/trunk/reactos
%_ROSSOURCEDIR%