28 Oct
2008
28 Oct
'08
2:42 p.m.
Author: dreimer
Date: Tue Oct 28 09:42:13 2008
New Revision: 37040
URL: http://svn.reactos.org/svn/reactos?rev=37040&view=rev
Log:
Bit more clean up.
Modified:
trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1
trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd
trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.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 Oct 28 09:42:13
2008
@@ -206,12 +206,12 @@
#
if ($args.count -gt 1) {
if ($args[0] -eq "multi") {
- $host.ui.RawUI.WindowTitle = "makex $($args) parallel build started:
$TIMERAW"
+ $host.ui.RawUI.WindowTitle = "makex $($args) parallel build started:
$TIMERAW $ENV:ROS_ARCH"
}
BUILDMULTI $args
} else {
if ($args.count -gt 0) {
- $host.ui.RawUI.WindowTitle = "make $($args) build started: $TIMERAW"
+ $host.ui.RawUI.WindowTitle = "make $($args) build started: $TIMERAW
$ENV:ROS_ARCH"
}
BUILD $args
}
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 Oct 28 09:42:13
2008
@@ -28,81 +28,81 @@
#
if ($ENV:ROS_ARCH -eq "arm") {
- if (Test-Path "obj-arm") {
- "Cleaning ReactOS source directory..."
+ if (Test-Path ".\obj-arm") {
+ "Cleaning ReactOS ARM source directory..."
#
# Remove directories/makefile.auto created by the build.
#
- if (Test-Path "obj-arm") {
- $null = (Remove-Item "obj-arm" -recurse -force)
+ if (Test-Path ".\obj-arm") {
+ $null = (Remove-Item ".\obj-arm" -recurse -force)
}
- if (Test-Path "output-arm") {
- $null = (Remove-Item "output-arm" -recurse -force)
+ if (Test-Path ".\output-arm") {
+ $null = (Remove-Item ".\output-arm" -recurse -force)
}
- if (Test-Path "makefile-arm.auto") {
- $null = (Remove-Item "makefile-arm.auto" -force)
+ if (Test-Path ".\makefile-arm.auto") {
+ $null = (Remove-Item ".\makefile-arm.auto" -force)
}
- "Done cleaning ReactOS source directory."
+ "Done cleaning ReactOS ARM source directory."
} else {
"ERROR: There is no compiler output to clean."
}
}
if ($ENV:ROS_ARCH -eq "ppc") {
- if (Test-Path "obj-ppc") {
- "Cleaning ReactOS source directory..."
+ if (Test-Path ".\obj-ppc") {
+ "Cleaning ReactOS PPC source directory..."
#
# Remove directories/makefile.auto created by the build.
#
- if (Test-Path "obj-ppc") {
- $null = (Remove-Item "obj-ppc" -recurse -force)
+ if (Test-Path ".\obj-ppc") {
+ $null = (Remove-Item ".\obj-ppc" -recurse -force)
}
- if (Test-Path "output-ppc") {
- $null = (Remove-Item "output-ppc" -recurse -force)
+ if (Test-Path ".\output-ppc") {
+ $null = (Remove-Item ".\output-ppc" -recurse -force)
}
- if (Test-Path "makefile-ppc.auto") {
- $null = (Remove-Item "makefile-ppc.auto" -force)
+ if (Test-Path ".\makefile-ppc.auto") {
+ $null = (Remove-Item ".\makefile-ppc.auto" -force)
}
- "Done cleaning ReactOS source directory."
+ "Done cleaning ReactOS PPC source directory."
} else {
"ERROR: There is no compiler output to clean."
}
}
if ($ENV:ROS_ARCH -eq "amd64") {
- if (Test-Path "obj-amd64") {
- "Cleaning ReactOS source directory..."
+ if (Test-Path ".\obj-amd64") {
+ "Cleaning ReactOS x86_64 source directory..."
#
# Remove directories/makefile.auto created by the build.
#
- if (Test-Path "obj-amd64") {
- $null = (Remove-Item "obj-amd64" -recurse -force)
+ if (Test-Path ".\obj-amd64") {
+ $null = (Remove-Item ".\obj-amd64" -recurse -force)
}
- if (Test-Path "output-amd64") {
- $null = (Remove-Item "output-amd64" -recurse -force)
+ if (Test-Path ".\output-amd64") {
+ $null = (Remove-Item ".\output-amd64" -recurse -force)
}
- if (Test-Path "makefile-amd64.auto") {
- $null = (Remove-Item "makefile-amd64.auto" -force)
+ if (Test-Path ".\makefile-amd64.auto") {
+ $null = (Remove-Item ".\makefile-amd64.auto" -force)
}
- "Done cleaning ReactOS source directory."
+ "Done cleaning ReactOS x86_64 source directory."
} else {
"ERROR: There is no compiler output to clean."
}
}
if ($ENV:ROS_ARCH -eq $null) {
- if (Test-Path "obj-i386") {
- "Cleaning ReactOS source directory..."
+ if (Test-Path ".\obj-i386") {
+ "Cleaning ReactOS i386 source directory..."
#
# Remove directories/makefile.auto created by the build.
#
- if (Test-Path "obj-i386") {
- $null = (Remove-Item "obj-i386" -recurse -force)
+ if (Test-Path ".\obj-i386") {
+ $null = (Remove-Item ".\obj-i386" -recurse -force)
}
- if (Test-Path "output-i386") {
- $null = (Remove-Item "output-i386" -recurse -force)
+ if (Test-Path ".\output-i386") {
+ $null = (Remove-Item ".\output-i386" -recurse -force)
}
- if (Test-Path "makefile.auto") {
- $null = (Remove-Item "makefile.auto" -force)
+ if (Test-Path ".\makefile.auto") {
+ $null = (Remove-Item ".\makefile.auto" -force)
}
- "Done cleaning ReactOS source directory."
+ "Done cleaning ReactOS i386 source directory."
} else {
"ERROR: There is no compiler output to clean."
}
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Tue Oct 28 09:42:13
2008
@@ -22,7 +22,7 @@
" basedir - Switch back to the ReactOS source directory."
if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") {
- " charch [OPTIONS] - Change the Architecture to build for for
the"
+ " charch [OPTIONS] - Change the Architecture to build for the"
" current RosBE session."
}
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 Oct 28 09:42:13
2008
@@ -15,8 +15,8 @@
(Get-Host).UI.RawUI.BackgroundColor = "Black"
cls
-if ($APPDATA.Length -lt 1) {
- $APPDATA = $ENV:USERPROFILE
+if ($ENV:APPDATA.Length -lt 1) {
+ $ENV:APPDATA = $ENV:USERPROFILE
}
$ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot"
$global:_ROSBE_VERSION = 1.3
@@ -111,15 +111,15 @@
#
# Check if RosBE data directory exists, if not, create it.
#
-if (!(Test-Path "$APPDATA\RosBE")) {
- New-Item -path "$APPDATA" -name "RosBE" -type directory
+if (!(Test-Path "$ENV:APPDATA\RosBE")) {
+ New-Item -path "$ENV:APPDATA" -name "RosBE" -type directory
}
#
# Check if the user has used the options utility and if so, load their options.
#
-if (Test-Path "$APPDATA\RosBE\rosbe-options.ps1") {
- & "$APPDATA\RosBE\rosbe-options.ps1"
+if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") {
+ & "$ENV:APPDATA\RosBE\rosbe-options.ps1"
}
$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Tue Oct 28
09:42:13 2008
@@ -76,17 +76,17 @@
# Display the current version of GCC, NASM, ld and make.
#
if ($ENV:ROS_ARCH -ne $null) {
-& "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-gcc" -v 2> v.txt
-(select-string -path .\v.txt "gcc version") -replace ".*:
(.+?)\b",'$1'
-rm v.txt
-"gcc target - $_ROSBE_GCCTARGET"
-& "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-ld" -v
+ & "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-gcc" -v 2> v.txt
+ (select-string -path .\v.txt "gcc version") -replace ".*:
(.+?)\b",'$1'
+ rm v.txt
+ "gcc target - $_ROSBE_GCCTARGET"
+ & "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-ld" -v
} else {
-gcc -v 2> v.txt
-(select-string -path .\v.txt "gcc version" ) -replace ".*:
(.+?)\b",'$1'
-rm v.txt
-"gcc target - $_ROSBE_GCCTARGET"
-& ld -v
+ gcc -v 2> v.txt
+ (select-string -path .\v.txt "gcc version" ) -replace ".*:
(.+?)\b",'$1'
+ rm v.txt
+ "gcc target - $_ROSBE_GCCTARGET"
+ & ld -v
}
if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\nasm.exe") {
& nasm -v
@@ -95,7 +95,7 @@
& yasm --version | select-string "yasm 0"
} else {
if ($_ROSBE_MODE -eq "RosBE") {
- "ERROR: NASM is required to build ReactOS, none found in the current
MinGW/GCC."
+ "ERROR: NASM or YASM is required to build ReactOS, none found in the
current MinGW/GCC."
}
}
}
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 Oct 28 09:42:13 2008
@@ -53,7 +53,7 @@
:: Check if we have something to clean, if so, clean it.
::
if exist "obj-arm\." (
- echo Cleaning ReactOS source directory...
+ echo Cleaning ReactOS ARM source directory...
::
: Remove directories created by the build.
::
@@ -66,7 +66,7 @@
if exist "makefile-arm.auto" (
del "makefile-arm.auto" 1> NUL 2> NUL
)
- echo Done cleaning ReactOS source directory.
+ echo Done cleaning ReactOS ARM source directory.
) else (
echo ERROR: There is no compiler output to clean.
)
@@ -77,7 +77,7 @@
:: Check if we have something to clean, if so, clean it.
::
if exist "obj-ppc\." (
- echo Cleaning ReactOS source directory...
+ echo Cleaning ReactOS PPC source directory...
::
: Remove directories created by the build.
::
@@ -90,7 +90,7 @@
if exist "makefile-ppc.auto" (
del "makefile-ppc.auto" 1> NUL 2> NUL
)
- echo Done cleaning ReactOS source directory.
+ echo Done cleaning ReactOS PPC source directory.
) else (
echo ERROR: There is no compiler output to clean.
)
@@ -101,7 +101,7 @@
:: Check if we have something to clean, if so, clean it.
::
if exist "obj-amd64\." (
- echo Cleaning ReactOS source directory...
+ echo Cleaning ReactOS X86_64 source directory...
::
: Remove directories created by the build.
::
@@ -114,7 +114,7 @@
if exist "makefile-amd64.auto" (
del "makefile-amd64.auto" 1> NUL 2> NUL
)
- echo Done cleaning ReactOS source directory.
+ echo Done cleaning ReactOS X86_64 source directory.
) else (
echo ERROR: There is no compiler output to clean.
)
@@ -125,7 +125,7 @@
:: Check if we have something to clean, if so, clean it.
::
if exist "obj-i386\." (
- echo Cleaning ReactOS source directory...
+ echo Cleaning ReactOS i386 source directory...
::
: Remove directories created by the build.
::
@@ -138,7 +138,7 @@
if exist "makefile.auto" (
del "makefile.auto" 1> NUL 2> NUL
)
- echo Done cleaning ReactOS source directory.
+ echo Done cleaning ReactOS i386 source directory.
) else (
echo ERROR: There is no compiler output to clean.
)
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Tue Oct 28 09:42:13 2008
@@ -28,7 +28,7 @@
echo basedir - Switch back to the ReactOS source directory.
if exist "%_ROSBE_BASEDIR%\charch.cmd" (
- echo charch [OPTIONS] - Change the Architecture to build for for the
+ echo charch [OPTIONS] - Change the Architecture to build for the
echo current RosBE session.
)
Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Oct 28
09:42:13 2008
@@ -37,12 +37,12 @@
if .%_ROSBE_ARCH%. == .1. (
set ROS_ARCH=arm
set ROS_PREFIX=arm-pc-mingw32
- REM set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0
+ set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0
)
if .%_ROSBE_ARCH%. == .2. (
set ROS_ARCH=ppc
set ROS_PREFIX=ppc-pc-mingw32
- REM set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0
+ set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0
)
if .%_ROSBE_ARCH%. == .3. (
set ROS_ARCH=amd64