[dreimer] 41951: Bugz, They are everywhere. - Fix up the call of the i386 config file in charch. - Fix up default color of the 64 bit RosBE. - "Only" call the 64 bit config file when you are in 64 bit mode. - Fix the 64 bit options tool to be useable.
Author: dreimer Date: Tue Jul 14 13:29:23 2009 New Revision: 41951
URL: http://svn.reactos.org/svn/reactos?rev=41951&view=rev Log: Bugz, They are everywhere. - Fix up the call of the i386 config file in charch. - Fix up default color of the 64 bit RosBE. - "Only" call the 64 bit config file when you are in 64 bit mode. - Fix the 64 bit options tool to be useable.
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.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 trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/de-DE.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/en-US.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/es-ES.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/fr-FR.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/pl-PL.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ru-RU.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/uk-UA.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h
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 Jul 14 13:29:23 2009 @@ -11,9 +11,6 @@ $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
# Set defaults to work with and override them if edited by the options utility. -(Get-Host).UI.RawUI.ForegroundColor = "Green" -(Get-Host).UI.RawUI.BackgroundColor = "Black" -clear-host
# For NT4 compatibility if ($ENV:APPDATA.Length -lt 1) { @@ -27,6 +24,14 @@ } else { $ENV:ROS_ARCH = "$($args)" } +if ($ENV:ROS_ARCH -eq "amd64") { + (Get-Host).UI.RawUI.ForegroundColor = 0xB + (Get-Host).UI.RawUI.BackgroundColor = 0x0 +} else { + (Get-Host).UI.RawUI.ForegroundColor = 0xA + (Get-Host).UI.RawUI.BackgroundColor = 0x0 +} +clear-host
$global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) @@ -123,8 +128,10 @@ }
# Load the user's options if any -if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { - & "$ENV:APPDATA\RosBE\rosbe-options.ps1" +if ($args[0] -eq $null) { + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { + & "$ENV:APPDATA\RosBE\rosbe-options.ps1" + } }
if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$args.ps1") {
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 Jul 14 13:29:23 2009 @@ -22,8 +22,14 @@ $ENV:ROS_ARCH = $ARCH
# Refresh all needed Params by recalling the main Path setting CMD File. -if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1") { - IEX "& '$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1'" +if ($ENV:ROS_ARCH -eq "i386") { + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { + IEX "& '$ENV:APPDATA\RosBE\rosbe-options.ps1'" + } +} else { + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1") { + IEX "& '$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1'" + } }
chdefgcc $ENV:ROS_ARCH target
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 Jul 14 13:29:23 2009 @@ -55,9 +55,14 @@ set CPLUS_INCLUDE_PATH= set LIBRARY_PATH=
+if "%ROS_ARCH%" == "amd64" ( + color 0B +) :: Load the user's options if any -if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( - call "%APPDATA%\RosBE\rosbe-options.cmd" +if "%ROS_ARCH%" == "i386" ( + if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( + call "%APPDATA%\RosBE\rosbe-options.cmd" + ) )
if exist "%APPDATA%\RosBE\rosbe-options-%1.cmd" (
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 Jul 14 13:29:23 2009 @@ -32,8 +32,14 @@ endlocal & set ROS_ARCH=%ARCH%
:: Refresh all needed Params by recalling the main Path setting CMD File. -if exist "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" ( - call "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" +if "%ROS_ARCH%" == "i386" ( + if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( + call "%APPDATA%\RosBE\rosbe-options.cmd" + ) +) else ( + if exist "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" ( + call "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" + ) )
call "%_ROSBE_BASEDIR%\chdefgcc.cmd" %ROS_ARCH% target
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 Jul 14 13:29:23 2009 @@ -16,7 +16,7 @@
:: Check if we're switching to the AMD64 architecture if "%ROS_ARCH%" == "amd64" ( - set ROS_PREFIX=x86_64-pc-mingw32 + set ROS_PREFIX=x86_64-w64-mingw32 ) else ( set ROS_PREFIX= )
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/de-DE.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -2,7 +2,7 @@
ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "RosBE x86-64 Einstellungen" +CAPTION "RosBE AMD64 Einstellungen" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Hintergrundfarbe", -1, 10, 10, 75, 12
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/en-US.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/en-US.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -2,7 +2,7 @@
ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS x86-64 Build Environment Settings" +CAPTION "ReactOS AMD64 Build Environment Settings" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Background Color", -1, 10, 10, 75, 12
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/es-ES.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -2,7 +2,7 @@
ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configuración de ReactOS x86-64 Build Environment" +CAPTION "Configuración de ReactOS AMD64 Build Environment" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Color de fondo", -1, 10, 10, 75, 12
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/fr-FR.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -2,7 +2,7 @@
ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Paramètres de x86-64 l'Environnement de Compilation de ReactOS" +CAPTION "Paramètres de AMD64 l'Environnement de Compilation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Couleur d'arrière plan", -1, 10, 10, 75, 12
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/pl-PL.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -2,7 +2,7 @@
ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ustawienia ReactOS x86-64 Build Environment" +CAPTION "Ustawienia ReactOS AMD64 Build Environment" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Kolor t³a", -1, 10, 10, 75, 12
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ru-RU.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -4,7 +4,7 @@
ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ReactOS - x86-64" +CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ReactOS - AMD64" FONT 8,"MS Sans Serif",0,0 BEGIN LTEXT "Öâåò ôîíà", -1, 10, 10, 75, 12
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/uk-UA.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -10,7 +10,7 @@
ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS - x86-64" +CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS - AMD64" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Êîë³ð ôîíó", -1, 10, 10, 75, 12
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -111,8 +111,8 @@ return FALSE;
wcscpy(checkmgw, mingwpath); - if ((wcslen(checkmgw) + wcslen(L"\bin\gcc.exe")) < MAX_PATH) - wcscat(checkmgw, L"\bin\gcc.exe"); + if ((wcslen(checkmgw) + wcslen(L"\bin\x86_64-w64-mingw32-gcc.exe")) < MAX_PATH) + wcscat(checkmgw, L"\bin\x86_64-w64-mingw32-gcc.exe"); hFile = CreateFile(checkmgw, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) {
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -14,7 +14,7 @@ #include <wchar.h> #include "resources.h"
-#define MINGWVERSION L"\x86_64" +#define MINGWVERSION L"\amd64"
typedef struct _SETTINGS {
-
dreimer＠svn.reactos.org