Author: dreimer Date: Tue Dec 9 07:51:24 2008 New Revision: 37963
URL: http://svn.reactos.org/svn/reactos?rev=37963&view=rev Log: Some more tidy up work. As side effect RosBE does support even more Target Compilers.
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Dec 9 07:51:24 2008 @@ -142,23 +142,9 @@ if ($args -eq "oldmode") { clear-host $_ROSBE_MODE = "MinGW" - } - elseif ($args -eq "arm") { + } else { clear-host - $_ROSBE_ARCH = 1 - } - elseif ($args -eq "ppc") { - clear-host - $_ROSBE_ARCH = 2 - } - elseif ($args -eq "amd64") { - clear-host - $_ROSBE_ARCH = 3 - } - elseif ($args -ne $null) { - clear-host - "Unknown parameter specified. Exiting." - exit + $_ROSBE_ARCH = $args } } RosBE
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Tue Dec 9 07:51:24 2008 @@ -32,23 +32,10 @@ } if ($_1 -eq "i386") { $_ROSBE_ARCH = $null - SYSPARAM +} else { + $_ROSBE_ARCH = $_1 } -elseif ($_1 -eq "arm") { - $_ROSBE_ARCH = 1 - SYSPARAM -} -elseif ($_1 -eq "ppc") { - $_ROSBE_ARCH = 2 - SYSPARAM -} -elseif ($_1 -eq "amd64") { - $_ROSBE_ARCH = 3 - SYSPARAM -} -else { - "Unknown parameter specified. Try 'help [COMMAND]'." -} +SYSPARAM
if ($_ROSBE_VERSION -ne $null) { $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/Powershel... ============================================================================== --- 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 Dec 9 07:51:24 2008 @@ -25,20 +25,27 @@ $ENV:ROS_ARCH = $null $ENV:ROS_PREFIX = $null
-if ($_ROSBE_ARCH -eq 1) { - $ENV:ROS_ARCH = "arm" - $ENV:ROS_PREFIX = "arm-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\arm" -} -if ($_ROSBE_ARCH -eq 2) { - $ENV:ROS_ARCH = "ppc" - $ENV:ROS_PREFIX = "ppc-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\ppc" -} -if ($_ROSBE_ARCH -eq 3) { - $ENV:ROS_ARCH = "amd64" - $ENV:ROS_PREFIX = "x86_64-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\x86_64" +if ($_ROSBE_ARCH -ne $null) { + $ENV:ROS_ARCH = $_ROSBE_ARCH + $ENV:ROS_PREFIX = "$_ROSBE_ARCH-pc-mingw32" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR$_ROSBE_ARCH" + + # HAXX + + if ($_ROSBE_ARCH -eq "amd64") { + $ENV:ROS_PREFIX = "x86_64-pc-mingw32" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\x86_64" + } + + # Check if existant arch + + if (Test-Path "$_ROSBE_TARGET_MINGWPATH.") { + "Unsupported arch specified. Fallback to Default." + pause + $ENV:ROS_ARCH = $null + $ENV:ROS_PREFIX = $null + $_ROSBE_TARGET_MINGWPATH = $null + } }
#
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/RosB... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Tue Dec 9 07:51:24 2008 @@ -64,34 +64,11 @@ set _ROSBE_MODE=MinGW call :RosBE4 goto :EndCommandParse +) else ( + cls + set _ROSBE_ARCH=%1 + call :RosBE4 ) -if /i "%1" == "arm" ( - cls - set _ROSBE_ARCH=1 - call :RosBE4 - goto :EndCommandParse -) -if /i "%1" == "ppc" ( - cls - set _ROSBE_ARCH=2 - call :RosBE4 - goto :EndCommandParse -) -if /i "%1" == "amd64" ( - cls - set _ROSBE_ARCH=3 - call :RosBE4 - goto :EndCommandParse -) -if not "%1" == "" ( - cls - echo Unknown parameter specified. Exiting. - goto :EOF -) - -cls -call :RosBE4 - :: :: Load the base directory from srclist.txt and set it as the :: new source directory.
Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/char... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Tue Dec 9 07:51:24 2008 @@ -25,24 +25,10 @@ ) if /i "%_1%" == "i386" ( set _ROSBE_ARCH= - goto :EOA +) else ( + set _ROSBE_ARCH=%_1% ) -if /i "%_1%" == "arm" ( - set _ROSBE_ARCH=1 - goto :EOA -) -if /i "%_1%" == "ppc" ( - set _ROSBE_ARCH=2 - goto :EOA -) -if /i "%_1%" == "amd64" ( - set _ROSBE_ARCH=3 - goto :EOA -) -if not "%_1%" == "" ( - echo Unknown parameter specified. Try 'help [COMMAND]'. - goto :EOC -) +goto :EOA
:: :: Refresh all needed Params by recalling the main Path setting CMD File.
Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rosb... ============================================================================== --- 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 Dec 9 07:51:24 2008 @@ -33,20 +33,27 @@ goto :main )
-if "%_ROSBE_ARCH%" == "1" ( - set ROS_ARCH=arm - set ROS_PREFIX=arm-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\arm -) -if "%_ROSBE_ARCH%" == "2" ( - set ROS_ARCH=ppc - set ROS_PREFIX=ppc-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\ppc -) -if "%_ROSBE_ARCH%" == "3" ( - set ROS_ARCH=amd64 - set ROS_PREFIX=x86_64-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 +if not "%_ROSBE_ARCH%" == "" ( + set ROS_ARCH=%_ROSBE_ARCH% + set ROS_PREFIX=%_ROSBE_ARCH%-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%%_ROSBE_ARCH% + + REM HAXX + + if "%_ROSBE_ARCH%" == "amd64" ( + set ROS_PREFIX=x86_64-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 + ) + + REM Check if existant arch + + if not exist "%_ROSBE_TARGET_MINGWPATH%." ( + echo Unsupported arch specified. Fallback to Default. + pause + set ROS_ARCH= + set ROS_PREFIX= + set _ROSBE_TARGET_MINGWPATH= + ) )
::