Make all pdb file names follow the same naming convention.

The new naming scheme simply appends .pdb to the target (e.g. foo.dll.pdb and foo.exe.pdb). This is beneficial for a couple reasons: * no more chrome_dll.pdb and chrome_exe.pdb silliness * also avoids this issue if we end up with similarly named targets in the future (target.dll and target.exe) * ninja already does this, and, by extension, either ninja needs to be broken to use the old scheme, or the we fix the broken in the existing system. One less difference between msvs and ninja. Fixes for chrome-internal stuff: https://chromereviews.googleplex.com/5681015 BUG= Review URL: https://codereview.chromium.org/11384003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168341 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Nov 17, 2012 · 45a7707 · 45a7707
1 parent 3fb32e1
commit 45a7707
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 36 deletions.
diff --git a/build/common.gypi b/build/common.gypi
@@ -1800,6 +1800,16 @@
               }
             }
           }],
+          ['"<(GENERATOR)"=="msvs"', {
+            'msvs_settings': {
+              'VCLinkerTool': {
+                # Make the pdb name sane. Otherwise foo.exe and foo.dll both
+                # have foo.pdb. The ninja generator already defaults to this and
+                # can't handle the $(TargetPath) macro.
+                'ProgramDatabaseFile': '$(TargetPath).pdb',
+              }
+            },
+          }],
         ],  # win_z7!=0
       }],  # OS==win
       ['enable_task_manager==1', {

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
@@ -41,7 +41,28 @@
                              '$(OutDir)\\initial\\chrome.dll',
                              '$(OutDir)\\chrome.dll'],
                   'msvs_cygwin_shell': 0,
-                }
+                },
+              ],
+              'conditions': [
+                # Only hardlink pdb if we're generating debug info.
+                ['fastbuild==0 or win_z7!=0', {
+                  'actions': [
+                    {
+                      'action_name': 'hardlink_pdb_to_output',
+                      'inputs': [
+                        # Not the pdb, since gyp doesn't know about it
+                        '$(OutDir)\\initial\\chrome.dll',
+                      ],
+                      'outputs': [
+                        '$(OutDir)\\chrome.dll.pdb',
+                      ],
+                      'action': ['tools\\build\\win\\hardlink_failsafe.bat',
+                                 '$(OutDir)\\initial\\chrome.dll.pdb',
+                                 '$(OutDir)\\chrome.dll.pdb'],
+                      'msvs_cygwin_shell': 0,
+                    }
+                  ]
+                }]
               ],
             }],
           ]
@@ -147,7 +168,6 @@
                   'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
                   'BaseAddress': '0x01c30000',
                   'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
