mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-29 10:39:49 +01:00
5a5d2caff2
- Linux/Mac: Load V8 initial snapshot from external bin files (see http://crbug.com/421063). - Windows: 8.1 SDK is now required (issue #1470). - Remove CefDOMDocument::GetSelectionStartNode and GetSelectionEndNode methods(see https://codereview.chromium.org/763043004). - Rename internal namespace used in base headers to avoid linker conflicts with cef_sandbox.lib. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1956 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
23 lines
1020 B
Diff
23 lines
1020 B
Diff
diff --git gyp/generator/ninja.py gyp/generator/ninja.py
|
|
index 5cda5c3..bad5ca3 100644
|
|
--- gyp/generator/ninja.py
|
|
+++ gyp/generator/ninja.py
|
|
@@ -743,7 +743,16 @@ class NinjaWriter(object):
|
|
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)
|