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

2010-08-06 10:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* debian/rules
  * package/harbour.spec
    + Added HB_INSTALL_DYN (same content as HB_INSTALL_LIB)

  * config/postinst.hbs
    * HB_INSTALL_LIB -> HB_INSTALL_DYN

  * config/global.mk
  * config/postinst.hbs
  * debian/rules
  * package/harbour.spec
  * package/harbour-win.spec.in
  * package/harbour-wce.spec.in
    * HB_INSTALL_PKG_TOP -> HB_INSTALL_PKG_ROOT

  * debian/dirs
    + Added usr/share/man
      (I'm not sure of this file and I didn't retest yet)

  * debian/rules
    % Optimized variable usage.
This commit is contained in:
Viktor Szakats
2010-08-06 08:13:43 +00:00
parent a1a8bcd8d4
commit ab42d34ab1
8 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
harbour/ChangeLog
View File

@@ -16,6 +16,29 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-08-06 10:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* debian/rules
* package/harbour.spec
+ Added HB_INSTALL_DYN (same content as HB_INSTALL_LIB)
* config/postinst.hbs
* HB_INSTALL_LIB -> HB_INSTALL_DYN
* config/global.mk
* config/postinst.hbs
* debian/rules
* package/harbour.spec
* package/harbour-win.spec.in
* package/harbour-wce.spec.in
* HB_INSTALL_PKG_TOP -> HB_INSTALL_PKG_ROOT
* debian/dirs
+ Added usr/share/man
(I'm not sure of this file and I didn't retest yet)
* debian/rules
% Optimized variable usage.
2010-08-06 09:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.mk
! Fixed setting LD_LIBRARY_PATH under pre-3.81 GNU Makes.
@@ -39,10 +62,10 @@
* package/harbour-win.spec.in
* package/harbour-wce.spec.in
! Use HB_INSTALL_PKG_TOP to denote the root of package dir structure.
; TODO: Change the name to HB_INSTALL_PKG_ROOT
; TODO: Optimize variable usage.
; TODO: Change the name to HB_INSTALL_PKG_ROOT [DONE]
; TODO: Optimize variable usage. [DONE~]
; TOFIX: Use HB_INSTALL_DYN instead HB_INSTALL_LIB in context of
dynamic libs in postinst.hbs and package scripts.
dynamic libs in postinst.hbs and package scripts. [DONE]
* package/harbour.spec
! Fixed to honor HB_BUILD_NAME in local LD_LIBRARY_PATH setting.

16
harbour/config/global.mk
View File

@@ -1471,14 +1471,14 @@ ifeq ($(HB_BUILD_PKG),yes)
endif
endif
# HB_TOP - dir where packages will be created (root of Harbour source tree)
# HB_INSTALL_PKG_TOP - dir which has to be packed
# HB_PKGNAME - name of the install package
# HB_INSTALL_PREFIX - dir where Harbour dirs will be created
# HB_TOP - dir where packages will be created (root of Harbour source tree)
# HB_INSTALL_PKG_ROOT - dir which has to be packed
# HB_PKGNAME - name of the install package
# HB_INSTALL_PREFIX - dir where Harbour dirs will be created
#
# <HB_TOP><plat/comp ><HB_BUILD_PKG_PREFIX>
# <HB_INSTALL_PKG_TOP>
# <HB_INSTALL_PREFIX >/bin
# <HB_TOP><plat/comp ><HB_BUILD_PKG_PREFIX>
# <HB_INSTALL_PKG_ROOT>
# <HB_INSTALL_PREFIX >/bin
#
ifneq ($(HB_SRC_ROOTPATH),)
@@ -1491,7 +1491,7 @@ ifeq ($(HB_BUILD_PKG),yes)
HB_INSTALL_PREFIX := $(subst /,$(DIRSEP),$(HB_INSTALL_PREFIX))
export HB_INSTALL_PKG_TOP := $(HB_INSTALL_PREFIX)
export HB_INSTALL_PKG_ROOT := $(HB_INSTALL_PREFIX)
HB_INSTALL_BIN :=
HB_INSTALL_INC :=

12
harbour/config/postinst.hbs
View File

