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

2010-07-26 22:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
- mpkg_deb.sh
    - Deleted wrapper script. Pls use the method documented in
      INSTALL to build .deb files.

  * utils/hbmk2/hbmk2.prg
    * Minor change in output for better clarity.
This commit is contained in:
Viktor Szakats
2010-07-26 20:34:57 +00:00
parent 575e7302a8
commit aa960ef3c0
3 changed files with 9 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -16,6 +16,14 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-07-26 22:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
- mpkg_deb.sh
- Deleted wrapper script. Pls use the method documented in
INSTALL to build .deb files.
* utils/hbmk2/hbmk2.prg
* Minor change in output for better clarity.
2010-07-26 21:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* bin/hb-func.sh
- Deleted one more now unused function.

43
harbour/mpkg_deb.sh
View File

@@ -1,43 +0,0 @@
#!/bin/sh
#
# $Id$
#
# ---------------------------------------------------------------
# Copyright 2003 Przemyslaw Czerpak <druzus@polbox.com>
# simple script to build DEBs from Harbour sources
#
# See COPYING for licensing terms.
# ---------------------------------------------------------------
test_reqpkg()
{
dpkg -l "$1" 2>/dev/null | grep '^ii' >/dev/null 2>&1
status="$?"
if [ -n "$2" ] && [ $status -eq 0 ]
then
dpkg --compare-versions `dpkg -s "$1" 2> /dev/null | grep "^Version:" | cut -d' ' -f2` ge $2
status="$?"
fi
return "$status"
}
TOINST_LST=""
for i in gcc binutils bash debhelper
do
test_reqpkg "$i" || TOINST_LST="${TOINST_LST} $i"
done
if [ -z "${TOINST_LST}" ] || [ "$1" = "--force" ]
then
dpkg-buildpackage -b
else
echo "If you want to build Harbour compiler"
echo "you have to install the folowing packages:"
echo ""
echo "${TOINST_LST}"
echo ""
echo "you can do that executing:"
echo "sudo apt-get install ${TOINST_LST}"
exit 1
fi

2
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -1050,7 +1050,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
IF nLevel > 1
IF ! hbmk[ _HBMK_lQuiet ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Building sub-project: %1$s (level %2$s)" ), hbmk[ _HBMK_aArgs ][ hbmk[ _HBMK_nArgTarget ] ], hb_ntos( nLevel ) ) )
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Building sub-project (level %1$s): %2$s" ), hb_ntos( nLevel ), hbmk[ _HBMK_aArgs ][ hbmk[ _HBMK_nArgTarget ] ] ) )
ENDIF
ENDIF