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 13:20:28 +01:00
parent d700e48d5f
commit afd7efb540
9 changed files with 33 additions and 0 deletions
--- a/extras/guestbk/guestbk.hbp
+++ b/extras/guestbk/guestbk.hbp
@@ -6,3 +6,5 @@
 -gtcgi

 guestbk.prg
+_cgi.prg
+_inifile.prg
--- 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
--- 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.
--- 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
--- 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
--- 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