From 9efec46787a4b4af9d5bcc0fb1ea1c94a62732b4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 2 Apr 2010 07:41:59 +0000 Subject: [PATCH] 2010-04-02 09:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + config/ren_sfn.prg - external/bzip2/cnv_hb2o.bat - external/bzip2/cnv_o2hb.bat + external/bzip2/ren_sfn.txt - external/libhpdf/cnv_o2hb.bat - external/libhpdf/cnv_hb2o.bat + external/libhpdf/ren_sfn.txt - external/pcre/cnv_o2hb.bat - external/pcre/cnv_hb2o.bat + external/pcre/ren_sfn.txt + Replaced .bat method for converting long filenames to short ones to a .prg script and simple text input file. Also much of the logic is automatized. * src/rtl/gtwvt/gtwvt.c * Minor in old comment. * INSTALL - Deleted no more relevant restriction with HB_BUILD_PKG. * contrib/hbwin/wapi_winuser.c * contrib/hbwin/hbwin.ch + Added WAPI_SETWINDOWPOS() + relevant constants. + Added WIN_WS_* constants. + Added WAPI_ISICONIC(), WAPI_ISZOOMED(). * contrib/hbwin/tests/testax.prg ! Fixed to compile without warning. * Using hbwin.ch. --- harbour/ChangeLog | 31 +++++ harbour/INSTALL | 1 - harbour/config/ren_sfn.prg | 132 ++++++++++++++++++++ harbour/contrib/hbwin/hbwin.ch | 52 +++++++- harbour/contrib/hbwin/tests/testax.prg | 17 +-- harbour/contrib/hbwin/wapi_winuser.c | 31 +++++ harbour/external/bzip2/cnv_hb2o.bat | 37 ------ harbour/external/bzip2/cnv_o2hb.bat | 36 ------ harbour/external/bzip2/ren_sfn.txt | 16 +++ harbour/external/libhpdf/cnv_hb2o.bat | 135 -------------------- harbour/external/libhpdf/cnv_o2hb.bat | 165 ------------------------- harbour/external/libhpdf/ren_sfn.txt | 87 +++++++++++++ harbour/external/pcre/cnv_hb2o.bat | 57 --------- harbour/external/pcre/cnv_o2hb.bat | 59 --------- harbour/external/pcre/ren_sfn.txt | 32 +++++ harbour/src/rtl/gtwvt/gtwvt.c | 2 +- 16 files changed, 390 insertions(+), 500 deletions(-) create mode 100644 harbour/config/ren_sfn.prg delete mode 100644 harbour/external/bzip2/cnv_hb2o.bat delete mode 100644 harbour/external/bzip2/cnv_o2hb.bat create mode 100644 harbour/external/bzip2/ren_sfn.txt delete mode 100644 harbour/external/libhpdf/cnv_hb2o.bat delete mode 100644 harbour/external/libhpdf/cnv_o2hb.bat create mode 100644 harbour/external/libhpdf/ren_sfn.txt delete mode 100644 harbour/external/pcre/cnv_hb2o.bat delete mode 100644 harbour/external/pcre/cnv_o2hb.bat create mode 100644 harbour/external/pcre/ren_sfn.txt diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0c1dad8863..4d11410233 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,37 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-02 09:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + + config/ren_sfn.prg + - external/bzip2/cnv_hb2o.bat + - external/bzip2/cnv_o2hb.bat + + external/bzip2/ren_sfn.txt + - external/libhpdf/cnv_o2hb.bat + - external/libhpdf/cnv_hb2o.bat + + external/libhpdf/ren_sfn.txt + - external/pcre/cnv_o2hb.bat + - external/pcre/cnv_hb2o.bat + + external/pcre/ren_sfn.txt + + Replaced .bat method for converting long filenames to + short ones to a .prg script and simple text input file. + Also much of the logic is automatized. + + * src/rtl/gtwvt/gtwvt.c + * Minor in old comment. + + * INSTALL + - Deleted no more relevant restriction with HB_BUILD_PKG. + + * contrib/hbwin/wapi_winuser.c + * contrib/hbwin/hbwin.ch + + Added WAPI_SETWINDOWPOS() + relevant constants. + + Added WIN_WS_* constants. + + Added WAPI_ISICONIC(), WAPI_ISZOOMED(). + + * contrib/hbwin/tests/testax.prg + ! Fixed to compile without warning. + * Using hbwin.ch. + 2010-04-01 16:44 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rtl/gtwin/gtwin.c * harbour/src/rtl/gtwvt/gtwvt.h diff --git a/harbour/INSTALL b/harbour/INSTALL index 9bd53419b7..f156606fdf 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -604,7 +604,6 @@ HARBOUR - HB_BUILD_PKG=yes Create release package. Default: no Requires 'clean install' in root source dir. (currently on Windows/Windows CE/MS-DOS) - (only when using Windows NT shells) - HB_BUILD_DLL=no Create Harbour dynamic libraries. Default: yes - HB_BUILD_SHARED=yes Create Harbour executables in shared mode. Default: yes when HB_INSTALL_PREFIX points diff --git a/harbour/config/ren_sfn.prg b/harbour/config/ren_sfn.prg new file mode 100644 index 0000000000..932db0fad9 --- /dev/null +++ b/harbour/config/ren_sfn.prg @@ -0,0 +1,132 @@ +/* + * $Id$ + */ + +/* + Copyright 2009 Viktor Szakats (harbour.01 syenar.hu) + See COPYING for licensing terms. + + NOTE: Purpose of this script is to take the source files + in Harbour repo and convert them back to the filenames + used in the original source distribution. + This is to aid finding local modifications and + apply them after an original source update. + [vszakats] + + DISCLAIMER: This tool is targeted only to Harbour core + maintainers. If you're not one of them you + don't have to mess with it. + */ + +PROCEDURE Main( cMode ) + LOCAL files := {} + LOCAL cFile := MemoRead( "ren_sfn.txt" ) + LOCAL cLine + + IF ! Empty( cFile ) + + cFile := StrTran( cFile, Chr( 13 ) + Chr( 10 ), Chr( 10 ) ) + cFile := StrTran( cFile, Chr( 9 ), " " ) + + FOR EACH cLine IN hb_ATokens( cFile, Chr( 10 ) ) + IF ! Empty( cLine ) .AND. ! ( Left( AllTrim( cLine ), 1 ) == "#" ) + IF Len( hb_ATokens( cLine ) ) == 2 + AAdd( files, hb_ATokens( cLine ) ) + ELSEIF Len( hb_ATokens( cLine ) ) == 1 + AAdd( files, { hb_ATokens( cLine )[ 1 ], hb_ATokens( cLine )[ 1 ] } ) + ENDIF + ENDIF + NEXT + + IF ! Empty( files ) .AND. cMode != NIL + SWITCH cMode + CASE "T" ; original_to_hb( files ) ; EXIT + CASE "F" ; hb_to_original( files ) ; EXIT + ENDSWITCH + ENDIF + ENDIF + + RETURN + +STATIC PROCEDURE original_to_hb( files ) + LOCAL cDir := "ori_src" + LOCAL file + LOCAL changes := files_to_changes( files ) + LOCAL change + + FOR EACH file IN files + hb_FCopy( cDir + hb_osPathSeparator() + file[ 2 ], file[ 1 ] ) + hb_FileEOLToNative( file[ 1 ] ) + FOR EACH change IN changes + hb_FileTran( file[ 1 ], Chr( 34 ) + change[ 2 ] + Chr( 34 ), Chr( 34 ) + change[ 1 ] + Chr( 34 ) ) + hb_FileTran( file[ 1 ], "<" + change[ 2 ] + ">", "<" + change[ 1 ] + ">" ) + NEXT + NEXT + + RETURN + +STATIC PROCEDURE hb_to_original( files ) + LOCAL cDir := "ori_dst" + LOCAL file + LOCAL changes := files_to_changes( files ) + LOCAL change + + MakeDir( cDir ) + hb_FEval( cDir + hb_osPathSeparator() + "*", {| cFileName | FErase( cFileName ) } ) + + FOR EACH file IN files + hb_FCopy( file[ 1 ], cDir + hb_osPathSeparator() + file[ 2 ] ) + FOR EACH change IN changes + hb_FileTran( cDir + hb_osPathSeparator() + file[ 2 ], Chr( 34 ) + change[ 1 ] + Chr( 34 ), Chr( 34 ) + change[ 2 ] + Chr( 34 ) ) + hb_FileTran( cDir + hb_osPathSeparator() + file[ 2 ], "<" + change[ 1 ] + ">", "<" + change[ 2 ] + ">" ) + NEXT + NEXT + + RETURN + +STATIC FUNCTION files_to_changes( files ) + LOCAL changes := {} + LOCAL file + + FOR EACH file IN files + IF Lower( FN_ExtGet( file[ 1 ] ) ) == ".h" .OR. ; + Lower( FN_ExtGet( file[ 2 ] ) ) == ".h" + IF !( file[ 1 ] == file[ 2 ] ) + AAdd( changes, file ) + ENDIF + ENDIF + NEXT + + RETURN changes + +STATIC FUNCTION hb_FileEOLToNative( cFileName ) + LOCAL cFile := hb_MemoRead( cFileName ) + + cFile := StrTran( cFile, Chr( 13 ) + Chr( 10 ), Chr( 10 ) ) + + RETURN hb_MemoWrit( cFileName, StrTran( cFile, Chr( 10 ), hb_osNewLine() ) ) + +STATIC FUNCTION hb_FileTran( cFileName, cFrom, cTo ) + RETURN hb_MemoWrit( cFileName, StrTran( hb_MemoRead( cFileName ), cFrom, cTo ) ) + +STATIC FUNCTION FN_ExtGet( cFileName ) + LOCAL cExt + + hb_FNameSplit( cFileName,,, @cExt ) + + RETURN cExt + +/* TOFIX: Ugly hack to avoid #include "directry.ch" */ +#define F_NAME 1 /* File name */ + +STATIC PROCEDURE hb_FEval( cMask, bBlock ) + LOCAL cDir + LOCAL tmp + + hb_FNameSplit( cMask, @cDir ) + + FOR EACH tmp IN Directory( cMask ) + Eval( bBlock, hb_FNameMerge( cDir, tmp[ F_NAME ] ) ) + NEXT + + RETURN diff --git a/harbour/contrib/hbwin/hbwin.ch b/harbour/contrib/hbwin/hbwin.ch index 62186bea22..47d7ade23b 100644 --- a/harbour/contrib/hbwin/hbwin.ch +++ b/harbour/contrib/hbwin/hbwin.ch @@ -582,10 +582,60 @@ #define WIN_SND_RING 0x00100000 #define WIN_SND_SYSTEM 0x00200000 +/* SETWINDOWPOS() flags */ +#define WIN_SWP_NOSIZE 0x0001 +#define WIN_SWP_NOMOVE 0x0002 +#define WIN_SWP_NOZORDER 0x0004 +#define WIN_SWP_NOREDRAW 0x0008 +#define WIN_SWP_NOACTIVATE 0x0010 +#define WIN_SWP_FRAMECHANGED 0x0020 +#define WIN_SWP_SHOWWINDOW 0x0040 +#define WIN_SWP_HIDEWINDOW 0x0080 +#define WIN_SWP_NOCOPYBITS 0x0100 +#define WIN_SWP_NOOWNERZORDER 0x0200 +#define WIN_SWP_NOSENDCHANGING 0x0400 +#define WIN_SWP_DEFERERASE 0x2000 +#define WIN_SWP_ASYNCWINDOWPOS 0x4000 +#define WIN_SWP_DRAWFRAME WIN_SWP_FRAMECHANGED +#define WIN_SWP_NOREPOSITION WIN_SWP_NOOWNERZORDER -/* window messages WM_* */ +/* Predefined window IDs */ +#define WIN_HWND_TOP win_n2p( 0 ) +#define WIN_HWND_BOTTOM win_n2p( 1 ) +#define WIN_HWND_TOPMOST win_n2p( -1 ) +#define WIN_HWND_NOTOPMOST win_n2p( -2 ) + +/* window messages */ #define WIN_WM_USER 1024 +/* window styles */ +#define WIN_WS_OVERLAPPED 0x00000000 +#define WIN_WS_TABSTOP 0x00010000 +#define WIN_WS_MAXIMIZEBOX 0x00010000 +#define WIN_WS_MINIMIZEBOX 0x00020000 +#define WIN_WS_GROUP 0x00020000 +#define WIN_WS_THICKFRAME 0x00040000 +#define WIN_WS_SYSMENU 0x00080000 +#define WIN_WS_HSCROLL 0x00100000 +#define WIN_WS_VSCROLL 0x00200000 +#define WIN_WS_DLGFRAME 0x00400000 +#define WIN_WS_BORDER 0x00800000 +#define WIN_WS_CAPTION 0x00C00000 +#define WIN_WS_MAXIMIZE 0x01000000 +#define WIN_WS_CLIPCHILDREN 0x02000000 +#define WIN_WS_CLIPSIBLINGS 0x04000000 +#define WIN_WS_DISABLED 0x08000000 +#define WIN_WS_VISIBLE 0x10000000 +#define WIN_WS_MINIMIZE 0x20000000 +#define WIN_WS_CHILD 0x40000000 +#define WIN_WS_POPUP 0x80000000 +#define WIN_WS_TILED WIN_WS_OVERLAPPED +#define WIN_WS_ICONIC WIN_WS_MINIMIZE +#define WIN_WS_SIZEBOX WIN_WS_THICKFRAME +#define WIN_WS_TILEDWINDOW WIN_WS_OVERLAPPEDWINDOW +#define WIN_WS_OVERLAPPEDWINDOW hb_bitOr( WIN_WS_OVERLAPPED, WIN_WS_CAPTION, WIN_WS_SYSMENU, WIN_WS_THICKFRAME, WIN_WS_MINIMIZEBOX, WIN_WS_MAXIMIZEBOX ) +#define WIN_WS_POPUPWINDOW hb_bitOr( WIN_WS_POPUP, WIN_WS_BORDER, WIN_WS_SYSMENU ) +#define WIN_WS_CHILDWINDOW WIN_WS_CHILD /* ------------------------------- */ /* Deprecated constants and macros */ diff --git a/harbour/contrib/hbwin/tests/testax.prg b/harbour/contrib/hbwin/tests/testax.prg index 9192f78995..b93dc5c53c 100644 --- a/harbour/contrib/hbwin/tests/testax.prg +++ b/harbour/contrib/hbwin/tests/testax.prg @@ -4,24 +4,24 @@ #include "hbgtinfo.ch" #include "hbclass.ch" +#include "hbwin.ch" REQUEST HB_GT_WVT_DEFAULT -#define WS_CHILD 1073741824 -#define WS_VISIBLE 268435456 -#define WS_CLIPCHILDREN 33554432 - PROCEDURE Main() LOCAL oMSCAL WAIT "Make sure we are 'Active Window'" oMSCAL := HActiveX():Init( WAPI_GetActiveWindow(), "MSCAL.Calendar", 0, 0, 300, 300 ) WAIT "Press any key to exit" + + HB_SYMBOL_UNUSED( oMSCAL ) + RETURN -CLASS HActiveX - DATA oOLE - DATA hWnd +CREATE CLASS HActiveX + VAR oOLE + VAR hWnd METHOD Init METHOD Event ERROR HANDLER OnError @@ -29,9 +29,10 @@ CLASS HActiveX ENDCLASS METHOD Init( hWnd, cProgId, nTop, nLeft, nWidth, nHeight, cID ) CLASS HActiveX - LOCAL nStyle := WS_CHILD + WS_VISIBLE + WS_CLIPCHILDREN + LOCAL nStyle := WIN_WS_CHILD + WIN_WS_VISIBLE + WIN_WS_CLIPCHILDREN win_AxInit() ::hWnd := WAPI_CreateWindowEX( 0, "AtlAxWin", cProgId, nStyle, nLeft, nTop, nWidth, nHeight, hWnd, 0 ) + /* WAPI_SetWindowPos( ::hWnd, WIN_HWND_TOPMOST, 0, 0, 1, 1, hb_bitOr( WIN_SWP_NOSIZE, WIN_SWP_DRAWFRAME ) ) */ ::oOLE := WIN_AxGetControl( ::hWnd, { | event, ... | ::Event( event, ... ) }, cID ) RETURN self diff --git a/harbour/contrib/hbwin/wapi_winuser.c b/harbour/contrib/hbwin/wapi_winuser.c index 8b5d21f613..219adb40c1 100644 --- a/harbour/contrib/hbwin/wapi_winuser.c +++ b/harbour/contrib/hbwin/wapi_winuser.c @@ -59,6 +59,37 @@ # define WS_OVERLAPPEDWINDOW ( WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX ) #endif +HB_FUNC( WAPI_SETWINDOWPOS ) +{ + BOOL bResult = SetWindowPos( wapi_par_HWND( 1 ), + wapi_par_HWND( 2 ), + hb_parni( 3 ), + hb_parni( 4 ), + hb_parni( 5 ), + hb_parni( 6 ), + ( UINT ) hb_parnl( 7 ) ); + hbwapi_SetLastError( GetLastError() ); + wapi_ret_L( bResult ); +} + +HB_FUNC( WAPI_ISICONIC ) +{ +#if defined( HB_OS_WIN_CE ) + wapi_ret_L( FALSE ); +#else + wapi_ret_L( IsIconic( wapi_par_HWND( 1 ) ) ); +#endif +} + +HB_FUNC( WAPI_ISZOOMED ) +{ +#if defined( HB_OS_WIN_CE ) + wapi_ret_L( FALSE ); +#else + wapi_ret_L( IsZoomed( wapi_par_HWND( 1 ) ) ); +#endif +} + HB_FUNC( WAPI_GETSYSTEMMETRICS ) { int iResult = GetSystemMetrics( wapi_par_INT( 1 ) ); diff --git a/harbour/external/bzip2/cnv_hb2o.bat b/harbour/external/bzip2/cnv_hb2o.bat deleted file mode 100644 index ba8245de0c..0000000000 --- a/harbour/external/bzip2/cnv_hb2o.bat +++ /dev/null @@ -1,37 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -rem NOTE: Purpose of this script is to take the source files -rem in Harbour repo and convert them back to the filenames -rem used in the original source distribution. -rem This is to aid finding local modifications and -rem apply them after an original source update. -rem [vszakats] -rem -rem This tool uses 'GNU gsar' for search and replace. -rem -rem DISCLAIMER: This tool is targeted only to Harbour core -rem maintainers. If you're not one of them you -rem don't have to mess with this tool. - -md ori_dst -del ori_dst\*.* /Y - -copy LICENCE ori_src\LICENCE -copy blocksor.c ori_src\blocksort.c -copy bzlib.c ori_src\bzlib.c -copy compress.c ori_src\compress.c -copy crctable.c ori_src\crctable.c -copy decompre.c ori_src\decompress.c -copy huffman.c ori_src\huffman.c -copy randtabl.c ori_src\randtable.c -copy bzlib.h ori_src\bzlib.h -copy bzlib_pr.h ori_src\bzlib_private.h - -cd ori_dst - -gsar -o -s":x22bzlib_pr.h:x22" -r":x22bzlib_private.h:x22" *.c - -cd .. diff --git a/harbour/external/bzip2/cnv_o2hb.bat b/harbour/external/bzip2/cnv_o2hb.bat deleted file mode 100644 index 7e7ac41e48..0000000000 --- a/harbour/external/bzip2/cnv_o2hb.bat +++ /dev/null @@ -1,36 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -rem NOTE: Purpose of this script is to take the original -rem files from its source distribution and convert -rem them to the short filenames we use here in Harbour. -rem Short filenames are needed for dos compiler support. -rem Some other automated modifications are also done -rem to help compiling the sources "as-is", to try to -rem avoid any manual editing on these foreign sources. -rem [vszakats] -rem -rem This tool uses 'GNU gsar' for search and replace. -rem and 'GNU unix2dos' for line ending conversion. -rem -rem DISCLAIMER: This tool is targeted only to Harbour core -rem maintainers. If you're not one of them you -rem don't have to mess with this tool. - -copy ori_src\LICENCE LICENCE -copy ori_src\blocksort.c blocksor.c -copy ori_src\bzlib.c bzlib.c -copy ori_src\compress.c compress.c -copy ori_src\crctable.c crctable.c -copy ori_src\decompress.c decompre.c -copy ori_src\huffman.c huffman.c -copy ori_src\randtable.c randtabl.c -copy ori_src\bzlib.h bzlib.h -copy ori_src\bzlib_private.h bzlib_pr.h - -unix2dos *.c -unix2dos *.h - -gsar -o -s":x22bzlib_private.h:x22" -r":x22bzlib_pr.h:x22" *.c diff --git a/harbour/external/bzip2/ren_sfn.txt b/harbour/external/bzip2/ren_sfn.txt new file mode 100644 index 0000000000..abdb835818 --- /dev/null +++ b/harbour/external/bzip2/ren_sfn.txt @@ -0,0 +1,16 @@ +# +# $Id$ +# + +# Use with 'hbrun /config/ren_sfn.prg [F|T]' + +LICENSE LICENSE +blocksor.c blocksort.c +bzlib.c bzlib.c +compress.c compress.c +crctable.c crctable.c +decompre.c decompress.c +huffman.c huffman.c +randtabl.c randtable.c +bzlib.h bzlib.h +bzlib_pr.h bzlib_private.h diff --git a/harbour/external/libhpdf/cnv_hb2o.bat b/harbour/external/libhpdf/cnv_hb2o.bat deleted file mode 100644 index 4731d6245d..0000000000 --- a/harbour/external/libhpdf/cnv_hb2o.bat +++ /dev/null @@ -1,135 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -rem NOTE: Purpose of this script is to take the source files -rem in Harbour repo and convert them back to the filenames -rem used in the original source distribution. -rem This is to aid finding local modifications and -rem apply them after an original source update. -rem [vszakats] -rem -rem This tool uses 'GNU gsar' for search and replace. -rem -rem DISCLAIMER: This tool is targeted only to Harbour core -rem maintainers. If you're not one of them you -rem don't have to mess with this tool. - -md ori_dst -del ori_dst\*.* /Y - -copy README ori_dst\README -copy hpdfanno.c ori_dst\hpdf_annotation.c -copy hpdfarra.c ori_dst\hpdf_array.c -copy hpdfbina.c ori_dst\hpdf_binary.c -copy hpdfbool.c ori_dst\hpdf_boolean.c -copy hpdfcata.c ori_dst\hpdf_catalog.c -copy hpdfdest.c ori_dst\hpdf_destination.c -copy hpdfdict.c ori_dst\hpdf_dict.c -copy hpdfdoc.c ori_dst\hpdf_doc.c -copy hpdfdocp.c ori_dst\hpdf_doc_png.c -copy hpdfenco.c ori_dst\hpdf_encoder.c -copy hpdfencc.c ori_dst\hpdf_encoder_cns.c -copy hpdfencn.c ori_dst\hpdf_encoder_cnt.c -copy hpdfencj.c ori_dst\hpdf_encoder_jp.c -copy hpdfenck.c ori_dst\hpdf_encoder_kr.c -copy hpdfecy.c ori_dst\hpdf_encrypt.c -copy hpdfecyd.c ori_dst\hpdf_encryptdict.c -copy hpdferro.c ori_dst\hpdf_error.c -copy hpdfextg.c ori_dst\hpdf_ext_gstate.c -copy hpdffont.c ori_dst\hpdf_font.c -copy hpdffonc.c ori_dst\hpdf_font_cid.c -copy hpdffott.c ori_dst\hpdf_font_tt.c -copy hpdffon1.c ori_dst\hpdf_font_type1.c -copy hpdffdf.c ori_dst\hpdf_fontdef.c -copy hpdffdfb.c ori_dst\hpdf_fontdef_base14.c -copy hpdffdfi.c ori_dst\hpdf_fontdef_cid.c -copy hpdffdfc.c ori_dst\hpdf_fontdef_cns.c -copy hpdffdfn.c ori_dst\hpdf_fontdef_cnt.c -copy hpdffdfj.c ori_dst\hpdf_fontdef_jp.c -copy hpdffdfk.c ori_dst\hpdf_fontdef_kr.c -copy hpdffdft.c ori_dst\hpdf_fontdef_tt.c -copy hpdffdf1.c ori_dst\hpdf_fontdef_type1.c -copy hpdfgsta.c ori_dst\hpdf_gstate.c -copy hpdfimag.c ori_dst\hpdf_image.c -copy hpdfimap.c ori_dst\hpdf_image_png.c -copy hpdfinfo.c ori_dst\hpdf_info.c -copy hpdflist.c ori_dst\hpdf_list.c -copy hpdfmmgr.c ori_dst\hpdf_mmgr.c -copy hpdfname.c ori_dst\hpdf_name.c -copy hpdfnull.c ori_dst\hpdf_null.c -copy hpdfnumb.c ori_dst\hpdf_number.c -copy hpdfobje.c ori_dst\hpdf_objects.c -copy hpdfoutl.c ori_dst\hpdf_outline.c -copy hpdfpage.c ori_dst\hpdf_page_label.c -copy hpdfpago.c ori_dst\hpdf_page_operator.c -copy hpdfpags.c ori_dst\hpdf_pages.c -copy hpdfreal.c ori_dst\hpdf_real.c -copy hpdfstre.c ori_dst\hpdf_streams.c -copy hpdfstri.c ori_dst\hpdf_string.c -copy hpdfu3d.c ori_dst\hpdf_u3d.c -copy hpdfutil.c ori_dst\hpdf_utils.c -copy hpdfxref.c ori_dst\hpdf_xref.c -copy hpdf.h ori_dst\hpdf.h -copy hpdfanno.h ori_dst\hpdf_annotation.h -copy hpdfcata.h ori_dst\hpdf_catalog.h -copy hpdfconf.h ori_dst\hpdf_conf.h -copy hpdfcfg.h ori_dst\hpdf_config.h -copy hpdfcons.h ori_dst\hpdf_consts.h -copy hpdfdest.h ori_dst\hpdf_destination.h -copy hpdfdoc.h ori_dst\hpdf_doc.h -copy hpdfenco.h ori_dst\hpdf_encoder.h -copy hpdfencr.h ori_dst\hpdf_encrypt.h -copy hpdfency.h ori_dst\hpdf_encryptdict.h -copy hpdferro.h ori_dst\hpdf_error.h -copy hpdfextg.h ori_dst\hpdf_ext_gstate.h -copy hpdffont.h ori_dst\hpdf_font.h -copy hpdffond.h ori_dst\hpdf_fontdef.h -copy hpdfgsta.h ori_dst\hpdf_gstate.h -copy hpdfimag.h ori_dst\hpdf_image.h -copy hpdfinfo.h ori_dst\hpdf_info.h -copy hpdflist.h ori_dst\hpdf_list.h -copy hpdfmmgr.h ori_dst\hpdf_mmgr.h -copy hpdfobje.h ori_dst\hpdf_objects.h -copy hpdfoutl.h ori_dst\hpdf_outline.h -copy hpdfpage.h ori_dst\hpdf_page_label.h -copy hpdfpags.h ori_dst\hpdf_pages.h -copy hpdfstre.h ori_dst\hpdf_streams.h -copy hpdftype.h ori_dst\hpdf_types.h -copy hpdfu3d.h ori_dst\hpdf_u3d.h -copy hpdfutil.h ori_dst\hpdf_utils.h -copy hpdfvers.h ori_dst\hpdf_version.h - -cd ori_dst - -gsar -o -s":x22hpdfanno.h:x22" -r":x22hpdf_annotation.h:x22" *.* -gsar -o -s":x22hpdfcata.h:x22" -r":x22hpdf_catalog.h:x22" *.* -gsar -o -s":x22hpdfconf.h:x22" -r":x22hpdf_conf.h:x22" *.* -gsar -o -s":x22hpdfcfg.h:x22" -r":x22hpdf_config.h:x22" *.* -gsar -o -s":x22hpdfcons.h:x22" -r":x22hpdf_consts.h:x22" *.* -gsar -o -s":x22hpdfdest.h:x22" -r":x22hpdf_destination.h:x22" *.* -gsar -o -s":x22hpdfdoc.h:x22" -r":x22hpdf_doc.h:x22" *.* -gsar -o -s":x22hpdfenco.h:x22" -r":x22hpdf_encoder.h:x22" *.* -gsar -o -s":x22hpdfencr.h:x22" -r":x22hpdf_encrypt.h:x22" *.* -gsar -o -s":x22hpdfency.h:x22" -r":x22hpdf_encryptdict.h:x22" *.* -gsar -o -s":x22hpdferro.h:x22" -r":x22hpdf_error.h:x22" *.* -gsar -o -s":x22hpdfextg.h:x22" -r":x22hpdf_ext_gstate.h:x22" *.* -gsar -o -s":x22hpdffont.h:x22" -r":x22hpdf_font.h:x22" *.* -gsar -o -s":x22hpdffond.h:x22" -r":x22hpdf_fontdef.h:x22" *.* -gsar -o -s":x22hpdfgsta.h:x22" -r":x22hpdf_gstate.h:x22" *.* -gsar -o -s":x22hpdfimag.h:x22" -r":x22hpdf_image.h:x22" *.* -gsar -o -s":x22hpdfinfo.h:x22" -r":x22hpdf_info.h:x22" *.* -gsar -o -s":x22hpdflist.h:x22" -r":x22hpdf_list.h:x22" *.* -gsar -o -s":x22hpdfmmgr.h:x22" -r":x22hpdf_mmgr.h:x22" *.* -gsar -o -s":x22hpdfobje.h:x22" -r":x22hpdf_objects.h:x22" *.* -gsar -o -s":x22hpdfoutl.h:x22" -r":x22hpdf_outline.h:x22" *.* -gsar -o -s":x22hpdfpage.h:x22" -r":x22hpdf_page_label.h:x22" *.* -gsar -o -s":x22hpdfpags.h:x22" -r":x22hpdf_pages.h:x22" *.* -gsar -o -s":x22hpdfstre.h:x22" -r":x22hpdf_streams.h:x22" *.* -gsar -o -s":x22hpdftype.h:x22" -r":x22hpdf_types.h:x22" *.* -gsar -o -s":x22hpdfu3d.h:x22" -r":x22hpdf_u3d.h:x22" *.* -gsar -o -s":x22hpdfutil.h:x22" -r":x22hpdf_utils.h:x22" *.* -gsar -o -s":x22hpdfvers.h:x22" -r":x22hpdf_version.h:x22" *.* - -cd .. diff --git a/harbour/external/libhpdf/cnv_o2hb.bat b/harbour/external/libhpdf/cnv_o2hb.bat deleted file mode 100644 index 55355d3c8c..0000000000 --- a/harbour/external/libhpdf/cnv_o2hb.bat +++ /dev/null @@ -1,165 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -rem Tested with PCRE 7.7 - -rem NOTE: Purpose of this script is to take the original -rem files from its source distribution and convert -rem them to the short filenames we use here in Harbour. -rem Short filenames are needed for dos compiler support. -rem Some other automated modifications are also done -rem to help compiling the sources "as-is", to try to -rem avoid any manual editing on these foreign sources. -rem [vszakats] -rem -rem This tool uses 'GNU gsar' for search and replace. -rem and 'GNU unix2dos' for line ending conversion. -rem -rem DISCLAIMER: This tool is targeted only to Harbour core -rem maintainers. If you're not one of them you -rem don't have to mess with this tool. - -copy ori_src\README README -copy ori_src\hpdf_annotation.c hpdfanno.c -copy ori_src\hpdf_array.c hpdfarra.c -copy ori_src\hpdf_binary.c hpdfbina.c -copy ori_src\hpdf_boolean.c hpdfbool.c -copy ori_src\hpdf_catalog.c hpdfcata.c -copy ori_src\hpdf_destination.c hpdfdest.c -copy ori_src\hpdf_dict.c hpdfdict.c -copy ori_src\hpdf_doc.c hpdfdoc.c -copy ori_src\hpdf_doc_png.c hpdfdocp.c -copy ori_src\hpdf_encoder.c hpdfenco.c -copy ori_src\hpdf_encoder_cns.c hpdfencc.c -copy ori_src\hpdf_encoder_cnt.c hpdfencn.c -copy ori_src\hpdf_encoder_jp.c hpdfencj.c -copy ori_src\hpdf_encoder_kr.c hpdfenck.c -copy ori_src\hpdf_encrypt.c hpdfecy.c -copy ori_src\hpdf_encryptdict.c hpdfecyd.c -copy ori_src\hpdf_error.c hpdferro.c -copy ori_src\hpdf_ext_gstate.c hpdfextg.c -copy ori_src\hpdf_font.c hpdffont.c -copy ori_src\hpdf_font_cid.c hpdffonc.c -copy ori_src\hpdf_font_tt.c hpdffott.c -copy ori_src\hpdf_font_type1.c hpdffon1.c -copy ori_src\hpdf_fontdef.c hpdffdf.c -copy ori_src\hpdf_fontdef_base14.c hpdffdfb.c -copy ori_src\hpdf_fontdef_cid.c hpdffdfi.c -copy ori_src\hpdf_fontdef_cns.c hpdffdfc.c -copy ori_src\hpdf_fontdef_cnt.c hpdffdfn.c -copy ori_src\hpdf_fontdef_jp.c hpdffdfj.c -copy ori_src\hpdf_fontdef_kr.c hpdffdfk.c -copy ori_src\hpdf_fontdef_tt.c hpdffdft.c -copy ori_src\hpdf_fontdef_type1.c hpdffdf1.c -copy ori_src\hpdf_gstate.c hpdfgsta.c -copy ori_src\hpdf_image.c hpdfimag.c -copy ori_src\hpdf_image_png.c hpdfimap.c -copy ori_src\hpdf_info.c hpdfinfo.c -copy ori_src\hpdf_list.c hpdflist.c -copy ori_src\hpdf_mmgr.c hpdfmmgr.c -copy ori_src\hpdf_name.c hpdfname.c -copy ori_src\hpdf_null.c hpdfnull.c -copy ori_src\hpdf_number.c hpdfnumb.c -copy ori_src\hpdf_objects.c hpdfobje.c -copy ori_src\hpdf_outline.c hpdfoutl.c -copy ori_src\hpdf_page_label.c hpdfpage.c -copy ori_src\hpdf_page_operator.c hpdfpago.c -copy ori_src\hpdf_pages.c hpdfpags.c -copy ori_src\hpdf_real.c hpdfreal.c -copy ori_src\hpdf_streams.c hpdfstre.c -copy ori_src\hpdf_string.c hpdfstri.c -copy ori_src\hpdf_u3d.c hpdfu3d.c -copy ori_src\hpdf_utils.c hpdfutil.c -copy ori_src\hpdf_xref.c hpdfxref.c -copy ori_src\hpdf.h hpdf.h -copy ori_src\hpdf_annotation.h hpdfanno.h -copy ori_src\hpdf_catalog.h hpdfcata.h -copy ori_src\hpdf_conf.h hpdfconf.h -copy ori_src\hpdf_config.h hpdfcfg.h -copy ori_src\hpdf_consts.h hpdfcons.h -copy ori_src\hpdf_destination.h hpdfdest.h -copy ori_src\hpdf_doc.h hpdfdoc.h -copy ori_src\hpdf_encoder.h hpdfenco.h -copy ori_src\hpdf_encrypt.h hpdfencr.h -copy ori_src\hpdf_encryptdict.h hpdfency.h -copy ori_src\hpdf_error.h hpdferro.h -copy ori_src\hpdf_ext_gstate.h hpdfextg.h -copy ori_src\hpdf_font.h hpdffont.h -copy ori_src\hpdf_fontdef.h hpdffond.h -copy ori_src\hpdf_gstate.h hpdfgsta.h -copy ori_src\hpdf_image.h hpdfimag.h -copy ori_src\hpdf_info.h hpdfinfo.h -copy ori_src\hpdf_list.h hpdflist.h -copy ori_src\hpdf_mmgr.h hpdfmmgr.h -copy ori_src\hpdf_objects.h hpdfobje.h -copy ori_src\hpdf_outline.h hpdfoutl.h -copy ori_src\hpdf_page_label.h hpdfpage.h -copy ori_src\hpdf_pages.h hpdfpags.h -copy ori_src\hpdf_streams.h hpdfstre.h -copy ori_src\hpdf_types.h hpdftype.h -copy ori_src\hpdf_u3d.h hpdfu3d.h -copy ori_src\hpdf_utils.h hpdfutil.h -copy ori_src\hpdf_version.h hpdfvers.h - -unix2dos *.c -unix2dos *.h - -gsar -o -s":x22hpdf_annotation.h:x22" -r":x22hpdfanno.h:x22" *.c -gsar -o -s":x22hpdf_catalog.h:x22" -r":x22hpdfcata.h:x22" *.c -gsar -o -s":x22hpdf_conf.h:x22" -r":x22hpdfconf.h:x22" *.c -gsar -o -s":x22hpdf_config.h:x22" -r":x22hpdfcfg.h:x22" *.c -gsar -o -s":x22hpdf_consts.h:x22" -r":x22hpdfcons.h:x22" *.c -gsar -o -s":x22hpdf_destination.h:x22" -r":x22hpdfdest.h:x22" *.c -gsar -o -s":x22hpdf_doc.h:x22" -r":x22hpdfdoc.h:x22" *.c -gsar -o -s":x22hpdf_encoder.h:x22" -r":x22hpdfenco.h:x22" *.c -gsar -o -s":x22hpdf_encrypt.h:x22" -r":x22hpdfencr.h:x22" *.c -gsar -o -s":x22hpdf_encryptdict.h:x22" -r":x22hpdfency.h:x22" *.c -gsar -o -s":x22hpdf_error.h:x22" -r":x22hpdferro.h:x22" *.c -gsar -o -s":x22hpdf_ext_gstate.h:x22" -r":x22hpdfextg.h:x22" *.c -gsar -o -s":x22hpdf_font.h:x22" -r":x22hpdffont.h:x22" *.c -gsar -o -s":x22hpdf_fontdef.h:x22" -r":x22hpdffond.h:x22" *.c -gsar -o -s":x22hpdf_gstate.h:x22" -r":x22hpdfgsta.h:x22" *.c -gsar -o -s":x22hpdf_image.h:x22" -r":x22hpdfimag.h:x22" *.c -gsar -o -s":x22hpdf_info.h:x22" -r":x22hpdfinfo.h:x22" *.c -gsar -o -s":x22hpdf_list.h:x22" -r":x22hpdflist.h:x22" *.c -gsar -o -s":x22hpdf_mmgr.h:x22" -r":x22hpdfmmgr.h:x22" *.c -gsar -o -s":x22hpdf_objects.h:x22" -r":x22hpdfobje.h:x22" *.c -gsar -o -s":x22hpdf_outline.h:x22" -r":x22hpdfoutl.h:x22" *.c -gsar -o -s":x22hpdf_page_label.h:x22" -r":x22hpdfpage.h:x22" *.c -gsar -o -s":x22hpdf_pages.h:x22" -r":x22hpdfpags.h:x22" *.c -gsar -o -s":x22hpdf_streams.h:x22" -r":x22hpdfstre.h:x22" *.c -gsar -o -s":x22hpdf_types.h:x22" -r":x22hpdftype.h:x22" *.c -gsar -o -s":x22hpdf_u3d.h:x22" -r":x22hpdfu3d.h:x22" *.c -gsar -o -s":x22hpdf_utils.h:x22" -r":x22hpdfutil.h:x22" *.c -gsar -o -s":x22hpdf_version.h:x22" -r":x22hpdfvers.h:x22" *.c - -gsar -o -s":x22hpdf_annotation.h:x22" -r":x22hpdfanno.h:x22" *.h -gsar -o -s":x22hpdf_catalog.h:x22" -r":x22hpdfcata.h:x22" *.h -gsar -o -s":x22hpdf_conf.h:x22" -r":x22hpdfconf.h:x22" *.h -gsar -o -s":x22hpdf_config.h:x22" -r":x22hpdfcfg.h:x22" *.h -gsar -o -s":x22hpdf_consts.h:x22" -r":x22hpdfcons.h:x22" *.h -gsar -o -s":x22hpdf_destination.h:x22" -r":x22hpdfdest.h:x22" *.h -gsar -o -s":x22hpdf_doc.h:x22" -r":x22hpdfdoc.h:x22" *.h -gsar -o -s":x22hpdf_encoder.h:x22" -r":x22hpdfenco.h:x22" *.h -gsar -o -s":x22hpdf_encrypt.h:x22" -r":x22hpdfencr.h:x22" *.h -gsar -o -s":x22hpdf_encryptdict.h:x22" -r":x22hpdfency.h:x22" *.h -gsar -o -s":x22hpdf_error.h:x22" -r":x22hpdferro.h:x22" *.h -gsar -o -s":x22hpdf_ext_gstate.h:x22" -r":x22hpdfextg.h:x22" *.h -gsar -o -s":x22hpdf_font.h:x22" -r":x22hpdffont.h:x22" *.h -gsar -o -s":x22hpdf_fontdef.h:x22" -r":x22hpdffond.h:x22" *.h -gsar -o -s":x22hpdf_gstate.h:x22" -r":x22hpdfgsta.h:x22" *.h -gsar -o -s":x22hpdf_image.h:x22" -r":x22hpdfimag.h:x22" *.h -gsar -o -s":x22hpdf_info.h:x22" -r":x22hpdfinfo.h:x22" *.h -gsar -o -s":x22hpdf_list.h:x22" -r":x22hpdflist.h:x22" *.h -gsar -o -s":x22hpdf_mmgr.h:x22" -r":x22hpdfmmgr.h:x22" *.h -gsar -o -s":x22hpdf_objects.h:x22" -r":x22hpdfobje.h:x22" *.h -gsar -o -s":x22hpdf_outline.h:x22" -r":x22hpdfoutl.h:x22" *.h -gsar -o -s":x22hpdf_page_label.h:x22" -r":x22hpdfpage.h:x22" *.h -gsar -o -s":x22hpdf_pages.h:x22" -r":x22hpdfpags.h:x22" *.h -gsar -o -s":x22hpdf_streams.h:x22" -r":x22hpdfstre.h:x22" *.h -gsar -o -s":x22hpdf_types.h:x22" -r":x22hpdftype.h:x22" *.h -gsar -o -s":x22hpdf_u3d.h:x22" -r":x22hpdfu3d.h:x22" *.h -gsar -o -s":x22hpdf_utils.h:x22" -r":x22hpdfutil.h:x22" *.h -gsar -o -s":x22hpdf_version.h:x22" -r":x22hpdfvers.h:x22" *.h diff --git a/harbour/external/libhpdf/ren_sfn.txt b/harbour/external/libhpdf/ren_sfn.txt new file mode 100644 index 0000000000..82cdf4429e --- /dev/null +++ b/harbour/external/libhpdf/ren_sfn.txt @@ -0,0 +1,87 @@ +# +# $Id$ +# + +# Use with 'hbrun /config/ren_sfn.prg [F|T]' + +README README +hpdfanno.c hpdf_annotation.c +hpdfarra.c hpdf_array.c +hpdfbina.c hpdf_binary.c +hpdfbool.c hpdf_boolean.c +hpdfcata.c hpdf_catalog.c +hpdfdest.c hpdf_destination.c +hpdfdict.c hpdf_dict.c +hpdfdoc.c hpdf_doc.c +hpdfdocp.c hpdf_doc_png.c +hpdfenco.c hpdf_encoder.c +hpdfencc.c hpdf_encoder_cns.c +hpdfencn.c hpdf_encoder_cnt.c +hpdfencj.c hpdf_encoder_jp.c +hpdfenck.c hpdf_encoder_kr.c +hpdfecy.c hpdf_encrypt.c +hpdfecyd.c hpdf_encryptdict.c +hpdferro.c hpdf_error.c +hpdfextg.c hpdf_ext_gstate.c +hpdffont.c hpdf_font.c +hpdffonc.c hpdf_font_cid.c +hpdffott.c hpdf_font_tt.c +hpdffon1.c hpdf_font_type1.c +hpdffdf.c hpdf_fontdef.c +hpdffdfb.c hpdf_fontdef_base14.c +hpdffdfi.c hpdf_fontdef_cid.c +hpdffdfc.c hpdf_fontdef_cns.c +hpdffdfn.c hpdf_fontdef_cnt.c +hpdffdfj.c hpdf_fontdef_jp.c +hpdffdfk.c hpdf_fontdef_kr.c +hpdffdft.c hpdf_fontdef_tt.c +hpdffdf1.c hpdf_fontdef_type1.c +hpdfgsta.c hpdf_gstate.c +hpdfimag.c hpdf_image.c +hpdfimap.c hpdf_image_png.c +hpdfinfo.c hpdf_info.c +hpdflist.c hpdf_list.c +hpdfmmgr.c hpdf_mmgr.c +hpdfname.c hpdf_name.c +hpdfnull.c hpdf_null.c +hpdfnumb.c hpdf_number.c +hpdfobje.c hpdf_objects.c +hpdfoutl.c hpdf_outline.c +hpdfpage.c hpdf_page_label.c +hpdfpago.c hpdf_page_operator.c +hpdfpags.c hpdf_pages.c +hpdfreal.c hpdf_real.c +hpdfstre.c hpdf_streams.c +hpdfstri.c hpdf_string.c +hpdfu3d.c hpdf_u3d.c +hpdfutil.c hpdf_utils.c +hpdfxref.c hpdf_xref.c +hpdf.h hpdf.h +hpdfanno.h hpdf_annotation.h +hpdfcata.h hpdf_catalog.h +hpdfconf.h hpdf_conf.h +hpdfcfg.h hpdf_config.h +hpdfcons.h hpdf_consts.h +hpdfdest.h hpdf_destination.h +hpdfdoc.h hpdf_doc.h +hpdfenco.h hpdf_encoder.h +hpdfencr.h hpdf_encrypt.h +hpdfency.h hpdf_encryptdict.h +hpdferro.h hpdf_error.h +hpdfextg.h hpdf_ext_gstate.h +hpdffont.h hpdf_font.h +hpdffond.h hpdf_fontdef.h +hpdfgsta.h hpdf_gstate.h +hpdfimag.h hpdf_image.h +hpdfinfo.h hpdf_info.h +hpdflist.h hpdf_list.h +hpdfmmgr.h hpdf_mmgr.h +hpdfobje.h hpdf_objects.h +hpdfoutl.h hpdf_outline.h +hpdfpage.h hpdf_page_label.h +hpdfpags.h hpdf_pages.h +hpdfstre.h hpdf_streams.h +hpdftype.h hpdf_types.h +hpdfu3d.h hpdf_u3d.h +hpdfutil.h hpdf_utils.h +hpdfvers.h hpdf_version.h diff --git a/harbour/external/pcre/cnv_hb2o.bat b/harbour/external/pcre/cnv_hb2o.bat deleted file mode 100644 index fe2d1e42b7..0000000000 --- a/harbour/external/pcre/cnv_hb2o.bat +++ /dev/null @@ -1,57 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -rem Tested with PCRE 8.0 - -rem NOTE: Purpose of this script is to take the source files -rem in Harbour repo and convert them back to the filenames -rem used in the original source distribution. -rem This is to aid finding local modifications and -rem apply them after an original source update. -rem [vszakats] -rem -rem This tool uses 'GNU gsar' for search and replace. -rem -rem DISCLAIMER: This tool is targeted only to Harbour core -rem maintainers. If you're not one of them you -rem don't have to mess with this tool. - -md ori_dst -del ori_dst\*.* /Y - -copy LICENCE ori_dst\LICENCE -copy config.h ori_dst\config.h.generic -copy pcre.h ori_dst\pcre.h.generic -copy pcreinal.h ori_dst\pcre_internal.h -copy ucp.h ori_dst\ucp.h -copy chartabs.c ori_dst\pcre_chartables.c.dist -copy pcrecomp.c ori_dst\pcre_compile.c -copy pcreconf.c ori_dst\pcre_config.c -copy pcredfa.c ori_dst\pcre_dfa_exec.c -copy pcreexec.c ori_dst\pcre_exec.c -copy pcrefinf.c ori_dst\pcre_fullinfo.c -copy pcreget.c ori_dst\pcre_get.c -copy pcreglob.c ori_dst\pcre_globals.c -copy pcreinfo.c ori_dst\pcre_info.c -copy pcremktb.c ori_dst\pcre_maketables.c -copy pcrenewl.c ori_dst\pcre_newline.c -copy pcreoutf.c ori_dst\pcre_ord2utf8.c -copy pcreprni.h ori_dst\pcre_printint.src -copy pcrerefc.c ori_dst\pcre_refcount.c -copy pcrestud.c ori_dst\pcre_study.c -copy pcretabs.c ori_dst\pcre_tables.c -copy pcretryf.c ori_dst\pcre_try_flipped.c -copy pcreucd.c ori_dst\pcre_ucd.c -copy pcrevutf.c ori_dst\pcre_valid_utf8.c -copy pcrever.c ori_dst\pcre_version.c -copy pcrexcls.c ori_dst\pcre_xclass.c - -cd ori_dst - -gsar -o -s":x22pcreinal.h:x22" -r":x22pcre_internal.h:x22" *.* -gsar -o -s":x22ucpinter.h:x22" -r":x22ucpinternal.h:x22" *.* -gsar -o -s":x22pcreprni.h:x22" -r":x22pcre_printint.src:x22" *.* - -cd .. diff --git a/harbour/external/pcre/cnv_o2hb.bat b/harbour/external/pcre/cnv_o2hb.bat deleted file mode 100644 index 1bc1dac46b..0000000000 --- a/harbour/external/pcre/cnv_o2hb.bat +++ /dev/null @@ -1,59 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -rem Tested with PCRE 8.0 - -rem NOTE: Purpose of this script is to take the original -rem files from its source distribution and convert -rem them to the short filenames we use here in Harbour. -rem Short filenames are needed for dos compiler support. -rem Some other automated modifications are also done -rem to help compiling the sources "as-is", to try to -rem avoid any manual editing on these foreign sources. -rem [vszakats] -rem -rem This tool uses 'GNU gsar' for search and replace. -rem and 'GNU unix2dos' for line ending conversion. -rem -rem DISCLAIMER: This tool is targeted only to Harbour core -rem maintainers. If you're not one of them you -rem don't have to mess with this tool. - -copy ori_src\LICENCE LICENCE -copy ori_src\config.h.generic config.h -copy ori_src\pcre.h.generic pcre.h -copy ori_src\pcre_internal.h pcreinal.h -copy ori_src\ucp.h ucp.h -copy ori_src\pcre_chartables.c.dist chartabs.c -copy ori_src\pcre_compile.c pcrecomp.c -copy ori_src\pcre_config.c pcreconf.c -copy ori_src\pcre_dfa_exec.c pcredfa.c -copy ori_src\pcre_exec.c pcreexec.c -copy ori_src\pcre_fullinfo.c pcrefinf.c -copy ori_src\pcre_get.c pcreget.c -copy ori_src\pcre_globals.c pcreglob.c -copy ori_src\pcre_info.c pcreinfo.c -copy ori_src\pcre_maketables.c pcremktb.c -copy ori_src\pcre_newline.c pcrenewl.c -copy ori_src\pcre_ord2utf8.c pcreoutf.c -copy ori_src\pcre_printint.src pcreprni.h -copy ori_src\pcre_refcount.c pcrerefc.c -copy ori_src\pcre_study.c pcrestud.c -copy ori_src\pcre_tables.c pcretabs.c -copy ori_src\pcre_try_flipped.c pcretryf.c -copy ori_src\pcre_ucd.c pcreucd.c -copy ori_src\pcre_valid_utf8.c pcrevutf.c -copy ori_src\pcre_version.c pcrever.c -copy ori_src\pcre_xclass.c pcrexcls.c - -unix2dos *.c -unix2dos *.h - -gsar -o -s":x22pcre_printint.src:x22" -r":x22pcreprni.h:x22" *.c -gsar -o -s":x22pcre_printint.src:x22" -r":x22pcreprni.h:x22" *.h -gsar -o -s":x22pcre_internal.h:x22" -r":x22pcreinal.h:x22" *.c -gsar -o -s":x22pcre_internal.h:x22" -r":x22pcreinal.h:x22" *.h -gsar -o -s":x22ucpinternal.h:x22" -r":x22ucpinter.h:x22" *.c -gsar -o -s":x22ucpinternal.h:x22" -r":x22ucpinter.h:x22" *.h diff --git a/harbour/external/pcre/ren_sfn.txt b/harbour/external/pcre/ren_sfn.txt new file mode 100644 index 0000000000..3d3cf15efa --- /dev/null +++ b/harbour/external/pcre/ren_sfn.txt @@ -0,0 +1,32 @@ +# +# $Id$ +# + +# Use with 'hbrun /config/ren_sfn.prg [F|T]' + +LICENCE LICENCE +config.h config.h.generic +pcre.h pcre.h.generic +pcreinal.h pcre_internal.h +ucp.h ucp.h +chartabs.c pcre_chartables.c.dist +pcrecomp.c pcre_compile.c +pcreconf.c pcre_config.c +pcredfa.c pcre_dfa_exec.c +pcreexec.c pcre_exec.c +pcrefinf.c pcre_fullinfo.c +pcreget.c pcre_get.c +pcreglob.c pcre_globals.c +pcreinfo.c pcre_info.c +pcremktb.c pcre_maketables.c +pcrenewl.c pcre_newline.c +pcreoutf.c pcre_ord2utf8.c +pcreprni.h pcre_printint.src +pcrerefc.c pcre_refcount.c +pcrestud.c pcre_study.c +pcretabs.c pcre_tables.c +pcretryf.c pcre_try_flipped.c +pcreucd.c pcre_ucd.c +pcrevutf.c pcre_valid_utf8.c +pcrever.c pcre_version.c +pcrexcls.c pcre_xclass.c diff --git a/harbour/src/rtl/gtwvt/gtwvt.c b/harbour/src/rtl/gtwvt/gtwvt.c index 4bf789be25..51b27a35d6 100644 --- a/harbour/src/rtl/gtwvt/gtwvt.c +++ b/harbour/src/rtl/gtwvt/gtwvt.c @@ -385,7 +385,7 @@ static int hb_gt_wvt_FireEvent( PHB_GTWVT pWVT, int nEvent ) } /* - * use the standard fixed oem font, unless the caller has requested set size fonts + * use the standard fixed OEM font, unless the caller has requested set size fonts */ static HFONT hb_gt_wvt_GetFont( const char * pszFace, int iHeight, int iWidth, int iWeight, int iQuality, int iCodePage ) {