2009-02-24 22:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* harbour-win-spec
  * harbour-wce-spec
  * harbour.spec
  * bin/hb-func.sh
  * utils/hbmk2/hbmk2.prg
    * hbmkcfg.hbp file renamed to the clearer: hbmk.cfg
      Same rules apply, the format is .hbp, which is also
      made clear on the hbmk2 help screen.

      hbmk2 and hbmk.cfg now effecticely replaces harbour.cfg,
      which can now be considered obsolete, along with the
      /go option. If someone knows some real-life tasks
      which can be done with /go+harbour.cfg, but cannot
      with hbmk2, please speak up.

harbour/ChangeLog

@@ -8,6 +8,22 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-24 22:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * harbour-win-spec
+  * harbour-wce-spec
+  * harbour.spec
+  * bin/hb-func.sh
+  * utils/hbmk2/hbmk2.prg
+    * hbmkcfg.hbp file renamed to the clearer: hbmk.cfg
+      Same rules apply, the format is .hbp, which is also
+      made clear on the hbmk2 help screen.
+
+      hbmk2 and hbmk.cfg now effecticely replaces harbour.cfg,
+      which can now be considered obsolete, along with the
+      /go option. If someone knows some real-life tasks
+      which can be done with /go+harbour.cfg, but cannot
+      with hbmk2, please speak up.
+
 2009-02-24 22:12 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * harbour-win-spec
   * harbour-wce-spec

harbour/bin/hb-func.sh

@@ -224,7 +224,7 @@ mk_hbtools()
         CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -fpic"
     fi
 
-    hb_hbmkcfg="$1/hbmkcfg.hbp"
+    hb_hbmkcfg="$1/hbmk.cfg"
     echo "Generating ${hb_hbmkcfg}... "
     echo "# Harbour Make configuration"> ${hb_hbmkcfg}
     echo "# Generated by Harbour build process">> ${hb_hbmkcfg}

harbour/harbour-wce-spec

@@ -296,7 +296,7 @@ rm -fR $RPM_BUILD_ROOT
 %{_bindir}/%{hb_pref}cmp
 %{_bindir}/%{hb_pref}lnk
 %{_bindir}/%{hb_pref}mk
-%{_bindir}/hbmkcfg.hbp
+%{_bindir}/hbmk.cfg
 
 %defattr(644,root,root,755)
 %dir %{_includedir}/%{name}

harbour/harbour-win-spec

@@ -296,7 +296,7 @@ rm -fR $RPM_BUILD_ROOT
 %{_bindir}/%{hb_pref}cmp
 %{_bindir}/%{hb_pref}lnk
 %{_bindir}/%{hb_pref}mk
-%{_bindir}/hbmkcfg.hbp
+%{_bindir}/hbmk.cfg
 
 %defattr(644,root,root,755)
 %dir %{_includedir}/%{name}

harbour/harbour.spec

@@ -616,7 +616,7 @@ rm -rf $RPM_BUILD_ROOT
 #%{_bindir}/hbtest
 %{_bindir}/hbrun
 %{_bindir}/hbi18n
-%{_bindir}/hbmkcfg.hbp
+%{_bindir}/hbmk.cfg
 %{_bindir}/hbmk2
 %{_mandir}/man1/*.1*
 %dir %{_includedir}/%{name}

harbour/utils/hbmk2/hbmk2.prg

@@ -2022,7 +2022,7 @@ STATIC FUNCTION FN_ExtSet( cFileName, cExt )
 
    RETURN hb_FNameMerge( cDir, cName, cExt )
 
-#define HBMK_CFG_NAME  "hbmkcfg.hbp"
+#define HBMK_CFG_NAME  "hbmk.cfg"
 
 STATIC PROCEDURE HBP_ProcessAll( lConfigOnly,;
                                  /* @ */ aLIBUSER,;
@@ -2046,10 +2046,10 @@ STATIC PROCEDURE HBP_ProcessAll( lConfigOnly,;
    LOCAL cDir
    LOCAL cFileName
 
-   LOCAL aCFGDirs := { DirAddPathSep( hb_DirBase() ) }
+   LOCAL aCFGDirs := { hb_DirBase() }
 
    FOR EACH cDir IN aCFGDirs
-      IF hb_FileExists( cFileName := ( cDir + HBMK_CFG_NAME ) )
+      IF hb_FileExists( cFileName := ( DirAddPathSep( cDir ) + HBMK_CFG_NAME ) )
          IF t_lInfo
             OutStd( "hbmk: Processing configuration: " + cFileName + hb_osNewLine() )
          ENDIF
@@ -2552,7 +2552,7 @@ STATIC PROCEDURE ShowHelp( lLong )
       "  - Regular Harbour options are also accepted." ,;
       "  - Multiple -l, -L and <script> parameters are accepted." ,;
       "  - " + HBMK_CFG_NAME + " option file in hbmk directory is always processed if it" ,;
-      "    exists." ,;
+      "    exists. The format is the same as for .hbp files." ,;
       "  - .hbp option files in current dir are automatically processed." ,;
       "  - .hbp options (they should come in separate lines):" ,;
       "    libs=[<libname[s]>], gt=[gtname], prgflags=[Harbour flags]" ,;