[ros-diffs] [dreimer] 40900: Finished my last run through the scripts. IMO they are well now. But as I said. First some more ppl have to test them before I release anything. - Cleaned whitespace - PS Variable nulling does not remove them, more keeps a empty variable. This was the reason for the "buildno.h not found" error fixed yesterday. This is not bad in the situations where it still happened, but now we remove them fully. - Updated changelog and readme.

Author: dreimer
Date: Tue May 12 19:02:44 2009
New Revision: 40900

URL: http://svn.reactos.org/svn/reactos?rev=40900&view=rev
Log:
Finished my last run through the scripts. IMO they are well now. But as I said. First some
more ppl have to test them before I release anything.

- Cleaned whitespace
- PS Variable nulling does not remove them, more keeps a empty variable. This was the
reason for the "buildno.h not found" error fixed yesterday. This is not bad in
the situations where it still happened, but now we remove them fully.
- Updated changelog and readme.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
    trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/README.odt
    trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/options.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Tue May 12 19:02:44
2009
@@ -41,7 +41,7 @@
 if ($_ROSBE_OBJPATH -ne $null) {
     if (Test-Path "$_ROSBE_OBJPATH") {
         "WARNING: The Object-Path specified doesn't seem to exist.
Creating..."
-    } 
+    }
     $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH"
     $ENV:ROS_TEMPORARY = "$_ROSBE_OBJPATH"
 }
@@ -55,7 +55,7 @@
 if ($_ROSBE_USECCACHE -eq 1) {
     $_ROSBE_CCACHE = "ccache "
 } else {
-    $_ROSBE_CCACHE = $null
+    remove-variable _ROSBE_CCACHE
 }
     $ENV:HOST_CC = "$_ROSBE_CCACHE" + "gcc"
     $ENV:HOST_CPP = "$_ROSBE_CCACHE" + "g++"

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Tue May 12 19:02:44
2009
@@ -86,6 +86,6 @@
 elseif ("$args" -ne "") {
     $cl = "$args" + "_clean"
     make $cl
-    $cl = $null
+    remove-variable cl
     end
 }

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue May 12 19:02:44
2009
@@ -61,7 +61,7 @@
     $clnt = new-object System.Net.WebClient
     $clnt.DownloadFile($url,$file)
     $local:ErrorActionPreference = "Continue"
-} 
+}
 
 # Load the doskey macros and delete any macros for components
 # that are not actually present.

Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Tue May 12 19:02:44
2009
@@ -1,4 +1,21 @@
-*** May XXth, 2009 - RosBE 1.4.2 Released
+*** XXX XXth, 2009 - RosBE 1.X.X Released
+
+RosBE-Windows spring cleaning:
+- Rewrite most of the RosBE-Windows CMD scripts resulting in more compact and cleaner
code. (Colin Finck)
+- Remove the Standard MinGW Build Environment. We don't need it any longer since we
have a new GCC. (Colin Finck)
+- Get rid of the GCC 3.4.5-specific hacks: A properly compiled GCC 3.4.5 shouldn't
need them. (Colin Finck)
+- Get rid of the experimental ARM and PPC compiler support: It simply won't work that
way and we can readd that
+  later, when we have proper compilers. (Colin Finck)
+- Use setlocal wherever possible, so that we don't need to unload the used variables
explicitly. (Colin Finck)
+- Make the coding style more consistent. (Colin Finck)
+- Commands like "make bootcd livecd install" work again. (Daniel Reimer)
+- Cleaned up the PS Scripts with an eye to Colin's cleaning process and removed the
Variable nulling because its
+  not needed at all. All vars are only available in the actual Script. So the are killed
anyway. (Daniel Reimer)
+- In PS Logs were generated, but without any warnings or errors in it. Additionally they
were not even displayed
+  in the console too. This is now fixed. (Daniel Reimer)
+- "buildno.h not found" errors i PS were fixed now that I was able to see them
:-P (Daniel Reimer)
+
+*** May 08th, 2009 - RosBE 1.4.2 Released
 
 - Add the environment variables ROSBE_HOST_CFLAGS, ROSBE_HOST_CXXFLAGS,
