From 8d4718d48fb1287d19f09aee776d37862dee5e64 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 3 Jul 2009 11:35:58 +0000
Subject: [PATCH] 2009-07-03 13:35 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * bin/postinst.bat     ! Fixed recently added copy command for
 DOS builds.

  * utils/hbmk2/hbmk2.prg
    % Don't spawn new thread if there is only one job.
---
 harbour/ChangeLog             |  7 +++++++
 harbour/bin/postinst.bat      | 14 +++++++++-----
 harbour/utils/hbmk2/hbmk2.prg | 12 ++++++------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 56c48b92bb..80bec6f8ec 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-03 13:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * bin/postinst.bat
+    ! Fixed recently added copy command for DOS builds.
+
+  * utils/hbmk2/hbmk2.prg
+    % Don't spawn new thread if there is only one job.
+
 2009-07-03 12:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/win/dir.cf
   * config/wce/dir.cf
diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat
index 7e8cbb5f71..9f9fa56763 100644
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -20,11 +20,15 @@ echo arch=%HB_ARCHITECTURE%>> %HB_BIN_INSTALL%\hbmk.cfg
 echo comp=%HB_COMPILER%>> %HB_BIN_INSTALL%\hbmk.cfg
 
 rem ; Post-build installation
-if not "%HB_INSTALL_PREFIX%" == "" copy /Y ChangeLog* "%HB_INSTALL_PREFIX%\" > nul
-if not "%HB_INSTALL_PREFIX%" == "" copy /Y COPYING    "%HB_INSTALL_PREFIX%\" > nul
-if not "%HB_INSTALL_PREFIX%" == "" copy /Y ERRATA     "%HB_INSTALL_PREFIX%\" > nul
-if not "%HB_INSTALL_PREFIX%" == "" copy /Y INSTALL    "%HB_INSTALL_PREFIX%\" > nul
-if not "%HB_INSTALL_PREFIX%" == "" copy /Y TODO       "%HB_INSTALL_PREFIX%\" > nul
+set _HB_COPYCMD=%COPYCMD%
+set COPYCMD=/Y
+if not "%HB_INSTALL_PREFIX%" == "" copy ChangeLog* "%HB_INSTALL_PREFIX%\" > nul
+if not "%HB_INSTALL_PREFIX%" == "" copy COPYING    "%HB_INSTALL_PREFIX%\" > nul
+if not "%HB_INSTALL_PREFIX%" == "" copy ERRATA     "%HB_INSTALL_PREFIX%\" > nul
+if not "%HB_INSTALL_PREFIX%" == "" copy INSTALL    "%HB_INSTALL_PREFIX%\" > nul
+if not "%HB_INSTALL_PREFIX%" == "" copy TODO       "%HB_INSTALL_PREFIX%\" > nul
+set COPYCMD=%_HB_COPYCMD%
+set _HB_COPYCMD=
 
 goto INST_%HB_ARCHITECTURE%
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 7b1157a616..47395271ef 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3153,7 +3153,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
             ENDIF
 
             IF ! hbmk[ _HBMK_lDONTEXEC ]
-               IF hb_mtvm()
+               IF hb_mtvm() .AND. Len( aTODO:__enumBase() ) > 1
                   AAdd( aThreads, { hb_threadStart( @hb_compile(), "harbour", aCommand ), aCommand } )
                ELSE
                   IF ( tmp := hb_compile( "harbour", aCommand ) ) != 0
@@ -3171,7 +3171,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
             ENDIF
          NEXT
 
-         IF hb_mtvm()
+         IF hb_mtvm() .AND. Len( aThreads ) > 1
             FOR EACH thread IN aThreads
                hb_threadJoin( thread[ 1 ], @tmp )
                IF tmp != 0
@@ -3586,7 +3586,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
 
                aThreads := {}
                FOR EACH aTODO IN ArraySplit( ArrayJoin( ListDirExt( l_aPRG_TODO, cWorkDir, ".c" ), l_aC_TODO ), l_nJOBS )
-                  IF hb_mtvm()
+                  IF hb_mtvm() .AND. Len( aTODO:__enumBase() ) > 1
                      AAdd( aThreads, hb_threadStart( @CompileCLoop(), hbmk, aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cObjExt, nOpt_Esc, aTODO:__enumIndex(), Len( aTODO:__enumBase() ) ) )
                   ELSE
                      IF ! CompileCLoop( hbmk, aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cObjExt, nOpt_Esc )
@@ -3595,7 +3595,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
                   ENDIF
                NEXT
 
-               IF hb_mtvm()
+               IF hb_mtvm() .AND. Len( aThreads ) > 1
                   FOR EACH thread IN aThreads
                      hb_threadJoin( thread, @tmp )
                      IF ! tmp
@@ -3642,7 +3642,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
                   ENDIF
 
                   IF ! hbmk[ _HBMK_lDONTEXEC ]
-                     IF hb_mtvm()
+                     IF hb_mtvm() .AND. Len( aTODO:__enumBase() ) > 1
                         AAdd( aThreads, { hb_threadStart( @hbmk_run(), cCommand ), cCommand } )
                      ELSE
                         IF ( tmp := hbmk_run( cCommand ) ) != 0
@@ -3660,7 +3660,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
                   ENDIF
                NEXT
 
-               IF hb_mtvm()
+               IF hb_mtvm() .AND. Len( aThreads ) > 1
                   FOR EACH thread IN aThreads
                      hb_threadJoin( thread[ 1 ], @tmp )
                      IF tmp != 0