fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-06-05 14:58 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* 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?
This commit is contained in:
Przemyslaw Czerpak
2008-06-05 12:58:54 +00:00
parent 9515e91f9e
commit ee30ae86ac
7 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
harbour/ChangeLog
View File

@@ -8,6 +8,23 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
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

2
harbour/config/install.cf
View File

@@ -4,5 +4,7 @@
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/install.cf
ifneq ($(HB_INSTALL_DEF),yes)
install:: first
$(INSTALL_RULE)
endif

2
harbour/harbour-ce-spec
View File

@@ -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.

2
harbour/harbour-w32-spec
View File

@@ -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.

4
harbour/harbour.spec
View File

@@ -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}

2
harbour/make_tgz.sh
View File

@@ -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}"

12
harbour/source/pp/Makefile
View File

@@ -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)