[ros-diffs] [dreimer] 45058: Some heavy cleanup. - We already have the tools folder in PATH for ages now, so we don't need to write the whole path to run a app from there. - Adding the Host GCC Path to PATH twice doesn't make things better. - Tidy up the clean command a bit more with Colin's Version in mind.

dreimer at svn.reactos.org dreimer at svn.reactos.org
Wed Jan 13 10:27:18 CET 2010


Author: dreimer
Date: Wed Jan 13 10:27:18 2010
New Revision: 45058

URL: http://svn.reactos.org/svn/reactos?rev=45058&view=rev
Log:
Some heavy cleanup.
- We already have the tools folder in PATH for ages now, so we don't need to write the whole path to run a app from there.
- Adding the Host GCC Path to PATH twice doesn't make things better.
- Tidy up the clean command a bit more with Colin's Version in mind.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/options.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/update.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -20,7 +20,7 @@
 }
 
 function rembin {
-    # Check if we have something to clean, if so, clean it.
+    # Check if we have any binaries to clean, if so, clean them.
 
     # Apply modified obj and out paths for deletion.
 
@@ -46,12 +46,12 @@
         $null = (Remove-Item "$MAKEFILE" -force)
     }
 
-    if (Test-Path "$OBJCLEANPATH\.") {
+    if (Test-Path "$OBJCLEANPATH") {
         "Cleaning ReactOS $ENV:ROS_ARCH source directory..."
-        if (Test-Path "$OBJCLEANPATH\.") {
+        if (Test-Path "$OBJCLEANPATH") {
             $null = (Remove-Item "$OBJCLEANPATH" -recurse -force)
         }
-        if (Test-Path "$OUTCLEANPATH\.") {
+        if (Test-Path "$OUTCLEANPATH") {
             $null = (Remove-Item "$OUTCLEANPATH" -recurse -force)
         }
         "Done cleaning ReactOS $ENV:ROS_ARCH source directory."
@@ -71,16 +71,13 @@
 
 if ("$args" -eq "") {
     rembin
-    end
 }
 elseif ("$args" -eq "logs") {
     remlog
-    end
 }
 elseif ("$args" -eq "all") {
     rembin
     remlog
-    end
 }
 elseif ("$args" -ne "") {
     $argindex = 0
@@ -90,5 +87,5 @@
         $argindex += 1
     }
     remove-variable cl
-    end
 }
+end

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -227,7 +227,7 @@
     settitle
 }
 elseif ("$args" -ne "") {
-    "Unknown parameter specified. Try 'help [COMMAND]'."
+    "Unknown parameter specified. Try 'help config'."
     settitle
 }
 

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -96,7 +96,7 @@
         "                       appropiate name."
         "    depends          - Does a full dependency check on the ReactOS Source"
         "                       and generates a new makefile. This will take a while."
-        "    ""module""-depends - Does a dependency check for one module with the"
+        "    ""module""_depends - Does a dependency check for one module with the"
         "                       appropiate name."
 } elseif ("$args" -eq "makex") {
     " Usage: makex [OPTIONS]"
@@ -118,7 +118,7 @@
         "                       appropiate name."
         "    depends          - Does a full dependency check on the ReactOS Source"
         "                       and generates a new makefile. This will take a while."
-        "    ""module""-depends - Does a dependency check for one module with the"
+        "    ""module""_depends - Does a dependency check for one module with the"
         "                       appropiate name."
     " NOTE: The number makex uses can be modified by editing Build.cmd"
     "       located in the RosBE directory, instructions for doing so are"
@@ -193,7 +193,7 @@
     }
 } elseif  ("$args" -eq "scut") {
     if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") {
-        IEX "&'$_ROSBE_BASEDIR\Tools\scut.exe' --help"
+        IEX "& scut.exe --help"
     }
 } elseif  ("$args" -eq "ssvn") {
     if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") {

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -45,7 +45,7 @@
 $global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs"
 $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386"
 $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH"
-$global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$_ROSBE_HOST_MINGWPATH\bin;$ENV:PATH"
+$global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:PATH"
 
 # Fix Bison package path (just in case RosBE is installed in a path which contains spaces)
 $ENV:BISON_PKGDATADIR = ((New-Object -ComObject Scripting.FileSystemObject).GetFolder("$_ROSBE_HOST_MINGWPATH\share\bison")).ShortPath
@@ -119,7 +119,6 @@
 
     if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") {
         set-alias SSVN "$_ROSBE_BASEDIR\sSVN.ps1" -scope Global
-        set-alias SVN "$_ROSBE_BASEDIR\Tools\svn.exe" -scope Global
     }
     function global:UPDATE {IEX "&'$_ROSBE_BASEDIR\Tools\Elevate.exe' '$pshome\powershell.exe' -noexit {&'$_ROSBE_BASEDIR\update.ps1' $_ROSBE_VERSION '$_ROSBE_BASEDIR' $args}"}
 

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -35,11 +35,11 @@
 $baseaddr = (objdump -p $FILEPATH | select-string "ImageBase").tostring().split()
 $baseaddr = "0x" + ($baseaddr.get($baseaddr.length - 1))
 if ($baseaddr -lt $ADDRESS) {
-    IEX "& '$_ROSBE_BASEDIR\Tools\log2lines.exe' '$FILEPATH' '$ADDRESS'"
+    IEX "& log2lines.exe '$FILEPATH' '$ADDRESS'"
 } else {
     $baseaddr = ($baseaddr | % {[Convert]::ToInt32($_,16)}) + ($ADDRESS | % {[Convert]::ToInt32($_,16)})
     $relbase = "0x" + ("{0:X}" -f $baseaddr)
-    IEX "& '$_ROSBE_BASEDIR\Tools\log2lines.exe' '$FILEPATH' '$relbase'"
+    IEX "& log2lines.exe '$FILEPATH' '$relbase'"
 }
 
 $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -7,13 +7,13 @@
 #
 
 function UP($arg) {
-    $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | select-string "Revision:"
+    $OFFSVN = IEX "& svn.exe info" | select-string "Revision:"
     $OFFSVN = $OFFSVN -replace "(.*)Revision: ",''
     $OFFSVN = [CONVERT]::ToInt32($OFFSVN,10)
     if ("$ENV:ROS_ARCH" -eq "amd64") {
-        $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos" | select-string "Revision:"
+        $ONSVN = IEX "& svn.exe info svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos" | select-string "Revision:"
     } else {
-        $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | select-string "Revision:"
+        $ONSVN = IEX "& svn.exe info svn://svn.reactos.org/reactos/trunk/reactos" | select-string "Revision:"
     }
     $ONSVN = $ONSVN -replace "(.*)Revision: ",''
     $ONSVN = [CONVERT]::ToInt32($ONSVN,10)
@@ -31,31 +31,31 @@
         if ("$_ROSBE_SSVN_JOB" -eq "update") {
             if ("$($arg[1])" -ne "") {
                 $temparg = $arg[1]
-                IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg"
+                IEX "& svn.exe update -r $temparg"
                 if (Test-Path "modules\rosapps\.") {
                     Set-Location modules\rosapps
                     "Updating RosApps..."
-                    IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg"
+                    IEX "& svn.exe update -r $temparg"
                     Set-Location "$_ROSBE_ROSSOURCEDIR"
                 }
                 if (Test-Path "modules\rostests\.") {
                     Set-Location modules\rostests
                     "Updating RosTests..."
-                    IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg"
+                    IEX "& svn.exe update -r $temparg"
                     Set-Location "$_ROSBE_ROSSOURCEDIR"
                 }
             } else {
-                IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update"
+                IEX "& svn.exe update"
                 if (Test-Path "modules\rosapps\.") {
                     Set-Location modules\rosapps
                     "Updating RosApps..."
-                    IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update"
+                    IEX "& svn.exe update"
                     Set-Location "$_ROSBE_ROSSOURCEDIR"
                 }
                 if (Test-Path "modules\rostests\.") {
                     Set-Location modules\rostests
                     "Updating RosTests..."
-                    IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update"
+                    IEX "& svn.exe update"
                     Set-Location "$_ROSBE_ROSSOURCEDIR"
                 }
             }
@@ -63,7 +63,7 @@
             $CL = Read-Host "Please enter 'yes' or 'no': "
             if (("$CL" -eq "yes") -or ("$CL" -eq "y")) {
                 $range = "$OFFSVN" + ":" + "$ONSVN"
-                IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' log -r $range"
+                IEX "& svn.exe log -r $range"
             }
         }
     }
