[ros-diffs] [dreimer] 41822: amd64 fixes by Samuel Serapion: - Fix the one dash too much problem. - Fix the args not checked bug. Thx for the help.

Author: dreimer
Date: Thu Jul  9 06:00:08 2009
New Revision: 41822
URL: http://svn.reactos.org/svn/reactos?rev=41822&view=rev
Log:
amd64 fixes by Samuel Serapion:
- Fix the one dash too much problem.
- Fix the args not checked bug.
Thx for the help.
Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
    trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/version.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] Thu Jul  9 06:00:08
2009
@@ -61,8 +61,8 @@
     $ENV:HOST_CPP = "$_ROSBE_CCACHE" + "g++"
     $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "gcc"
     $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++"
-    $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$ROS_PREFIX" +
"gcc"
-    $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$ROS_PREFIX" +
"g++"
+    $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$_ROSBE_PREFIX" +
"gcc"
+    $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$_ROSBE_PREFIX" +
"g++"
 # Get the current date and time for use in in our build log's file name.
 $TIMERAW = get-date -f t
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] Thu Jul  9 06:00:08
2009
@@ -22,7 +22,7 @@
 # Set defaults to work with and override them if edited by
 # the options utility.
-if ("$ENV:ROS_ARCH" -eq "") {
+if ($args[0] -eq $null) {
     $ENV:ROS_ARCH = "i386"
 } else {
     $ENV:ROS_ARCH = "$($args)"
@@ -30,6 +30,7 @@
 $global:0 = $myInvocation.MyCommand.Definition
 $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0)
+$global:_ROSBE_PREFIX = $null
 $global:_ROSBE_VERSION = "1.4.4"
 $global:_ROSBE_ROSSOURCEDIR = "$pwd"
 $global:_ROSBE_SHOWTIME = 1
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] Thu Jul  9
06:00:08 2009
@@ -9,13 +9,19 @@
 # Check if we're switching to the AMD64 architecture
 if ("$ENV:ROS_ARCH" -eq "amd64") {
-    $ENV:ROS_PREFIX = "x86_64-pc-mingw32-"
+    $ENV:ROS_PREFIX = "x86_64-pc-mingw32"
 } else {
     $ENV:ROS_PREFIX = $null
 }
+if ("$ENV:ROS_PREFIX") {
+    $global:_ROSBE_PREFIX = "$ENV:ROS_PREFIX" + "-"
+} else {
+    $global:_ROSBE_PREFIX = $null
+}
+
 $ENV:PATH = "$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH"
-$TARGETGCC = "$ENV:ROS_PREFIX" + "gcc"
+$TARGETGCC = "$global:_ROSBE_PREFIX" + "gcc"
 & $TARGETGCC -v 2> gcctvers.tmp
 $global:_ROSBE_TARGET_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc
version") -replace ".*version ((\d|\.)+).*",'$1'
 $global:_ROSBE_TARGET_GCCTARGET = (select-string -path .\gcctvers.tmp
"target=") -replace ".*--target=(.+?)\b.*",'$1'
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Thu Jul  9
06:00:08 2009
@@ -9,14 +9,14 @@
 (get-WmiObject Win32_OperatingSystem).caption
 # GCC
-$TARGETGCC = "$ENV:ROS_PREFIX" + "gcc"
+$TARGETGCC = "$global:_ROSBE_PREFIX" + "gcc"
 & $TARGETGCC -v 2> gcctvers.tmp
 (select-string -path .\gcctvers.tmp "gcc version") -replace
".*:(.*?)\b",'$1'
 "gcc target - $_ROSBE_TARGET_GCCTARGET"
 remove-item gcctvers.tmp
 # LD
-$run = "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX" + "ld.exe"
+$run = "$_ROSBE_TARGET_MINGWPATH\bin\$global:_ROSBE_PREFIX" + "ld"
 & "$run" -v
 # NASM or YASM
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui…
==============================================================================
--- 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] Thu Jul  9 06:00:08
2009
@@ -38,8 +38,8 @@
 set HOST_CC=%_ROSBE_CCACHE%gcc
 set HOST_CPP=%_ROSBE_CCACHE%g++
