[ros-diffs] [dreimer] 47093: If a custom output folder is defined, pass it to log2lines, too. Thx to Mephisto for noticing.

Author: dreimer
Date: Mon May  3 14:41:30 2010
New Revision: 47093

URL: http://svn.reactos.org/svn/reactos?rev=47093&view=rev
Log:
If a custom output folder is defined, pass it to log2lines, too.
Thx to Mephisto for noticing.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Mon May  3
14:41:30 2010
@@ -33,6 +33,10 @@
     "ERROR: You must specify a address to analyze."
 }
 
-IEX "& log2lines.exe '$FILEPATH' '$ADDRESS'"
+if ("$ENV:ROS_OUTPUT" -ne "") {
+    IEX "& log2lines.exe -d '$ENV:ROS_OUTPUT' '$FILEPATH'
'$ADDRESS'"
+} else {
+    IEX "& log2lines.exe '$FILEPATH' '$ADDRESS'"
+}
 
 $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"

Modified: trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rad…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] Mon May  3 14:41:30
2010
@@ -54,7 +54,11 @@
     for /f "usebackq" %%i in (`"dir /a:-d /s /b "%FILEPATH%"
2>NUL | findstr "%FILEPATH%""`) do set FILEPATH=%%i
 )
 
-log2lines.exe "%FILEPATH%" "%ADDRESS%"
+if not "%ROS_OUTPUT%" == "" (
+    log2lines.exe -d "%ROS_OUTPUT%" "%FILEPATH%"
"%ADDRESS%"
+) else (
+    log2lines.exe "%FILEPATH%" "%ADDRESS%"
+)
 
 :EOC
 title ReactOS Build Environment %_ROSBE_VERSION%