[nw10] rebase fix: icudct.dat and force linking all objs in node

rogerwang · rogerwang · commit f9b6f3f84ac6 · 2014-06-09T22:02:50.000+08:00
diff --git a/nw.gypi b/nw.gypi
@@ -832,6 +832,7 @@
           'mac_bundle': 1,
           'mac_bundle_resources': [
             'src/mac/English.lproj/HttpAuth.xib',
+            '<(PRODUCT_DIR)/icudtl.dat',
             '<(PRODUCT_DIR)/nw.pak',
             '<(PRODUCT_DIR)/locale/en-US.pak',
             '<(PRODUCT_DIR)/locale/am.pak',
@@ -897,6 +898,7 @@
             'src/shell_content_main.cc',
             'src/shell_content_main.h',
           ],
+          'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-force_load,libnode.a' ], },
           'copies': [
             {
               # Copy FFmpeg binaries for audio/video support.
diff --git a/src/shell_main_delegate.cc b/src/shell_main_delegate.cc
@@ -129,6 +129,15 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   logging::LogEventProvider::Initialize(kContentShellProviderName);
 #endif
 
+#if defined(OS_MACOSX)
+  // Needs to happen before InitializeResourceBundle() and before
+  // WebKitTestPlatformInitialize() are called.
+  OverrideFrameworkBundlePath();
+  OverrideChildProcessPath();
+  // FIXME: EnsureCorrectResolutionSettings();
+  l10n_util::OverrideLocaleWithUserDefault();
+#endif  // OS_MACOSX
+
   InitLogging();
   // FIXME: net::CookieMonster::EnableFileScheme();
 
@@ -144,11 +153,6 @@ void ShellMainDelegate::PreSandboxStartup() {
     pref_locale = command_line->GetSwitchValueASCII(switches::kLang);
   }
 
-#if defined(OS_MACOSX)
-  OverrideFrameworkBundlePath();
-  OverrideChildProcessPath();
-  l10n_util::OverrideLocaleWithUserDefault();
-#endif  // OS_MACOSX
   InitializeResourceBundle(pref_locale);
 
   std::string process_type =
