Adds support for the library_dirs key, which appears in the documentation but was never actually im…

pylib/gyp/generator/xcode.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import filecmp
 import gyp.common
 import gyp.xcodeproj_file
 import errno
 import os
 import sys
@@ skipping 1175 matching lines @@
     # no compelling reason for Xcode's linker invocations to differ.
 
     if 'dependencies' in spec:
       for dependency in spec['dependencies']:
         xct.AddDependency(xcode_targets[dependency])
         # The support project also gets the dependencies (in case they are
         # needed for the actions/rules to work).
         if support_xct:
           support_xct.AddDependency(xcode_targets[dependency])
 
+    def Quote(s):
+      return '"%s"' % s

[Mark Mentovai, 2013/05/29 13:23:07]

?

This isn’t the right way to quote something. What if it has embedded quotation
marks? I’m sure we already have a quoting function that does what you want.

But why do you need to quote a library_dir at all? AppendBuildSetting should
take care of this for you.

[Dimi Shahbaz, 2013/05/29 21:32:41]

Done.

+
     if 'libraries' in spec:
       for library in spec['libraries']:
         xct.FrameworksPhase().AddFile(library)
         # Add the library's directory to LIBRARY_SEARCH_PATHS if necessary.
         # I wish Xcode handled this automatically.
         library_dir = posixpath.dirname(library)
         if library_dir not in xcode_standard_library_dirs and (
             not xct.HasBuildSetting(_library_search_paths_var) or
             library_dir not in xct.GetBuildSetting(_library_search_paths_var)):
           xct.AppendBuildSetting(_library_search_paths_var, library_dir)
 
     for configuration_name in configuration_names:
       configuration = spec['configurations'][configuration_name]
       xcbc = xct.ConfigurationNamed(configuration_name)
       for include_dir in configuration.get('mac_framework_dirs', []):
         xcbc.AppendBuildSetting('FRAMEWORK_SEARCH_PATHS', include_dir)
       for include_dir in configuration.get('include_dirs', []):
         xcbc.AppendBuildSetting('HEADER_SEARCH_PATHS', include_dir)
+      for library_dir in configuration.get('library_dirs', []):
+        if library_dir not in xcode_standard_library_dirs and (
+            not xcbc.HasBuildSetting(_library_search_paths_var) or
+            library_dir not in xcbc.GetBuildSetting(_library_search_paths_var)):
+          xcbc.AppendBuildSetting(_library_search_paths_var, Quote(library_dir))
+
       if 'defines' in configuration:
         for define in configuration['defines']:
           set_define = EscapeXCodeArgument(define)
           xcbc.AppendBuildSetting('GCC_PREPROCESSOR_DEFINITIONS', set_define)
       if 'xcode_settings' in configuration:
         for xck, xcv in configuration['xcode_settings'].iteritems():
           xcbc.SetBuildSetting(xck, xcv)
       if 'xcode_config_file' in configuration:
         config_ref = pbxp.AddOrGetFileInRootGroup(
             configuration['xcode_config_file'])
         xcbc.SetBaseConfiguration(config_ref)
 
   build_files = []
   for build_file, build_file_dict in data.iteritems():
     if build_file.endswith('.gyp'):
       build_files.append(build_file)
 
   for build_file in build_files:
     xcode_projects[build_file].Finalize1(xcode_targets, serialize_all_tests)
 
   for build_file in build_files:
     xcode_projects[build_file].Finalize2(xcode_targets,
                                          xcode_target_to_target_dict)
 
   for build_file in build_files:
     xcode_projects[build_file].Write()