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

2010-07-28 00:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/postinst.hbs
    + Will now install root documents (INSTALL, COPYING, TODO, ChangeLog)
      to HB_DOC_INSTALL on *nix systems.
    + Will now create the HB_MAN_INSTALL dir before copying.

  * debian/rules
    + Sets HB_MAN_INSTALL.
    + Sets HB_BUILD_SHARED=yes.
    % Deleted explicit reference to man files and ChangeLog, these are 
      now installed by postinst.hbs and picked automatically by debhelper.
      This means that now debian/rules doesn't have to be tweaked 
      if any Harbour files change name or location.
This commit is contained in:
Viktor Szakats
2010-07-27 22:16:52 +00:00
parent aa6055f5f4
commit a92ffb97ae
3 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -16,6 +16,20 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-07-28 00:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/postinst.hbs
+ Will now install root documents (INSTALL, COPYING, TODO, ChangeLog)
to HB_DOC_INSTALL on *nix systems.
+ Will now create the HB_MAN_INSTALL dir before copying.
* debian/rules
+ Sets HB_MAN_INSTALL.
+ Sets HB_BUILD_SHARED=yes.
% Deleted explicit reference to man files and ChangeLog, these are
now installed by postinst.hbs and picked automatically by debhelper.
This means that now debian/rules doesn't have to be tweaked
if any Harbour files change name or location.
2010-07-27 23:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
- package/debian
+ debian

34
harbour/config/postinst.hbs
View File

@@ -61,18 +61,22 @@ PROCEDURE Main()
/* Installing some misc files */
IF GetEnv( "HB_PLATFORM" ) $ "win|wce|os2|dos" .AND. ;
! Empty( GetEnv( "HB_INSTALL_PREFIX" ) )
IF GetEnv( "HB_PLATFORM" ) $ "win|wce|os2|dos"
tmp := GetEnv( "HB_INSTALL_PREFIX" )
ELSE
tmp := GetEnv( "HB_DOC_INSTALL" )
ENDIF
IF ! Empty( tmp )
OutStd( "! Copying root documents..." + hb_eol() )
FOR EACH aFile IN Directory( "Change*" )
mk_hb_FCopy( aFile[ F_NAME ], GetEnv( "HB_INSTALL_PREFIX" ) + hb_ps() + iif( GetEnv( "HB_PLATFORM" ) == "dos", "CHANGES", "" ) )
mk_hb_FCopy( aFile[ F_NAME ], tmp + hb_ps() + iif( GetEnv( "HB_PLATFORM" ) == "dos", "CHANGES", "" ) )
NEXT
mk_hb_FCopy( "COPYING", GetEnv( "HB_INSTALL_PREFIX" ) + hb_ps() )
mk_hb_FCopy( "INSTALL", GetEnv( "HB_INSTALL_PREFIX" ) + hb_ps() )
mk_hb_FCopy( "TODO" , GetEnv( "HB_INSTALL_PREFIX" ) + hb_ps() )
mk_hb_FCopy( "COPYING", tmp + hb_ps() )
mk_hb_FCopy( "INSTALL", tmp + hb_ps() )
mk_hb_FCopy( "TODO" , tmp + hb_ps() )
ENDIF
IF ! Empty( GetEnv( "HB_BIN_INSTALL" ) )
@@ -101,13 +105,17 @@ PROCEDURE Main()
OutStd( "! Copying *nix man files..." + hb_eol() )
FOR EACH tmp IN { "src/main/harbour.1" ,;
"src/pp/hbpp.1" ,;
"utils/hbmk2/hbmk2.1" ,;
"utils/hbrun/hbrun.1" ,;
"utils/hbtest/hbtest.1" }
mk_hb_FCopy( tmp, GetEnv( "HB_MAN_INSTALL" ) + hb_ps() + "man1" + hb_ps(), .T. )
NEXT
IF DirBuild( GetEnv( "HB_MAN_INSTALL" ) + hb_ps() + "man1" )
FOR EACH tmp IN { "src/main/harbour.1" ,;
"src/pp/hbpp.1" ,;
"utils/hbmk2/hbmk2.1" ,;
"utils/hbrun/hbrun.1" ,;
"utils/hbtest/hbtest.1" }
mk_hb_FCopy( tmp, GetEnv( "HB_MAN_INSTALL" ) + hb_ps() + "man1" + hb_ps(), .T. )
NEXT
ELSE
OutStd( hb_StrFormat( "! Error: Cannot create directory '%1$s'", GetEnv( "HB_MAN_INSTALL" ) ) + hb_eol() )
ENDIF
ENDIF
/* Creating language files */

7
harbour/debian/rules
View File

@@ -10,8 +10,11 @@ export HB_BIN_INSTALL := $(CURDIR)/debian/harbour/usr/bin
export HB_LIB_INSTALL := $(CURDIR)/debian/harbour/usr/lib/harbour
export HB_INC_INSTALL := $(CURDIR)/debian/harbour/usr/include/harbour
export HB_DOC_INSTALL := $(CURDIR)/debian/harbour/usr/share/doc/harbour
export HB_MAN_INSTALL := $(CURDIR)/debian/harbour/usr/share/man
export HB_ETC_INSTALL := $(CURDIR)/debian/harbour/etc/harbour
export HB_BUILD_PKG := no
export HB_BUILD_SHARED := yes
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
export HB_BUILD_OPTIM := no
endif
@@ -51,11 +54,11 @@ binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
dh_installchangelogs
dh_installdocs
dh_installexamples
# dh_install
dh_installman src/main/harbour.1 src/pp/hbpp.1 utils/hbmk2/hbmk2.1 utils/hbrun/hbrun.1 utils/hbtest/hbtest.1
dh_installman
dh_link
dh_strip
dh_compress