From 837d53ede4d7fe9065d32884d892adcb4cc755cc Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 14 Jun 2012 12:39:38 +0000
Subject: [PATCH] 2012-06-14 14:38 UTC+0200 Viktor Szakats (harbour syenar.net)
   * INSTALL     + documented hbmk2 usage as shell, script runner and      
 .hrb builder/runner

  * package/mpkg_win.nsi
  * package/winuni/mpkg_win_uni.nsi
    + use hbmk2 as interactive shell instead of hbrun

  * utils/hbmk2/hbmk2.prg
    + display Harbour version when starting up the interactive shell
---
 harbour/ChangeLog                       | 12 ++++++++++++
 harbour/INSTALL                         | 14 ++++++++++++++
 harbour/package/mpkg_win.nsi            |  2 +-
 harbour/package/winuni/mpkg_win_uni.nsi |  2 +-
 harbour/utils/hbmk2/hbmk2.prg           |  2 ++
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f485148157..f780c11c7d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-06-14 14:38 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * INSTALL
+    + documented hbmk2 usage as shell, script runner and
+      .hrb builder/runner
+
+  * package/mpkg_win.nsi
+  * package/winuni/mpkg_win_uni.nsi
+    + use hbmk2 as interactive shell instead of hbrun
+
+  * utils/hbmk2/hbmk2.prg
+    + display Harbour version when starting up the interactive shell
+
 2012-06-14 14:27 UTC+0200 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     * killed some more 'dynamic' in hbshell source
diff --git a/harbour/INSTALL b/harbour/INSTALL
index eb350aca5e..f2ae825213 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -1357,6 +1357,20 @@ HARBOUR
        which will automatically be used, so you don't have to
        make any extra steps here.
 
+   Examples to start with Harbour:
+
+   - To run the interactive shell ('dot' prompt):
+       'hbmk2 .'
+   - To run a Harbour script:
+       'hbmk2 script.hb [<options>]'
+
+   Examples to build and run Harbour portable binary (aka precompiled script):
+
+   - To build:
+       'hbmk2 -gh script.hb'
+   - To run result of above:
+       'hbmk2 script.hrb [<options>]'
+
    Examples to build a Harbour application:
 
    - To build one simple .prg:
diff --git a/harbour/package/mpkg_win.nsi b/harbour/package/mpkg_win.nsi
index e94fd706f9..5bc151bc25 100644
--- a/harbour/package/mpkg_win.nsi
+++ b/harbour/package/mpkg_win.nsi
@@ -130,7 +130,7 @@ Section "Start Menu and Desktop icons" hb_shortcuts
   CreateShortCut  "$SMPROGRAMS\Harbour\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
   CreateShortCut  "$SMPROGRAMS\Harbour\Harbour (Command line).lnk" "cmd.exe" "/k cd $INSTDIR\bin" "cmd.exe" 0
   CreateShortCut  "$SMPROGRAMS\Harbour\Harbour.lnk" "$INSTDIR" "" "$INSTDIR" 0
-  CreateShortCut  "$SMPROGRAMS\Harbour\Harbour (Interactive shell).lnk" "$INSTDIR\bin\hbrun.exe" "-v" "$INSTDIR\bin\hbrun.exe" 0
+  CreateShortCut  "$SMPROGRAMS\Harbour\Harbour (Interactive shell).lnk" "$INSTDIR\bin\hbmk2.exe" "." "$INSTDIR\bin\hbmk2.exe" 0
   CreateDirectory "$SMPROGRAMS\Harbour\Links"
   WriteINIStr     "$SMPROGRAMS\Harbour\Links\Homepage.url"                   "InternetShortcut" "URL" "http://harbour-project.org/"
   WriteINIStr     "$SMPROGRAMS\Harbour\Links\Sourceforge Page.url"           "InternetShortcut" "URL" "http://sourceforge.net/projects/harbour-project/"
diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi
index 7652196c0f..ec9cc03313 100644
--- a/harbour/package/winuni/mpkg_win_uni.nsi
+++ b/harbour/package/winuni/mpkg_win_uni.nsi
@@ -347,7 +347,7 @@ Section "Start Menu and Desktop icons" hb_shortcuts
   CreateShortCut  "$SMPROGRAMS\Harbour $%HB_VM%\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
   CreateShortCut  "$SMPROGRAMS\Harbour $%HB_VM%\Harbour (Command line).lnk" "cmd.exe" "/k cd $INSTDIR\bin" "cmd.exe" 0
   CreateShortCut  "$SMPROGRAMS\Harbour $%HB_VM%\Harbour.lnk" "$INSTDIR" "" "$INSTDIR" 0
-  CreateShortCut  "$SMPROGRAMS\Harbour $%HB_VM%\Harbout (Interactive shell).lnk" "$INSTDIR\bin\hbrun.exe" "-v" "$INSTDIR\bin\hbrun.exe" 0
+  CreateShortCut  "$SMPROGRAMS\Harbour $%HB_VM%\Harbour (Interactive shell).lnk" "$INSTDIR\bin\hbmk2.exe" "." "$INSTDIR\bin\hbmk2.exe" 0
   ; TOFIX: Only create this shortcut, if 'hb_ide' component was enabled at install time (or when the target filename exists)
 ;!ifndef PKG_NO_IDE
 ;  CreateShortCut  "$SMPROGRAMS\Harbour $%HB_VM%\hbide.lnk" "$INSTDIR\bin\hbide.exe" "" "$INSTDIR\bin\hbide.exe" 0
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index be00ee0368..8263ce21b6 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -12696,6 +12696,8 @@ STATIC PROCEDURE __hbshell_prompt( aParams, cCommand )
 
    plugins := __hbshell_plugins_load( __hbshell_plugins(), aParams )
 
+   __hbshell_Exec( "? hb_Version()" )
+
    DO WHILE .T.
 
       IF cLine == NIL