-                  'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
                   # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
                   'SubSystem': '2',
                   'conditions': [

diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
@@ -479,7 +479,6 @@
           'msvs_settings': {
             'VCLinkerTool': {
               'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
-              'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb',
               'DelayLoadDLLs': [
                 'dbghelp.dll',
                 'dwmapi.dll',
@@ -584,7 +583,6 @@
               'msvs_settings': {
                 'VCLinkerTool': {
                   'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
-                  'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb',
                   'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
                 },
               },

diff --git a/chrome/chrome_syzygy.gyp b/chrome/chrome_syzygy.gyp
@@ -27,17 +27,17 @@
               'msvs_cygwin_shell': 0,
               'inputs': [
                 '<(PRODUCT_DIR)\\chrome.dll',
-                '<(PRODUCT_DIR)\\chrome_dll.pdb',
+                '<(PRODUCT_DIR)\\chrome.dll.pdb',
               ],
               'outputs': [
                 '<(dest_dir)\\chrome.dll',
-                '<(dest_dir)\\chrome_dll.pdb',
+                '<(dest_dir)\\chrome.dll.pdb',
               ],
               'action': [
                 'python',
                 '<(DEPTH)/chrome/tools/build/win/syzygy_reorder.py',
                 '--input_executable', '<(PRODUCT_DIR)\\chrome.dll',
-                '--input_symbol', '<(PRODUCT_DIR)\\chrome_dll.pdb',
+                '--input_symbol', '<(PRODUCT_DIR)\\chrome.dll.pdb',
                 '--destination_dir', '<(dest_dir)',
               ],
             },

diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
@@ -48,7 +48,6 @@
     },
     'VCLinkerTool': {
       'OutputFile': '<(output_dir)/mini_installer.exe',
-      'ProgramDatabaseFile': '<(output_dir)/mini_installer.pdb',
       'MapFileName': '<(output_dir)/mini_installer.map',
       'RandomizedBaseAddress': '1',
       'DataExecutionPrevention': '0',

diff --git a/chrome/test/functional/stress.py b/chrome/test/functional/stress.py
@@ -97,7 +97,7 @@ def _DownloadSymbols(self):
     # TODO: Add linux symbol_files
     if self.IsWin():
       url = url + '/win/'
-      symbol_files = ['chrome_dll.pdb', 'chrome_exe.pdb']
+      symbol_files = ['chrome.dll.pdb', 'chrome.exe.pdb']
     elif self.IsMac():
       url = url + '/mac/'
       symbol_files = map(urllib.quote,

diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
@@ -459,7 +459,7 @@ FILES = [
     'filegroup': ['symsrc'],
   },
   {
-    'filename': 'remoting_controller.pdb',
+    'filename': 'remoting_controller.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['official'],
     'archive': 'remoting-win32.zip',
@@ -472,7 +472,7 @@ FILES = [
     'filegroup': ['symsrc'],
   },
   {
-    'filename': 'remoting_daemon.pdb',
+    'filename': 'remoting_daemon.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['official'],
     'archive': 'remoting-win32.zip',
@@ -485,7 +485,7 @@ FILES = [
     'filegroup': ['symsrc'],
   },
   {
-    'filename': 'remoting_host.pdb',
+    'filename': 'remoting_host.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['official'],
     'archive': 'remoting-win32.zip',
@@ -498,7 +498,7 @@ FILES = [
     'filegroup': ['symsrc'],
   },
   {
-    'filename': 'remoting_host_plugin.pdb',
+    'filename': 'remoting_host_plugin.dll.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['official'],
     'archive': 'remoting-win32.zip',
@@ -617,13 +617,13 @@ FILES = [
     'filegroup': ['default', 'symsrc'],
   },
   {
-    'filename': 'metro_driver.pdb',
+    'filename': 'metro_driver.dll.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'delegate_execute.pdb',
+    'filename': 'delegate_execute.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['official'],
     'archive': 'chrome-win32-syms.zip',
@@ -671,109 +671,109 @@ FILES = [
     'archive': 'courgette64.exe',
   },
   {
-    'filename': 'app_host.pdb',
+    'filename': 'app_host.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'chrome_dll.pdb',
+    'filename': 'chrome.dll.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'chrome_exe.pdb',
+    'filename': 'chrome.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'libEGL.pdb',
+    'filename': 'libEGL.dll.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'libGLESv2.pdb',
+    'filename': 'libGLESv2.dll.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'mini_installer.pdb',
+    'filename': 'mini_installer.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'nacl64_exe.pdb',
+    'filename': 'nacl64.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'ppGoogleNaClPluginChrome.pdb',
+    'filename': 'ppGoogleNaClPluginChrome.dll.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'setup.pdb',
+    'filename': 'setup.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'gcp_portmon.pdb',
+    'filename': 'gcp_portmon.dll.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'gcp_portmon64.pdb',
+    'filename': 'gcp_portmon64.dll.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'virtual_driver_setup.pdb',
+    'filename': 'virtual_driver_setup.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'npchrome_frame.pdb',
+    'filename': 'npchrome_frame.dll.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'chrome_launcher.pdb',
+    'filename': 'chrome_launcher.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'chrome_frame_helper.pdb',
+    'filename': 'chrome_frame_helper.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'chrome_frame_helper_dll.pdb',
+    'filename': 'chrome_frame_helper.dll.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'syzygy/chrome_dll.pdb',
+    'filename': 'syzygy/chrome.dll.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['official'],
     'archive': 'chrome-win32-syms.zip',
   },
   {
-    'filename': 'syzygy/mini_installer.pdb',
+    'filename': 'syzygy/mini_installer.exe.pdb',
     'arch': ['32bit', '64bit'],
     'buildtype': ['official'],
     'archive': 'chrome-win32-syms.zip',

diff --git a/chrome/tools/build/win/make_chromebot_zip.sh b/chrome/tools/build/win/make_chromebot_zip.sh
@@ -47,7 +47,7 @@ popd
 zip -r $output.zip $output
 
 # Create chrome symbol zip file
-sym_files=( chrome_dll.pdb chrome_exe.pdb )
+sym_files=( chrome.dll.pdb chrome.exe.pdb )
 
 sym_output=${2:-chrome-win32-syms}
 rm -fr $sym_output $sym_output.zip

diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp
@@ -169,7 +169,6 @@
       'msvs_settings': {
         'VCLinkerTool': {
           'OutputFile': '$(OutDir)\\chrome_frame_helper.dll',
-          'ProgramDatabaseFile': '$(OutDir)\\chrome_frame_helper_dll.pdb',
           # Set /SUBSYSTEM:WINDOWS since this is not a command-line program.
           'SubSystem': '2',
         },

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
@@ -1845,7 +1845,6 @@
               ],
               'ImportLibrary': '$(OutDir)\\lib\\remoting_host_exe.lib',
               'OutputFile': '$(OutDir)\\remoting_host.exe',
-              'ProgramDatabaseFile': '$(OutDir)\\remoting_host.pdb',
               # 2 == /SUBSYSTEM:WINDOWS
               'SubSystem': '2',
             },