[ros-diffs] [dreimer] 39204: Fix a problem with charch not detecting a wrong arch. Add support for setting different obj and out folders for different arches

Author: dreimer
Date: Fri Jan 30 01:11:43 2009
New Revision: 39204

URL: http://svn.reactos.org/svn/reactos?rev=39204&view=rev
Log:
Fix a problem with charch not detecting a wrong arch.
Add support for setting different obj and out folders for different arches

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
    trunk/tools/RosBE/RosBE-Windows/plans.txt

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] Fri Jan 30 01:11:43 2009
@@ -24,6 +24,9 @@

$ENV:ROS_ARCH = $null
 $ENV:ROS_PREFIX = $null
+$_ROSBE_OBJPATH = "$_ROSBE_i386_OBJPATH"
+$_ROSBE_OUTPATH = "$_ROSBE_i386_OUTPATH"
+

if ($_ROSBE_ARCH -ne $null) {
     $ENV:ROS_ARCH = $_ROSBE_ARCH
@@ -31,8 +34,17 @@
     $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR$_ROSBE_ARCH"

# HAXX
-
+    if ($_ROSBE_ARCH -eq "arm") {
+        $_ROSBE_OBJPATH = "$_ROSBE_ARM_OBJPATH"
+        $_ROSBE_OUTPATH = "$_ROSBE_ARM_OUTPATH"
+    }
+    if ($_ROSBE_ARCH -eq "ppc") {
+        $_ROSBE_OBJPATH = "$_ROSBE_PPC_OBJPATH"
+        $_ROSBE_OUTPATH = "$_ROSBE_PPC_OUTPATH"
+    }
     if ($_ROSBE_ARCH -eq "amd64") {
+        $_ROSBE_OBJPATH = "$_ROSBE_AMD64_OBJPATH"
+        $_ROSBE_OUTPATH = "$_ROSBE_AMD64_OUTPATH"
         $ENV:ROS_PREFIX = "x86_64-pc-mingw32"
         $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\x86_64"
     }
@@ -42,6 +54,8 @@
     if (Test-Path "$_ROSBE_TARGET_MINGWPATH.") {   
     "Unsupported arch specified. Fallback to Default."
     pause
+    $_ROSBE_OBJPATH = "$_ROSBE_i386_OBJPATH"
+    $_ROSBE_OUTPATH = "$_ROSBE_i386_OUTPATH"
     $ENV:ROS_ARCH = $null
     $ENV:ROS_PREFIX = $null
     $_ROSBE_TARGET_MINGWPATH = $null

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] Fri Jan 30 01:11:43 2009
@@ -33,32 +33,51 @@
     goto :main
 )

-if not "%_ROSBE_ARCH%" == "" (
-    set ROS_ARCH=%_ROSBE_ARCH%
-    set ROS_PREFIX=%_ROSBE_ARCH%-pc-mingw32
-    set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%%_ROSBE_ARCH%
+setlocal enabledelayedexpansion
+
+set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH%
+set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH%
+
+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" (
+    if "!_ROSBE_ARCH!" == "arm" (
+        set _ROSBE_OBJPATH=!_ROSBE_ARM_OBJPATH!
+        set _ROSBE_OUTPATH=!_ROSBE_ARM_OUTPATH!
+    )
+    if "!_ROSBE_ARCH!" == "ppc" (
+        set _ROSBE_OBJPATH=!_ROSBE_PPC_OBJPATH!
+        set _ROSBE_OUTPATH=!_ROSBE_PPC_OUTPATH!
+    )
+    if "!_ROSBE_ARCH!" == "amd64" (
+        set _ROSBE_OBJPATH=!_ROSBE_AMD64_OBJPATH!
+        set _ROSBE_OUTPATH=!_ROSBE_AMD64_OUTPATH!
         set ROS_PREFIX=x86_64-pc-mingw32
-        set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64
+        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=
+    if not exist "!_ROSBE_TARGET_MINGWPATH!." (   
+        echo Unsupported arch specified. Fallback to Default.
+        pause
+        set _ROSBE_OBJPATH=!_ROSBE_i386_OBJPATH!
+        set _ROSBE_OUTPATH=!_ROSBE_i386_OUTPATH!
+        set ROS_ARCH=
+        set ROS_PREFIX=
+        set _ROSBE_TARGET_MINGWPATH=
     )
 )

::
 :: Set up the GCC 4.x.x build environment.
 ::
+
+endlocal

:main

Modified: trunk/tools/RosBE/RosBE-Windows/plans.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/plans.txt...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/plans.txt [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/plans.txt [iso-8859-1] Fri Jan 30 01:11:43 2009
@@ -1,4 +1,5 @@
 - New icons for every arch we support
 - More Error catching
 - support y/n and yes/no
-- Make it possible to set different obj and out folders for different arches
+- Make it possible to set different obj and out folders for different arches
+- support for different dep checks.