stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r588290 - /incubator/stdcxx/branches/4.2.x/etc/config/windows/projectdef.js
Date Thu, 25 Oct 2007 17:40:21 GMT
Author: faridz
Date: Thu Oct 25 10:40:21 2007
New Revision: 588290

URL: http://svn.apache.org/viewvc?rev=588290&view=rev
Log:
2007-10-25 Farid Zaripov <farid_zaripov@epam.com>

	* projectdef.js (projectCreateVCProject): Generate .pdb file
	in $(OutDir) instead of $(IntDir). Use common .pdb file
	instead of two (compiler's and linker's).

Modified:
    incubator/stdcxx/branches/4.2.x/etc/config/windows/projectdef.js

Modified: incubator/stdcxx/branches/4.2.x/etc/config/windows/projectdef.js
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/etc/config/windows/projectdef.js?rev=588290&r1=588289&r2=588290&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/etc/config/windows/projectdef.js (original)
+++ incubator/stdcxx/branches/4.2.x/etc/config/windows/projectdef.js Thu Oct 25 10:40:21 2007
@@ -411,6 +411,23 @@
 
         var allMacros = prjMacros.concat(cfgMacros);
 
+        var OutFile = this.OutFile != null ?
+            ReplaceMacros(this.OutFile, allMacros) :
+            "$(OutDir)\\" + PrjName + ext;
+
+        var IngoreLibs = "";
+        if (confInfo.dll)
+        {
+            IngoreLibs = confInfo.debug ? "msvcprtd.lib" : "msvcprt.lib";
+        }
+        else
+        {
+            if (confInfo.mt || NOSTCRT)
+                IngoreLibs = confInfo.debug ? "libcpmtd.lib" : "libcpmt.lib";
+            else
+                IngoreLibs = confInfo.debug ? "libcpd.lib" : "libcp.lib";
+        }
+
         var compiler = conf.Tools.Item("VCCLCompilerTool");
         if (null != compiler)
         {
@@ -423,6 +440,7 @@
             if (null != this.PrepOpts)
                 compiler.GeneratePreprocessedFile = this.PrepOpts;
             compiler.DebugInformationFormat = debugEnabled;
+            compiler.ProgramDataBaseFileName = changeFileExt(OutFile, "pdb");
             compiler.SuppressStartupBanner = true;
             compiler.WarningLevel = warningLevel_3;
             setProperty(compiler.Detect64BitPortabilityProblems, false);
@@ -486,28 +504,17 @@
             linker.AdditionalOptions = LDFLAGS + " " +
                 (null != this.LnkOpts ? this.LnkOpts : "");
 
-            linker.LinkIncremental = linkIncrementalNo;
-            linker.SuppressStartupBanner = true;
-            linker.GenerateDebugInformation = true;
             if (null != this.Libs)
                 linker.AdditionalDependencies = this.Libs;
 
-            if (confInfo.dll)
-            {
-                linker.IgnoreDefaultLibraryNames =
-                    confInfo.debug ? "msvcprtd.lib" : "msvcprt.lib";
-            }
-            else
-            {
-                if (confInfo.mt || NOSTCRT)
-                    linker.IgnoreDefaultLibraryNames =
-                        confInfo.debug ? "libcpmtd.lib" : "libcpmt.lib";
-                else
-                    linker.IgnoreDefaultLibraryNames =
-                        confInfo.debug ? "libcpd.lib" : "libcp.lib";
-            }
-
+            linker.LinkIncremental = linkIncrementalNo;
+            linker.SuppressStartupBanner = true;
+            linker.GenerateDebugInformation = true;
+            // use the compiler's .pdb
+            linker.ProgramDatabaseFile = "";
+            linker.IgnoreDefaultLibraryNames = IngoreLibs;
             linker.SubSystem = this.SubSystem;
+
             if (confInfo.debug)
             {
                 linker.OptimizeReferences = optReferencesDefault;
@@ -519,12 +526,7 @@
                 linker.EnableCOMDATFolding = optFolding;
             }
 
-            if (this.OutFile != null)
-                linker.OutputFile = ReplaceMacros(this.OutFile, allMacros);
-            else
-                linker.OutputFile = "$(OutDir)\\" + PrjName + ext;
-
-            linker.ProgramDatabaseFile = changeFileExt(linker.OutputFile, "pdb");
+            linker.OutputFile = OutFile;
 
             if (this.Type != typeApplication)
                 linker.ImportLibrary = changeFileExt(linker.OutputFile, "lib");
@@ -537,10 +539,8 @@
                 linker.AdditionalOptions = this.LibOpts;
                 
             librarian.SuppressStartupBanner = true;
-            if (this.OutFile != null)
-                librarian.OutputFile = ReplaceMacros(this.OutFile, allMacros);
-            else
-                librarian.OutputFile = "$(OutDir)\\" + PrjName + ".lib";
+            librarian.IgnoreDefaultLibraryNames = IngoreLibs;
+            librarian.OutputFile = OutFile;
         }
 
         if (null != this.PreLinkCmd)



Mime
View raw message