From 4696e8764fb90ea18591e95a602c0de1d785aa00 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 23 Feb 2009 14:15:04 +0000 Subject: [PATCH] 2009-02-23 15:14 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/postinst.bat ! Protected command from pre-NT systems. * harbour-win-spec * harbour-wce-spec * harbour.spec + hbmkcfg.hbp added to distros (I hope to all of them). * ChangeLog * Updated statuses of a few pending items. --- harbour/ChangeLog | 23 +++++++++++++++++------ harbour/bin/postinst.bat | 2 +- harbour/harbour-wce-spec | 1 + harbour/harbour-win-spec | 1 + harbour/harbour.spec | 1 + 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9c768542c4..40aba5616e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-23 15:14 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * bin/postinst.bat + ! Protected command from pre-NT systems. + + * harbour-win-spec + * harbour-wce-spec + * harbour.spec + + hbmkcfg.hbp added to distros (I hope to all of them). + + * ChangeLog + * Updated statuses of a few pending items. + 2009-02-23 14:51 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Fixed bug which made gtwvt the default GT for mingw. @@ -170,8 +182,8 @@ ; TODO: Solve to compile Harbour lib .prgs using -n1 switch. (needed for .dll, and this one has only befenefits for other scenarios) - ; TODO: Add hb-mkdll.bat to postinst.bat. - ; TODO: Add BCC support, if possible. + ; TODO: Add hb-mkdll.bat to postinst.bat. [DONE] + ; TODO: Add BCC support, if possible. [DONE] ; TODO: Rename hb-mkslib.sh to 8.3 name and sync name with the .bat version (not necessarily mkdll, but something short.) @@ -608,7 +620,7 @@ + Added generation of hbmkcfg.hbp. gt override, cflags, ldflags and slang/curses libs are currently added. - ; TODO: Add this file to distro packages. + ; TODO: Add this file to distro packages. [DONE] * utils/hbmk2/hbmk2.prg ! Fixed handling of -DHB_EXT_ZLIB. @@ -2000,8 +2012,7 @@ - Switch to portable command lines in hbmk.bat files. [DONE] (Win9x will be supported again). [DONE] - Remove bin/hbmk*.bat, bin/hbmk*.cmd, util/hbmake/*. [DONE] - - Cleanup on variable names in hbmk.prg. - [MOVED TO hbmk2.prg] + - Cleanup on variable names in hbmk.prg. [MOVED TO hbmk2.prg] * tests/testid.prg * Minor cleanup. @@ -4823,7 +4834,7 @@ ; TODO: Shouldn't we add core support for C-level thread specific cargo (user defined data) area available for - 3rd party libs/apps? + 3rd party libs/apps? [FEATURE ALREADY IMPLEMENTED] ; TODO: Same could be added to GT structure to hold GT instance specific user defined data. [DONE] diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index 28c68995a2..059d3c8b24 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -18,7 +18,7 @@ goto inst_%HB_ARCHITECTURE% :inst_win rem Windows post install part -if "%HB_DLL%" == "yes" call %~dp0hb-mkdll.bat +if "%OS%" == "Windows_NT" if "%HB_DLL%" == "yes" call %~dp0hb-mkdll.bat echo @"%%~dp0hbmk2.exe" -hbcc %%*> %HB_BIN_INSTALL%\hbcc.bat echo @"%%~dp0hbmk2.exe" -hbcmp %%*> %HB_BIN_INSTALL%\hbcmp.bat diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec index 5333ed42e6..dd0f6a8626 100644 --- a/harbour/harbour-wce-spec +++ b/harbour/harbour-wce-spec @@ -295,6 +295,7 @@ rm -fR $RPM_BUILD_ROOT %{_bindir}/%{hb_pref}cmp %{_bindir}/%{hb_pref}lnk %{_bindir}/%{hb_pref}mk +%{_bindir}/hbmkcfg.hbp %defattr(644,root,root,755) %dir %{_includedir}/%{name} diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec index c750edd9ce..da1517ce06 100644 --- a/harbour/harbour-win-spec +++ b/harbour/harbour-win-spec @@ -295,6 +295,7 @@ rm -fR $RPM_BUILD_ROOT %{_bindir}/%{hb_pref}cmp %{_bindir}/%{hb_pref}lnk %{_bindir}/%{hb_pref}mk +%{_bindir}/hbmkcfg.hbp %defattr(644,root,root,755) %dir %{_includedir}/%{name} diff --git a/harbour/harbour.spec b/harbour/harbour.spec index c9c616ab0c..5643771a3c 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -615,6 +615,7 @@ rm -rf $RPM_BUILD_ROOT #%{_bindir}/hbtest %{_bindir}/hbrun %{_bindir}/hbi18n +%{_bindir}/hbmkcfg.hbp %{_bindir}/hbmk2 %{_mandir}/man1/*.1* %dir %{_includedir}/%{name}