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

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

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=<libsrc.a> -plugin=hbmk_l2d.hbs -o<dynlibdst> -nohblib-'
+ *    'hbmk2 -hbdyn -pi=<libsrc.a> -plugin=hbmk2l2d.hbs -o<dynlibdst> -nohblib-'
   *
  * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
  * www - http://harbour-project.org

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

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"

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"

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

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/"
 

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