From 4b17624bbf1cbf56c7faf5f5103776046d7c690b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 11 Jun 2009 19:05:34 +0000 Subject: [PATCH] 2009-06-11 21:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/gtdos/Makefile * source/rtl/gtwin/Makefile * source/rtl/gtos2/Makefile * source/rtl/gtgui/Makefile * source/rtl/gtwvt/Makefile + Added architecture protection. Just a step to make them all self detecting. * mpkg_win.nsi * Updated links installed. * examples/superlib/readme.txt * examples/dbu/readme.txt * examples/rl/readme.txt ! Fixed my typo in hbformat cmdline. --- harbour/ChangeLog | 19 ++++++++++++++++++- harbour/examples/dbu/readme.txt | 2 +- harbour/examples/rl/readme.txt | 2 +- harbour/examples/superlib/readme.txt | 2 +- harbour/mpkg_win.nsi | 12 ++++++------ harbour/source/rtl/gtdos/Makefile | 10 ++++++++-- harbour/source/rtl/gtgui/Makefile | 18 ++++++++++++++++-- harbour/source/rtl/gtos2/Makefile | 10 ++++++++-- harbour/source/rtl/gtwin/Makefile | 10 ++++++++-- harbour/source/rtl/gtwvt/Makefile | 18 ++++++++++++++++-- 10 files changed, 83 insertions(+), 20 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index acc3f52e96..43072ddf38 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,13 +17,30 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-11 21:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * source/rtl/gtdos/Makefile + * source/rtl/gtwin/Makefile + * source/rtl/gtos2/Makefile + * source/rtl/gtgui/Makefile + * source/rtl/gtwvt/Makefile + + Added architecture protection. + Just a step to make them all self detecting. + + * mpkg_win.nsi + * Updated links installed. + + * examples/superlib/readme.txt + * examples/dbu/readme.txt + * examples/rl/readme.txt + ! Fixed my typo in hbformat cmdline. + 2009-06-11 22:57 UTC+0300 Alexander Kresin * source/debug/tbrwtext.prg ! Bug fixed in Search() method. 2009-06-11 17:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL - - Deleted link to clc newgroup. + - Deleted link to clc newsgroup. * contrib/hbsqlit3/hbsqlit3.c + Now all Harbour callable functions are always defined diff --git a/harbour/examples/dbu/readme.txt b/harbour/examples/dbu/readme.txt index 4416809a40..cf428870f5 100644 --- a/harbour/examples/dbu/readme.txt +++ b/harbour/examples/dbu/readme.txt @@ -7,7 +7,7 @@ 2.) *nix users will need convert original filenames to lowercase and EOLs to native format, using this command: - hbformat -lFCaseLow=yes -nEol=0 -lIndent=no -lCase=no -lSpace=no *.prg + hbformat -lFCaseLow=yes -nEol=0 -lIndent=no -lCase=no -lSpaces=no *.prg 3.) Apply supplied patch to the source using GNU Patch: diff --git a/harbour/examples/rl/readme.txt b/harbour/examples/rl/readme.txt index 2842503ed7..49156fd214 100644 --- a/harbour/examples/rl/readme.txt +++ b/harbour/examples/rl/readme.txt @@ -7,7 +7,7 @@ 2.) *nix users will need convert original filenames to lowercase and EOLs to native format, using this command: - hbformat -lFCaseLow=yes -nEol=0 -lIndent=no -lCase=no -lSpace=no *.prg + hbformat -lFCaseLow=yes -nEol=0 -lIndent=no -lCase=no -lSpaces=no *.prg 3.) Apply supplied patch to the source using GNU Patch: patch -N -i rl.dif diff --git a/harbour/examples/superlib/readme.txt b/harbour/examples/superlib/readme.txt index 9504a2e78f..644bba3826 100644 --- a/harbour/examples/superlib/readme.txt +++ b/harbour/examples/superlib/readme.txt @@ -9,7 +9,7 @@ 3.) *nix users will need convert original filenames to lowercase and EOLs to native format, using this command: - hbformat -lFCaseLow=yes -nEol=0 -lIndent=no -lCase=no -lSpace=no *.prg + hbformat -lFCaseLow=yes -nEol=0 -lIndent=no -lCase=no -lSpaces=no *.prg 4.) Apply supplied patch to the source using GNU Patch: patch -N -i hbsuper.dif diff --git a/harbour/mpkg_win.nsi b/harbour/mpkg_win.nsi index e05ef84670..b5ba4ac27e 100644 --- a/harbour/mpkg_win.nsi +++ b/harbour/mpkg_win.nsi @@ -126,12 +126,12 @@ Section "Start Menu and Desktop icons" hb_shortcuts CreateShortCut "$SMPROGRAMS\Harbour Project\Harbour Project.lnk" "$INSTDIR" "" "$INSTDIR" 0 CreateShortCut "$SMPROGRAMS\Harbour Project\hbrun.lnk" "$INSTDIR\bin\hbrun.exe" "-v" "$INSTDIR\bin\hbrun.exe" 0 CreateDirectory "$SMPROGRAMS\Harbour Project\Links" - WriteINIStr "$SMPROGRAMS\Harbour Project\Links\Home.url" "InternetShortcut" "URL" "http://www.harbour-project.org/" - WriteINIStr "$SMPROGRAMS\Harbour Project\Links\Mailing lists.url" "InternetShortcut" "URL" "http://www.harbour-project.org/mailing.html" - WriteINIStr "$SMPROGRAMS\Harbour Project\Links\Developers' mail archives.url" "InternetShortcut" "URL" "http://lists.harbour-project.org/pipermail/harbour/" -; WriteINIStr "$SMPROGRAMS\Harbour Project\Links\Users' mail archives.url" "InternetShortcut" "URL" "http://lists.harbour-project.org/pipermail/harbour-users/" - WriteINIStr "$SMPROGRAMS\Harbour Project\Links\Sourceforge page.url" "InternetShortcut" "URL" "http://sourceforge.net/projects/harbour-project/" - WriteINIStr "$SMPROGRAMS\Harbour Project\Links\Development timeline.url" "InternetShortcut" "URL" "http://apps.sourceforge.net/trac/harbour-project/timeline" + WriteINIStr "$SMPROGRAMS\Harbour Project\Links\Homepage.url" "InternetShortcut" "URL" "http://www.harbour-project.org/" + WriteINIStr "$SMPROGRAMS\Harbour Project\Links\User Forums.url" "InternetShortcut" "URL" "http://apps.sourceforge.net/phpbb/harbour-project/" +; WriteINIStr "$SMPROGRAMS\Harbour Project\Links\User Newsgroup.url" "InternetShortcut" "URL" "http://groups.google.com/group/comp.lang.clipper/" + WriteINIStr "$SMPROGRAMS\Harbour Project\Links\Sourceforge Page.url" "InternetShortcut" "URL" "http://sourceforge.net/projects/harbour-project/" + WriteINIStr "$SMPROGRAMS\Harbour Project\Links\Developers' Mail Archives.url" "InternetShortcut" "URL" "http://lists.harbour-project.org/pipermail/harbour/" + WriteINIStr "$SMPROGRAMS\Harbour Project\Links\Development Timeline.url" "InternetShortcut" "URL" "http://apps.sourceforge.net/trac/harbour-project/timeline" SectionEnd diff --git a/harbour/source/rtl/gtdos/Makefile b/harbour/source/rtl/gtdos/Makefile index 9da2ee382b..55150e8a3d 100644 --- a/harbour/source/rtl/gtdos/Makefile +++ b/harbour/source/rtl/gtdos/Makefile @@ -4,9 +4,15 @@ ROOT = ../../../ +LIBNAME=gtdos + +ifeq ($(HB_ARCHITECTURE),dos) + C_SOURCES=\ gtdos.c \ -LIBNAME=gtdos - include $(TOP)$(ROOT)config/lib.cf + +else +include $(TOP)$(ROOT)config/none.cf +endif diff --git a/harbour/source/rtl/gtgui/Makefile b/harbour/source/rtl/gtgui/Makefile index 08aa82e124..15e7808e89 100644 --- a/harbour/source/rtl/gtgui/Makefile +++ b/harbour/source/rtl/gtgui/Makefile @@ -4,9 +4,23 @@ ROOT = ../../../ +LIBNAME=gtgui + +HB_WITH_GTGUI=no +ifeq ($(HB_ARCHITECTURE),win) +HB_WITH_GTGUI=yes +endif +ifeq ($(HB_ARCHITECTURE),wce) +HB_WITH_GTGUI=yes +endif + +ifeq ($(HB_WITH_GTGUI),yes) + C_SOURCES=\ gtgui.c \ -LIBNAME=gtgui - include $(TOP)$(ROOT)config/lib.cf + +else +include $(TOP)$(ROOT)config/none.cf +endif diff --git a/harbour/source/rtl/gtos2/Makefile b/harbour/source/rtl/gtos2/Makefile index 85f8d99a6b..a2a02f35fb 100644 --- a/harbour/source/rtl/gtos2/Makefile +++ b/harbour/source/rtl/gtos2/Makefile @@ -4,9 +4,15 @@ ROOT = ../../../ +LIBNAME=gtos2 + +ifeq ($(HB_ARCHITECTURE),os2) + C_SOURCES=\ gtos2.c \ -LIBNAME=gtos2 - include $(TOP)$(ROOT)config/lib.cf + +else +include $(TOP)$(ROOT)config/none.cf +endif diff --git a/harbour/source/rtl/gtwin/Makefile b/harbour/source/rtl/gtwin/Makefile index 99e60d8af3..99353c369e 100644 --- a/harbour/source/rtl/gtwin/Makefile +++ b/harbour/source/rtl/gtwin/Makefile @@ -4,9 +4,15 @@ ROOT = ../../../ +LIBNAME=gtwin + +ifeq ($(HB_ARCHITECTURE),win) + C_SOURCES=\ gtwin.c \ -LIBNAME=gtwin - include $(TOP)$(ROOT)config/lib.cf + +else +include $(TOP)$(ROOT)config/none.cf +endif diff --git a/harbour/source/rtl/gtwvt/Makefile b/harbour/source/rtl/gtwvt/Makefile index 8bbfec2d0c..005fcb55dc 100644 --- a/harbour/source/rtl/gtwvt/Makefile +++ b/harbour/source/rtl/gtwvt/Makefile @@ -4,9 +4,23 @@ ROOT = ../../../ +LIBNAME=gtwvt + +HB_WITH_GTWVT=no +ifeq ($(HB_ARCHITECTURE),win) +HB_WITH_GTWVT=yes +endif +ifeq ($(HB_ARCHITECTURE),wce) +HB_WITH_GTWVT=yes +endif + +ifeq ($(HB_WITH_GTWVT),yes) + C_SOURCES=\ gtwvt.c \ -LIBNAME=gtwvt - include $(TOP)$(ROOT)config/lib.cf + +else +include $(TOP)$(ROOT)config/none.cf +endif