From b387963fad7d46341a19f206e31fc3d7433a216d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 18 Mar 2010 12:30:42 +0000 Subject: [PATCH] 2010-03-18 13:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * INSTALL ! Fixed Debian bzip2 package name. * external/bzip2/Makefile * contrib/hbbzip2/hbbzip2.hbc * Changed local bzip2 lib name to match regular name used on *nix systems. * external/zlib/Makefile * Formatting. * contrib/hbmzip/Makefile ! Minor fix. --- harbour/ChangeLog | 26 ++++++++++++++++++++------ harbour/INSTALL | 2 +- harbour/contrib/hbbzip2/hbbzip2.hbc | 2 +- harbour/contrib/hbmzip/Makefile | 2 +- harbour/external/bzip2/Makefile | 2 +- harbour/external/zlib/Makefile | 4 ++-- 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d939d7836a..7b22651fa7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,20 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-18 13:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + ! Fixed Debian bzip2 package name. + + * external/bzip2/Makefile + * contrib/hbbzip2/hbbzip2.hbc + * Changed local bzip2 lib name to match regular name used on *nix systems. + + * external/zlib/Makefile + * Formatting. + + * contrib/hbmzip/Makefile + ! Minor fix. + 2010-03-17 23:50 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbxbp/xbptreeview.prg ! Added :tooltipText instance variable to manage tooltips. @@ -28,26 +42,26 @@ * contrib/hbide/ideprojmanager.prg * contrib/hbide/resources/docwriter.ui * contrib/hbide/resources/docwriter.uic - + ! Reworked "Projects" and "Editors" tree. Now the indentation is reduced, visual elements are added, long paths are shifted inside tooltips, nodes are sorted. ! "Editors" tree now displays the panel icon on which this source is hosted. A very handy and useful implementation. - These tree-views will remain stationary for the rest of hbIDE - development cycle, i.e., there will bo no change whatsoever + These tree-views will remain stationary for the rest of hbIDE + development cycle, i.e., there will bo no change whatsoever on these components. - ! Many other artifacts corrected while working with the production + ! Many other artifacts corrected while working with the production projects myself. Probably now you may try, at least, for real-time use. + Setup a dedicated web-presence of hbIDE http://hbide.vouch.info/ - Please remain in tough with these pages as contents will keep on - posted with every available spare time. + Please remain in tough with these pages as contents will keep on + posted with every available spare time. 2010-03-17 00:37 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * INSTALL diff --git a/harbour/INSTALL b/harbour/INSTALL index 86630243fe..0358b5c431 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -392,7 +392,7 @@ HARBOUR Optional, to override locally hosted sources: - for bzip2 support: $ sudo apt-get install bzip2 + for bzip2 support: $ sudo apt-get install libbz2-dev for zlib support: $ sudo apt-get install zlib1g-dev for pcre (regex) support: $ sudo apt-get install libpcre3-dev for contrib/hbsqlit3 lib: $ sudo apt-get install libsqlite3-dev diff --git a/harbour/contrib/hbbzip2/hbbzip2.hbc b/harbour/contrib/hbbzip2/hbbzip2.hbc index 1a1143e5b4..ca205d46a7 100644 --- a/harbour/contrib/hbbzip2/hbbzip2.hbc +++ b/harbour/contrib/hbbzip2/hbbzip2.hbc @@ -5,4 +5,4 @@ incpaths=. libs=hbbzip2 -libs=bzip2 +libs=bz2 diff --git a/harbour/contrib/hbmzip/Makefile b/harbour/contrib/hbmzip/Makefile index 97dcbde5fd..f26d286e5d 100644 --- a/harbour/contrib/hbmzip/Makefile +++ b/harbour/contrib/hbmzip/Makefile @@ -23,6 +23,6 @@ ifneq ($(HB_HAS_ZLIB),) include $(TOP)$(ROOT)config/header.mk include $(TOP)$(ROOT)config/lib.mk else - HB_SKIP_REASON := $(_DET_RES_TEXT) + HB_SKIP_REASON := component not found include $(TOP)$(ROOT)config/none.mk endif diff --git a/harbour/external/bzip2/Makefile b/harbour/external/bzip2/Makefile index 13029784e1..2de39fc2c1 100644 --- a/harbour/external/bzip2/Makefile +++ b/harbour/external/bzip2/Makefile @@ -6,7 +6,7 @@ ROOT := ../../ include $(TOP)$(ROOT)config/global.mk -LIBNAME := bzip2 +LIBNAME := bz2 HB_BUILD_WARN := no HB_BUILD_MODE := c diff --git a/harbour/external/zlib/Makefile b/harbour/external/zlib/Makefile index b2dcdfa31f..e7b0b1acb1 100644 --- a/harbour/external/zlib/Makefile +++ b/harbour/external/zlib/Makefile @@ -6,6 +6,8 @@ ROOT := ../../ include $(TOP)$(ROOT)config/global.mk +LIBNAME := hbzlib + HB_BUILD_WARN := no C_SOURCES := \ @@ -22,8 +24,6 @@ C_SOURCES := \ uncompr.c \ zutil.c \ -LIBNAME := hbzlib - ifneq ($(HB_HAS_ZLIB_LOCAL),) include $(TOP)$(ROOT)config/lib.mk else