From afd7efb540642752fb11916545f81228dd3b5328 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 23 Mar 2013 13:20:28 +0100
Subject: [PATCH] partially reverted to pick sources from .hbp and only use SET
 PROCEDURE in script mode. Ugly, but SET PROCEDURE can only find sources in
 cwd.

---
 ChangeLog.txt                             | 13 +++++++++++++
 contrib/hbnetio/utils/hbnetio/hbnetio.hbp |  2 ++
 contrib/hbnetio/utils/hbnetio/hbnetio.prg |  2 ++
 extras/guestbk/guestbk.hbp                |  2 ++
 extras/guestbk/guestbk.prg                |  2 ++
 extras/hbdoc/hbdoc.hbp                    |  5 +++++
 extras/hbdoc/hbdoc.prg                    |  2 ++
 extras/httpsrv/uhttpd.hbp                 |  3 +++
 extras/httpsrv/uhttpd.prg                 |  2 ++
 9 files changed, 33 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 17cfd5263a..a5f225f277 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,19 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-23 13:19 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbnetio/utils/hbnetio/hbnetio.hbp
+  * contrib/hbnetio/utils/hbnetio/hbnetio.prg
+  * extras/guestbk/guestbk.hbp
+  * extras/guestbk/guestbk.prg
+  * extras/hbdoc/hbdoc.hbp
+  * extras/hbdoc/hbdoc.prg
+  * extras/httpsrv/uhttpd.hbp
+  * extras/httpsrv/uhttpd.prg
+    ! partially reverted to pick sources from .hbp and
+      only use SET PROCEDURE in script mode. Ugly, but
+      SET PROCEDURE can only find sources in cwd.
+
 2013-03-23 12:53 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbnetio/utils/hbnetio/hbnetio.hbp
   * README.txt
diff --git a/contrib/hbnetio/utils/hbnetio/hbnetio.hbp b/contrib/hbnetio/utils/hbnetio/hbnetio.hbp
index 60b2ee7f07..0d6902665b 100644
--- a/contrib/hbnetio/utils/hbnetio/hbnetio.hbp
+++ b/contrib/hbnetio/utils/hbnetio/hbnetio.hbp
@@ -7,6 +7,8 @@ hbnetio.hbc
 -o${hb_name}
 
 hbnetio.prg
+_console.prg
+netiomgm.hb
 
 _winsvc.prg{win}
 -main=WinMain{win}
diff --git a/contrib/hbnetio/utils/hbnetio/hbnetio.prg b/contrib/hbnetio/utils/hbnetio/hbnetio.prg
index 188bcc314b..b2585a03af 100644
--- a/contrib/hbnetio/utils/hbnetio/hbnetio.prg
+++ b/contrib/hbnetio/utils/hbnetio/hbnetio.prg
@@ -887,5 +887,7 @@ STATIC PROCEDURE HB_Usage()
 
    RETURN
 
+#if defined( __HBSCRIPT__HBSHELL )
 SET PROCEDURE TO "_console.prg"
 SET PROCEDURE TO "netiomgm.hb"
+#endif
diff --git a/extras/guestbk/guestbk.hbp b/extras/guestbk/guestbk.hbp
index 0699658c7a..3938ec72e9 100644
--- a/extras/guestbk/guestbk.hbp
+++ b/extras/guestbk/guestbk.hbp
@@ -6,3 +6,5 @@
 -gtcgi
 
 guestbk.prg
+_cgi.prg
+_inifile.prg
diff --git a/extras/guestbk/guestbk.prg b/extras/guestbk/guestbk.prg
index 94d6656ced..41bc10e86e 100644
--- a/extras/guestbk/guestbk.prg
+++ b/extras/guestbk/guestbk.prg
@@ -155,5 +155,7 @@ PROCEDURE Main()
 
    RETURN
 
+#if defined( __HBSCRIPT__HBSHELL )
 SET PROCEDURE TO "_cgi.prg"
 SET PROCEDURE TO "_inifile.prg"
+#endif
diff --git a/extras/hbdoc/hbdoc.hbp b/extras/hbdoc/hbdoc.hbp
index 9205e22447..6cc16ad0d9 100644
--- a/extras/hbdoc/hbdoc.hbp
+++ b/extras/hbdoc/hbdoc.hbp
@@ -9,6 +9,11 @@
 -gtcgi
 
 hbdoc.prg
+_genbase.prg
+_genhtml.prg
+_gentxt.prg
+_genxml.prg
+_tmplates.prg
 
 # NOTE: hbdoc doesn't work from other locations than
 #       the current one, so we don't install it yet.
diff --git a/extras/hbdoc/hbdoc.prg b/extras/hbdoc/hbdoc.prg
index 9c8ef47e41..cab7081201 100644
--- a/extras/hbdoc/hbdoc.prg
+++ b/extras/hbdoc/hbdoc.prg
@@ -1150,8 +1150,10 @@ FUNCTION Filename( cFile, cFormat, nLength )
 
    RETURN cResult
 
+#if defined( __HBSCRIPT__HBSHELL )
 SET PROCEDURE TO "_tmplates.prg"
 SET PROCEDURE TO "_genbase.prg"
 SET PROCEDURE TO "_gentxt.prg"
 SET PROCEDURE TO "_genhtml.prg"
 SET PROCEDURE TO "_genxml.prg"
+#endif
diff --git a/extras/httpsrv/uhttpd.hbp b/extras/httpsrv/uhttpd.hbp
index eed368e1a3..258f7fec08 100644
--- a/extras/httpsrv/uhttpd.hbp
+++ b/extras/httpsrv/uhttpd.hbp
@@ -6,6 +6,9 @@
 -gtwvt
 
 uhttpd.prg
+_cgifunc.prg
+_cookie.prg
+_session.prg
 
 hbwin.hbc
 hbnf.hbc
diff --git a/extras/httpsrv/uhttpd.prg b/extras/httpsrv/uhttpd.prg
index 84f219d25d..f2dcd4b0d1 100644
--- a/extras/httpsrv/uhttpd.prg
+++ b/extras/httpsrv/uhttpd.prg
@@ -2871,6 +2871,8 @@ STATIC FUNCTION HB_HASHI()
 
    RETURN h
 
+#if defined( __HBSCRIPT__HBSHELL )
 SET PROCEDURE TO "_cgifunc.prg"
 SET PROCEDURE TO "_cookie.prg"
 SET PROCEDURE TO "_session.prg"
+#endif