From ee30ae86acd2134ec3694a5e8c72629388ec8548 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 5 Jun 2008 12:58:54 +0000 Subject: [PATCH] 2008-06-05 14:58 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/harbour-ce-spec * harbour/harbour-w32-spec * harbour/harbour.spec * harbour/make_tgz.sh * removed not longer used HBPP references, thanks to Adam * added hbppgen to list of installed binaries for native builds * removed hbppgen from cross builds * harbour/source/pp/Makefile * harbour/config/install.cf * added hack to install also hbppgen I do not want to make deeper modifications in non GNU makefiles now. Looks that now we are ready to rename hbppgen to hbpp. I would like to keep -w hbppgen option semantic as is. Does anyone find it as a problem? --- harbour/ChangeLog | 17 +++++++++++++++++ harbour/config/install.cf | 2 ++ harbour/harbour-ce-spec | 2 +- harbour/harbour-w32-spec | 2 +- harbour/harbour.spec | 4 ++-- harbour/make_tgz.sh | 2 +- harbour/source/pp/Makefile | 12 ++++++++++++ 7 files changed, 36 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 482014f2b0..e2889c442e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,23 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-05 14:58 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/harbour-ce-spec + * harbour/harbour-w32-spec + * harbour/harbour.spec + * harbour/make_tgz.sh + * removed not longer used HBPP references, thanks to Adam + * added hbppgen to list of installed binaries for native builds + * removed hbppgen from cross builds + + * harbour/source/pp/Makefile + * harbour/config/install.cf + * added hack to install also hbppgen + I do not want to make deeper modifications in non GNU makefiles now. + Looks that now we are ready to rename hbppgen to hbpp. I would like + to keep -w hbppgen option semantic as is. Does anyone find it as + a problem? + 2008-06-05 13:53 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/make_vcce.mak * harbour/make_vc.mak diff --git a/harbour/config/install.cf b/harbour/config/install.cf index 5f872f433d..d40d54a05f 100644 --- a/harbour/config/install.cf +++ b/harbour/config/install.cf @@ -4,5 +4,7 @@ include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/install.cf +ifneq ($(HB_INSTALL_DEF),yes) install:: first $(INSTALL_RULE) +endif diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index 409529a361..3078d4a10e 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -172,7 +172,7 @@ make -r -i install ${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/* # remove unused files -rm -fR ${HB_BIN_INSTALL}/{harbour,hbdoc,hbdot,hbmake,hbpp,hbrun,hbtest,hbverfix,hbpptest}.exe +rm -fR ${HB_BIN_INSTALL}/{harbour,hbppgen,hbdoc,hbdot,hbmake,hbrun,hbtest,hbverfix,hbpptest}.exe rm -fR $HB_INC_INSTALL # Create a README file for people using this RPM. diff --git a/harbour/harbour-w32-spec b/harbour/harbour-w32-spec index 75742ccc88..599fa989c5 100644 --- a/harbour/harbour-w32-spec +++ b/harbour/harbour-w32-spec @@ -172,7 +172,7 @@ make -r -i install ${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/* # remove unused files -rm -fR ${HB_BIN_INSTALL}/{harbour,hbdoc,hbdot,hbmake,hbpp,hbrun,hbtest,hbverfix,hbpptest}.exe +rm -fR ${HB_BIN_INSTALL}/{harbour,hbppgen,hbdoc,hbdot,hbmake,hbrun,hbtest,hbverfix,hbpptest}.exe rm -fR $HB_INC_INSTALL # Create a README file for people using this RPM. diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 247d463143..3bb74b9bd4 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -328,7 +328,7 @@ then export L_USR="${CC_L_USR} -L${HB_LIB_INSTALL} -l%{name} -lncurses %{!?_without_gtsln:-lslang} %{!?_without_gpm:-lgpm} %{!?_without_x11:-L/usr/X11R6/%{_lib} -lX11} %{?_with_pgsql4:/usr/lib/libpq.so.4} %{?_with_pgsql:-lpq} %{?_with_gd:-lgd}" export PRG_USR="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${PRG_USR}" - for utl in hbmake hbrun hbdot hbpp hbdoc + for utl in hbmake hbrun hbdot hbdoc do pushd utils/${utl} rm -fR "./${HB_ARCHITECTURE}/${HB_COMPILER}" @@ -492,6 +492,7 @@ rm -rf $RPM_BUILD_ROOT %verify(not md5 mtime) %config /etc/harbour.cfg %verify(not md5 mtime) %config /etc/harbour/hb-charmap.def %{_bindir}/harbour +%{_bindir}/hbppgen %{_bindir}/hb-mkslib %{_bindir}/%{hb_pref}-build %{_bindir}/%{hb_pref}cc @@ -501,7 +502,6 @@ rm -rf $RPM_BUILD_ROOT #%{_bindir}/hbtest %{_bindir}/hbrun %{_bindir}/hbdot -%{_bindir}/hbpp %{_bindir}/hbmake %{_mandir}/man1/*.1* %dir %{_includedir}/%{name} diff --git a/harbour/make_tgz.sh b/harbour/make_tgz.sh index df1b1e52ed..73bdf90014 100755 --- a/harbour/make_tgz.sh +++ b/harbour/make_tgz.sh @@ -275,7 +275,7 @@ then export L_USR="-L${HB_LIB_INSTALL} -l${name} ${ADD_LIBS} ${L_USR}" export PRG_USR="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${PRG_USR}" - for utl in hbmake hbrun hbdot hbpp hbdoc hbtest + for utl in hbmake hbrun hbdot hbdoc hbtest do (cd "utils/${utl}" rm -fR "./${HB_ARCHITECTURE}/${HB_COMPILER}" diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile index a1c462a0cd..ec4abc3bd3 100644 --- a/harbour/source/pp/Makefile +++ b/harbour/source/pp/Makefile @@ -22,6 +22,8 @@ endif include $(TOP)$(ROOT)config/lib.cf +INSTALL_RULE_LIBRARIES := $(INSTALL_RULE) + ifneq ($(HB_PP_RULES),) pptable.c : $(HB_PP_RULES) $(CP) $(subst /,$(DIRSEP),$<) $@ @@ -29,3 +31,13 @@ else pptable.c : hbppgen$(EXE_EXT) $(HB_PPGEN_PATH)/hbppgen$(EXE_EXT) $(TOP)$(ROOT)include/hbstdgen.ch -opptable.c -q -c -v$(TOP)$(ROOT)include/hbverbld.h endif + +ifneq ($(HB_BIN_INSTALL),) +INSTALL_OBJS = $(ARCH_DIR)/hbppgen$(EXE_EXT) +INSTALL_DIR = $(HB_BIN_INSTALL) +HB_INSTALL_DEF=yes +include $(TOP)$(ROOT)config/install.cf +endif + +install:: + $(INSTALL_RULE_LIBRARIES)