diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 38518c06f7..103279a248 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,21 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-02-20 13:02 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/Makefile + - contrib/xpp + + contrib/hbxpp + * contrib/hbxpp/Makefile + - contrib/hbxpp/xpp.hbc + + contrib/hbxpp/hbxpp.hbc + - contrib/hbxpp/xppextrn.ch + + contrib/hbxpp/hbxppext.ch + - contrib/hbxpp/xpp.ch + + contrib/hbxpp/hbxpp.ch + * contrib/hbxpp/tests/hbmk.hbm + * utils/hbmk2/examples/contribf.hbc + * Renamed 'xpp' lib to 'hbxpp'. Final name. + 2010-02-20 12:55 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * include/hbsetup.ch * src/common/hbverdsp.c diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index e32b721239..6d9963f1c0 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -23,10 +23,10 @@ DIRS := \ hbtip \ hbtpathy \ hbwin \ + hbxpp \ hbziparc \ rddbmcdx \ xhb \ - xpp \ # contribs _with_ external dependencies DIRS += \ diff --git a/harbour/contrib/xpp/Makefile b/harbour/contrib/hbxpp/Makefile similarity index 92% rename from harbour/contrib/xpp/Makefile rename to harbour/contrib/hbxpp/Makefile index f1713d6d51..396dc4fb50 100644 --- a/harbour/contrib/xpp/Makefile +++ b/harbour/contrib/hbxpp/Makefile @@ -6,7 +6,7 @@ ROOT := ../../ include $(TOP)$(ROOT)config/global.mk -LIBNAME := xpp +LIBNAME := hbxpp C_SOURCES := \ binnumx.c \ @@ -36,7 +36,8 @@ PRG_SOURCES := \ PRG_HEADERS := \ dll.ch \ - xpp.ch \ + hbxpp.ch \ + hbxppext.ch \ include $(TOP)$(ROOT)config/header.mk include $(TOP)$(ROOT)config/lib.mk diff --git a/harbour/contrib/xpp/binnumx.c b/harbour/contrib/hbxpp/binnumx.c similarity index 100% rename from harbour/contrib/xpp/binnumx.c rename to harbour/contrib/hbxpp/binnumx.c diff --git a/harbour/contrib/xpp/browdbx.prg b/harbour/contrib/hbxpp/browdbx.prg similarity index 100% rename from harbour/contrib/xpp/browdbx.prg rename to harbour/contrib/hbxpp/browdbx.prg diff --git a/harbour/contrib/xpp/dbcmdx.c b/harbour/contrib/hbxpp/dbcmdx.c similarity index 100% rename from harbour/contrib/xpp/dbcmdx.c rename to harbour/contrib/hbxpp/dbcmdx.c diff --git a/harbour/contrib/xpp/dbdetacx.c b/harbour/contrib/hbxpp/dbdetacx.c similarity index 100% rename from harbour/contrib/xpp/dbdetacx.c rename to harbour/contrib/hbxpp/dbdetacx.c diff --git a/harbour/contrib/xpp/dbfuncsx.prg b/harbour/contrib/hbxpp/dbfuncsx.prg similarity index 100% rename from harbour/contrib/xpp/dbfuncsx.prg rename to harbour/contrib/hbxpp/dbfuncsx.prg diff --git a/harbour/contrib/xpp/dbjoinx.prg b/harbour/contrib/hbxpp/dbjoinx.prg similarity index 100% rename from harbour/contrib/xpp/dbjoinx.prg rename to harbour/contrib/hbxpp/dbjoinx.prg diff --git a/harbour/contrib/xpp/dblistx.prg b/harbour/contrib/hbxpp/dblistx.prg similarity index 100% rename from harbour/contrib/xpp/dblistx.prg rename to harbour/contrib/hbxpp/dblistx.prg diff --git a/harbour/contrib/xpp/dbsortx.prg b/harbour/contrib/hbxpp/dbsortx.prg similarity index 100% rename from harbour/contrib/xpp/dbsortx.prg rename to harbour/contrib/hbxpp/dbsortx.prg diff --git a/harbour/contrib/xpp/dbstruxx.prg b/harbour/contrib/hbxpp/dbstruxx.prg similarity index 100% rename from harbour/contrib/xpp/dbstruxx.prg rename to harbour/contrib/hbxpp/dbstruxx.prg diff --git a/harbour/contrib/xpp/dbtotalx.prg b/harbour/contrib/hbxpp/dbtotalx.prg similarity index 100% rename from harbour/contrib/xpp/dbtotalx.prg rename to harbour/contrib/hbxpp/dbtotalx.prg diff --git a/harbour/contrib/xpp/dbupdatx.prg b/harbour/contrib/hbxpp/dbupdatx.prg similarity index 100% rename from harbour/contrib/xpp/dbupdatx.prg rename to harbour/contrib/hbxpp/dbupdatx.prg diff --git a/harbour/contrib/xpp/dll.ch b/harbour/contrib/hbxpp/dll.ch similarity index 100% rename from harbour/contrib/xpp/dll.ch rename to harbour/contrib/hbxpp/dll.ch diff --git a/harbour/contrib/xpp/dllx.c b/harbour/contrib/hbxpp/dllx.c similarity index 100% rename from harbour/contrib/xpp/dllx.c rename to harbour/contrib/hbxpp/dllx.c diff --git a/harbour/contrib/xpp/xpp.ch b/harbour/contrib/hbxpp/hbxpp.ch similarity index 100% rename from harbour/contrib/xpp/xpp.ch rename to harbour/contrib/hbxpp/hbxpp.ch diff --git a/harbour/contrib/xpp/xpp.hbc b/harbour/contrib/hbxpp/hbxpp.hbc similarity index 68% rename from harbour/contrib/xpp/xpp.hbc rename to harbour/contrib/hbxpp/hbxpp.hbc index cb3dc3d59a..62a2571796 100644 --- a/harbour/contrib/xpp/xpp.hbc +++ b/harbour/contrib/hbxpp/hbxpp.hbc @@ -4,4 +4,4 @@ incpaths=. -libs=xpp +libs=hbxpp diff --git a/harbour/contrib/xpp/xppextrn.ch b/harbour/contrib/hbxpp/hbxppext.ch similarity index 97% rename from harbour/contrib/xpp/xppextrn.ch rename to harbour/contrib/hbxpp/hbxppext.ch index c230b380db..58a1ef3db4 100644 --- a/harbour/contrib/xpp/xppextrn.ch +++ b/harbour/contrib/hbxpp/hbxppext.ch @@ -50,8 +50,8 @@ * */ -#ifndef XPP_EXTERN_CH_ -#define XPP_EXTERN_CH_ +#ifndef _HBXPPEXT_CH +#define _HBXPPEXT_CH EXTERNAL XPP_GET EXTERNAL XPP_TBROWSE @@ -87,4 +87,4 @@ EXTERNAL THREADOBJECT EXTERNAL THREAD EXTERNAL SIGNAL -#endif /* XPP_EXTERN_CH_ */ +#endif /* _HBXPPEXT_CH */ diff --git a/harbour/contrib/xpp/idlex.c b/harbour/contrib/hbxpp/idlex.c similarity index 100% rename from harbour/contrib/xpp/idlex.c rename to harbour/contrib/hbxpp/idlex.c diff --git a/harbour/contrib/xpp/mousex.c b/harbour/contrib/hbxpp/mousex.c similarity index 100% rename from harbour/contrib/xpp/mousex.c rename to harbour/contrib/hbxpp/mousex.c diff --git a/harbour/contrib/xpp/oemansix.c b/harbour/contrib/hbxpp/oemansix.c similarity index 100% rename from harbour/contrib/xpp/oemansix.c rename to harbour/contrib/hbxpp/oemansix.c diff --git a/harbour/contrib/xpp/philesx.c b/harbour/contrib/hbxpp/philesx.c similarity index 100% rename from harbour/contrib/xpp/philesx.c rename to harbour/contrib/hbxpp/philesx.c diff --git a/harbour/contrib/xpp/tbcolumx.prg b/harbour/contrib/hbxpp/tbcolumx.prg similarity index 100% rename from harbour/contrib/xpp/tbcolumx.prg rename to harbour/contrib/hbxpp/tbcolumx.prg diff --git a/harbour/contrib/xpp/tbrowsex.prg b/harbour/contrib/hbxpp/tbrowsex.prg similarity index 100% rename from harbour/contrib/xpp/tbrowsex.prg rename to harbour/contrib/hbxpp/tbrowsex.prg diff --git a/harbour/contrib/xpp/tests/hbmk.hbm b/harbour/contrib/hbxpp/tests/hbmk.hbm similarity index 62% rename from harbour/contrib/xpp/tests/hbmk.hbm rename to harbour/contrib/hbxpp/tests/hbmk.hbm index 597fb80f96..a5180e2dea 100644 --- a/harbour/contrib/xpp/tests/hbmk.hbm +++ b/harbour/contrib/hbxpp/tests/hbmk.hbm @@ -2,6 +2,6 @@ # $Id$ # -../xpp.hbc +../hbxpp.hbc -w3 -es2 diff --git a/harbour/contrib/xpp/tests/testdll.prg b/harbour/contrib/hbxpp/tests/testdll.prg similarity index 100% rename from harbour/contrib/xpp/tests/testdll.prg rename to harbour/contrib/hbxpp/tests/testdll.prg diff --git a/harbour/contrib/xpp/tgetx.prg b/harbour/contrib/hbxpp/tgetx.prg similarity index 100% rename from harbour/contrib/xpp/tgetx.prg rename to harbour/contrib/hbxpp/tgetx.prg diff --git a/harbour/contrib/xpp/thfuncx.prg b/harbour/contrib/hbxpp/thfuncx.prg similarity index 100% rename from harbour/contrib/xpp/thfuncx.prg rename to harbour/contrib/hbxpp/thfuncx.prg diff --git a/harbour/contrib/xpp/tthreadx.prg b/harbour/contrib/hbxpp/tthreadx.prg similarity index 100% rename from harbour/contrib/xpp/tthreadx.prg rename to harbour/contrib/hbxpp/tthreadx.prg diff --git a/harbour/contrib/xpp/typefilx.prg b/harbour/contrib/hbxpp/typefilx.prg similarity index 100% rename from harbour/contrib/xpp/typefilx.prg rename to harbour/contrib/hbxpp/typefilx.prg diff --git a/harbour/utils/hbmk2/examples/contribf.hbc b/harbour/utils/hbmk2/examples/contribf.hbc index 446b89a0a4..a6d0e21830 100644 --- a/harbour/utils/hbmk2/examples/contribf.hbc +++ b/harbour/utils/hbmk2/examples/contribf.hbc @@ -6,7 +6,7 @@ # [ This should be kept in sync with local Makefile information. ] # contribs portable, with no external dependencies: -libs=hbbmcdx hbbtree hbclipsm hbct hbfship hbgt hbmisc hbmzip hbnf hbtpathy hbziparc rddsql xhb +libs=hbbmcdx hbbtree hbclipsm hbct hbfship hbgt hbmisc hbmzip hbnf hbtpathy hbxpp hbziparc rddsql xhb # contribs portable, with external dependencies: libs=hbcurl hbfbird hbgd hbhpdf hbmysql hbpgsql hbqt hbtip sddfb sddmy sddpg