Author: dreimer Date: Sun Jan 10 17:21:53 2010 New Revision: 45031
URL: http://svn.reactos.org/svn/reactos?rev=45031&view=rev Log: R.I.P. raddr2line.
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Sun Jan 10 17:21:53 2010 @@ -35,11 +35,11 @@ $baseaddr = (objdump -p $FILEPATH | select-string "ImageBase").tostring().split() $baseaddr = "0x" + ($baseaddr.get($baseaddr.length - 1)) if ($baseaddr -lt $ADDRESS) { - IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$FILEPATH' '$ADDRESS'" + IEX "& '$_ROSBE_BASEDIR\Tools\log2lines.exe' '$FILEPATH' '$ADDRESS'" } else { $baseaddr = ($baseaddr | % {[Convert]::ToInt32($_,16)}) + ($ADDRESS | % {[Convert]::ToInt32($_,16)}) $relbase = "0x" + ("{0:X}" -f $baseaddr) - IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$FILEPATH' '$relbase'" + IEX "& '$_ROSBE_BASEDIR\Tools\log2lines.exe' '$FILEPATH' '$relbase'" }
$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Chan... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sun Jan 10 17:21:53 2010 @@ -6,7 +6,7 @@ - Updated w32api to 3.14 (Daniel Reimer) - Updated NSIS to 2.46 (Daniel Reimer) - Added Remake command (Daniel Reimer) -- Added log2lines v1.9 to RosBE (Daniel Reimer) +- Replaced raddr2line with log2lines v1.9 (Daniel Reimer) - Added a chinese translation to the options tool (Elton Chung) - Added ARM Arch support to RosBE (Daniel Reimer) - Added ARM Settings to options.exe, too (Daniel Reimer)
Modified: trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/radd... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] Sun Jan 10 17:21:53 2010 @@ -63,12 +63,12 @@ for /f "tokens=2" %%i in ('"objdump -p "%FILEPATH%" 2>NUL | findstr ImageBase"') do set BASEADDRESS=0x%%i
if %%i lss %ADDRESS% ( - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%FILEPATH%" "%ADDRESS%" + "%_ROSBE_BASEDIR%\Tools\log2lines.exe" "%FILEPATH%" "%ADDRESS%" ) else ( set /a BASEADDRESS+=0x%ADDRESS%
for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" !BASEADDRESS!"') do set RELBASE=%%i - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "!FILEPATH!" "!RELBASE!" + "%_ROSBE_BASEDIR%\Tools\log2lines.exe" "!FILEPATH!" "!RELBASE!" )
:EOC
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.nsi... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sun Jan 10 17:21:53 2010 @@ -269,7 +269,6 @@ SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\echoh.exe - File /r Components\Tools\raddr2line.exe File /r Components\Tools\log2lines.exe File /r Components\Tools\chkslash.exe SectionEnd