diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fd7ce02c3c..5dd7f0101a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,17 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-15 20:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * include/Makefile + + include/hbextcdp.ch + * include/hbextern.ch + * utils/hbmk2/hbmk2.prg + + Separated EXTERNAL HB_CODEPAGE_* lines to hbextcdp.ch. + These are commonly needed by apps. + * Using hbextcdp.ch in hbmk2. + ; TODO: hbextern app needs to be updated to filter out + CODEPAGE symbols. + 2009-07-15 19:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/win/mingw.cf * config/wce/mingwarm.cf diff --git a/harbour/include/Makefile b/harbour/include/Makefile index 76ac191a7f..8e5f8b8a26 100644 --- a/harbour/include/Makefile +++ b/harbour/include/Makefile @@ -78,6 +78,7 @@ PRG_HEADERS=\ getexit.ch \ hbclass.ch \ hbdebug.ch \ + hbextcdp.ch \ hbextern.ch \ hbgetcmt.ch \ hbgfx.ch \ diff --git a/harbour/include/hbextcdp.ch b/harbour/include/hbextcdp.ch new file mode 100644 index 0000000000..7e59568d4e --- /dev/null +++ b/harbour/include/hbextcdp.ch @@ -0,0 +1,130 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * All HB_CODEPAGE_* externals. + * + * 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. + * + */ + +#ifndef HB_EXTCDP_CH_ +#define HB_EXTCDP_CH_ + +#include "hbextcdp.ch" + +/* Codepage support */ +EXTERNAL HB_CODEPAGE_BG866 +EXTERNAL HB_CODEPAGE_BGISO +EXTERNAL HB_CODEPAGE_BGMIK +EXTERNAL HB_CODEPAGE_BGWIN +EXTERNAL HB_CODEPAGE_CS852 +EXTERNAL HB_CODEPAGE_CSISO +EXTERNAL HB_CODEPAGE_CSKAM +EXTERNAL HB_CODEPAGE_CSWIN +EXTERNAL HB_CODEPAGE_DE850 +EXTERNAL HB_CODEPAGE_DEISO +EXTERNAL HB_CODEPAGE_DEWIN +EXTERNAL HB_CODEPAGE_EL737 +EXTERNAL HB_CODEPAGE_ELWIN +EXTERNAL HB_CODEPAGE_EN +EXTERNAL HB_CODEPAGE_ES850 +EXTERNAL HB_CODEPAGE_ES850C +EXTERNAL HB_CODEPAGE_ESISO +EXTERNAL HB_CODEPAGE_ESISOC +EXTERNAL HB_CODEPAGE_ESWIN +EXTERNAL HB_CODEPAGE_ESWINC +EXTERNAL HB_CODEPAGE_FR850 +EXTERNAL HB_CODEPAGE_FRISO +EXTERNAL HB_CODEPAGE_FRWIN +EXTERNAL HB_CODEPAGE_HR437 +EXTERNAL HB_CODEPAGE_HR852 +EXTERNAL HB_CODEPAGE_HRWIN +EXTERNAL HB_CODEPAGE_HU852 +EXTERNAL HB_CODEPAGE_HU852S +EXTERNAL HB_CODEPAGE_HUISO +EXTERNAL HB_CODEPAGE_HUISOS +EXTERNAL HB_CODEPAGE_HUWIN +EXTERNAL HB_CODEPAGE_HUWINS +EXTERNAL HB_CODEPAGE_IT437 +EXTERNAL HB_CODEPAGE_IT850 +EXTERNAL HB_CODEPAGE_ITISB +EXTERNAL HB_CODEPAGE_ITISO +EXTERNAL HB_CODEPAGE_ITWIN +EXTERNAL HB_CODEPAGE_LTWIN +EXTERNAL HB_CODEPAGE_PL852 +EXTERNAL HB_CODEPAGE_PLISO +EXTERNAL HB_CODEPAGE_PLMAZ +EXTERNAL HB_CODEPAGE_PLWIN +EXTERNAL HB_CODEPAGE_PT850 +EXTERNAL HB_CODEPAGE_PTISO +EXTERNAL HB_CODEPAGE_RO852 +EXTERNAL HB_CODEPAGE_ROISO +EXTERNAL HB_CODEPAGE_ROWIN +EXTERNAL HB_CODEPAGE_RU1251 +EXTERNAL HB_CODEPAGE_RU866 +EXTERNAL HB_CODEPAGE_RUISO +EXTERNAL HB_CODEPAGE_RUKOI8 +EXTERNAL HB_CODEPAGE_SK852 +EXTERNAL HB_CODEPAGE_SKISO +EXTERNAL HB_CODEPAGE_SKKAM +EXTERNAL HB_CODEPAGE_SKWIN +EXTERNAL HB_CODEPAGE_SL437 +EXTERNAL HB_CODEPAGE_SL852 +EXTERNAL HB_CODEPAGE_SLISO +EXTERNAL HB_CODEPAGE_SLWIN +EXTERNAL HB_CODEPAGE_SRWIN +EXTERNAL HB_CODEPAGE_SV850 +EXTERNAL HB_CODEPAGE_SVCLIP +EXTERNAL HB_CODEPAGE_SVISO +EXTERNAL HB_CODEPAGE_SVWIN +EXTERNAL HB_CODEPAGE_TR857 +EXTERNAL HB_CODEPAGE_TRWIN +EXTERNAL HB_CODEPAGE_UA1125 +EXTERNAL HB_CODEPAGE_UA1251 +EXTERNAL HB_CODEPAGE_UA866 +EXTERNAL HB_CODEPAGE_UAKOI8 + +#endif /* HB_EXTCDP_CH_ */ diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index 1dd336595a..fc6cc6e9de 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -53,6 +53,8 @@ #ifndef HB_EXTERN_CH_ #define HB_EXTERN_CH_ +#include "hbextcdp.ch" + /* CA-Cl*pper compatible standard functions */ EXTERNAL AADD @@ -1034,78 +1036,6 @@ EXTERNAL HB_MUTEXSUBSCRIBE EXTERNAL HB_MUTEXSUBSCRIBENOW EXTERNAL HB_MUTEXQUEUEINFO -/* Codepage support */ -EXTERNAL HB_CODEPAGE_BG866 -EXTERNAL HB_CODEPAGE_BGISO -EXTERNAL HB_CODEPAGE_BGMIK -EXTERNAL HB_CODEPAGE_BGWIN -EXTERNAL HB_CODEPAGE_CS852 -EXTERNAL HB_CODEPAGE_CSISO -EXTERNAL HB_CODEPAGE_CSKAM -EXTERNAL HB_CODEPAGE_CSWIN -EXTERNAL HB_CODEPAGE_DE850 -EXTERNAL HB_CODEPAGE_DEISO -EXTERNAL HB_CODEPAGE_DEWIN -EXTERNAL HB_CODEPAGE_EL737 -EXTERNAL HB_CODEPAGE_ELWIN -EXTERNAL HB_CODEPAGE_EN -EXTERNAL HB_CODEPAGE_ES850 -EXTERNAL HB_CODEPAGE_ES850C -EXTERNAL HB_CODEPAGE_ESISO -EXTERNAL HB_CODEPAGE_ESISOC -EXTERNAL HB_CODEPAGE_ESWIN -EXTERNAL HB_CODEPAGE_ESWINC -EXTERNAL HB_CODEPAGE_FR850 -EXTERNAL HB_CODEPAGE_FRISO -EXTERNAL HB_CODEPAGE_FRWIN -EXTERNAL HB_CODEPAGE_HR437 -EXTERNAL HB_CODEPAGE_HR852 -EXTERNAL HB_CODEPAGE_HRWIN -EXTERNAL HB_CODEPAGE_HU852 -EXTERNAL HB_CODEPAGE_HU852S -EXTERNAL HB_CODEPAGE_HUISO -EXTERNAL HB_CODEPAGE_HUISOS -EXTERNAL HB_CODEPAGE_HUWIN -EXTERNAL HB_CODEPAGE_HUWINS -EXTERNAL HB_CODEPAGE_IT437 -EXTERNAL HB_CODEPAGE_IT850 -EXTERNAL HB_CODEPAGE_ITISB -EXTERNAL HB_CODEPAGE_ITISO -EXTERNAL HB_CODEPAGE_ITWIN -EXTERNAL HB_CODEPAGE_LTWIN -EXTERNAL HB_CODEPAGE_PL852 -EXTERNAL HB_CODEPAGE_PLISO -EXTERNAL HB_CODEPAGE_PLMAZ -EXTERNAL HB_CODEPAGE_PLWIN -EXTERNAL HB_CODEPAGE_PT850 -EXTERNAL HB_CODEPAGE_PTISO -EXTERNAL HB_CODEPAGE_RO852 -EXTERNAL HB_CODEPAGE_ROISO -EXTERNAL HB_CODEPAGE_ROWIN -EXTERNAL HB_CODEPAGE_RU1251 -EXTERNAL HB_CODEPAGE_RU866 -EXTERNAL HB_CODEPAGE_RUISO -EXTERNAL HB_CODEPAGE_RUKOI8 -EXTERNAL HB_CODEPAGE_SK852 -EXTERNAL HB_CODEPAGE_SKISO -EXTERNAL HB_CODEPAGE_SKKAM -EXTERNAL HB_CODEPAGE_SKWIN -EXTERNAL HB_CODEPAGE_SL437 -EXTERNAL HB_CODEPAGE_SL852 -EXTERNAL HB_CODEPAGE_SLISO -EXTERNAL HB_CODEPAGE_SLWIN -EXTERNAL HB_CODEPAGE_SRWIN -EXTERNAL HB_CODEPAGE_SV850 -EXTERNAL HB_CODEPAGE_SVCLIP -EXTERNAL HB_CODEPAGE_SVISO -EXTERNAL HB_CODEPAGE_SVWIN -EXTERNAL HB_CODEPAGE_TR857 -EXTERNAL HB_CODEPAGE_TRWIN -EXTERNAL HB_CODEPAGE_UA1125 -EXTERNAL HB_CODEPAGE_UA1251 -EXTERNAL HB_CODEPAGE_UA866 -EXTERNAL HB_CODEPAGE_UAKOI8 - /* lang support */ EXTERNAL HB_LANG_BE866 EXTERNAL HB_LANG_BEWIN diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index ef35994a68..e8c4f2b668 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -62,6 +62,7 @@ #include "common.ch" #include "directry.ch" #include "fileio.ch" + #include "hbgtinfo.ch" #include "hbver.ch" @@ -98,6 +99,8 @@ #ifndef _HBMK_EMBEDDED_ +#include "hbextcdp.ch" + #pragma linenumber=on ANNOUNCE HB_GTSYS @@ -116,16 +119,6 @@ REQUEST HB_GT_CGI_DEFAULT REQUEST HB_GT_TRM #endif -/* Extend as needed */ -REQUEST HB_CODEPAGE_DE850, HB_CODEPAGE_DEISO -REQUEST HB_CODEPAGE_ES850, HB_CODEPAGE_ESISO -REQUEST HB_CODEPAGE_FR850, HB_CODEPAGE_FRISO -REQUEST HB_CODEPAGE_HU852, HB_CODEPAGE_HUISO -REQUEST HB_CODEPAGE_IT850, HB_CODEPAGE_ITISO -REQUEST HB_CODEPAGE_PL852, HB_CODEPAGE_PLISO -REQUEST HB_CODEPAGE_PT850, HB_CODEPAGE_PTISO -REQUEST HB_CODEPAGE_RU866, HB_CODEPAGE_RUISO - #endif REQUEST hbmk_ARCH