fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-07-03 13:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2009-07-03 11:35:58 +00:00
parent c244abe73d
commit 8d4718d48f
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

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

14
harbour/bin/postinst.bat
View File

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

12
harbour/utils/hbmk2/hbmk2.prg
View File

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