-set TARGET_CC=%_ROSBE_CCACHE%%ROS_PREFIX%gcc
-set TARGET_CPP=%_ROSBE_CCACHE%%ROS_PREFIX%g++
+set TARGET_CC=%_ROSBE_CCACHE%%_ROSBE_ROSPREFIX%gcc
+set TARGET_CPP=%_ROSBE_CCACHE%%_ROSBE_ROSPREFIX%g++
 :: Get the current date and time for use in in our build log's file name.
 call "%_ROSBE_BASEDIR%\TimeDate.cmd"
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] Thu Jul  9 06:00:08
2009
@@ -7,7 +7,7 @@
   * Fixed some line skippers.
 (care2debug, Daniel Reimer)
-*** Jul 29th, 2009 - RosBE 1.4.4 Released
+*** Jun 29th, 2009 - RosBE 1.4.4 Released
 - Reverted to the old GCC. Because of the optimization we have problems running ROS on
Pentium I PCs. (Colin Finck)
 - Updated SVN to 1.6.3 (Daniel Reimer)
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Thu Jul  9 06:00:08 2009
@@ -22,12 +22,13 @@
 :: Set defaults to work with and override them if edited by
 :: the options utility.
-if "%ROS_ARCH%" == "" (
+if "%1%" == "" (
     set ROS_ARCH=i386
 ) else (
     set ROS_ARCH=%1
 )
+set _ROSBE_ROSPREFIX=""
 set _ROSBE_BASEDIR=%~dp0
 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1%
 set _ROSBE_VERSION=1.4.4
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] Thu Jul  9
06:00:08 2009
@@ -16,15 +16,17 @@
 :: Check if we're switching to the AMD64 architecture
 if "%ROS_ARCH%" == "amd64" (
-    set ROS_PREFIX=x86_64-pc-mingw32-
-) else (
-    set ROS_PREFIX=
+    set ROS_PREFIX=x86_64-pc-mingw32
+)
+
+if NOT "%ROS_PREFIX%" == "" (
+    set _ROSBE_PREFIX="%ROS_PREFIX%"-
 )
 set PATH=%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH%
-for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%gcc -v 2>&1 | find
"gcc version""`) do set _ROSBE_TARGET_GCCVERSION=%%i
-for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%gcc -v 2>&1 | find
"Target""`) do set _ROSBE_TARGET_GCCTARGET=%%i
+for /f "usebackq tokens=3" %%i in (`"%_ROSBE_PREFIX%gcc -v 2>&1 |
find "gcc version""`) do set _ROSBE_TARGET_GCCVERSION=%%i
+for /f "usebackq tokens=2" %%i in (`"%_ROSBE_PREFIX%gcc -v 2>&1 |
find "Target""`) do set _ROSBE_TARGET_GCCTARGET=%%i
 for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc
version""`) do set _ROSBE_HOST_GCCVERSION=%%i
 for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find
"Target""`) do set _ROSBE_HOST_GCCTARGET=%%i
Modified: trunk/tools/RosBE/RosBE-Windows/Root/version.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ver…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] Thu Jul  9 06:00:08 2009
@@ -16,11 +16,11 @@
 ver
 :: GCC
-"%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%gcc" -v 2>&1 | find "gcc
version"
+"%_ROSBE_TARGET_MINGWPATH%\bin\%_ROSBE_PREFIX%gcc" -v 2>&1 | find
"gcc version"
 echo gcc target^: %_ROSBE_TARGET_GCCTARGET%
 :: LD
-"%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%ld" -v
+"%_ROSBE_TARGET_MINGWPATH%\bin\%_ROSBE_PREFIX%ld" -v
 :: NASM or YASM
 if exist "%_ROSBE_HOST_MINGWPATH%\bin\nasm.exe" (