ROSBE_TARGET_CFLAGS, ROSBE_TARGET_CXXFLAGS
   They contain existing pathes for the built-in include directories of the Host C/C++ and
Target C/C++ compilers as compiler flags.
@@ -39,7 +56,7 @@
 - Fixed: More logical names for the GCC Folders
 - Fixed: Drive not Found Errors (Colin Finck, d0g)
 - Fixed: clean when using _ROSBE_OBJPATH and/or _ROSBE_OUTPATH
-- Fixed: If the specified OBJ and OUT Paths are non existant, don't just abort.
Create 
+- Fixed: If the specified OBJ and OUT Paths are non existant, don't just abort.
Create
   them and continue.
 - Fixed: Options.exe configs the PS Port now too.
 - Updated: "clean MODULENAME" does the same like "make MODULENAME_clean
now"
@@ -76,11 +93,11 @@
 - Added: YASM 0.72, which supports 64 bit asm too. (Daniel Reimer)
 - Added: Update command (Daniel Reimer)
 - Added: nostrip function (Christoph von Wittich)
-- Added: RosBE Debugging Feature which disables the @echo off. just set 
+- Added: RosBE Debugging Feature which disables the @echo off. just set
          _ROSBE_DEBUG=1 (Daniel Reimer)
 - Added: Mingw-64 GCC 4.4.0 for the 64 bit Branch. It will be installed with a
          Optional installer (Daniel Reimer)
-- Fixed: Fixed the Header Mess in the different GCC Versions. Now the need for 
+- Fixed: Fixed the Header Mess in the different GCC Versions. Now the need for
          LIBRARY_PATH is no more and all Arches use THEIR Headers. (Samuel Serapion)
 - Fixed: Dependant on the Arch variable a crosscompiler will be used now. (Daniel
Reimer)
 - Fixed: Clean only cleans the arch which is active right now. (Daniel Reimer)

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Tue May 12 19:02:44 2009
@@ -73,15 +73,15 @@
 
 if exist "%OBJCLEANPATH%\." (
     echo Cleaning ReactOS %ROS_ARCH% source directory...
-    
+
     if exist "%OBJCLEANPATH%\." (
         rd /s /q "%OBJCLEANPATH%" 1> NUL 2> NUL
     )
-    
+
     if exist "%OUTCLEANPATH%\." (
         rd /s /q "%OUTCLEANPATH%" 1> NUL 2> NUL
     )
-    
+
     echo Done cleaning ReactOS %ROS_ARCH% source directory.
 ) else (
     echo ERROR: There is no %ROS_ARCH% compiler output to clean.
@@ -93,7 +93,6 @@
 
 goto :EOF
 
-
 :EOC
 title ReactOS Build Environment %_ROSBE_VERSION%
 endlocal

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Tue May 12 19:02:44 2009
@@ -31,14 +31,14 @@
     ) else (
         echo Main Configuration File was not found in ReactOS Source Tree.
     )
-    
+
     if exist "%APPDATA%\RosBE\config.rbuild" (
         del "%APPDATA%\RosBE\config.rbuild"
         echo Working Configuration File was found and deleted.
     ) else (
         echo Working Configuration File was not found in ReactOS Source Tree.
     )
