Author: dreimer Date: Sat Oct 25 20:22:48 2008 New Revision: 36978
URL: http://svn.reactos.org/svn/reactos?rev=36978&view=rev Log: Baaad, but working Hack, realized together with Jaykul from #powershell. Now Powershell Version does build ROS again. Somehow GCC has a strange way to output console stdout and stderr, so the previous idea always returned vars with $null in it. Updated Russian Translation by tower
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc
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] Sat Oct 25 20:22:48 2008 @@ -46,17 +46,21 @@ # $ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" $global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" -#$global:_ROSBE_GCCVERSION = $null -#$global:_ROSBE_GCCTARGET = $null if ($ENV:ROS_ARCH -ne $null) { - $global:_ROSBE_GCCVERSION = (& $ENV:ROS_PREFIX-gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|.)+).*",'$1' - $global:_ROSBE_GCCTARGET = (& $ENV:ROS_PREFIX-gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' + & "$ENV:ROS_PREFIX-gcc" -v 2> v.txt + $global:_ROSBE_GCCVERSION = (select-string -path .\v.txt "gcc version") -replace ".*version ((\d|.)+).*",'$1' + $global:_ROSBE_GCCTARGET = (select-string -path .\v.txt "target=") -replace ".*--target=(.+?)\b.*",'$1' + rm v.txt } else { - $global:_ROSBE_GCCVERSION = (& gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|.)+).*",'$1' - $global:_ROSBE_GCCTARGET = (& gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' + gcc -v 2> v.txt + $global:_ROSBE_GCCVERSION = (select-string -path .\v.txt "gcc version") -replace ".*version ((\d|.)+).*",'$1' + $global:_ROSBE_GCCTARGET = (select-string -path .\v.txt "target=") -replace ".*--target=(.+?)\b.*",'$1' + rm v.txt } -$global:_ROSBE_HOST_GCCVERSION = (& gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|.)+).*",'$1' -$global:_ROSBE_HOST_GCCTARGET = (& gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' +gcc -v 2> v.txt +$global:_ROSBE_HOST_GCCVERSION = (select-string -path .\v.txt "gcc version") -replace ".*version ((\d|.)+).*",'$1' +$global:_ROSBE_HOST_GCCTARGET = (select-string -path .\v.txt "target=") -replace ".*--target=(.+?)\b.*",'$1' +rm v.txt
if ($_ROSBE_MODE -eq "MinGW") { $ENV:C_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\lib\gcc$_ROSBE_GCCTARGET$_ROSBE_GCCVERSION\include" @@ -72,11 +76,15 @@ # 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>&1 | select-string "gcc version" +& "$_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>&1 | select-string "gcc version" +gcc -v 2> v.txt +(select-string -path .\v.txt "gcc version" ) -replace ".*: (.+?)\b",'$1' +rm v.txt "gcc target - $_ROSBE_GCCTARGET" & ld -v }
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/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/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] Sat Oct 25 20:22:48 2008 @@ -15,7 +15,7 @@ CONTROL "Îòîáðàæàòü âðåìÿ êîìïèëÿöèè", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 CONTROL "Èñïîëüçîâàòü êåøèðîâàíèå", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 CONTROL "Âûðåçàòü ïóñòîé êîä ïðè êîìïèë.", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 - CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 + CONTROL "Îñòàâëÿòü â ôàéëàõ èíôîðìàöèþ äëÿ âîçìîæíîñòè ðàáîòû äåáàãåðà", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 LTEXT "Ïóòü ê êîìïèëÿòîðó GCC", -1, 10, 107, 100, 15 EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP @@ -75,5 +75,5 @@ HLP_SAVEBUTTON, "Àêòèâíîå ñîñòîÿíèå êíîïêè óêàçûâàåò íà âîçìîæíîñòü ñîõðàíåíèÿ èçìåíåííûõ íàñòðîåê" HLP_QUITBUTTON, "Ýòî êëàâèøà ïîçâîëÿåò âûéòè áåç ñîõðàíåíèÿ èçìåíåíèé" HLP_DEFAULTMSG, "Ïîìîùü ïî èçíà÷àëüíûì ïàðàìåòðàì" - HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." + HLP_NOSTRIP, "Êîìïèëÿöèÿ ôàéëîâ ReactOS'à ñ ñîçäàíèåì èíôîðìàöèè äëÿ äåáàãåðà." END