Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Side by Side Diff: pylib/gyp/generator/ninja.py

Issue 24792003: homogenize msvs and ninja library_dir and libraries settings for Windows (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master
Patch Set: reland r1743 with fixed test case Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | pylib/gyp/msvs_emulation.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 Google Inc. All rights reserved. 1 # Copyright (c) 2013 Google Inc. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import copy 5 import copy
6 import hashlib 6 import hashlib
7 import multiprocessing 7 import multiprocessing
8 import os.path 8 import os.path
9 import re 9 import re
10 import signal 10 import signal
(...skipping 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 rpath += self.toolset 1048 rpath += self.toolset
1049 ldflags.append('-Wl,-rpath=\$$ORIGIN/%s' % rpath) 1049 ldflags.append('-Wl,-rpath=\$$ORIGIN/%s' % rpath)
1050 ldflags.append('-Wl,-rpath-link=%s' % rpath) 1050 ldflags.append('-Wl,-rpath-link=%s' % rpath)
1051 self.WriteVariableList(ninja_file, 'ldflags', 1051 self.WriteVariableList(ninja_file, 'ldflags',
1052 gyp.common.uniquer(map(self.ExpandSpecial, ldflags))) 1052 gyp.common.uniquer(map(self.ExpandSpecial, ldflags)))
1053 1053
1054 library_dirs = config.get('library_dirs', []) 1054 library_dirs = config.get('library_dirs', [])
1055 if self.flavor == 'win': 1055 if self.flavor == 'win':
1056 library_dirs = [self.msvs_settings.ConvertVSMacros(l, config_name) 1056 library_dirs = [self.msvs_settings.ConvertVSMacros(l, config_name)
1057 for l in library_dirs] 1057 for l in library_dirs]
1058 library_dirs = [QuoteShellArgument('-LIBPATH:' + self.GypPathToNinja(l), 1058 library_dirs = ['/LIBPATH:' + QuoteShellArgument(self.GypPathToNinja(l),
1059 self.flavor) 1059 self.flavor)
1060 for l in library_dirs] 1060 for l in library_dirs]
1061 else: 1061 else:
1062 library_dirs = [QuoteShellArgument('-L' + self.GypPathToNinja(l), 1062 library_dirs = [QuoteShellArgument('-L' + self.GypPathToNinja(l),
1063 self.flavor) 1063 self.flavor)
1064 for l in library_dirs] 1064 for l in library_dirs]
1065 1065
1066 libraries = gyp.common.uniquer(map(self.ExpandSpecial, 1066 libraries = gyp.common.uniquer(map(self.ExpandSpecial,
1067 spec.get('libraries', []))) 1067 spec.get('libraries', [])))
1068 if self.flavor == 'mac': 1068 if self.flavor == 'mac':
1069 libraries = self.xcode_settings.AdjustLibraries(libraries, config_name) 1069 libraries = self.xcode_settings.AdjustLibraries(libraries, config_name)
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
2124 arglists.append( 2124 arglists.append(
2125 (target_list, target_dicts, data, params, config_name)) 2125 (target_list, target_dicts, data, params, config_name))
2126 pool.map(CallGenerateOutputForConfig, arglists) 2126 pool.map(CallGenerateOutputForConfig, arglists)
2127 except KeyboardInterrupt, e: 2127 except KeyboardInterrupt, e:
2128 pool.terminate() 2128 pool.terminate()
2129 raise e 2129 raise e
2130 else: 2130 else:
2131 for config_name in config_names: 2131 for config_name in config_names:
2132 GenerateOutputForConfig(target_list, target_dicts, data, params, 2132 GenerateOutputForConfig(target_list, target_dicts, data, params,
2133 config_name) 2133 config_name)
OLDNEW
« no previous file with comments | « no previous file | pylib/gyp/msvs_emulation.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698