mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-04-18 04:37:24 +02:00
f7aa98fe69
- Building on Windows now requires the Windows 10.0.10586 SDK. - Remove CefParseCSSColor which was implemented using Blink code in the browser process. This is longer advisable now that the Oilpan GC is enabled. - Avoid potential renderer process crashes by disabling script actions on the CefV8Context passed to CefRenderProcessHandler::OnContextReleased.
23 lines
1020 B
Diff
23 lines
1020 B
Diff
diff --git gyp/generator/ninja.py gyp/generator/ninja.py
|
|
index 552b2f8..3d61233 100644
|
|
--- gyp/generator/ninja.py
|
|
+++ gyp/generator/ninja.py
|
|
@@ -747,7 +747,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)
|