mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
cb907f3649
- Mac: Remove Carbon interpose library (see http://crbug.com/157130). - Remove unused LOGSEVERITY_ERROR_REPORT value (see http://crbug.com/352378). - CefURLRequest in the render process will now always have the UR_FLAG_REPORT_LOAD_TIMING flag set (see http://crbug.com/376025#c15). - Change CefGeolocationHandler::OnRequestGeolocationPermission return value from void to boolean. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1753 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
23 lines
1.0 KiB
Diff
23 lines
1.0 KiB
Diff
Index: gyp/generator/ninja.py
|
|
===================================================================
|
|
--- gyp/generator/ninja.py (revision 1944)
|
|
+++ gyp/generator/ninja.py (working copy)
|
|
@@ -740,7 +740,16 @@
|
|
for path in copy['files']:
|
|
# Normalize the path so trailing slashes don't confuse us.
|
|
path = os.path.normpath(path)
|
|
- basename = os.path.split(path)[1]
|
|
+ (parent_path, basename) = os.path.split(path)
|
|
+
|
|
+ # Xcode uses .lproj directories for localized resources. Add a special
|
|
+ # case to maintain the localization directory component if present.
|
|
+ if parent_path != '':
|
|
+ parent_basename = os.path.basename(parent_path)
|
|
+ (parent_root, parent_ext) = os.path.splitext(parent_basename)
|
|
+ if parent_ext == '.lproj':
|
|
+ basename = os.path.join(parent_basename, basename)
|
|
+
|
|
src = self.GypPathToNinja(path, env)
|
|
dst = self.GypPathToNinja(os.path.join(copy['destination'], basename),
|
|
env)
|