From 082dec5be5069aed10c0d940b5d63f9467ad8b2c Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 13 Mar 2009 15:31:41 +0000
Subject: [PATCH] 2009-03-13 16:30 UTC+0100 Viktor Szakats (harbour.01 syenar
 hu)   * mpkg_win.bat     * Cleanup.     - Removed checking for errorlevel as
 it made it exit       even when doing successful builds. [ Why? Could someone
       look at this? ]

  * contrib/hbwin/wapi_commctrl.c
    ! Fix of the fix of the fix for non-ANSI comment fixes.
---
 harbour/ChangeLog                     | 10 +++++++++
 harbour/contrib/hbwin/wapi_commctrl.c |  4 ++--
 harbour/mpkg_win.bat                  | 29 +++++++++++++++++----------
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ddb12c9131..8eeef67c08 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-13 16:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * mpkg_win.bat
+    * Cleanup.
+    - Removed checking for errorlevel as it made it exit
+      even when doing successful builds. [ Why? Could someone
+      look at this? ]
+
+  * contrib/hbwin/wapi_commctrl.c
+    ! Fix of the fix of the fix for non-ANSI comment fixes.
+
 2009-03-13 13:19 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * tests/ac_test2.prg
     * Updated.
diff --git a/harbour/contrib/hbwin/wapi_commctrl.c b/harbour/contrib/hbwin/wapi_commctrl.c
index 5717e4808d..5109c79efc 100644
--- a/harbour/contrib/hbwin/wapi_commctrl.c
+++ b/harbour/contrib/hbwin/wapi_commctrl.c
@@ -737,8 +737,8 @@ HB_FUNC( WAPI_TABCTRL_SETEXTENDEDSTYLE )
    wapi_ret_NINT( TabCtrl_SetExtendedStyle( wapi_par_HWND( 1 ), wapi_par_DWORD( 2 ) ) );
 }
 /*----------------------------------------------------------------------*/
-/* TabCtrl_GetExtendedStyle(hwnd)
-/* (DWORD)SNDMSG((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0)
+/* TabCtrl_GetExtendedStyle(hwnd) */
+/* (DWORD)SNDMSG((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0) */
 
 HB_FUNC( WAPI_TABCTRL_GETEXTENDEDSTYLE )
 {
diff --git a/harbour/mpkg_win.bat b/harbour/mpkg_win.bat
index 5c2cde3dab..ca095aaa3a 100644
--- a/harbour/mpkg_win.bat
+++ b/harbour/mpkg_win.bat
@@ -39,32 +39,39 @@ set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib
 set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include
 set HB_DOC_INSTALL=%HB_INSTALL_PREFIX%\doc
 
-rem ; Cleanup
+rem ; Pre-build cleanup
 if exist %HB_INSTALL_BASE% rmdir /q /s %HB_INSTALL_BASE%
 
-rem ; Build
-if "%HB_COMPILER%" == "mingw"  ( sh make_gnu.sh clean install && goto MK_PKG )
-if "%HB_COMPILER%" == "cygwin" ( sh make_gnu.sh clean install && goto MK_PKG )
-set HB_BUILD_IMPLIB=no
+rem ; Option setup
 set HB_BUILD_DLL=yes
 set HB_BUILD_OPTIM=yes
 set HB_BUILD_DEBUG=no
-call make_gnu.bat
+set HB_BUILD_IMPLIB=no
 
+rem ; Build Harbour
+if "%HB_COMPILER%" == "mingw"  ( sh make_gnu.sh clean install && goto MK_PKG )
+if "%HB_COMPILER%" == "cygwin" ( sh make_gnu.sh clean install && goto MK_PKG )
+call make_gnu.bat
 :MK_PKG
 
-if errorlevel 1 goto MK_ERROR
-
-rem ; Post build cleanup
+rem if errorlevel 1 goto MK_ERROR
 
+rem ; Post-build cleanup
 if exist "%HB_BIN_INSTALL%\*.tds" del "%HB_BIN_INSTALL%\*.tds"
 if exist "%HB_BIN_INSTALL%\*.lib" del "%HB_BIN_INSTALL%\*.lib"
 if exist "%HB_BIN_INSTALL%\*.exp" del "%HB_BIN_INSTALL%\*.exp"
 
-rem ; Installer package
+rem ; Post-build installation
+xcopy /D /Y ChangeLog "%HB_INSTALL_PREFIX%"
+xcopy /D /Y COPYING   "%HB_INSTALL_PREFIX%"
+xcopy /D /Y ERRATA    "%HB_INSTALL_PREFIX%"
+xcopy /D /Y INSTALL   "%HB_INSTALL_PREFIX%"
+xcopy /D /Y TODO      "%HB_INSTALL_PREFIX%"
+
+rem ; Build installer package
 makensis.exe %~dp0mpkg_win.nsi
 
-rem ; .zip package
+rem ; Build .zip package
 if exist %HB_PKGNAME%.zip del %HB_PKGNAME%.zip
 pushd
 cd %HB_INSTALL_BASE%