From fc4e4dc590f01594432c7d33628665af0a39510a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 2 Feb 2011 10:09:25 +0000 Subject: [PATCH] 2011-02-02 11:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * package/winuni/mpkg_win_uni.bat + Redirect stderr too, into the log file. --- harbour/ChangeLog | 4 ++++ harbour/package/winuni/mpkg_win_uni.bat | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 73f00b4373..7db2ae7ed9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-02 11:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * package/winuni/mpkg_win_uni.bat + + Redirect stderr too, into the log file. + 2011-02-02 02:22 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/3rd/sqlite3/sqlite3.c * contrib/3rd/sqlite3/sqlite3.h diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 055c8f2ade..6be6ce536a 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -112,7 +112,7 @@ cd %HB_RT% if exist %HB_RT%harbour-%HB_VF%-win-log.txt del %HB_RT%harbour-%HB_VF%-win-log.txt if exist %HB_RT%harbour-%HB_VF%-win.exe del %HB_RT%harbour-%HB_VF%-win.exe -"%HB_DIR_NSIS%makensis.exe" %HB_OPT_NSIS% %~dp0mpkg_win_uni.nsi >> %HB_RT%harbour-%HB_VF%-win-log.txt +"%HB_DIR_NSIS%makensis.exe" %HB_OPT_NSIS% %~dp0mpkg_win_uni.nsi >> %HB_RT%harbour-%HB_VF%-win-log.txt 2>&1 rem ; Create unified archive @@ -179,12 +179,12 @@ echo "%HB_DR%lib\win\watcom\*.*" >> _hbfiles rem echo "%HB_DR%lib\win\pocc\*.*" >> _hbfiles rem echo "%HB_DR%lib\win\pocc64\*.*" >> _hbfiles rem echo "%HB_DR%lib\wce\poccarm\*.*" >> _hbfiles -echo "%HB_DR%bin\harbour-%HB_VS%-x64.dll" >> _hbfiles -echo "%HB_DR%bin\harbourmt-%HB_VS%-x64.dll" >> _hbfiles -echo "%HB_DR%bin\harbour-%HB_VS%-wce-arm.dll" >> _hbfiles -echo "%HB_DR%bin\harbourmt-%HB_VS%-wce-arm.dll" >> _hbfiles -rem echo "%HB_DR%bin\harbour-%HB_VS%-os2.dll" >> _hbfiles -rem echo "%HB_DR%bin\harbourmt-%HB_VS%-os2.dll" >> _hbfiles +echo "%HB_DR%bin\harbour-%HB_VS%-x64.dll" >> _hbfiles +echo "%HB_DR%bin\harbourmt-%HB_VS%-x64.dll" >> _hbfiles +echo "%HB_DR%bin\harbour-%HB_VS%-wce-arm.dll" >> _hbfiles +echo "%HB_DR%bin\harbourmt-%HB_VS%-wce-arm.dll" >> _hbfiles +rem echo "%HB_DR%bin\harbour-%HB_VS%-os2.dll" >> _hbfiles +rem echo "%HB_DR%bin\harbourmt-%HB_VS%-os2.dll" >> _hbfiles echo "%HB_DR%tests\*.*" >> _hbfiles echo "%HB_DR%doc\*.*" >> _hbfiles echo "%HB_DR%comp\mingw\*" >> _hbfiles @@ -192,7 +192,7 @@ echo "%HB_DR%examples\*.*" >> _hbfiles echo "%HB_DR%contrib\*.*" >> _hbfiles if exist %HB_RT%harbour-%HB_VF%-win.7z del %HB_RT%harbour-%HB_VF%-win.7z -"%HB_DIR_7Z%7za.exe" a -r %HB_RT%harbour-%HB_VF%-win.7z @_hbfiles >> %HB_RT%harbour-%HB_VF%-win-log.txt +"%HB_DIR_7Z%7za.exe" a -r %HB_RT%harbour-%HB_VF%-win.7z @_hbfiles >> %HB_RT%harbour-%HB_VF%-win-log.txt 2>&1 del _hbfiles