-    
+
     goto :NOK
 )
 

Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA…
==============================================================================
Binary files - no diff available.

Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Tue May 12 19:02:44 2009
@@ -19,7 +19,7 @@
 :: Parse the command line arguments.
 if "%1" == "" (
     set /p ARCH="Please enter an Architecture you want to build ReactOS for: "
-    
+
     if "!ARCH!" == "" (
         echo ERROR: You must enter an Architecture.
         goto :EOC

Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] Tue May 12 19:02:44
2009
@@ -21,7 +21,7 @@
 :: Parse the command line arguments.
 if "%1" == "" (
     set /p SOURCEDIR="Please enter a ReactOS source directory, or
'previous': "
-    
+
     if "!SOURCEDIR!" == "" (
         echo ERROR: You must enter a ReactOS source directory, or 'previous'.
         goto :EOC
@@ -37,7 +37,7 @@
         echo ERROR: The path specified doesn't seem to exist.
         goto :EOC
     )
-    
+
     pushd %SOURCEDIR%
 )
 

Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Tue May 12 19:02:44
2009
@@ -20,7 +20,7 @@
 :: Parse the command line arguments. Ask the user if certain parameters are missing.
 if "%1" == "" (
     set /p TOOLPATH="Please enter a MinGW/GCC directory (don't use quotes):
"
-    
+
     if "!TOOLPATH!" == "" (
         echo ERROR: You must enter a MinGW/GCC directory.
         goto :EOC
@@ -31,7 +31,7 @@
 
 if "%2" == "" (
     set /p TOOLMODE="Please specify, if this will be the Target or Host GCC: "
-    
+
     if "!TOOLMODE!" == "" (
         echo ERROR: You must enter "target" or "host".
         goto :EOC

Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Tue May 12 19:02:44
2009
@@ -28,7 +28,7 @@
     pushd "%_ROSBE_BASEDIR%"
     call "%options%"
     popd
-    
+
     if exist "%cfgfile%" (
         call "%cfgfile%"
     )

Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] Tue May 12 19:02:44
2009
@@ -66,7 +66,7 @@
     "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%FILEPATH%"
"%ADDRESS%"
 ) else (
     set /a BASEADDRESS+=0x%ADDRESS%
-    
+
     for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe"
!BASEADDRESS!"') do set RELBASE=%%i
     "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "!FILEPATH!"
"!RELBASE!"
 )

Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Tue May 12 19:02:44 2009
@@ -25,13 +25,13 @@
     title SVN Updating...
     echo This might take a while, so please be patient.
     echo.
-    
+
     if not "%2" == "" (
         "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2
     ) else (
         "%_ROSBE_BASEDIR%\Tools\svn.exe" update
     )
-    
+
     goto :EOC
 )
 
@@ -39,9 +39,9 @@
     title SVN Cleaning...
     echo This might take a while, so please be patient.
     echo.
-    
+
     "%_ROSBE_BASEDIR%\Tools\svn.exe" cleanup
-    
+
     goto :EOC
 )
 
@@ -52,14 +52,14 @@
         echo ERROR: Folder already contains a repository.
         goto :EOC
     )
-    
+
     dir /b 2>nul | findstr "." >nul
     if errorlevel 1 (
         "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/reactos .
     ) else (
         echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors.
ABORTED
     )
-    
+
     goto :EOC
 )
 
@@ -69,17 +69,17 @@
     title SVN Status
     echo This might take a while, so please be patient.
     echo.
-    
+
     for /f "usebackq tokens=2" %%i in
(`""%_ROSBE_BASEDIR%\Tools\svn.exe" info | find
"Revision:""`) do set OFFSVN=%%i
     for /f "usebackq tokens=2" %%j in
(`""%_ROSBE_BASEDIR%\Tools\svn.exe" info
svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set
ONSVN=%%j
-    
+
     echo Local Revision: !OFFSVN!
     echo Online HEAD Revision: !ONSVN!
     echo.
 
     if !OFFSVN! lss !ONSVN! (
         echo Your tree is not up to date. Do you want to update it?
-        
+
         set /p UP="Please enter 'yes' or 'no': "
         if /i "!UP!"=="yes" "%_ROSBE_BASEDIR%\ssvn" update
         if /i "!UP!"=="y" "%_ROSBE_BASEDIR%\ssvn" update
@@ -88,7 +88,7 @@
     if !OFFSVN! equ !ONSVN! (
         echo Your tree is up to date.
     )
-    
+
     goto :EOC
 )