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

* contrib/make.hbs
  * contrib/hbpre.hbm
    ! Fixed -build option to be always passed on the cmdline.
    % Cleaned 'hbmk2 --hbinfo' cmdline.

harbour/ChangeLog

@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-09 22:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/make.hbs
+  * contrib/hbpre.hbm
+    ! Fixed -build option to be always passed on the cmdline.
+    % Cleaned 'hbmk2 --hbinfo' cmdline.
+
 2010-07-09 22:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + --hbrefs option renamed to --hbinfo and now also includes

harbour/contrib/hbpre.hbm

@@ -9,7 +9,6 @@
 {_HB_BUILD_MIGR}-trace
 
 {!HB_BUILD_DEBUG}-l
-{HB_BUILD_NAME}-build=${HB_BUILD_NAME}
 
 {HB_BUILD_MODE='cpp'}-cpp=yes
 {HB_BUILD_MODE='c'}-cpp=no

harbour/contrib/make.hbs

@@ -549,7 +549,7 @@ STATIC FUNCTION call_hbmk2_dept( cBinDir, cProject, /* @ */ cType )
    LOCAL tmp, tmp1
    LOCAL aList := {}
 
-   hb_processRun( PathSepToSelf( cBinDir ) + "hbmk2" + " -quiet -lang=en -width=0 -q0 --hbinfo " + cProject,, @tmp  )
+   hb_processRun( PathSepToSelf( cBinDir ) + "hbmk2 --hbinfo " + cProject,, @tmp  )
 
    IF ( tmp1 := At( "targettype{{", tmp ) ) > 0
       tmp := SubStr( tmp, tmp1 + Len( "targettype{{" ) )
@@ -576,6 +576,10 @@ STATIC FUNCTION call_hbmk2_dept( cBinDir, cProject, /* @ */ cType )
 STATIC FUNCTION call_hbmk2( cBinDir, cProject, cOptionsPre, cOptionsPost )
    LOCAL nErrorLevel
 
+   IF ! Empty( GetEnv( "HB_BUILD_NAME" ) )
+      cOptionsPre += " -build=" + GetEnv( "HB_BUILD_NAME" )
+   ENDIF
+
    nErrorLevel := mk_hb_processRun( PathSepToSelf( cBinDir ) + "hbmk2" +;
                                     " -lang=en -width=0 @" + s_cHome + "hbpre" + cOptionsPre +;
                                     " " + cProject +;