@@ -89,7 +89,7 @@
     $host.ui.RawUI.WindowTitle = "SVN Cleaning..."
     "This might take a while, so please be patient."
     ""
-    IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' cleanup"
+    IEX "& svn.exe cleanup"
 }
 
 # Check if the folder is empty. If not, output an error.
@@ -102,9 +102,9 @@
         $dir = get-childitem
         if ("$dir" -eq "") {
             if ("$ENV:ROS_ARCH" -eq "amd64") {
-                IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos ."
+                IEX "& svn.exe checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos ."
             } else {
-                IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/reactos ."
+                IEX "& svn.exe checkout svn://svn.reactos.org/reactos/trunk/reactos ."
             }
         } else {
             "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED"
@@ -125,9 +125,9 @@
         $dir = get-childitem
         if ("$dir" -eq "") {
             if ("$ENV:ROS_ARCH" -eq "amd64") {
-                IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps ."
+                IEX "& svn.exe checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps ."
             } else {
-                IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/rosapps ."
+                IEX "& svn.exe checkout svn://svn.reactos.org/reactos/trunk/rosapps ."
             }
         } else {
             "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED"
@@ -149,9 +149,9 @@
         $dir = get-childitem
         if ("$dir" -eq "") {
             if ("$ENV:ROS_ARCH" -eq "amd64") {
-                IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests ."
+                IEX "& svn.exe checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests ."
             } else {
-                IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/rostests ."
+                IEX "& svn.exe checkout svn://svn.reactos.org/reactos/trunk/rostests ."
             }
         } else {
             "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED"

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -7,7 +7,7 @@
 #
 
 function paramcall($arg) {
-    IEX "&'$_ROSBE_BASEDIR\Tools\scut.exe' $arg"
+    IEX "& scut.exe $arg"
 }
 
 function parse($arg) {

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -49,7 +49,7 @@
             }
             if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z") {
                 remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT\*.*" -force -EA SilentlyContinue
-                IEX "&'$_ROSBE_BASEDIR\Tools\7z.exe' x '$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z'"
+                IEX "& 7z.exe x '$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z'"
                 set-location "$_ROSBE_VERSION-$_ROSBE_STATCOUNT"
                 IEX "& .\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.ps1"
                 return
@@ -57,7 +57,7 @@
                 "ERROR: This Update does not seem to exist or the Internet connection is not working correctly."
                 return
             }
-        } elseif ("$YESNO" -eq "no") {
+        } elseif (("$YESNO" -eq "no") -or ("$YESNO" -eq "n")) {
             "Do you want to be asked again to install this update?"
             $YESNO = Read-Host "(yes), (no)"
             if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) {

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -17,7 +17,7 @@
 :: Check if config.template.rbuild is newer than config.rbuild, if it is then
 :: abort the build and inform the user.
 if exist .\config.rbuild (
-    "%_ROSBE_BASEDIR%\Tools\chknewer.exe" .\config.template.rbuild .\config.rbuild
+    chknewer.exe config.template.rbuild config.rbuild
     if !errorlevel! == 1 (
         echo.
         echo *** config.template.rbuild is newer than config.rbuild ***
@@ -46,7 +46,7 @@
 
 :: Do the actual building
 if %_ROSBE_SHOWTIME% == 1 (
-    set BUILDTIME_COMMAND="%_ROSBE_BASEDIR%\Tools\buildtime.exe"
+    set BUILDTIME_COMMAND=buildtime.exe
 ) else (
     set BUILDTIME_COMMAND=
 )
@@ -55,12 +55,12 @@
     if not exist "%_ROSBE_LOGDIR%\." (
         mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL
     )
-    %BUILDTIME_COMMAND% "make.exe" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt"
+    %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt"
 ) else (
-    %BUILDTIME_COMMAND% "make.exe" -j %MAKE_JOBS% %*
+    %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %*
 )
 
 :EOC
 :: Highlight the fact that building has ended.
-"%_ROSBE_BASEDIR%\Tools\flash.exe"
+flash.exe
 title ReactOS Build Environment %_ROSBE_VERSION%

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -18,26 +18,23 @@
 title Cleaning...
 
 if "%1" == "" (
-    call :DEL
-    goto :EOC
+    call :BIN
 ) else if /i "%1" == "logs" (
     call :LOG
-    goto :EOC
 ) else if /i "%1" == "all" (
-    call :DEL
+    call :BIN
     call :LOG
-    goto :EOC
 ) else (
-    call :WHILE %*
+    call :MODULE %*
 )
 goto :EOC
 
-:WHILE
+:MODULE
     if "%1" == "" goto :EOF
     call "%_ROSBE_BASEDIR%\Make.cmd" %1_clean
     shift /1
     echo.
-    GOTO :WHILE %*
+    GOTO :MODULE %*
 
 :: Check if we have any logs to clean, if so, clean them.
 :LOG
@@ -51,8 +48,8 @@
 goto :EOF
 
 
-:: Check if we have something to clean, if so, clean it.
-:DEL
+:: Check if we have any binaries to clean, if so, clean them.
+:BIN
 
 :: Apply modified obj and out paths for deletion.
 if "%_ROSBE_OBJPATH%" == "" (

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -234,7 +234,7 @@
 )
 
 if not "%1" == "" (
-    echo Unknown parameter specified. Try 'help [COMMAND]'.
+    echo Unknown parameter specified. Try 'help config'.
     goto :NOK
 )
 
@@ -260,7 +260,7 @@
 :: Check if config.template.rbuild is newer than config.rbuild, if it is then
 :: inform the user and offer an update.
 if exist ".\config.rbuild" (
-    "%_ROSBE_BASEDIR%\Tools\chknewer.exe" ".\config.template.rbuild" ".\config.rbuild"
+    chknewer.exe config.template.rbuild config.rbuild
     if !errorlevel! == 1 (
         echo.
         echo *** config.template.rbuild is newer than working config.rbuild ***

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -103,7 +103,7 @@
         echo                       appropiate name.
         echo    depends          - Does a full dependency check on the ReactOS Source
         echo                       and generates a new makefile. This will take a while.
-        echo    "module"-depends - Does a dependency check for one module with the
+        echo    "module"_depends - Does a dependency check for one module with the
         echo                       appropiate name.
 ) else if /i "%1" == "makex" (
     echo Usage: makex [OPTIONS]
@@ -125,7 +125,7 @@
         echo                       appropiate name.
         echo    depends          - Does a full dependency check on the ReactOS Source
         echo                       and generates a new makefile. This will take a while.
-        echo    "module"-depends - Does a dependency check for one module with the
+        echo    "module"_depends - Does a dependency check for one module with the
         echo                       appropiate name.
     echo NOTE: The number makex uses can be modified by editing Build.cmd
     echo       located in the RosBE directory, instructions for doing so are
@@ -200,7 +200,7 @@
     )
 ) else if /i "%1" == "scut" (
     if exist "%_ROSBE_BASEDIR%\scut.cmd" (
-        "%_ROSBE_BASEDIR%\Tools\scut.exe" --help
+        scut.exe --help
     )
 ) else if /i "%1" == "ssvn" (
     if exist "%_ROSBE_BASEDIR%\sSVN.cmd" (

Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -39,7 +39,7 @@
 set _ROSBE_SHOWVERSION=0
 set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386
 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH%
-set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_HOST_MINGWPATH%\bin;%PATH%
+set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%PATH%
 
 :: Fix Bison package path (just in case RosBE is installed in a path which contains spaces)
 set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison

Modified: trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -15,7 +15,7 @@
 )
 
 :: Get the raw date and time.
-for /f "usebackq tokens=1" %%u in (`"%_ROSBE_BASEDIR%\Tools\getdate.exe"`) do set DATERAW=%%u
+for /f "usebackq tokens=1" %%u in (`getdate.exe`) do set DATERAW=%%u
 for /f "usebackq tokens=1" %%u in (`time /t`) do set TIMERAW=%%u
 
 :: Check if we need to pad the time with a zero.

Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -26,7 +26,7 @@
         goto :EOC
     )
 ) else (
-    for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\rquote.exe" %1"`) do set TOOLPATH=%%i
+    for /f "usebackq tokens=*" %%i in (`"rquote.exe %1"`) do set TOOLPATH=%%i
 )
 
 if "%2" == "" (

Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/options.cmd?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -14,8 +14,6 @@
 
 title Options
 
-set options=%_ROSBE_BASEDIR%\Tools\options.exe
-
 if not "%ROS_ARCH%" == "i386" (
     set param=%ROS_ARCH%
     set cfgfile=%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd
@@ -25,9 +23,9 @@
 )
 
 :: Run options.exe
-if exist "%options%" (
+if exist "%_ROSBE_BASEDIR%\Tools\options.exe" (
     pushd "%_ROSBE_BASEDIR%"
-    call "%options%" %param%
+    call options.exe %param%
     popd
 
     if exist "%cfgfile%" (

Modified: trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -49,7 +49,7 @@
 :: Check if the user supplied a path, if they didn't look for
 :: the specified file in the current directory and any
 :: sub-directories.
-"%_ROSBE_BASEDIR%\Tools\chkslash.exe" "%FILEPATH%"
+chkslash.exe "%FILEPATH%"
 if errorlevel 2 (
     for /f "usebackq" %%i in (`"dir /a:-d /s /b "%FILEPATH%" 2>NUL | findstr "%FILEPATH%""`) do set FILEPATH=%%i
 )
@@ -63,12 +63,12 @@
 for /f "tokens=2" %%i in ('"objdump -p "%FILEPATH%" 2>NUL | findstr ImageBase"') do set BASEADDRESS=0x%%i
 
 if %%i lss %ADDRESS% (
-    "%_ROSBE_BASEDIR%\Tools\log2lines.exe" "%FILEPATH%" "%ADDRESS%"
+    log2lines.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\log2lines.exe" "!FILEPATH!" "!RELBASE!"
+    for /f %%i in ('"echoh.exe !BASEADDRESS!"') do set RELBASE=%%i
+    log2lines.exe "!FILEPATH!" "!RELBASE!"
 )
 
 :EOC

Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -32,7 +32,7 @@
 if /i "%1" == "cleanup" (
     title SVN Cleaning...
 
-    "%_ROSBE_BASEDIR%\Tools\svn.exe" cleanup
+    svn.exe cleanup
 
     goto :EOC
 )
@@ -48,9 +48,9 @@
     dir /b 2>nul | findstr "." >nul
     if errorlevel 1 (
         if "%ROS_ARCH%" == "amd64" (
-            "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos .
+            svn.exe checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos .
         ) else (
-            "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/reactos .
+            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
@@ -72,9 +72,9 @@
     dir /b 2>nul | findstr "." >nul
     if errorlevel 1 (
         if "%ROS_ARCH%" == "amd64" (
-            "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps .
+            svn.exe checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps .
         ) else (
-            "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rosapps .
+            svn.exe checkout svn://svn.reactos.org/reactos/trunk/rosapps .
         )
     ) else (
         echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED
@@ -97,9 +97,9 @@
     dir /b 2>nul | findstr "." >nul
     if errorlevel 1 (
         if "%ROS_ARCH%" == "amd64" (
-            "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests .
+            svn.exe checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests .
         ) else (
-            "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rostests .
+            svn.exe checkout svn://svn.reactos.org/reactos/trunk/rostests .
         )
     ) else (
         echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED
@@ -123,11 +123,11 @@
 )
 
 :UP
-    for /f "usebackq tokens=2" %%i in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info | find "Revision:""`) do set OFFSVN=%%i
+    for /f "usebackq tokens=2" %%i in (`"svn.exe info | find "Revision:""`) do set OFFSVN=%%i
     if "%ROS_ARCH%" == "amd64" (
-        for /f "usebackq tokens=2" %%j in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos | find "Revision:""`) do set ONSVN=%%j
+        for /f "usebackq tokens=2" %%j in (`"svn.exe info svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos | find "Revision:""`) do set ONSVN=%%j
     ) else (
-        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
+        for /f "usebackq tokens=2" %%j in (`"svn.exe info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j
     )
 
     echo Local Revision: !OFFSVN!
@@ -142,31 +142,31 @@
         )
         if "!_ROSBE_SSVN_JOB!" == "update" (
             if not "%2" == "" (
-                "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2
+                svn.exe update -r %2
                 if exist "modules\rosapps\." (
                     cd modules\rosapps
                     echo Updating RosApps...
-                    "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2
+                    svn.exe update -r %2
                     cd "%_ROSBE_ROSSOURCEDIR%"
                 )
                 if exist "modules\rostests\." (
                     cd modules\rostests
                     echo Updating RosTests...
-                    "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2
+                    svn.exe update -r %2
                     cd "%_ROSBE_ROSSOURCEDIR%"
                 )
             ) else (
-                "%_ROSBE_BASEDIR%\Tools\svn.exe" update
+                svn.exe update
                 if exist "modules\rosapps\." (
                     cd modules\rosapps
                     echo Updating RosApps...
-                    "%_ROSBE_BASEDIR%\Tools\svn.exe" update
+                    svn.exe update
                     cd "%_ROSBE_ROSSOURCEDIR%"
                 )
                 if exist "modules\rostests\." (
                     cd modules\rostests
                     echo Updating RosTests...
-                    "%_ROSBE_BASEDIR%\Tools\svn.exe" update
+                    svn.exe update
                     cd "%_ROSBE_ROSSOURCEDIR%"
                 )
             )
@@ -174,7 +174,7 @@
         echo Do you want to see the changelog?
         set /p CL="Please enter 'yes' or 'no': "
         if /i "!CL!"=="yes" (
-            "%_ROSBE_BASEDIR%\Tools\svn.exe" log -r !OFFSVN!:!ONSVN!
+            svn.exe log -r !OFFSVN!:!ONSVN!
         )
     )
     if !OFFSVN! equ !ONSVN! (

Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -25,7 +25,7 @@
 if /i "%1" == "--help" goto paramcall
 
 :: It's a shortcut name, so change the directory
-for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\scut.exe" %*"`) do (
+for /f "usebackq tokens=*" %%i in (`"scut.exe %*"`) do (
     if /i not "%%i" == "Default" (
         if exist "%%i\." (
             cd /d %%i
@@ -36,7 +36,7 @@
 goto :EOC
 
 :paramcall
-call "%_ROSBE_BASEDIR%\Tools\scut.exe" "%1" %2 %3
+call scut.exe "%1" %2 %3
 
 :EOC
 title ReactOS Build Environment %_ROSBE_VERSION%

Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/update.cmd?rev=45058&r1=45057&r2=45058&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010
@@ -32,7 +32,7 @@
 
 :: First check for a new Updater
 for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF
-"Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL
+wget.exe -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL
 for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF
 if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! (
     cls
@@ -63,7 +63,7 @@
     set _ROSBE_STATCOUNT=%2
     cd tmp
     if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
-        "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL
+        wget.exe -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL
         if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
             type "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt"
         ) else (
@@ -97,7 +97,7 @@
 )
 
 if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
-    "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL
+    wget.exe -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL
 )
 
 if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
@@ -110,11 +110,11 @@
     goto :no
     :updyes
         if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z" (
-            "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z 1> NUL 2> NUL
+            wget.exe -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z 1> NUL 2> NUL
         )
         if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z" (
             del /F /Q "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!\*.*" 1>NUL 2>NUL
-            "%_ROSBE_BASEDIR%\Tools\7z.exe" x "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z"
+            7z.exe x "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z"
             cd "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!"
             call "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.cmd"
             goto :EOF
@@ -152,7 +152,7 @@
     if "!_ROSBE_STATCOUNT!" == "10" GOTO :OUT
     cd tmp
     if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
-        "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL
+        wget.exe -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL
         if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
             set _ROSBE_UPDATES=!_ROSBE_UPDATES! !_ROSBE_STATCOUNT!
         ) else (




More information about the Ros-diffs mailing list