[Hugin-cvs] /hgroot/hugin/hugin: Make make aware of Hugins internal tempdir ...

[<hug...@li...>]

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/a798739317aa
changeset:  6149:a798739317aa
user:       tmodes
date:       Thu Feb 07 18:49:23 2013 +0100
description:

Make make aware of Hugins internal tempdir (Windows only) [791677]

diffstat:

 src/hugin1/base_wx/RunStitchPanel.cpp |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 37244ecf0c3b -r a798739317aa src/hugin1/base_wx/RunStitchPanel.cpp
--- a/src/hugin1/base_wx/RunStitchPanel.cpp	Wed Feb 06 20:55:03 2013 +0100
+++ b/src/hugin1/base_wx/RunStitchPanel.cpp	Thu Feb 07 18:49:23 2013 +0100
@@ -118,8 +118,14 @@
     wxString cmdExe;
     if(!wxGetEnv(wxT("ComSpec"),&cmdExe))
         cmdExe=wxT("cmd");
-    wxString cmd = cmdExe + wxString::Format(wxT(" /C \"chcp %d >NUL && "),GetACP())+
-        wxT("\"") + getExePath(wxTheApp->argv[0])+wxT("\\make\" ") + args + wxT("\"");
+    wxString tempDir=wxConfigBase::Get()->Read(wxT("tempDir"),wxT(""));
+    wxString cmd = cmdExe + wxString::Format(wxT(" /C \"chcp %d >NUL && "),GetACP());
+    //explicit set temp path for make, e. g. in case user name contains an ampersand
+    if(tempDir.Len()>0)
+    {
+        cmd=cmd + wxT("set TEMP=")+tempDir + wxT(" && set TMP=") + tempDir + wxT(" && ");
+    };
+    cmd = cmd +  wxT("\"") + getExePath(wxTheApp->argv[0])+wxT("\\make\" ") + args + wxT("\"");
 #else
     wxString cmd = wxT("make ") + args;  
 #endif