From f53e90c1e6886e8c2b6b4858d38bbc2a310a84df Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 8 May 2012 15:30:53 +0000 Subject: [PATCH] 2012-05-08 17:29 UTC+0200 Viktor Szakats (harbour syenar.net) - bin/hb3rdpat.hbs + bin/3rdpatch.hb * config/postinst.hbs * package/harbour.spec * package/winuni/mpkg_win_uni.nsi * renamed public script to use .hb extension. * utils/hbmk2/hbmk2.prg * formatting --- harbour/ChangeLog | 11 +++++++++++ harbour/bin/{hb3rdpat.hbs => 3rdpatch.hb} | 0 harbour/config/postinst.hbs | 2 +- harbour/package/harbour.spec | 2 +- harbour/package/winuni/mpkg_win_uni.nsi | 1 - harbour/utils/hbmk2/hbmk2.prg | 4 ++-- 6 files changed, 15 insertions(+), 5 deletions(-) rename harbour/bin/{hb3rdpat.hbs => 3rdpatch.hb} (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bbc04f1f38..121bba9325 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2012-05-08 17:29 UTC+0200 Viktor Szakats (harbour syenar.net) + - bin/hb3rdpat.hbs + + bin/3rdpatch.hb + * config/postinst.hbs + * package/harbour.spec + * package/winuni/mpkg_win_uni.nsi + * renamed public script to use .hb extension. + + * utils/hbmk2/hbmk2.prg + * formatting + 2012-05-08 06:50 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/qth/QWheelEvent.qth ! Fixed: ISNUM() => HB_ISNUM. diff --git a/harbour/bin/hb3rdpat.hbs b/harbour/bin/3rdpatch.hb similarity index 100% rename from harbour/bin/hb3rdpat.hbs rename to harbour/bin/3rdpatch.hb diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs index 946c5a10ce..1722c34223 100644 --- a/harbour/config/postinst.hbs +++ b/harbour/config/postinst.hbs @@ -83,7 +83,7 @@ PROCEDURE Main( ... ) OutStd( "! Copying Harbour script files..." + hb_eol() ) /* public Harbour scripts */ - FOR EACH tmp IN { "bin/hb3rdpat.hbs" } + FOR EACH tmp IN { "bin/3rdpatch.hb" } mk_hb_FCopy( tmp, GetEnvC( "HB_INSTALL_BIN" ) + hb_ps() ) NEXT ENDIF diff --git a/harbour/package/harbour.spec b/harbour/package/harbour.spec index dd43e8b90c..ccce638b93 100644 --- a/harbour/package/harbour.spec +++ b/harbour/package/harbour.spec @@ -461,7 +461,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/hbi18n %{_bindir}/hbmk2 %{_bindir}/hbmk2.*.hbl -%{_bindir}/hb3rdpat.hbs +%{_bindir}/3rdpatch.hb %{_mandir}/man1/*.1* %dir %{_includedir}/%{name} %attr(644,root,root) %{_includedir}/%{name}/* diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi index 70bce40d5c..7652196c0f 100644 --- a/harbour/package/winuni/mpkg_win_uni.nsi +++ b/harbour/package/winuni/mpkg_win_uni.nsi @@ -102,7 +102,6 @@ Section "Main components" hb_main File "$%HB_ABSROOT%bin\hbrun.exe" File "$%HB_ABSROOT%bin\hbtest.exe" File /nonfatal "$%HB_ABSROOT%bin\*.hb" - File /nonfatal "$%HB_ABSROOT%bin\*.hbs" File /nonfatal "$%HB_ABSROOT%bin\hbmk.hbc" File "$%HB_ABSROOT%bin\upx*.*" diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index c8d3eedf6e..475de2f1dc 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -7585,7 +7585,7 @@ STATIC FUNCTION s_getIncludedFiles( hbmk, cFile, cParentDir, lCMode ) NIL /* lNewLine */, NIL, ; NIL /* nGetMatch */, ; .T. /* lOnlyMatch */ ) - cHeader := atail( tmp ) /* Last group in match marker */ + cHeader := ATail( tmp ) /* Last group in match marker */ lSystemHeader := ( Left( cHeader, 1 ) == "<" ) cHeader := SubStr( cHeader, 2, Len( cHeader ) - 2 ) @@ -10234,7 +10234,7 @@ STATIC FUNCTION MacroGet( hbmk, cMacro, cFileName ) #if 0 /* Support for: ${@} to include on-disk file content of - ${@@} to include on-disk file content referenced + ${@@} to include on-disk file content referenced from filename contained in */ IF Left( cMacro, 1 ) == "@" cMacro := SubStr( cMacro, 2 )