diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 603ffe3d97..6670d4269e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,18 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-09 17:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/examples/contribf.hbc + * contrib/hbtpathy/Makefile + + contrib/hbtpathy/tpdos.c + * contrib/hbtpathy/hbtpathy.hbc + + Added DOS stubs. This makes it possible to enable this contrib + for all existing platforms. Serial support is possible to + implement in DOS. + % Now all source files are compiled for each platform, platform + specific parts are guarded internally, no need to duplicate the + logic on the make level. + 2009-08-09 16:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbtpathy/tpwin.c * contrib/hbtpathy/tpos2.c diff --git a/harbour/contrib/hbtpathy/Makefile b/harbour/contrib/hbtpathy/Makefile index 13ac938b14..6067d17a99 100644 --- a/harbour/contrib/hbtpathy/Makefile +++ b/harbour/contrib/hbtpathy/Makefile @@ -6,28 +6,12 @@ ROOT = ../../ LIBNAME=hbtpathy -C_SOURCES= - -ifneq ($(findstring $(HB_ARCHITECTURE),linux darwin hpux bsd sunos),) C_SOURCES=\ + tpcommon.c \ tpunix.c \ - tpcommon.c \ - -endif -ifneq ($(findstring $(HB_ARCHITECTURE),win wce),) -C_SOURCES=\ tpwin.c \ - tpcommon.c \ - -endif -ifeq ($(HB_ARCHITECTURE),os2) -C_SOURCES=\ tpos2.c \ - tpcommon.c \ - -endif - -ifneq ($(C_SOURCES),) + tpdos.c \ PRG_SOURCES=\ telepath.prg \ @@ -41,7 +25,3 @@ include $(TOP)$(ROOT)config/lib.cf install:: $(INSTALL_RULE_HEADERS) - -else -include $(TOP)$(ROOT)config/none.cf -endif diff --git a/harbour/contrib/hbtpathy/hbtpathy.hbc b/harbour/contrib/hbtpathy/hbtpathy.hbc index 646d6e6a2a..a521ed93f0 100644 --- a/harbour/contrib/hbtpathy/hbtpathy.hbc +++ b/harbour/contrib/hbtpathy/hbtpathy.hbc @@ -2,8 +2,6 @@ # $Id$ # -{!(unix|win|os2)}skip=yes - incpaths=. libs=hbtpathy diff --git a/harbour/contrib/hbtpathy/tpdos.c b/harbour/contrib/hbtpathy/tpdos.c new file mode 100644 index 0000000000..99bc912daf --- /dev/null +++ b/harbour/contrib/hbtpathy/tpdos.c @@ -0,0 +1,97 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Telepathy emulation library (DOS low-level - stubs) + * + * Copyright 2009 Viktor Szakats (harbour.01 syenar.hu) + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#include "hbapi.h" + +#if defined( HB_OS_DOS ) + +HB_FUNC( __TP_INITPORTSPEED ) +{ +} + +HB_FUNC( __TP_READPORT ) +{ +} + +HB_FUNC( __TP_WRITEPORT ) +{ +} + +HB_FUNC( __TP_INFREE ) +{ +} + +HB_FUNC( __TP_OUTFREE ) +{ +} + +HB_FUNC( __TP_CTRLCTS ) +{ +} + +HB_FUNC( __TP_ISDCD ) +{ +} + +HB_FUNC( __TP_ISRI ) +{ +} + +HB_FUNC( __TP_ISDSR ) +{ +} + +HB_FUNC( __TP_ISCTS ) +{ +} + +#endif /* HB_OS_DOS */ diff --git a/harbour/utils/hbmk2/examples/contribf.hbc b/harbour/utils/hbmk2/examples/contribf.hbc index 039b8ca669..d2f469e365 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 hbcrypt hbct hbgt hbmisc hbmzip hbnf hbvpdf hbziparc rddsql xhb +libs=hbbmcdx hbbtree hbclipsm hbcrypt hbct hbgt hbmisc hbmzip hbnf hbtpathy hbvpdf hbziparc rddsql xhb # contribs portable, with external dependencies: libs=hbcurl hbfbird hbgd hbhpdf hbmysql hbpgsql hbqt sddfb sddmy sddpg @@ -15,7 +15,6 @@ libs=hbcurl hbfbird hbgd hbhpdf hbmysql hbpgsql hbqt sddfb sddmy sddpg {!pocc&!xcc&!dmc&!watcom}libs=gtalleg {!dos}libs=hbfimage hbssl hbtip {linux|win}libs=rddads -{linux|win|os2}libs=hbtpathy {win}libs=gtwvg hbblat hbwin rddado {win&!dmc}libs=hbwhat {!rsxnt}libs=hbodbc