@@ -116,8 +116,8 @@ PROCEDURE Main( ... )
tmp := GetEnv( "HB_INSTALL_ETC" ) + hb_ps() + ".." + hb_ps() + "ld.so.conf.d"
IF DirBuild( tmp )
tmp1 := GetEnv( "HB_INSTALL_DYN" )
IF Left( tmp1, Len( GetEnv( "HB_INSTALL_PKG_TOP" ) ) ) == GetEnv( "HB_INSTALL_PKG_TOP" )
tmp1 := SubStr( tmp1, Len( GetEnv( "HB_INSTALL_PKG_TOP" ) ) + 1 )
IF Left( tmp1, Len( GetEnv( "HB_INSTALL_PKG_ROOT" ) ) ) == GetEnv( "HB_INSTALL_PKG_ROOT" )
tmp1 := SubStr( tmp1, Len( GetEnv( "HB_INSTALL_PKG_ROOT" ) ) + 1 )
ENDIF
hb_MemoWrit( tmp + hb_ps() + "harbour.conf", tmp1 + hb_eol() )
ELSE
@@ -154,11 +154,11 @@ PROCEDURE Main( ... )
IF !( GetEnv( "HB_PLATFORM" ) $ "win|wce" )
DO CASE
CASE GetEnv( "HB_INSTALL_LIB" ) $ "/usr/lib/harbour|/usr/lib64/harbour|/usr/local/lib/harbour|/usr/local/lib64/harbour"
CASE GetEnv( "HB_INSTALL_DYN" ) $ "/usr/lib/harbour|/usr/lib64/harbour|/usr/local/lib/harbour|/usr/local/lib64/harbour"
ln -sf harbour/$l ../$ll
ln -sf harbour/$l ../$l
;;
CASE GetEnv( "HB_INSTALL_LIB" ) $ "/usr/local/harbour/lib"
CASE GetEnv( "HB_INSTALL_DYN" ) $ "/usr/local/harbour/lib"
ld="/usr/lib"
if [ -n "${HB_INST_PKGPREF}" ] || [ -w $ld ]
then
@@ -220,7 +220,7 @@ PROCEDURE Main( ... )
first to avoid mixing in an existing .zip file. [vszakats] */
cOldDir := hb_ps() + CurDir()
DirChange( GetEnv( "HB_INSTALL_PKG_TOP" ) )
DirChange( GetEnv( "HB_INSTALL_PKG_ROOT" ) )
mk_hb_processRun( PathSepToSelf( GetEnv( "HB_DIR_ZIP" ) ) + "zip" +;
" -q -9 -X -r -o" +;
@@ -270,7 +270,7 @@ PROCEDURE Main( ... )
GetEnv( "HB_PLATFORM" ) == "bsd", "wheel", "root" )
cOldDir := hb_ps() + CurDir()
DirChange( GetEnv( "HB_INSTALL_PKG_TOP" ) )
DirChange( GetEnv( "HB_INSTALL_PKG_ROOT" ) )
/* TODO: Add support for non-GNU non-BSD tar (which gets the data from stdio) */

1
harbour/debian/dirs
View File

@@ -3,3 +3,4 @@ usr/bin
usr/lib/harbour
usr/include/harbour
usr/share/doc/harbour
usr/share/man

15
harbour/debian/rules
View File

@@ -6,13 +6,14 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE := 1
export HB_INSTALL_PKG_TOP := $(CURDIR)/debian/harbour
export HB_INSTALL_BIN := $(CURDIR)/debian/harbour/usr/bin
export HB_INSTALL_LIB := $(CURDIR)/debian/harbour/usr/lib/harbour
export HB_INSTALL_INC := $(CURDIR)/debian/harbour/usr/include/harbour
export HB_INSTALL_DOC := $(CURDIR)/debian/harbour/usr/share/doc/harbour
export HB_INSTALL_MAN := $(CURDIR)/debian/harbour/usr/share/man
export HB_INSTALL_ETC := $(CURDIR)/debian/harbour/etc/harbour
export HB_INSTALL_PKG_ROOT := $(CURDIR)/debian/harbour
export HB_INSTALL_BIN := $(HB_INSTALL_PKG_ROOT)/usr/bin
export HB_INSTALL_LIB := $(HB_INSTALL_PKG_ROOT)/usr/lib/harbour
export HB_INSTALL_DYN := $(HB_INSTALL_LIB)
export HB_INSTALL_INC := $(HB_INSTALL_PKG_ROOT)/usr/include/harbour
export HB_INSTALL_DOC := $(HB_INSTALL_PKG_ROOT)/usr/share/doc/harbour
export HB_INSTALL_MAN := $(HB_INSTALL_PKG_ROOT)/usr/share/man
export HB_INSTALL_ETC := $(HB_INSTALL_PKG_ROOT)/etc/harbour
export HB_BUILD_PKG := no
export HB_BUILD_SHARED := yes

8
harbour/package/harbour-wce.spec.in
View File

