[cmake-commits] king committed cmLocalGenerator.cxx 1.196 1.197 cmMakefileExecutableTargetGenerator.cxx 1.26 1.27 cmMakefileLibraryTargetGenerator.cxx 1.31 1.32 cmMakefileTargetGenerator.cxx 1.55 1.56

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv3946

Modified Files:
	cmLocalGenerator.cxx cmMakefileExecutableTargetGenerator.cxx 
	cmMakefileLibraryTargetGenerator.cxx 
	cmMakefileTargetGenerator.cxx 
Log Message:
BUG: Some calls to Convert() were converting for MAKEFILE but then passing the output to the build shell.  The calls have now been converted to call Convert() with SHELL.


Index: cmMakefileLibraryTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileLibraryTargetGenerator.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- cmMakefileLibraryTargetGenerator.cxx	1 Feb 2007 21:52:52 -0000	1.31
+++ cmMakefileLibraryTargetGenerator.cxx	8 Mar 2007 15:31:03 -0000	1.32
@@ -148,7 +148,7 @@
         extraFlags += 
           this->Convert((*i)->GetFullPath().c_str(),
                         cmLocalGenerator::START_OUTPUT,
-                        cmLocalGenerator::MAKEFILE);
+                        cmLocalGenerator::SHELL);
         }
       }
     }
@@ -269,19 +269,19 @@
   // arguments.
   std::string targetOutPathPDB = 
     this->Convert(targetFullPathPDB.c_str(),cmLocalGenerator::FULL,
-                  cmLocalGenerator::MAKEFILE);
+                  cmLocalGenerator::SHELL);
   std::string targetOutPath = 
     this->Convert(targetFullPath.c_str(),cmLocalGenerator::START_OUTPUT,
-                  cmLocalGenerator::MAKEFILE);
+                  cmLocalGenerator::SHELL);
   std::string targetOutPathSO = 
     this->Convert(targetFullPathSO.c_str(),cmLocalGenerator::START_OUTPUT,
-                  cmLocalGenerator::MAKEFILE);
+                  cmLocalGenerator::SHELL);
   std::string targetOutPathReal = 
     this->Convert(targetFullPathReal.c_str(),cmLocalGenerator::START_OUTPUT,
-                  cmLocalGenerator::MAKEFILE);
+                  cmLocalGenerator::SHELL);
   std::string targetOutPathImport =
     this->Convert(targetFullPathImport.c_str(),cmLocalGenerator::START_OUTPUT,
-                  cmLocalGenerator::MAKEFILE);
+                  cmLocalGenerator::SHELL);
 
   // Add the link message.
   std::string buildEcho = "Linking ";
@@ -566,21 +566,7 @@
   objdir += this->Target->GetName();
   objdir += ".dir";
   vars.ObjectDir = objdir.c_str(); 
-  std::string targetLinkScriptPathReal;
-  if(useLinkScript)
-    {
-    // Paths in the link script are interpreted directly by the shell
-    // and not make.
-    targetLinkScriptPathReal =
-      this->Convert(targetFullPathReal.c_str(),
-                    cmLocalGenerator::START_OUTPUT,
-                    cmLocalGenerator::SHELL);
-    vars.Target = targetLinkScriptPathReal.c_str();
-    }
-  else
-    {
-    vars.Target = targetOutPathReal.c_str();
-    }
+  vars.Target = targetOutPathReal.c_str();
   std::string linkString = linklibs.str();
   vars.LinkLibraries = linkString.c_str();
   vars.ObjectsQuoted = buildObjs.c_str();

Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- cmLocalGenerator.cxx	8 Mar 2007 13:38:40 -0000	1.196
+++ cmLocalGenerator.cxx	8 Mar 2007 15:31:03 -0000	1.197
@@ -1320,7 +1320,7 @@
             linkFlags += 
               this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
             linkFlags += this->Convert((*i)->GetFullPath().c_str(),
-                                       START_OUTPUT,MAKEFILE);
+                                       START_OUTPUT, SHELL);
             linkFlags += " ";
             }
           }

Index: cmMakefileExecutableTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileExecutableTargetGenerator.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- cmMakefileExecutableTargetGenerator.cxx	1 Feb 2007 21:52:52 -0000	1.26
+++ cmMakefileExecutableTargetGenerator.cxx	8 Mar 2007 15:31:03 -0000	1.27
@@ -192,16 +192,16 @@
   std::string targetOutPathPDB = 
     this->Convert(targetFullPathPDB.c_str(),
                   cmLocalGenerator::FULL,
-                  cmLocalGenerator::MAKEFILE); 
+                  cmLocalGenerator::SHELL);
   // Convert to the output path to use in constructing commands.
   std::string targetOutPath =
     this->Convert(targetFullPath.c_str(),
                   cmLocalGenerator::START_OUTPUT,
-                  cmLocalGenerator::MAKEFILE); 
+                  cmLocalGenerator::SHELL);
   std::string targetOutPathReal =
     this->Convert(targetFullPathReal.c_str(),
                   cmLocalGenerator::START_OUTPUT,
-                  cmLocalGenerator::MAKEFILE);
+                  cmLocalGenerator::SHELL);
   
   // Get the language to use for linking this executable.
   const char* linkLanguage =

Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- cmMakefileTargetGenerator.cxx	20 Feb 2007 17:28:22 -0000	1.55
+++ cmMakefileTargetGenerator.cxx	8 Mar 2007 15:31:03 -0000	1.56
@@ -480,7 +480,7 @@
     }
   targetOutPathPDB =
     this->Convert(targetFullPathPDB.c_str(),cmLocalGenerator::FULL,
-                  cmLocalGenerator::MAKEFILE);
+                  cmLocalGenerator::SHELL);
   }
   cmLocalGenerator::RuleVariables vars;
   vars.Language = lang;