From c9a80f866cef7cdb37c775c2d69d8b0874a5b21f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 27 Jul 2010 10:55:41 +0000 Subject: [PATCH] 2010-07-27 12:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * mpkg_rpm_wce.sh * mpkg_rpm_win.sh * mpkg_src.sh - bin/hb-func.sh + package/mpkg_ver.sh - Deleted unused function from hb-func.sh * Moved and renamed hb-func.sh * config/postinst.hbs - bin/hbmk_l2d.hbs + bin/hbmk2l2d.hbs * Renamed. - mpkg_nightly.sh + package/mpkg_nightly.sh * Moved to package dir. --- harbour/ChangeLog | 18 ++++++++++++++++++ harbour/bin/{hbmk_l2d.hbs => hbmk2l2d.hbs} | 2 +- harbour/config/postinst.hbs | 2 +- harbour/mpkg_rpm_wce.sh | 2 +- harbour/mpkg_rpm_win.sh | 2 +- harbour/mpkg_src.sh | 4 ++-- harbour/{ => package}/mpkg_nightly.sh | 10 +++++----- .../{bin/hb-func.sh => package/mpkg_ver.sh} | 9 --------- 8 files changed, 29 insertions(+), 20 deletions(-) rename harbour/bin/{hbmk_l2d.hbs => hbmk2l2d.hbs} (98%) rename harbour/{ => package}/mpkg_nightly.sh (95%) rename harbour/{bin/hb-func.sh => package/mpkg_ver.sh} (76%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5f92d9a976..ae2188d8c9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,24 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-27 12:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * mpkg_rpm_wce.sh + * mpkg_rpm_win.sh + * mpkg_src.sh + - bin/hb-func.sh + + package/mpkg_ver.sh + - Deleted unused function from hb-func.sh + * Moved and renamed hb-func.sh + + * config/postinst.hbs + - bin/hbmk_l2d.hbs + + bin/hbmk2l2d.hbs + * Renamed. + + - mpkg_nightly.sh + + package/mpkg_nightly.sh + * Moved to package dir. + 2010-07-27 12:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + Added new plugin APIs: diff --git a/harbour/bin/hbmk_l2d.hbs b/harbour/bin/hbmk2l2d.hbs similarity index 98% rename from harbour/bin/hbmk_l2d.hbs rename to harbour/bin/hbmk2l2d.hbs index e37a2c1c8d..754487f238 100644 --- a/harbour/bin/hbmk_l2d.hbs +++ b/harbour/bin/hbmk2l2d.hbs @@ -6,7 +6,7 @@ * hbmk2 plugin script, static lib to dynamic lib conversion for * environments supporting 'ar' tool. * Usage: - * 'hbmk2 -hbdyn -pi= -plugin=hbmk_l2d.hbs -o -nohblib-' + * 'hbmk2 -hbdyn -pi= -plugin=hbmk2l2d.hbs -o -nohblib-' * * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) * www - http://harbour-project.org diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs index 5dcd274e1d..f7dec36694 100644 --- a/harbour/config/postinst.hbs +++ b/harbour/config/postinst.hbs @@ -73,7 +73,7 @@ PROCEDURE Main() hb_FCopy( "TODO" , GetEnv( "HB_INSTALL_PREFIX" ) + hb_ps() + "TODO" ) /* public Harbour scripts */ - FOR EACH tmp IN { "hbmk_l2d.hbs" ,; + FOR EACH tmp IN { "hbmk2l2d.hbs" ,; "hbxpatch.hbs" } hb_FCopy( "bin" + hb_ps() + tmp, GetEnv( "HB_BIN_INSTALL" ) + hb_ps() + tmp ) NEXT diff --git a/harbour/mpkg_rpm_wce.sh b/harbour/mpkg_rpm_wce.sh index 96644e655f..2f7980631f 100755 --- a/harbour/mpkg_rpm_wce.sh +++ b/harbour/mpkg_rpm_wce.sh @@ -36,7 +36,7 @@ get_rpmmacro() } cd `dirname $0` -. bin/hb-func.sh +. package/mpkg_ver.sh hb_ver=`get_hbver` hb_verstat=`get_hbverstat` [ -n "${hb_verstat}" ] || hb_verstat="0" diff --git a/harbour/mpkg_rpm_win.sh b/harbour/mpkg_rpm_win.sh index d977c12b1f..30acb6b939 100755 --- a/harbour/mpkg_rpm_win.sh +++ b/harbour/mpkg_rpm_win.sh @@ -58,7 +58,7 @@ HB_CCPATH="$MINGW_DIR/bin" cd `dirname $0` -. bin/hb-func.sh +. package/mpkg_ver.sh hb_ver=`get_hbver` hb_verstat=`get_hbverstat` [ -n "${hb_verstat}" ] || hb_verstat="0" diff --git a/harbour/mpkg_src.sh b/harbour/mpkg_src.sh index c939616ebe..34a1bb7f8d 100755 --- a/harbour/mpkg_src.sh +++ b/harbour/mpkg_src.sh @@ -24,12 +24,12 @@ hb_currdir=`pwd` hb_archopt="-czf" [ -n "${hb_ext}" ] || hb_ext=".tar.gz" -if [ -f bin/hb-func.sh ]; then +if [ -f package/mpkg_ver.sh ]; then hb_rootdir="." else hb_rootdir=`dirname $0` fi -. ${hb_rootdir}/bin/hb-func.sh +. ${hb_rootdir}/package/mpkg_ver.sh hb_ver=`get_hbver ${hb_rootdir}` hb_filename="${hb_currdir}/harbour-${hb_ver}.src${hb_ext}" diff --git a/harbour/mpkg_nightly.sh b/harbour/package/mpkg_nightly.sh similarity index 95% rename from harbour/mpkg_nightly.sh rename to harbour/package/mpkg_nightly.sh index 239326671e..8ba75b2faf 100755 --- a/harbour/mpkg_nightly.sh +++ b/harbour/package/mpkg_nightly.sh @@ -46,12 +46,12 @@ echo Starting Harbour Project nightly source package creation... rm -f harbour-nightly-src.zip harbour-nightly.tar.bz2 harbour-nightly.tar.gz -rm -f -r _mk_nightly -mkdir _mk_nightly || { - echo "Failed to create directory _mk_nightly" +rm -f -r _hb_mpkg_src +mkdir _hb_mpkg_src || { + echo "Failed to create directory _hb_mpkg_src" exit 1 } -cd _mk_nightly +cd _hb_mpkg_src echo Downloading sources with LF line ending... @@ -74,7 +74,7 @@ echo Creating zip package... zip -q -X -r -o ../harbour-nightly-src.zip harbour/* cd .. -rm -f -r _mk_nightly +rm -f -r _hb_mpkg_src destdir="/home/frs/project/h/ha/harbour-project/source/nightly/" diff --git a/harbour/bin/hb-func.sh b/harbour/package/mpkg_ver.sh similarity index 76% rename from harbour/bin/hb-func.sh rename to harbour/package/mpkg_ver.sh index 3cdcedb1ca..a8ca65c97b 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/package/mpkg_ver.sh @@ -21,15 +21,6 @@ get_hbver() echo "${MAJOR}.${MINOR}.${RELEA}" } -get_hbver_win() -{ - hb_rootdir="${1-.}" - FVER="${hb_rootdir}/include/hbver.h" - MAJOR=`sed -e '/HB_VER_MAJOR/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"` - MINOR=`sed -e '/HB_VER_MINOR/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"` - echo "${MAJOR}${MINOR}" -} - get_hbverstat() { hb_rootdir="${1-.}"