@@ -100,10 +100,10 @@ export HB_BUILD_PARTS=lib
export HB_PLATFORM=wce
export HB_HOST_BIN="$(pwd)/bin/linux/gcc"
export HB_INSTALL_PKG_TOP=$RPM_BUILD_ROOT
export HB_INSTALL_BIN=$RPM_BUILD_ROOT/%{_bindir}
export HB_INSTALL_INC=$RPM_BUILD_ROOT/%{_includedir}/%{name}
export HB_INSTALL_LIB=$RPM_BUILD_ROOT/%{_libdir}/%{name}
export HB_INSTALL_PKG_ROOT=${RPM_BUILD_ROOT}
export HB_INSTALL_BIN=${RPM_BUILD_ROOT}/%{_bindir}
export HB_INSTALL_INC=${RPM_BUILD_ROOT}/%{_includedir}/%{name}
export HB_INSTALL_LIB=${RPM_BUILD_ROOT}/%{_libdir}/%{name}
export HB_INSTALL_DYN=${HB_INSTALL_LIB}
export HB_BUILD_STRIP=lib

8
harbour/package/harbour-win.spec.in
View File

@@ -100,10 +100,10 @@ export HB_BUILD_PARTS=lib
export HB_PLATFORM=win
export HB_HOST_BIN="$(pwd)/bin/linux/gcc"
export HB_INSTALL_PKG_TOP=$RPM_BUILD_ROOT
export HB_INSTALL_BIN=$RPM_BUILD_ROOT/%{_bindir}
export HB_INSTALL_INC=$RPM_BUILD_ROOT/%{_includedir}/%{name}
export HB_INSTALL_LIB=$RPM_BUILD_ROOT/%{_libdir}/%{name}
export HB_INSTALL_PKG_ROOT=${RPM_BUILD_ROOT}
export HB_INSTALL_BIN=${RPM_BUILD_ROOT}/%{_bindir}
export HB_INSTALL_INC=${RPM_BUILD_ROOT}/%{_includedir}/%{name}
export HB_INSTALL_LIB=${RPM_BUILD_ROOT}/%{_libdir}/%{name}
export HB_INSTALL_DYN=${HB_INSTALL_LIB}
export HB_BUILD_STRIP=lib

5
harbour/package/harbour.spec
View File

@@ -67,17 +67,18 @@
%define hb_sln export HB_WITH_SLANG=%{!?_without_slang:yes}%{?_without_slang:no}
%define hb_x11 export HB_WITH_X11=%{!?_without_x11:yes}%{?_without_x11:no}
%define hb_local export HB_WITH_ZLIB=%{?_with_localzlib:local} ; export HB_WITH_PCRE=%{?_with_localpcre:local}
%define hb_proot export HB_INSTALL_PKG_TOP=${RPM_BUILD_ROOT}
%define hb_proot export HB_INSTALL_PKG_ROOT=${RPM_BUILD_ROOT}
%define hb_bdir export HB_INSTALL_BIN=${RPM_BUILD_ROOT}%{_bindir}
%define hb_idir export HB_INSTALL_INC=${RPM_BUILD_ROOT}%{_includedir}/%{name}
%define hb_ldir export HB_INSTALL_LIB=${RPM_BUILD_ROOT}%{_libdir}/%{name}
%define hb_ddir export HB_INSTALL_DYN=${RPM_BUILD_ROOT}%{_libdir}/%{name}
%define hb_edir export HB_INSTALL_ETC=${RPM_BUILD_ROOT}%{hb_etcdir}
%define hb_mdir export HB_INSTALL_MAN=${RPM_BUILD_ROOT}%{_mandir}
%define hb_blds export HB_BUILD_STRIP=all
%define hb_bldsh export HB_BUILD_SHARED=%{!?_with_static:yes}
%define hb_cmrc export HB_BUILD_NOGPLLIB=%{?_without_gpllib:yes}
%define hb_ctrb export HB_BUILD_CONTRIBS="hbblink hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbziparc hbfoxpro hbsms hbfship hbxpp xhb rddbmcdx rddsql sddsqlt3 hbnf %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_cups:hbcups} %{?_with_curl:hbcurl} %{?_with_firebird:hbfbird sddfb} %{?_with_freeimage:hbfimage} %{?_with_gd:hbgd} %{?_with_mysql:hbmysql sddmy} %{?_with_odbc:hbodbc sddodbc} %{?_with_pgsql:hbpgsql sddpg} %{?_with_qt:hbqt hbxbp} %{?_with_ads:rddads}"
%define hb_env %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_dflag} ; %{shl_path} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_proot} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_edir} ; %{hb_mdir} ; %{hb_ctrb} ; %{hb_cmrc} ; %{hb_blds} ; %{hb_bldsh}
%define hb_env %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_dflag} ; %{shl_path} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_proot} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ddir} ; %{hb_edir} ; %{hb_mdir} ; %{hb_ctrb} ; %{hb_cmrc} ; %{hb_blds} ; %{hb_bldsh}
######################################################################
## Preamble.
######################################################################