2007-11-10 18:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* Makefile
   - samples
   + contrib/examples
   * contrib/Makefile
   * contrib/examples/Makefile
   * contrib/examples/guestbk/inifiles.prg
   * contrib/examples/guestbk/testcgi.prg
   * contrib/examples/guestbk/bld_b32.bat
   * contrib/examples/guestbk/Makefile
   * contrib/examples/pe/pe.prg
   * contrib/examples/pe/Makefile
   * contrib/examples/misc/Makefile
   * contrib/examples/hscript/bld_b32.bat
   * contrib/examples/hscript/Makefile
   * contrib/examples/Makefile
     * Moved /samples to /contrib/examples

harbour/ChangeLog

@@ -8,6 +8,24 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-10 18:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * Makefile
+   - samples
+   + contrib/examples
+   * contrib/Makefile
+   * contrib/examples/Makefile
+   * contrib/examples/guestbk/inifiles.prg
+   * contrib/examples/guestbk/testcgi.prg
+   * contrib/examples/guestbk/bld_b32.bat
+   * contrib/examples/guestbk/Makefile
+   * contrib/examples/pe/pe.prg
+   * contrib/examples/pe/Makefile
+   * contrib/examples/misc/Makefile
+   * contrib/examples/hscript/bld_b32.bat
+   * contrib/examples/hscript/Makefile
+   * contrib/examples/Makefile
+     * Moved /samples to /contrib/examples
+
 2007-11-10 17:35 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * source/vm/hvm.c
      ! Fixed unused var warning when HB_NO_DEBUG was defined 

harbour/Makefile

@@ -23,7 +23,6 @@ DIRS=\
 	source \
 	$(HB_UTIL_DIR) \
 	contrib \
-#	samples \
 
 endif
 

harbour/contrib/Makefile

@@ -14,6 +14,7 @@ DIRS=\
 	samples \
 	xhb \
 	$(HB_CONTRIBLIBS)
+#	examples \
 
 
 ifneq ($(HB_ARCHITECTURE),dos)

harbour/contrib/examples/Makefile

@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../
+ROOT = ../../
 
 DIRS=\
 	guestbk \

harbour/contrib/examples/guestbk/Makefile

@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../
+ROOT = ../../../
 
 PRG_SOURCES=\
 	guestbk.prg \

harbour/contrib/examples/guestbk/bld_b32.bat

@@ -3,11 +3,11 @@ rem
 rem $Id$
 rem
 
-..\..\bin\harbour /n guestbk  /i..\..\include\
-..\..\bin\harbour /n inifiles /i..\..\include\
-..\..\bin\harbour /n testcgi  /i..\..\include\
+..\..\..\bin\harbour /n guestbk  /i..\..\..\include\
+..\..\..\bin\harbour /n inifiles /i..\..\..\include\
+..\..\..\bin\harbour /n testcgi  /i..\..\..\include\
 
-echo -O2 -I..\..\include -L..\..\lib > build.tmp
+echo -O2 -I..\..\..\include -L..\..\..\lib > build.tmp
 echo -eguestbk.exe >> build.tmp
 echo guestbk.c inifiles.c testcgi.c >> build.tmp
 echo debug.lib >> build.tmp

harbour/contrib/examples/guestbk/inifiles.prg

@@ -1,6 +1,7 @@
-//
-// $Id$
-//
+/*
+ * $Id$
+ */
+
 #define CRLF (Chr(13) + Chr(10))
 
 function TIniFile()

harbour/contrib/examples/guestbk/testcgi.prg

@@ -1,6 +1,6 @@
-//
-// $Id$
-//
+/*
+ * $Id$
+ */
 
 /*
 *

harbour/contrib/examples/hscript/Makefile

@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../
+ROOT = ../../../
 
 PRG_SOURCES=\
 	hscript.prg \

harbour/contrib/examples/hscript/bld_b32.bat

@@ -0,0 +1,10 @@
+@echo off
+rem
+rem $Id$
+rem
+
+rem NOTE: This sample program need nf.lib from contrib/libnf
+
+..\..\..\bin\harbour hscript /n /i..\..\..\include
+bcc32 -O2 -I..\..\..\include -L..\..\..\lib -ehscript.exe hscript.c debug.lib vm.lib rtl.lib gtwin.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib dbffpt.lib codepage.lib hbsix.lib common.lib hbpcre.lib hsx.lib nf.lib
+del hscript.c

harbour/contrib/examples/misc/Makefile

@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../
+ROOT = ../../../
 
 LIBS=\
 	debug \

harbour/contrib/examples/pe/Makefile

@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../
+ROOT = ../../../
 
 PRG_SOURCES=\
 	editorhi.prg \

harbour/contrib/examples/pe/pe.prg

@@ -12,7 +12,7 @@ PROCEDURE Main( cFile )
    IF cFile == NIL
       cFile := "license.txt"
       IF !File( cFile )
-         cFile := "../../license.txt"
+         cFile := "../../../license.txt"
       ENDIF
       lMode := EDIT_VIEW
    ENDIF

harbour/samples/hscript/bld_b32.bat

@@ -1,10 +0,0 @@
-@echo off
-rem
-rem $Id$
-rem
-
-rem NOTE: This sample program need nf.lib from contrib/libnf
-
-..\..\bin\harbour hscript /n /i..\..\include
-bcc32 -O2 -I..\..\include -L..\..\lib -ehscript.exe hscript.c debug.lib vm.lib rtl.lib gtwin.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib dbffpt.lib codepage.lib hbsix.lib common.lib hbpcre.lib hsx.lib nf.lib
-del hscript.c