From 35e33d1ec504f4451b27c71fe6f352a2ffe7f528 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 23 Jan 2010 11:38:03 +0000 Subject: [PATCH] 2010-01-23 12:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbide/ideprojmanager.prg ! Don't delete temp .hbp file when creating PPO file, otherwise hbmk2 couldn't find it (at least on my system). * Changed temp .hbp name to have "_tmp.hbp" appended (instead of "._tmp.hbp"). --- harbour/ChangeLog | 6 ++++++ harbour/contrib/hbide/ideprojmanager.prg | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0da9610728..3430b70b28 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-23 12:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbide/ideprojmanager.prg + ! Don't delete temp .hbp file when creating PPO file, otherwise + hbmk2 couldn't find it (at least on my system). + * Changed temp .hbp name to have "_tmp.hbp" appended (instead of "._tmp.hbp"). + 2010-01-23 12:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * Typo in last ChangeLog entry. diff --git a/harbour/contrib/hbide/ideprojmanager.prg b/harbour/contrib/hbide/ideprojmanager.prg index 22994f9c94..9cbff2dbf9 100644 --- a/harbour/contrib/hbide/ideprojmanager.prg +++ b/harbour/contrib/hbide/ideprojmanager.prg @@ -947,7 +947,7 @@ METHOD IdeProjManager:buildProject( cProject, lLaunch, lRebuild, lPPO, lViaQt ) iif( empty( ::oProject:outputName ), "_temp", ::oProject:outputName ) ) //cHbpPath := cHbpFN + iif( ::lPPO, '.' + hb_md5( hb_ntos( seconds() ) ), "" ) + ".hbp" - cHbpPath := cHbpFN + iif( ::lPPO, '._tmp', "" ) + ".hbp" + cHbpPath := cHbpFN + iif( ::lPPO, '_tmp', "" ) + ".hbp" IF !( ::lPPO ) IF ::oProject:type == "Lib" @@ -1059,7 +1059,7 @@ METHOD IdeProjManager:buildProject( cProject, lLaunch, lRebuild, lPPO, lViaQt ) #endif ELSE cOutput := "" ; cErrors := "" - nResult := hb_processRun( ( ::oProject:hbmk2dir + "hbmk2 " + iif( ::lPPO, "-hbraw ", "" ) + cHbpPath ), , @cOutput, @cErrors ) + nResult := hb_processRun( ::oProject:hbmk2dir + "hbmk2 " + iif( ::lPPO, "-hbraw ", "" ) + cHbpPath, , @cOutput, @cErrors ) cTmp := cOutput + CRLF cTmp += IIF( empty( cErrors ), "", cErrors ) + CRLF @@ -1082,10 +1082,6 @@ METHOD IdeProjManager:buildProject( cProject, lLaunch, lRebuild, lPPO, lViaQt ) ENDIF - IF ::lPPO - FErase( cHbpPath ) - ENDIF - RETURN Self /*----------------------------------------------------------------------*/