diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e42ee38d9a..ae27e59437 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,178 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-09 20:27 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + - contrib/examples/dbu/bld_b32.bat + - contrib/examples/dbu/bld_vc.bat + + contrib/examples/dbu/hbmk_b32.bat + + contrib/examples/dbu/hbmk_vc.bat + - contrib/examples/guestbk/bld_b32.bat + - contrib/examples/guestbk/bld_vc.bat + + contrib/examples/guestbk/hbmk_b32.bat + + contrib/examples/guestbk/hbmk_vc.bat + - contrib/examples/hbsqlit2/tests/bld_b32.bat + - contrib/examples/hbsqlit2/tests/bld_vc.bat + + contrib/examples/hbsqlit2/tests/hbmk_b32.bat + + contrib/examples/hbsqlit2/tests/hbmk_vc.bat + - contrib/examples/hscript/bld_b32.bat + - contrib/examples/hscript/bld_vc.bat + + contrib/examples/hscript/hbmk_b32.bat + + contrib/examples/hscript/hbmk_vc.bat + - contrib/examples/pe/bld_b32.bat + - contrib/examples/pe/bld_vc.bat + + contrib/examples/pe/hbmk_b32.bat + + contrib/examples/pe/hbmk_vc.bat + - contrib/examples/pp/bld_b32.bat + - contrib/examples/pp/bld_vc.bat + + contrib/examples/pp/hbmk_b32.bat + + contrib/examples/pp/hbmk_vc.bat + - contrib/gtwvg/tests/bld_b32.bat + - contrib/gtwvg/tests/bld_vc.bat + + contrib/gtwvg/tests/hbmk_b32.bat + + contrib/gtwvg/tests/hbmk_vc.bat + - contrib/hbapollo/tests/bld_b32.bat + - contrib/hbapollo/tests/bld_vc.bat + + contrib/hbapollo/tests/hbmk_b32.bat + + contrib/hbapollo/tests/hbmk_vc.bat + - contrib/hbbtree/tests/bld_b32.bat + - contrib/hbbtree/tests/bld_djgp.bat + - contrib/hbbtree/tests/bld_vc.bat + + contrib/hbbtree/tests/hbmk_b32.bat + + contrib/hbbtree/tests/hbmk_djg.bat + + contrib/hbbtree/tests/hbmk_vc.bat + - contrib/hbclipsm/tests/bld_b32.bat + - contrib/hbclipsm/tests/bld_vc.bat + + contrib/hbclipsm/tests/hbmk_b32.bat + + contrib/hbclipsm/tests/hbmk_vc.bat + - contrib/hbct/tests/bld_b32.bat + - contrib/hbct/tests/bld_vc.bat + + contrib/hbct/tests/hbmk_b32.bat + + contrib/hbct/tests/hbmk_vc.bat + - contrib/hbcurl/tests/bld_b32.bat + - contrib/hbcurl/tests/bld_vc.bat + + contrib/hbcurl/tests/hbmk_b32.bat + + contrib/hbcurl/tests/hbmk_vc.bat + - contrib/hbfbird/tests/bld_b32.bat + - contrib/hbfbird/tests/bld_vc.bat + + contrib/hbfbird/tests/hbmk_b32.bat + + contrib/hbfbird/tests/hbmk_vc.bat + - contrib/hbfimage/tests/bld_b32.bat + - contrib/hbfimage/tests/bld_vc.bat + + contrib/hbfimage/tests/hbmk_b32.bat + + contrib/hbfimage/tests/hbmk_vc.bat + - contrib/hbgd/tests/bld_b32.bat + - contrib/hbgd/tests/bld_vc.bat + + contrib/hbgd/tests/hbmk_b32.bat + + contrib/hbgd/tests/hbmk_vc.bat + - contrib/hbgf/tests/bld_b32.bat + - contrib/hbgf/tests/bld_vc.bat + + contrib/hbgf/tests/hbmk_b32.bat + + contrib/hbgf/tests/hbmk_vc.bat + - contrib/hbhpdf/tests/bld_b32.bat + - contrib/hbhpdf/tests/bld_vc.bat + + contrib/hbhpdf/tests/hbmk_b32.bat + + contrib/hbhpdf/tests/hbmk_vc.bat + - contrib/hbmisc/tests/bld_b32.bat + - contrib/hbmisc/tests/bld_vc.bat + + contrib/hbmisc/tests/hbmk_b32.bat + + contrib/hbmisc/tests/hbmk_vc.bat + - contrib/hbmysql/tests/bld_b32.bat + - contrib/hbmysql/tests/bld_vc.bat + + contrib/hbmysql/tests/hbmk_b32.bat + + contrib/hbmysql/tests/hbmk_vc.bat + - contrib/hbmzip/tests/bld_b32.bat + - contrib/hbmzip/tests/bld_vc.bat + + contrib/hbmzip/tests/hbmk_b32.bat + + contrib/hbmzip/tests/hbmk_vc.bat + - contrib/hbnf/tests/bld_b32.bat + - contrib/hbnf/tests/bld_vc.bat + + contrib/hbnf/tests/hbmk_b32.bat + + contrib/hbnf/tests/hbmk_vc.bat + - contrib/hbodbc/tests/bld_b32.bat + - contrib/hbodbc/tests/bld_vc.bat + + contrib/hbodbc/tests/hbmk_b32.bat + + contrib/hbodbc/tests/hbmk_vc.bat + - contrib/hbole/tests/bld_b32.bat + - contrib/hbole/tests/bld_vc.bat + + contrib/hbole/tests/hbmk_b32.bat + + contrib/hbole/tests/hbmk_vc.bat + - contrib/hbpgsql/tests/bld_b32.bat + - contrib/hbpgsql/tests/bld_vc.bat + + contrib/hbpgsql/tests/hbmk_b32.bat + + contrib/hbpgsql/tests/hbmk_vc.bat + - contrib/hbsqlit3/tests/bld_b32.bat + - contrib/hbsqlit3/tests/bld_vc.bat + + contrib/hbsqlit3/tests/hbmk_b32.bat + + contrib/hbsqlit3/tests/hbmk_vc.bat + - contrib/hbtip/tests/bld_b32.bat + - contrib/hbtip/tests/bld_vc.bat + + contrib/hbtip/tests/hbmk_b32.bat + + contrib/hbtip/tests/hbmk_vc.bat + - contrib/hbtpathy/tests/bld_b32.bat + - contrib/hbtpathy/tests/bld_vc.bat + + contrib/hbtpathy/tests/hbmk_b32.bat + + contrib/hbtpathy/tests/hbmk_vc.bat + - contrib/hbvpdf/tests/bld_b32.bat + - contrib/hbvpdf/tests/bld_vc.bat + + contrib/hbvpdf/tests/hbmk_b32.bat + + contrib/hbvpdf/tests/hbmk_vc.bat + - contrib/hbwhat/tests/bld_b32.bat + - contrib/hbwhat/tests/bld_vc.bat + + contrib/hbwhat/tests/hbmk_b32.bat + + contrib/hbwhat/tests/hbmk_vc.bat + - contrib/hbwin/tests/bld_b32.bat + - contrib/hbwin/tests/bld_vc.bat + + contrib/hbwin/tests/hbmk_b32.bat + + contrib/hbwin/tests/hbmk_vc.bat + - contrib/hbziparc/tests/bld_b32.bat + - contrib/hbziparc/tests/bld_vc.bat + + contrib/hbziparc/tests/hbmk_b32.bat + + contrib/hbziparc/tests/hbmk_vc.bat + - contrib/rddado/tests/bld_b32.bat + - contrib/rddado/tests/bld_vc.bat + + contrib/rddado/tests/hbmk_b32.bat + + contrib/rddado/tests/hbmk_vc.bat + - contrib/rddads/tests/bld_b32.bat + - contrib/rddads/tests/bld_vc.bat + + contrib/rddads/tests/hbmk_b32.bat + + contrib/rddads/tests/hbmk_vc.bat + - contrib/rddsql/tests/bld_b32.bat + - contrib/rddsql/tests/bld_vc.bat + + contrib/rddsql/tests/hbmk_b32.bat + + contrib/rddsql/tests/hbmk_vc.bat + - contrib/xhb/tests/bld_b32.bat + - contrib/xhb/tests/bld_vc.bat + + contrib/xhb/tests/hbmk_b32.bat + + contrib/xhb/tests/hbmk_vc.bat + - tests/bld_b32.bat + - tests/bld_b32_dll.bat + - tests/bld_gnu.bat + - tests/bld_vc.bat + + tests/hbmk_b32.bat + + tests/hbmk_b32_dll.bat + + tests/hbmk_gnu.bat + + tests/hbmk_vc.bat + - utils/hbdoc/bld_b32.bat + - utils/hbdoc/bld_vc.bat + + utils/hbdoc/hbmk_b32.bat + + utils/hbdoc/hbmk_vc.bat + - utils/hbmake/bld_b32.bat + - utils/hbmake/bld_vc.bat + + utils/hbmake/hbmk_b32.bat + + utils/hbmake/hbmk_vc.bat + * bld*.bat -> hbmk*.bat + + * contrib/mtpl_b32.mak + * /P32 -> /P64 + + + contrib/hbmsql/tests/hbmk_b32.bat + + contrib/hbmsql/tests/hbmk_vc.bat + + Added make files. + + - contrib/hbclip + - Removed this contrib. It was incomplete and not + updated since 2001. + 2008-11-09 17:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * make_vc.mak * config/rules.cf @@ -413,7 +585,7 @@ * utils/hbtest/rt_misc.prg + Added one C5.2 SET()s for two simple tests. + Added all C5.3 SET()s for two simple tests each. - ; NOFIX: _SET_VIDEOMODE has the type wrong. + ; TOFIX: _SET_VIDEOMODE has the type wrong. ; NOTE: It wouldn't be a bad idea to add some more comprehensive tests for SET()s. diff --git a/harbour/contrib/examples/dbu/bld_b32.bat b/harbour/contrib/examples/dbu/hbmk_b32.bat similarity index 100% rename from harbour/contrib/examples/dbu/bld_b32.bat rename to harbour/contrib/examples/dbu/hbmk_b32.bat diff --git a/harbour/contrib/examples/dbu/bld_vc.bat b/harbour/contrib/examples/dbu/hbmk_vc.bat similarity index 100% rename from harbour/contrib/examples/dbu/bld_vc.bat rename to harbour/contrib/examples/dbu/hbmk_vc.bat diff --git a/harbour/contrib/examples/guestbk/bld_b32.bat b/harbour/contrib/examples/guestbk/hbmk_b32.bat similarity index 100% rename from harbour/contrib/examples/guestbk/bld_b32.bat rename to harbour/contrib/examples/guestbk/hbmk_b32.bat diff --git a/harbour/contrib/examples/guestbk/bld_vc.bat b/harbour/contrib/examples/guestbk/hbmk_vc.bat similarity index 100% rename from harbour/contrib/examples/guestbk/bld_vc.bat rename to harbour/contrib/examples/guestbk/hbmk_vc.bat diff --git a/harbour/contrib/examples/hbsqlit2/tests/bld_b32.bat b/harbour/contrib/examples/hbsqlit2/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/examples/hbsqlit2/tests/bld_b32.bat rename to harbour/contrib/examples/hbsqlit2/tests/hbmk_b32.bat diff --git a/harbour/contrib/examples/hbsqlit2/tests/bld_vc.bat b/harbour/contrib/examples/hbsqlit2/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/examples/hbsqlit2/tests/bld_vc.bat rename to harbour/contrib/examples/hbsqlit2/tests/hbmk_vc.bat diff --git a/harbour/contrib/examples/hscript/bld_b32.bat b/harbour/contrib/examples/hscript/hbmk_b32.bat similarity index 100% rename from harbour/contrib/examples/hscript/bld_b32.bat rename to harbour/contrib/examples/hscript/hbmk_b32.bat diff --git a/harbour/contrib/examples/hscript/bld_vc.bat b/harbour/contrib/examples/hscript/hbmk_vc.bat similarity index 100% rename from harbour/contrib/examples/hscript/bld_vc.bat rename to harbour/contrib/examples/hscript/hbmk_vc.bat diff --git a/harbour/contrib/examples/pe/bld_b32.bat b/harbour/contrib/examples/pe/hbmk_b32.bat similarity index 100% rename from harbour/contrib/examples/pe/bld_b32.bat rename to harbour/contrib/examples/pe/hbmk_b32.bat diff --git a/harbour/contrib/examples/pe/bld_vc.bat b/harbour/contrib/examples/pe/hbmk_vc.bat similarity index 100% rename from harbour/contrib/examples/pe/bld_vc.bat rename to harbour/contrib/examples/pe/hbmk_vc.bat diff --git a/harbour/contrib/examples/pp/bld_b32.bat b/harbour/contrib/examples/pp/hbmk_b32.bat similarity index 100% rename from harbour/contrib/examples/pp/bld_b32.bat rename to harbour/contrib/examples/pp/hbmk_b32.bat diff --git a/harbour/contrib/examples/pp/bld_vc.bat b/harbour/contrib/examples/pp/hbmk_vc.bat similarity index 100% rename from harbour/contrib/examples/pp/bld_vc.bat rename to harbour/contrib/examples/pp/hbmk_vc.bat diff --git a/harbour/contrib/gtwvg/tests/bld_b32.bat b/harbour/contrib/gtwvg/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/gtwvg/tests/bld_b32.bat rename to harbour/contrib/gtwvg/tests/hbmk_b32.bat diff --git a/harbour/contrib/gtwvg/tests/bld_vc.bat b/harbour/contrib/gtwvg/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/gtwvg/tests/bld_vc.bat rename to harbour/contrib/gtwvg/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbapollo/tests/bld_b32.bat b/harbour/contrib/hbapollo/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbapollo/tests/bld_b32.bat rename to harbour/contrib/hbapollo/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbapollo/tests/bld_vc.bat b/harbour/contrib/hbapollo/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbapollo/tests/bld_vc.bat rename to harbour/contrib/hbapollo/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbbtree/tests/bld_b32.bat b/harbour/contrib/hbbtree/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbbtree/tests/bld_b32.bat rename to harbour/contrib/hbbtree/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbbtree/tests/bld_djgp.bat b/harbour/contrib/hbbtree/tests/hbmk_djg.bat similarity index 100% rename from harbour/contrib/hbbtree/tests/bld_djgp.bat rename to harbour/contrib/hbbtree/tests/hbmk_djg.bat diff --git a/harbour/contrib/hbbtree/tests/bld_vc.bat b/harbour/contrib/hbbtree/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbbtree/tests/bld_vc.bat rename to harbour/contrib/hbbtree/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbclip/hbarg.c b/harbour/contrib/hbclip/hbarg.c deleted file mode 100644 index 596903a161..0000000000 --- a/harbour/contrib/hbclip/hbarg.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Compatibility Library for CA-Cl*pper source code: - * HB_ARGC(), HB_ARGV() functions - * - * Copyright 1999-2001 Viktor Szakats - * 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 "extend.h" - -extern int __argc; -extern char ** __argv; - -CLIPPER HB_ARGC( void ) -{ - _retni( __argc - 1 ); -} - -CLIPPER HB_ARGV( void ) -{ - if( ISNUM( 1 ) ) - { - int argc = _parni( 1 ); - - _retc( ( argc >= 0 && argc < __argc ) ? __argv[ argc ] : "" ); - } - else - _retc( "" ); -} diff --git a/harbour/contrib/hbclip/hbclip.ch b/harbour/contrib/hbclip/hbclip.ch deleted file mode 100644 index f7513419d9..0000000000 --- a/harbour/contrib/hbclip/hbclip.ch +++ /dev/null @@ -1,98 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Compatibility Library for CA-Cl*pper source code: - * Header file to help compile Harbour source files with Clipper - * - * Copyright 1999 Paul Tucker - * 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. - * - */ - -/* - * NOTE: This file is meant to be included in CA-Cl*pper applications - * that were written to take advantage of specific Harbour extensions - * or platform dependent features. - */ - -/* - * TODO: Extend as needed. - */ - -#ifndef __HARBOUR__ - -#ifndef HB_CLIP_CH_ -#define HB_CLIP_CH_ - -/* TODO: Rewrite as much of these in C or Clipper as possible */ - -#xtranslate HB_ARGCHECK( ) => ( .F. ) -#xtranslate HB_ARGSTRING( ) => "" -#xtranslate HB_FNAMESPLIT( ) => NIL -#xtranslate HB_FNAMEMERGE( [, [, [, ]]] ) => "" -#xtranslate HB_PVALUE( ) => NIL -#xtranslate HB_SETKEYGET( [][, ] ) => NIL -#xtranslate HB_SETKEYSAVE( [] ) => ( {} ) -#xtranslate HB_SETKEYCHECK( [, [, [, ]]] ) => ( .F. ) -#xtranslate HB_SETKEYARRAY( [, ] ) => AEval( , {| tmp | SetKey( tmp, ) } ) - -/* HB_DISKSPACE() types */ -#define HB_DISK_AVAIL 0 -#define HB_DISK_FREE 1 -#define HB_DISK_USED 2 -#define HB_DISK_TOTAL 3 - -/* Strong typing */ - -#translate AS ARRAY [OF ] => -#translate AS STRING => -#translate AS CLASS => -#translate AS NUMERIC => -#translate AS DATE => -#translate AS CODEBLOCK => -#translate AS OBJECT => -#translate AS LOGICAL => -#translate AS USUAL => - -#endif diff --git a/harbour/contrib/hbclip/hbclip.h b/harbour/contrib/hbclip/hbclip.h deleted file mode 100644 index c55218252c..0000000000 --- a/harbour/contrib/hbclip/hbclip.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Compatibility Library for CA-Cl*pper source code: - * Header file to help compile C file for both Harbour and Clipper - * - * Copyright 1999-2001 Viktor Szakats - * 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. - * - */ - -#ifndef HB_CLIP_H_ -#define HB_CLIP_H_ - -#ifdef __HARBOUR__ - #include "hbdefs.h" - #define HB_FUNCL( funcname, funcshort ) HB_FUNC( funcname ) -#else - #define HB_FUNC( funcname ) CLIPPER funcname ( void ) - #define HB_FUNCL( funcname, funcshort ) CLIPPER funcshort ( void ) -#endif - -#endif /* HB_CLIP_H_ */ - diff --git a/harbour/contrib/hbclip/hbclip.prg b/harbour/contrib/hbclip/hbclip.prg deleted file mode 100644 index 81a7ad272e..0000000000 --- a/harbour/contrib/hbclip/hbclip.prg +++ /dev/null @@ -1,72 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Compatibility Library for CA-Cl*pper source code: - * Some simple and dummy functions (to use instead of hbclip.ch) - * - * Copyright 1999-2001 Viktor Szakats - * 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. - * - */ - -/* Dummy or simple functions */ - -FUNCTION HB_OSNEWLINE() - RETURN Chr( 13 ) + Chr( 10 ) - -FUNCTION HB_ANSITOOEM( cString ) - RETURN cString - -FUNCTION HB_OEMTOANSI( cString ) - RETURN cString - -FUNCTION HB_TRACESTATE( nValue ) - RETURN 0 - -FUNCTION HB_TRACELEVEL( nValue ) - RETURN 0 - -FUNCTION HB_COMPILER() - RETURN iif( "5.3" $ Version(), "Microsoft C 8.0", "Microsoft C 5.1" ) - diff --git a/harbour/contrib/hbclip/hbcolind.c b/harbour/contrib/hbclip/hbcolind.c deleted file mode 100644 index 56a8be12f2..0000000000 --- a/harbour/contrib/hbclip/hbcolind.c +++ /dev/null @@ -1,102 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Compatibility Library for CA-Cl*pper source code: - * HB_COLORINDEX() function - * - * Copyright 1999-2001 Viktor Szakats - * 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 "extend.h" - -CLIPPER HB_COLORIN( void ) -{ - if( ISCHAR( 1 ) && ISNUM( 2 ) ) - { - char * pszColor = _parc( 1 ); - USHORT uiColorPos; - USHORT uiColorLen; - USHORT uiColorIndex = ( USHORT ) _parni( 2 ); - - /* Skip the given number of commas */ - - for( uiColorPos = 0 ; pszColor[ uiColorPos ] != '\0' && uiColorIndex > 0 ; uiColorPos++ ) - { - if( pszColor[ uiColorPos ] == ',' ) - uiColorIndex--; - } - - /* if found, continue */ - - if( uiColorIndex == 0 ) - { - /* Skip the spaces after the comma */ - - while( pszColor[ uiColorPos ] == ' ' ) uiColorPos++; - - /* Search for next comma or end of string */ - - uiColorLen = 0; - - while( pszColor[ uiColorPos + uiColorLen ] != '\0' && - pszColor[ uiColorPos + uiColorLen ] != ',' ) uiColorLen++; - - /* Skip the trailing spaces */ - - while( uiColorLen > 0 && - pszColor[ uiColorPos + uiColorLen - 1 ] == ' ' ) uiColorLen--; - - /* Return the string */ - - _retclen( pszColor + uiColorPos, uiColorLen ); - } - else - _retc( "" ); - } - else - _retc( "" ); -} - diff --git a/harbour/contrib/hbclip/hbkeyput.prg b/harbour/contrib/hbclip/hbkeyput.prg deleted file mode 100644 index 819c3d98a1..0000000000 --- a/harbour/contrib/hbclip/hbkeyput.prg +++ /dev/null @@ -1,60 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Compatibility Library for CA-Cl*pper source code: - * HB_KEYPUT() function - * - * Copyright 1999-2001 Viktor Szakats - * 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. - * - */ - -/* NOTE: This one will reset the keyboard buffer, while Harbour not. */ -/* NOTE: This one will not allow certain keycodes which are fine in Harbour. */ - -PROCEDURE HB_KEYPUT( nKey ) - - KEYBOARD Chr( nKey ) - - RETURN diff --git a/harbour/contrib/hbclip/hbshadow.prg b/harbour/contrib/hbclip/hbshadow.prg deleted file mode 100644 index 22957ae0e5..0000000000 --- a/harbour/contrib/hbclip/hbshadow.prg +++ /dev/null @@ -1,57 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Compatibility Library for CA-Cl*pper source code: - * HB_SHADOW() function - * - * Copyright 1999-2001 Viktor Szakats - * 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. - * - */ - -/* NOTE: You can also use the header file */ - -FUNCTION HB_SHADOW( t, l, b, r, a ) - RETURN dbgShadow( t, l, b, r, a ) - diff --git a/harbour/contrib/hbclip/hbstod.c b/harbour/contrib/hbclip/hbstod.c deleted file mode 100644 index 7797f73d75..0000000000 --- a/harbour/contrib/hbclip/hbstod.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Compatibility Library for CA-Cl*pper source code: - * HB_STOD() function - * - * Copyright 1999-2001 Viktor Szakats - * 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 "extend.h" - -CLIPPER HB_STOD( void ) -{ - /* The length check is a fix to avoid buggy behaviour of _retds() */ - _retds( ( ISCHAR( 1 ) && _parclen( 1 ) == 8 ) ? _parc( 1 ) : " " ); -} - diff --git a/harbour/contrib/hbclip/hbstodx.c b/harbour/contrib/hbclip/hbstodx.c deleted file mode 100644 index f2e9e9390b..0000000000 --- a/harbour/contrib/hbclip/hbstodx.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Compatibility Library for CA-Cl*pper source code: - * STOD() function - * - * Copyright 1999-2001 Viktor Szakats - * 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 "extend.h" - -CLIPPER STOD( void ) -{ - /* The length check is a fix to avoid buggy behaviour of _retds() */ - _retds( ( ISCHAR( 1 ) && _parclen( 1 ) == 8 ) ? _parc( 1 ) : " " ); -} - diff --git a/harbour/contrib/hbclip/hbvaltoc.prg b/harbour/contrib/hbclip/hbvaltoc.prg deleted file mode 100644 index 865f2ce7a9..0000000000 --- a/harbour/contrib/hbclip/hbvaltoc.prg +++ /dev/null @@ -1,65 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Compatibility Library for CA-Cl*pper source code: - * HB_VALTOSTR() function - * - * Copyright 1999-2001 Viktor Szakats - * 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. - * - */ - -FUNCTION HB_VALTOSTR( xValue ) - LOCAL cType := ValType( xValue ) - - DO CASE - CASE cType $ "CM" ; RETURN xValue - CASE cType == "D" ; RETURN CToD( xValue ) - CASE cType == "N" ; RETURN Str( xValue ) - CASE cType == "L" ; RETURN iif( xValue, ".T.", ".F." ) - CASE cType == "U" ; RETURN "NIL" - ENDCASE - - RETURN "" - diff --git a/harbour/contrib/hbclip/make_clp.bat b/harbour/contrib/hbclip/make_clp.bat deleted file mode 100644 index 0956d73fdc..0000000000 --- a/harbour/contrib/hbclip/make_clp.bat +++ /dev/null @@ -1,29 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -clipper hbclip.prg /n /w -clipper hbkeyput.prg /n /w -clipper hbshadow.prg /n /w -clipper hbvaltoc.prg /n /w - -cl /c /AL /Zl /Oalt /Gs /W3 hbarg.c -cl /c /AL /Zl /Oalt /Gs /W3 hbcolind.c -cl /c /AL /Zl /Oalt /Gs /W3 hbstod.c -cl /c /AL /Zl /Oalt /Gs /W3 hbstodx.c - -del hbclip.lib - -lib hbclip -+ hbclip.obj ,, -lib hbclip -+ hbkeyput.obj ,, -lib hbclip -+ hbshadow.obj ,, -lib hbclip -+ hbvaltoc.obj ,, - -lib hbclip -+ hbarg.obj ,, -lib hbclip -+ hbcolind.obj ,, -lib hbclip -+ hbstod.obj ,, -lib hbclip -+ hbstodx.obj ,, - -del hbclip.bak -del *.obj diff --git a/harbour/contrib/hbclip/readme.txt b/harbour/contrib/hbclip/readme.txt deleted file mode 100644 index 1a29c1d1e9..0000000000 --- a/harbour/contrib/hbclip/readme.txt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * $Id$ - */ - -Harbour Compatibility Library (HCL) for CA-Cl*pper 5.x -====================================================== - -The goal of this library and header file is to provide some level -of compatibility for Harbour code when compiled with CA-Cl*pper. - -You will require Microsoft C 5.1 or 8.x and CA-Cl*pper to compile -and build this library. - -Use MAKE_CLP.BAT to build the library. - -Later on add HBCLIP.LIB to your link script. - -Optionally you may want to #include "hbclip.ch" to -your source files. - -Viktor Szakats diff --git a/harbour/contrib/hbclipsm/tests/bld_b32.bat b/harbour/contrib/hbclipsm/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbclipsm/tests/bld_b32.bat rename to harbour/contrib/hbclipsm/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbclipsm/tests/bld_vc.bat b/harbour/contrib/hbclipsm/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbclipsm/tests/bld_vc.bat rename to harbour/contrib/hbclipsm/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbct/tests/bld_b32.bat b/harbour/contrib/hbct/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbct/tests/bld_b32.bat rename to harbour/contrib/hbct/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbct/tests/bld_vc.bat b/harbour/contrib/hbct/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbct/tests/bld_vc.bat rename to harbour/contrib/hbct/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbcurl/tests/bld_b32.bat b/harbour/contrib/hbcurl/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbcurl/tests/bld_b32.bat rename to harbour/contrib/hbcurl/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbcurl/tests/bld_vc.bat b/harbour/contrib/hbcurl/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbcurl/tests/bld_vc.bat rename to harbour/contrib/hbcurl/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbfbird/tests/bld_b32.bat b/harbour/contrib/hbfbird/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbfbird/tests/bld_b32.bat rename to harbour/contrib/hbfbird/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbfbird/tests/bld_vc.bat b/harbour/contrib/hbfbird/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbfbird/tests/bld_vc.bat rename to harbour/contrib/hbfbird/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbfimage/tests/bld_b32.bat b/harbour/contrib/hbfimage/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbfimage/tests/bld_b32.bat rename to harbour/contrib/hbfimage/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbfimage/tests/bld_vc.bat b/harbour/contrib/hbfimage/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbfimage/tests/bld_vc.bat rename to harbour/contrib/hbfimage/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbgd/tests/bld_b32.bat b/harbour/contrib/hbgd/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbgd/tests/bld_b32.bat rename to harbour/contrib/hbgd/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbgd/tests/bld_vc.bat b/harbour/contrib/hbgd/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbgd/tests/bld_vc.bat rename to harbour/contrib/hbgd/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbgf/tests/bld_b32.bat b/harbour/contrib/hbgf/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbgf/tests/bld_b32.bat rename to harbour/contrib/hbgf/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbgf/tests/bld_vc.bat b/harbour/contrib/hbgf/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbgf/tests/bld_vc.bat rename to harbour/contrib/hbgf/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbhpdf/tests/bld_b32.bat b/harbour/contrib/hbhpdf/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbhpdf/tests/bld_b32.bat rename to harbour/contrib/hbhpdf/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbhpdf/tests/bld_vc.bat b/harbour/contrib/hbhpdf/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbhpdf/tests/bld_vc.bat rename to harbour/contrib/hbhpdf/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbmisc/tests/bld_b32.bat b/harbour/contrib/hbmisc/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbmisc/tests/bld_b32.bat rename to harbour/contrib/hbmisc/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbmisc/tests/bld_vc.bat b/harbour/contrib/hbmisc/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbmisc/tests/bld_vc.bat rename to harbour/contrib/hbmisc/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbmsql/tests/hbmk_b32.bat b/harbour/contrib/hbmsql/tests/hbmk_b32.bat new file mode 100644 index 0000000000..f85ae94512 --- /dev/null +++ b/harbour/contrib/hbmsql/tests/hbmk_b32.bat @@ -0,0 +1,14 @@ +@echo off +rem +rem $Id: bld_b32.bat 8411 2008-05-14 06:41:01Z vszakats $ +rem + +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +set HB_USER_LIBS=%HB_USER_LIBS% hbmsql.lib + +call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbmsql/tests/hbmk_vc.bat b/harbour/contrib/hbmsql/tests/hbmk_vc.bat new file mode 100644 index 0000000000..56c8de249b --- /dev/null +++ b/harbour/contrib/hbmsql/tests/hbmk_vc.bat @@ -0,0 +1,14 @@ +@echo off +rem +rem $Id: bld_vc.bat 8411 2008-05-14 06:41:01Z vszakats $ +rem + +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=%HB_USER_LIBS% hbmsql.lib + +call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbmysql/tests/bld_b32.bat b/harbour/contrib/hbmysql/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbmysql/tests/bld_b32.bat rename to harbour/contrib/hbmysql/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbmysql/tests/bld_vc.bat b/harbour/contrib/hbmysql/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbmysql/tests/bld_vc.bat rename to harbour/contrib/hbmysql/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbmzip/tests/bld_b32.bat b/harbour/contrib/hbmzip/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbmzip/tests/bld_b32.bat rename to harbour/contrib/hbmzip/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbmzip/tests/bld_vc.bat b/harbour/contrib/hbmzip/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbmzip/tests/bld_vc.bat rename to harbour/contrib/hbmzip/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbnf/tests/bld_b32.bat b/harbour/contrib/hbnf/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbnf/tests/bld_b32.bat rename to harbour/contrib/hbnf/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbnf/tests/bld_vc.bat b/harbour/contrib/hbnf/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbnf/tests/bld_vc.bat rename to harbour/contrib/hbnf/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbodbc/tests/bld_b32.bat b/harbour/contrib/hbodbc/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbodbc/tests/bld_b32.bat rename to harbour/contrib/hbodbc/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbodbc/tests/bld_vc.bat b/harbour/contrib/hbodbc/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbodbc/tests/bld_vc.bat rename to harbour/contrib/hbodbc/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbole/tests/bld_b32.bat b/harbour/contrib/hbole/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbole/tests/bld_b32.bat rename to harbour/contrib/hbole/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbole/tests/bld_vc.bat b/harbour/contrib/hbole/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbole/tests/bld_vc.bat rename to harbour/contrib/hbole/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbpgsql/tests/bld_b32.bat b/harbour/contrib/hbpgsql/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbpgsql/tests/bld_b32.bat rename to harbour/contrib/hbpgsql/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbpgsql/tests/bld_vc.bat b/harbour/contrib/hbpgsql/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbpgsql/tests/bld_vc.bat rename to harbour/contrib/hbpgsql/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbsqlit3/tests/bld_b32.bat b/harbour/contrib/hbsqlit3/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbsqlit3/tests/bld_b32.bat rename to harbour/contrib/hbsqlit3/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbsqlit3/tests/bld_vc.bat b/harbour/contrib/hbsqlit3/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbsqlit3/tests/bld_vc.bat rename to harbour/contrib/hbsqlit3/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbtip/tests/bld_b32.bat b/harbour/contrib/hbtip/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbtip/tests/bld_b32.bat rename to harbour/contrib/hbtip/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbtip/tests/bld_vc.bat b/harbour/contrib/hbtip/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbtip/tests/bld_vc.bat rename to harbour/contrib/hbtip/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbtpathy/tests/bld_b32.bat b/harbour/contrib/hbtpathy/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbtpathy/tests/bld_b32.bat rename to harbour/contrib/hbtpathy/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbtpathy/tests/bld_vc.bat b/harbour/contrib/hbtpathy/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbtpathy/tests/bld_vc.bat rename to harbour/contrib/hbtpathy/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbvpdf/tests/bld_b32.bat b/harbour/contrib/hbvpdf/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbvpdf/tests/bld_b32.bat rename to harbour/contrib/hbvpdf/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbvpdf/tests/bld_vc.bat b/harbour/contrib/hbvpdf/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbvpdf/tests/bld_vc.bat rename to harbour/contrib/hbvpdf/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbwhat/tests/bld_b32.bat b/harbour/contrib/hbwhat/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbwhat/tests/bld_b32.bat rename to harbour/contrib/hbwhat/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbwhat/tests/bld_vc.bat b/harbour/contrib/hbwhat/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbwhat/tests/bld_vc.bat rename to harbour/contrib/hbwhat/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbwin/tests/bld_b32.bat b/harbour/contrib/hbwin/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbwin/tests/bld_b32.bat rename to harbour/contrib/hbwin/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbwin/tests/bld_vc.bat b/harbour/contrib/hbwin/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbwin/tests/bld_vc.bat rename to harbour/contrib/hbwin/tests/hbmk_vc.bat diff --git a/harbour/contrib/hbziparc/tests/bld_b32.bat b/harbour/contrib/hbziparc/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/hbziparc/tests/bld_b32.bat rename to harbour/contrib/hbziparc/tests/hbmk_b32.bat diff --git a/harbour/contrib/hbziparc/tests/bld_vc.bat b/harbour/contrib/hbziparc/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/hbziparc/tests/bld_vc.bat rename to harbour/contrib/hbziparc/tests/hbmk_vc.bat diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index 962b85f52e..f5429f3e1a 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -130,7 +130,7 @@ LDFLAGS = $(LDFLAGS) $(L_USR) # This is needed, otherwise the libs may overflow when # debug info is requested with -v -y -ARFLAGS = /P32 $(A_USR) +ARFLAGS = /P64 $(A_USR) #********************************************************** # COMPILE Rules diff --git a/harbour/contrib/rddado/tests/bld_b32.bat b/harbour/contrib/rddado/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/rddado/tests/bld_b32.bat rename to harbour/contrib/rddado/tests/hbmk_b32.bat diff --git a/harbour/contrib/rddado/tests/bld_vc.bat b/harbour/contrib/rddado/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/rddado/tests/bld_vc.bat rename to harbour/contrib/rddado/tests/hbmk_vc.bat diff --git a/harbour/contrib/rddads/tests/bld_b32.bat b/harbour/contrib/rddads/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/rddads/tests/bld_b32.bat rename to harbour/contrib/rddads/tests/hbmk_b32.bat diff --git a/harbour/contrib/rddads/tests/bld_vc.bat b/harbour/contrib/rddads/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/rddads/tests/bld_vc.bat rename to harbour/contrib/rddads/tests/hbmk_vc.bat diff --git a/harbour/contrib/rddsql/tests/bld_b32.bat b/harbour/contrib/rddsql/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/rddsql/tests/bld_b32.bat rename to harbour/contrib/rddsql/tests/hbmk_b32.bat diff --git a/harbour/contrib/rddsql/tests/bld_vc.bat b/harbour/contrib/rddsql/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/rddsql/tests/bld_vc.bat rename to harbour/contrib/rddsql/tests/hbmk_vc.bat diff --git a/harbour/contrib/xhb/tests/bld_b32.bat b/harbour/contrib/xhb/tests/hbmk_b32.bat similarity index 100% rename from harbour/contrib/xhb/tests/bld_b32.bat rename to harbour/contrib/xhb/tests/hbmk_b32.bat diff --git a/harbour/contrib/xhb/tests/bld_vc.bat b/harbour/contrib/xhb/tests/hbmk_vc.bat similarity index 100% rename from harbour/contrib/xhb/tests/bld_vc.bat rename to harbour/contrib/xhb/tests/hbmk_vc.bat diff --git a/harbour/tests/bld_b32_dll.bat b/harbour/tests/bld_b32_dll.bat deleted file mode 100644 index 0a7b49f71e..0000000000 --- a/harbour/tests/bld_b32_dll.bat +++ /dev/null @@ -1,32 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This file is intended to build a program, which uses harbour-b32.dll -rem The main function must be called _AppMain. -rem To run the program, you need to have harbour-b32.dll in your path. -rem --------------------------------------------------------------- - -..\bin\harbour %1.prg -n -i..\include %2 %3 - -bcc32 -c -O2 -d -I..\include %1.c ..\source\vm\mainwin.c - -@echo c0w32.obj + > _bld_b32_dll.tmp -@echo %1.obj + >> _bld_b32_dll.tmp -@echo mainwin.obj, + >> _bld_b32_dll.tmp -@echo %1.exe, + >> _bld_b32_dll.tmp -@echo , + >> _bld_b32_dll.tmp -@echo ..\lib\harbour-11-b32.lib + >> _bld_b32_dll.tmp -@echo cw32.lib + >> _bld_b32_dll.tmp -@echo import32.lib, >> _bld_b32_dll.tmp - -ilink32 -Tpe -Gn @_bld_b32_dll.tmp - -del %1.obj -del mainwin.obj -del %1.c -del *.tds - -del _bld_b32_dll.tmp diff --git a/harbour/tests/bld_b32.bat b/harbour/tests/hbmk_b32.bat similarity index 100% rename from harbour/tests/bld_b32.bat rename to harbour/tests/hbmk_b32.bat diff --git a/harbour/tests/hbmk_b32_dll.bat b/harbour/tests/hbmk_b32_dll.bat new file mode 100644 index 0000000000..5e62e3baee --- /dev/null +++ b/harbour/tests/hbmk_b32_dll.bat @@ -0,0 +1,32 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This file is intended to build a program, which uses harbour-b32.dll +rem The main function must be called _AppMain. +rem To run the program, you need to have harbour-b32.dll in your path. +rem --------------------------------------------------------------- + +..\bin\harbour %1.prg -n -i..\include %2 %3 + +bcc32 -c -O2 -d -I..\include %1.c ..\source\vm\mainwin.c + +@echo c0w32.obj + > _hbmk_b32_dll.tmp +@echo %1.obj + >> _hbmk_b32_dll.tmp +@echo mainwin.obj, + >> _hbmk_b32_dll.tmp +@echo %1.exe, + >> _hbmk_b32_dll.tmp +@echo , + >> _hbmk_b32_dll.tmp +@echo ..\lib\harbour-11-b32.lib + >> _hbmk_b32_dll.tmp +@echo cw32.lib + >> _hbmk_b32_dll.tmp +@echo import32.lib, >> _hbmk_b32_dll.tmp + +ilink32 -Tpe -Gn @_hbmk_b32_dll.tmp + +del %1.obj +del mainwin.obj +del %1.c +del *.tds + +del _hbmk_b32_dll.tmp diff --git a/harbour/tests/bld_gnu.bat b/harbour/tests/hbmk_gnu.bat similarity index 100% rename from harbour/tests/bld_gnu.bat rename to harbour/tests/hbmk_gnu.bat diff --git a/harbour/tests/bld_vc.bat b/harbour/tests/hbmk_vc.bat similarity index 100% rename from harbour/tests/bld_vc.bat rename to harbour/tests/hbmk_vc.bat diff --git a/harbour/utils/hbdoc/bld_b32.bat b/harbour/utils/hbdoc/hbmk_b32.bat similarity index 100% rename from harbour/utils/hbdoc/bld_b32.bat rename to harbour/utils/hbdoc/hbmk_b32.bat diff --git a/harbour/utils/hbdoc/bld_vc.bat b/harbour/utils/hbdoc/hbmk_vc.bat similarity index 100% rename from harbour/utils/hbdoc/bld_vc.bat rename to harbour/utils/hbdoc/hbmk_vc.bat diff --git a/harbour/utils/hbmake/bld_b32.bat b/harbour/utils/hbmake/hbmk_b32.bat similarity index 100% rename from harbour/utils/hbmake/bld_b32.bat rename to harbour/utils/hbmake/hbmk_b32.bat diff --git a/harbour/utils/hbmake/bld_vc.bat b/harbour/utils/hbmake/hbmk_vc.bat similarity index 100% rename from harbour/utils/hbmake/bld_vc.bat rename to harbour/utils/hbmake/hbmk_vc.bat