diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bf6e3de7e6..ad37f3817c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,25 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-24 17:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * Makefile + * utils/Makefile + * Changed to build hbrun and hbmk2 in HB_BUILD_PARTS=compiler mode. + + Added running bin/postinst.prg. + + + bin/postinst.prg + + Added postinst.prg with test content. + + * package/winuni/RELNOTES + * Added information about new MinGW CEGCC build. + + * utils/Makefile + * Changed HB_UTILS setting name to HB_UTIL_ADDONS. To be + in sync with rest of similar settings. + + * INSTALL + + Documented HB_UTIL_ADDONS setting. (formerly HB_UTILS) + 2009-09-24 16:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * harbour/config/globsh.mk + Added command $(TRUE) as dummy one for all shells. Pls check. diff --git a/harbour/INSTALL b/harbour/INSTALL index 3f6cc0dde6..8fc1b0db0b 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -550,6 +550,8 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR libraries. Build all if left empty. - HB_EXTERNAL_ADDONS= Build space separated of additional libraries stored in the external directory. + - HB_UTIL_ADDONS= Build space separated of additional + utilities stored in the utils directoty. - HB_VISUALC_VER_PRE80=yes Set this if you're using a pre-8.0 (= pre-MSVS 2005) version of MSVC compiler. Default: no diff --git a/harbour/Makefile b/harbour/Makefile index 4b377e5a65..57bc05da78 100644 --- a/harbour/Makefile +++ b/harbour/Makefile @@ -4,10 +4,13 @@ ROOT := ./ +include $(ROOT)config/global.mk + ifeq ($(HB_BUILD_PARTS),compiler) DIRS := \ source \ + utils{source} \ else @@ -41,3 +44,4 @@ endif install:: +$(HB_POSTINST) + +$(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT) --hb:gtcgi $(TOP)$(ROOT)bin/postinst.prg diff --git a/harbour/bin/postinst.prg b/harbour/bin/postinst.prg new file mode 100644 index 0000000000..06b9ac7054 --- /dev/null +++ b/harbour/bin/postinst.prg @@ -0,0 +1,17 @@ +/* + * $Id$ + */ + +/* + * Copyright 2009 Viktor Szakats (harbour.01 syenar.hu) + * See COPYING for licensing terms. + */ + +PROCEDURE Main() + LOCAL nErrorLevel := 0 + + OutStd( "! Hello from postinst.prg" + hb_osNewLine() ) + + ErrorLevel( nErrorLevel ) + + RETURN diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES index 91ef5b47f3..420c6f63c4 100644 --- a/harbour/package/winuni/RELNOTES +++ b/harbour/package/winuni/RELNOTES @@ -43,7 +43,7 @@ Tool/lib versions used to create this package: MinGW 4.4.1 (included) MinGW w64 4.5.0 - MinGW CEGCC 4.1.0 + MinGW CEGCC 4.4.0 DJGPP 4.4.1 (2.04b1) MSVC 2008 SP1 Open Watcom C++ 1.8 @@ -65,6 +65,11 @@ Tool/lib versions used to create this package: QT 4.5.2 WATTCG 2.2.10 +Changes since previous (2.0.0beta3 20090905) release: +----------------------------------------------------------------------- + +- MinGW CEGCC updated to 4.4.0 + Changes since previous (2.0.0beta2 20090624) release: ----------------------------------------------------------------------- diff --git a/harbour/utils/Makefile b/harbour/utils/Makefile index 23952dc066..d6a6a9ff86 100644 --- a/harbour/utils/Makefile +++ b/harbour/utils/Makefile @@ -7,9 +7,16 @@ ROOT := ../ DIRS := \ hbrun \ hbmk2 \ - hbi18n \ - hbtest \ - hbformat \ - $(HB_UTILS) \ + +ifneq ($(HB_BUILD_PARTS),compiler) + + DIRS += \ + hbi18n \ + hbtest \ + hbformat \ + +endif + +DIRS += $(HB_UTIL_ADDONS) include $(ROOT)config/dir.mk