- Solved problem in generated error string when build-command failed.1.7.99.1

- Strip function now strips all white space (including \r and \n)

4 files changed, 5 insertions, 5 deletions

diff --git a/tools/mhmake/src/build.cpp b/tools/mhmake/src/build.cpp
index 3d31b4605..d869fd69b 100644
--- a/tools/mhmake/src/build.cpp
+++ b/tools/mhmake/src/build.cpp
@@ -1655,7 +1655,7 @@ mh_time_t mhmakefileparser::BuildTarget(const refptr<fileinfo> &Target,bool bChe
           if (!pMakefile->ExecuteCommand(Command))

           {

             string ErrorMessage = string("Error running command: ")+ Command +"\n";

-            ErrorMessage += "Command defined in makefile: " + GetMakeDir()->GetQuotedFullFileName();

+            ErrorMessage += "Command defined in makefile: " + pMakefile->GetMakeDir()->GetQuotedFullFileName();

             Target->SetCommandsMd5_32(0);  /* Clear the md5 to make sure that the target is rebuild the next time mhmake is ran */

             m_AutoDepsDirty=true;  /* We need to update the autodeps file if the md5 has been changed */

             throw ErrorMessage;

diff --git a/tools/mhmake/src/fileinfo.h b/tools/mhmake/src/fileinfo.h
index a6606b294..9be40bdbe 100644
--- a/tools/mhmake/src/fileinfo.h
+++ b/tools/mhmake/src/fileinfo.h
@@ -65,7 +65,7 @@ inline string stringify(const T& x)
   ostringstream o;

   o << x;

   return o.str();

-} 

+}

 

 #define TIMESAFETY 3

 class mh_time

diff --git a/tools/mhmake/src/functions.cpp b/tools/mhmake/src/functions.cpp
index 5b59044c7..6ba64c3c1 100644
--- a/tools/mhmake/src/functions.cpp
+++ b/tools/mhmake/src/functions.cpp
@@ -622,10 +622,10 @@ string mhmakefileparser::f_strip(const string & Arg) const
 {

   string::const_iterator pFirst=Arg.begin();

   string::const_iterator pLast=Arg.end();

-  while (strchr(" \t",*pFirst) && pFirst!=pLast) pFirst++;

+  while (strchr(" \t\r\n",*pFirst) && pFirst!=pLast) pFirst++;

   if (pFirst==pLast)

     return "";

-  while (strchr(" \t",*(--pLast)));

+  while (strchr(" \t\r\n",*(--pLast)));

   pLast++;

   return Arg.substr(pFirst-Arg.begin(),pLast-pFirst);

 }

diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h
index 0ec798ab9..578f4a3a1 100644
--- a/tools/mhmake/src/util.h
+++ b/tools/mhmake/src/util.h
@@ -50,7 +50,7 @@
 #define PLATFORM     "linux"

 #endif

 

-#define MHMAKEVER    "1.4.2"

+#define MHMAKEVER    "1.4.4"

 

 #define MAKEDEPFILE  ".makefile.dep"