Replace icu38/icu38.gyp with icu/icu.gyp in gyp files replace all the references to third_party/icu38 and icudt38.dll with third_party/icu and icudt42.dll in vsprops and cc files. Also, update the icu data module name and the icu data symbol in icu_util.cc

In addition, add a dummy C++ source file (xmldummy_mac.cc) to libxml to work around an Xcode bug (xmllint and xmlcatalog are linked with gcc rather than g++ even though it's linked to a "C++ library", libicuuc.a). 

Also updated is the test results for net_util_unittests.


This will not be landed until deps/third_party/icu42 is ready for all 3 platforms (Windows VS build files are not yet updated there). 

BUG=8198
TEST=On all platforms, all the targets are built fine.

Review URL: http://codereview.chromium.org/172031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25708 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 21 insertions, 11 deletions

diff --git a/third_party/libxml/README.chromium b/third_party/libxml/README.chromium
index 659e650..8c7a407 100644
--- a/third_party/libxml/README.chromium
+++ b/third_party/libxml/README.chromium
@@ -17,6 +17,7 @@ includes the following modifications :
   (http://bugzilla.gnome.org/show_bug.cgi?id=502960 )
 * Applied security patch located at https://bugzilla.redhat.com/show_bug.cgi?id=461015
 * Applied v2.6.26 version of security patch located at https://bugzilla.redhat.com/show_bug.cgi?id=515195
+* Add an empty source file, xmldummy_mac.cc, to the tree to work around an Xcode bug.
 
 Current version: 2.6.32
 
diff --git a/third_party/libxml/build/libxml.vsprops b/third_party/libxml/build/libxml.vsprops
index a8392e2c..0a35f12 100644
--- a/third_party/libxml/build/libxml.vsprops
+++ b/third_party/libxml/build/libxml.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="libxml"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\icu\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index 848c857..16f49d8 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -158,11 +158,11 @@
             'include',
           ],
           'dependencies': [
-            '../icu38/icu38.gyp:icuuc',
+            '../icu/icu.gyp:icuuc',
             '../zlib/zlib.gyp:zlib',
           ],
           'export_dependent_settings': [
-            '../icu38/icu38.gyp:icuuc',
+            '../icu/icu.gyp:icuuc',
           ],
           'direct_dependent_settings': {
             'defines': [
@@ -189,6 +189,7 @@
       'type': 'executable',
       'sources': [
         'xmlcatalog.c',
+        'xmldummy_mac.cc',
       ],
       'include_dirs': [
         '<(os_include)',
@@ -212,13 +213,14 @@
       'type': 'executable',
       'sources': [
         'xmllint.c',
+        'xmldummy_mac.cc',
       ],
       'include_dirs': [
         '<(os_include)',
       ],
       'dependencies': [
         'libxml',
-        '../icu38/icu38.gyp:icuuc',
+        '../icu/icu.gyp:icuuc',
       ],
       'conditions': [
         ['OS=="linux"', {
diff --git a/third_party/libxml/xmldummy_mac.cc b/third_party/libxml/xmldummy_mac.cc
new file mode 100644
index 0000000..181fd34
--- /dev/null
+++ b/third_party/libxml/xmldummy_mac.cc
@@ -0,0 +1,2 @@
+// This is a dummy file to work around an Xcode bug and to force Xcode to use
+// g++ instead of gcc when linking xmllint and xmlcatalog.
diff --git a/third_party/libxslt/build/libxslt.vsprops b/third_party/libxslt/build/libxslt.vsprops
index 4a41281..494585b 100644
--- a/third_party/libxslt/build/libxslt.vsprops
+++ b/third_party/libxslt/build/libxslt.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="libxslt"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\third_party\icu\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index c2cd656..9297345 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -186,8 +186,8 @@
             'src',
           ],
           'dependencies': [
-            '../icu38/icu38.gyp:icui18n',
-            '../icu38/icu38.gyp:icuuc',
+            '../icu/icu.gyp:icui18n',
+            '../icu/icu.gyp:icuuc',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
@@ -215,7 +215,7 @@
           'target_name': 'sqlite_shell',
           'type': 'executable',
           'dependencies': [
-            '../icu38/icu38.gyp:icuuc',
+            '../icu/icu.gyp:icuuc',
             'sqlite',
           ],
           'sources': [
diff --git a/third_party/sqlite/src/shell_icu_win.c b/third_party/sqlite/src/shell_icu_win.c
index d68cf8f..afea472 100644
--- a/third_party/sqlite/src/shell_icu_win.c
+++ b/third_party/sqlite/src/shell_icu_win.c
@@ -9,16 +9,21 @@
 ** Returns 0 on failure, nonzero on success.
 ** This a hack job of icu_utils.cc:Initialize().  It's Chrome-specific code.
 */
+
+#define ICU_DATA_SYMBOL "icudt" U_ICU_VERSION_SHORT "_dat"
 int sqlite_shell_init_icu() {
   HMODULE module;
   FARPROC addr;
   UErrorCode err;
-  
-  module = LoadLibrary(L"icudt38.dll");
+
+  wchar_t dll_name[12];
+  wsprintf(dll_name, L"icudt%2S.dll", U_ICU_VERSION_SHORT);
+  dll_name[11] = L'\0';
+  module = LoadLibrary(dll_name);
   if (!module)
     return 0;
 
-  addr = GetProcAddress(module, "icudt38_dat");
+  addr = GetProcAddress(module, ICU_DATA_SYMBOL);
   if (!addr)
     return 0;