From 6e47dd35f58deb18377707007cce8bc714167274 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 10 Nov 2007 17:04:20 +0000 Subject: [PATCH] 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 | 18 ++++++++++++++++++ harbour/Makefile | 1 - harbour/contrib/Makefile | 1 + harbour/{samples => contrib/examples}/Makefile | 2 +- .../examples}/guestbk/Makefile | 2 +- .../examples}/guestbk/bld_b32.bat | 8 ++++---- .../examples}/guestbk/cgi.ch | 0 .../examples}/guestbk/guestbk.htm | 0 .../examples}/guestbk/guestbk.ini | 0 .../examples}/guestbk/guestbk.prg | 0 .../examples}/guestbk/guestbk.txt | 0 .../examples}/guestbk/inifiles.prg | 7 ++++--- .../examples}/guestbk/testcgi.prg | 6 +++--- .../examples}/hscript/Makefile | 2 +- harbour/contrib/examples/hscript/bld_b32.bat | 10 ++++++++++ .../examples}/hscript/cgi.ch | 0 .../examples}/hscript/dir.hs | 0 .../examples}/hscript/hello.hs | 0 .../examples}/hscript/hscript.prg | 0 .../examples}/hscript/makehtm.bat | 0 .../examples}/hscript/multiply.hs | 0 .../examples}/hscript/readme.txt | 0 .../examples}/hscript/ugly.hs | 0 .../examples}/misc/Makefile | 2 +- .../examples}/misc/guess.prg | 0 .../examples}/misc/mankala.prg | 0 .../{samples => contrib/examples}/pe/Makefile | 2 +- .../examples}/pe/bld_b32.bat | 0 .../examples}/pe/editorhi.prg | 0 .../examples}/pe/editorlo.c | 0 .../examples}/pe/license.txt | 0 .../{samples => contrib/examples}/pe/pe.prg | 2 +- .../examples}/pe/readme.txt | 0 harbour/samples/hscript/bld_b32.bat | 10 ---------- 34 files changed, 46 insertions(+), 27 deletions(-) rename harbour/{samples => contrib/examples}/Makefile (86%) rename harbour/{samples => contrib/examples}/guestbk/Makefile (93%) rename harbour/{samples => contrib/examples}/guestbk/bld_b32.bat (67%) rename harbour/{samples => contrib/examples}/guestbk/cgi.ch (100%) rename harbour/{samples => contrib/examples}/guestbk/guestbk.htm (100%) rename harbour/{samples => contrib/examples}/guestbk/guestbk.ini (100%) rename harbour/{samples => contrib/examples}/guestbk/guestbk.prg (100%) rename harbour/{samples => contrib/examples}/guestbk/guestbk.txt (100%) rename harbour/{samples => contrib/examples}/guestbk/inifiles.prg (99%) rename harbour/{samples => contrib/examples}/guestbk/testcgi.prg (99%) rename harbour/{samples => contrib/examples}/hscript/Makefile (92%) create mode 100644 harbour/contrib/examples/hscript/bld_b32.bat rename harbour/{samples => contrib/examples}/hscript/cgi.ch (100%) rename harbour/{samples => contrib/examples}/hscript/dir.hs (100%) rename harbour/{samples => contrib/examples}/hscript/hello.hs (100%) rename harbour/{samples => contrib/examples}/hscript/hscript.prg (100%) rename harbour/{samples => contrib/examples}/hscript/makehtm.bat (100%) rename harbour/{samples => contrib/examples}/hscript/multiply.hs (100%) rename harbour/{samples => contrib/examples}/hscript/readme.txt (100%) rename harbour/{samples => contrib/examples}/hscript/ugly.hs (100%) rename harbour/{samples => contrib/examples}/misc/Makefile (97%) rename harbour/{samples => contrib/examples}/misc/guess.prg (100%) rename harbour/{samples => contrib/examples}/misc/mankala.prg (100%) rename harbour/{samples => contrib/examples}/pe/Makefile (93%) rename harbour/{samples => contrib/examples}/pe/bld_b32.bat (100%) rename harbour/{samples => contrib/examples}/pe/editorhi.prg (100%) rename harbour/{samples => contrib/examples}/pe/editorlo.c (100%) rename harbour/{samples => contrib/examples}/pe/license.txt (100%) rename harbour/{samples => contrib/examples}/pe/pe.prg (95%) rename harbour/{samples => contrib/examples}/pe/readme.txt (100%) delete mode 100644 harbour/samples/hscript/bld_b32.bat diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5a37df63c1..20e2e57fc1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,24 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +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 diff --git a/harbour/Makefile b/harbour/Makefile index c25da38757..fa3bf6e0fd 100644 --- a/harbour/Makefile +++ b/harbour/Makefile @@ -23,7 +23,6 @@ DIRS=\ source \ $(HB_UTIL_DIR) \ contrib \ -# samples \ endif diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index c6fedb79b0..101bb0221f 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -14,6 +14,7 @@ DIRS=\ samples \ xhb \ $(HB_CONTRIBLIBS) +# examples \ ifneq ($(HB_ARCHITECTURE),dos) diff --git a/harbour/samples/Makefile b/harbour/contrib/examples/Makefile similarity index 86% rename from harbour/samples/Makefile rename to harbour/contrib/examples/Makefile index f6efac9132..40bf5f9969 100644 --- a/harbour/samples/Makefile +++ b/harbour/contrib/examples/Makefile @@ -2,7 +2,7 @@ # $Id$ # -ROOT = ../ +ROOT = ../../ DIRS=\ guestbk \ diff --git a/harbour/samples/guestbk/Makefile b/harbour/contrib/examples/guestbk/Makefile similarity index 93% rename from harbour/samples/guestbk/Makefile rename to harbour/contrib/examples/guestbk/Makefile index d55de27640..0b0fb2f29f 100644 --- a/harbour/samples/guestbk/Makefile +++ b/harbour/contrib/examples/guestbk/Makefile @@ -2,7 +2,7 @@ # $Id$ # -ROOT = ../../ +ROOT = ../../../ PRG_SOURCES=\ guestbk.prg \ diff --git a/harbour/samples/guestbk/bld_b32.bat b/harbour/contrib/examples/guestbk/bld_b32.bat similarity index 67% rename from harbour/samples/guestbk/bld_b32.bat rename to harbour/contrib/examples/guestbk/bld_b32.bat index fd5d2e629c..efd6d21806 100644 --- a/harbour/samples/guestbk/bld_b32.bat +++ b/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 diff --git a/harbour/samples/guestbk/cgi.ch b/harbour/contrib/examples/guestbk/cgi.ch similarity index 100% rename from harbour/samples/guestbk/cgi.ch rename to harbour/contrib/examples/guestbk/cgi.ch diff --git a/harbour/samples/guestbk/guestbk.htm b/harbour/contrib/examples/guestbk/guestbk.htm similarity index 100% rename from harbour/samples/guestbk/guestbk.htm rename to harbour/contrib/examples/guestbk/guestbk.htm diff --git a/harbour/samples/guestbk/guestbk.ini b/harbour/contrib/examples/guestbk/guestbk.ini similarity index 100% rename from harbour/samples/guestbk/guestbk.ini rename to harbour/contrib/examples/guestbk/guestbk.ini diff --git a/harbour/samples/guestbk/guestbk.prg b/harbour/contrib/examples/guestbk/guestbk.prg similarity index 100% rename from harbour/samples/guestbk/guestbk.prg rename to harbour/contrib/examples/guestbk/guestbk.prg diff --git a/harbour/samples/guestbk/guestbk.txt b/harbour/contrib/examples/guestbk/guestbk.txt similarity index 100% rename from harbour/samples/guestbk/guestbk.txt rename to harbour/contrib/examples/guestbk/guestbk.txt diff --git a/harbour/samples/guestbk/inifiles.prg b/harbour/contrib/examples/guestbk/inifiles.prg similarity index 99% rename from harbour/samples/guestbk/inifiles.prg rename to harbour/contrib/examples/guestbk/inifiles.prg index 202e8ab437..1839226f5c 100644 --- a/harbour/samples/guestbk/inifiles.prg +++ b/harbour/contrib/examples/guestbk/inifiles.prg @@ -1,6 +1,7 @@ -// -// $Id$ -// +/* + * $Id$ + */ + #define CRLF (Chr(13) + Chr(10)) function TIniFile() diff --git a/harbour/samples/guestbk/testcgi.prg b/harbour/contrib/examples/guestbk/testcgi.prg similarity index 99% rename from harbour/samples/guestbk/testcgi.prg rename to harbour/contrib/examples/guestbk/testcgi.prg index bcf95bca67..42ffd65f8b 100644 --- a/harbour/samples/guestbk/testcgi.prg +++ b/harbour/contrib/examples/guestbk/testcgi.prg @@ -1,6 +1,6 @@ -// -// $Id$ -// +/* + * $Id$ + */ /* * diff --git a/harbour/samples/hscript/Makefile b/harbour/contrib/examples/hscript/Makefile similarity index 92% rename from harbour/samples/hscript/Makefile rename to harbour/contrib/examples/hscript/Makefile index 1905b5bd65..f94c8d57d9 100644 --- a/harbour/samples/hscript/Makefile +++ b/harbour/contrib/examples/hscript/Makefile @@ -2,7 +2,7 @@ # $Id$ # -ROOT = ../../ +ROOT = ../../../ PRG_SOURCES=\ hscript.prg \ diff --git a/harbour/contrib/examples/hscript/bld_b32.bat b/harbour/contrib/examples/hscript/bld_b32.bat new file mode 100644 index 0000000000..a780731b83 --- /dev/null +++ b/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 diff --git a/harbour/samples/hscript/cgi.ch b/harbour/contrib/examples/hscript/cgi.ch similarity index 100% rename from harbour/samples/hscript/cgi.ch rename to harbour/contrib/examples/hscript/cgi.ch diff --git a/harbour/samples/hscript/dir.hs b/harbour/contrib/examples/hscript/dir.hs similarity index 100% rename from harbour/samples/hscript/dir.hs rename to harbour/contrib/examples/hscript/dir.hs diff --git a/harbour/samples/hscript/hello.hs b/harbour/contrib/examples/hscript/hello.hs similarity index 100% rename from harbour/samples/hscript/hello.hs rename to harbour/contrib/examples/hscript/hello.hs diff --git a/harbour/samples/hscript/hscript.prg b/harbour/contrib/examples/hscript/hscript.prg similarity index 100% rename from harbour/samples/hscript/hscript.prg rename to harbour/contrib/examples/hscript/hscript.prg diff --git a/harbour/samples/hscript/makehtm.bat b/harbour/contrib/examples/hscript/makehtm.bat similarity index 100% rename from harbour/samples/hscript/makehtm.bat rename to harbour/contrib/examples/hscript/makehtm.bat diff --git a/harbour/samples/hscript/multiply.hs b/harbour/contrib/examples/hscript/multiply.hs similarity index 100% rename from harbour/samples/hscript/multiply.hs rename to harbour/contrib/examples/hscript/multiply.hs diff --git a/harbour/samples/hscript/readme.txt b/harbour/contrib/examples/hscript/readme.txt similarity index 100% rename from harbour/samples/hscript/readme.txt rename to harbour/contrib/examples/hscript/readme.txt diff --git a/harbour/samples/hscript/ugly.hs b/harbour/contrib/examples/hscript/ugly.hs similarity index 100% rename from harbour/samples/hscript/ugly.hs rename to harbour/contrib/examples/hscript/ugly.hs diff --git a/harbour/samples/misc/Makefile b/harbour/contrib/examples/misc/Makefile similarity index 97% rename from harbour/samples/misc/Makefile rename to harbour/contrib/examples/misc/Makefile index ad90a918dd..4220d4ecf9 100644 --- a/harbour/samples/misc/Makefile +++ b/harbour/contrib/examples/misc/Makefile @@ -2,7 +2,7 @@ # $Id$ # -ROOT = ../../ +ROOT = ../../../ LIBS=\ debug \ diff --git a/harbour/samples/misc/guess.prg b/harbour/contrib/examples/misc/guess.prg similarity index 100% rename from harbour/samples/misc/guess.prg rename to harbour/contrib/examples/misc/guess.prg diff --git a/harbour/samples/misc/mankala.prg b/harbour/contrib/examples/misc/mankala.prg similarity index 100% rename from harbour/samples/misc/mankala.prg rename to harbour/contrib/examples/misc/mankala.prg diff --git a/harbour/samples/pe/Makefile b/harbour/contrib/examples/pe/Makefile similarity index 93% rename from harbour/samples/pe/Makefile rename to harbour/contrib/examples/pe/Makefile index 93fc50e4bf..0511389cd2 100644 --- a/harbour/samples/pe/Makefile +++ b/harbour/contrib/examples/pe/Makefile @@ -2,7 +2,7 @@ # $Id$ # -ROOT = ../../ +ROOT = ../../../ PRG_SOURCES=\ editorhi.prg \ diff --git a/harbour/samples/pe/bld_b32.bat b/harbour/contrib/examples/pe/bld_b32.bat similarity index 100% rename from harbour/samples/pe/bld_b32.bat rename to harbour/contrib/examples/pe/bld_b32.bat diff --git a/harbour/samples/pe/editorhi.prg b/harbour/contrib/examples/pe/editorhi.prg similarity index 100% rename from harbour/samples/pe/editorhi.prg rename to harbour/contrib/examples/pe/editorhi.prg diff --git a/harbour/samples/pe/editorlo.c b/harbour/contrib/examples/pe/editorlo.c similarity index 100% rename from harbour/samples/pe/editorlo.c rename to harbour/contrib/examples/pe/editorlo.c diff --git a/harbour/samples/pe/license.txt b/harbour/contrib/examples/pe/license.txt similarity index 100% rename from harbour/samples/pe/license.txt rename to harbour/contrib/examples/pe/license.txt diff --git a/harbour/samples/pe/pe.prg b/harbour/contrib/examples/pe/pe.prg similarity index 95% rename from harbour/samples/pe/pe.prg rename to harbour/contrib/examples/pe/pe.prg index ed06fb7f69..86249c19e9 100644 --- a/harbour/samples/pe/pe.prg +++ b/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 diff --git a/harbour/samples/pe/readme.txt b/harbour/contrib/examples/pe/readme.txt similarity index 100% rename from harbour/samples/pe/readme.txt rename to harbour/contrib/examples/pe/readme.txt diff --git a/harbour/samples/hscript/bld_b32.bat b/harbour/samples/hscript/bld_b32.bat deleted file mode 100644 index 7c211164d4..0000000000 --- a/harbour/samples/hscript/bld_b32.bat +++ /dev/null @@ -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