Skip to content

Commit

Permalink
Replace icu38/icu38.gyp with icu/icu.gyp in gyp files replace all the…
Browse files Browse the repository at this point in the history 
… 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
  • Loading branch information
jshin@chromium.org committed Sep 9, 2009
1 parent 65caf73 commit 2806294
Show file tree
Hide file tree
Showing 32 changed files with 105 additions and 90 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
/third_party/ffmpeg/binaries/
/third_party/googlemac/
/third_party/hunspell/
/third_party/icu38/
/third_party/icu/
/third_party/personalization/
/third_party/pdfsqueeze/
/third_party/protobuf2/
Expand Down
6 changes: 3 additions & 3 deletions DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ deps = {
"src/third_party/WebKit":
"/trunk/deps/third_party/WebKit@20601",

"src/third_party/icu38":
"/trunk/deps/third_party/icu38@24923",
"src/third_party/icu":
"/trunk/deps/third_party/icu42@25651",

"src/third_party/hunspell":
"/trunk/deps/third_party/hunspell128@24986",
"/trunk/deps/third_party/hunspell128@25668",

"src/third_party/protobuf2/src":
"http://protobuf.googlecode.com/svn/trunk@219",
Expand Down
8 changes: 4 additions & 4 deletions app/app.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
'../base/base.gyp:base_gfx',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
],
'include_dirs': [
'..',
Expand Down Expand Up @@ -185,8 +185,8 @@
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libxml/libxml.gyp:libxml',
],
'sources': [
Expand Down
8 changes: 4 additions & 4 deletions base/base.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
'target_name': 'base',
'type': '<(library)',
'dependencies': [
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
],
'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165',
'sources': [
Expand Down Expand Up @@ -667,7 +667,7 @@
'include_dirs': [
# word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU
# #include for unicode/uchar.h. This should probably be cleaned up.
'../third_party/icu38/public/common',
'../third_party/icu/public/common',
],
'dependencies': [
'base',
Expand Down Expand Up @@ -703,7 +703,7 @@
# TODO(mark): This should not be necessary.
['OS == "win"', {
'dependencies': [
'../third_party/icu38/icu38.gyp:icudata',
'../third_party/icu/icu.gyp:icudata',
],
'sources!': [
'data_pack_unittest.cc',
Expand Down
9 changes: 7 additions & 2 deletions base/icu_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,17 @@ bool Initialize() {
ASCIIToWide(ICU_UTIL_DATA_SHARED_MODULE_NAME));

HMODULE module = LoadLibrary(data_path.c_str());
if (!module)
if (!module) {
LOG(ERROR) << "Failed to load " << ICU_UTIL_DATA_SHARED_MODULE_NAME;
return false;
}

FARPROC addr = GetProcAddress(module, ICU_UTIL_DATA_SYMBOL);
if (!addr)
if (!addr) {
LOG(ERROR) << ICU_UTIL_DATA_SYMBOL << ": not found in "
<< ICU_UTIL_DATA_SHARED_MODULE_NAME;
return false;
}

UErrorCode err = U_ZERO_ERROR;
udata_setCommonData(reinterpret_cast<void*>(addr), &err);
Expand Down
2 changes: 1 addition & 1 deletion build/all.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
'../third_party/bzip2/bzip2.gyp:*',
'../third_party/codesighs/codesighs.gyp:*',
'../third_party/ffmpeg/ffmpeg.gyp:*',
'../third_party/icu38/icu38.gyp:*',
'../third_party/icu/icu.gyp:*',
'../third_party/libjpeg/libjpeg.gyp:*',
'../third_party/libpng/libpng.gyp:*',
'../third_party/libxml/libxml.gyp:*',
Expand Down
8 changes: 4 additions & 4 deletions build/temp_gyp/googleurl.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
'msvs_guid': 'EF5E94AB-B646-4E5B-A058-52EF07B8351C',
'dependencies': [
'../../base/base.gyp:base',
'../../third_party/icu38/icu38.gyp:icudata',
'../../third_party/icu38/icu38.gyp:icui18n',
'../../third_party/icu38/icu38.gyp:icuuc',
'../../third_party/icu/icu.gyp:icudata',
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
],
'sources': [
'../../googleurl/src/gurl.cc',
Expand Down Expand Up @@ -62,7 +62,7 @@
'dependencies': [
'googleurl',
'../../testing/gtest.gyp:gtest',
'../../third_party/icu38/icu38.gyp:icuuc',
'../../third_party/icu/icu.gyp:icuuc',
],
'sources': [
'../../googleurl/src/gurl_unittest.cc',
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/autocomplete/autocomplete_popup_model.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_model.h"
#include "chrome/common/notification_service.h"
#include "third_party/icu38/public/common/unicode/ubidi.h"
#include "third_party/icu/public/common/unicode/ubidi.h"

///////////////////////////////////////////////////////////////////////////////
// AutocompletePopupModel
Expand Down
8 changes: 4 additions & 4 deletions chrome/browser/resources/about_credits.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,15 +306,15 @@ <h3>libpng is licensed as follows:</h3>
</div>
</div>

<!-- ICU38 --->
<!-- ICU --->
<div class="product">
<span class="title">icu38</span>
<span class="title">ICU</span>
<a class="show" href="#" onclick="return toggle(this);">show license</a>
<span class="homepage"><a href="http://www.icu-project.org">homepage</a></span>
<div class="licence">
<h3>icu38 is licensed as follows:</h3>
<h3>third_party/icu is licensed as follows:</h3>
<p>COPYRIGHT AND PERMISSION NOTICE</p>
<p>Copyright (c) 1995-2008 International Business Machines Corporation and others</p>
<p>Copyright (c) 1995-2009 International Business Machines Corporation and others</p>
<p>All rights reserved.</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.</p>
<p>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</p>
Expand Down
12 changes: 6 additions & 6 deletions chrome/browser/spellcheck_worditerator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
#include "base/string_util.h"
#include "chrome/browser/spellchecker.h"

#include "third_party/icu38/public/common/unicode/normlzr.h"
#include "third_party/icu38/public/common/unicode/schriter.h"
#include "third_party/icu38/public/common/unicode/uchar.h"
#include "third_party/icu38/public/common/unicode/uscript.h"
#include "third_party/icu38/public/common/unicode/uset.h"
#include "third_party/icu38/public/i18n/unicode/ulocdata.h"
#include "third_party/icu/public/common/unicode/normlzr.h"
#include "third_party/icu/public/common/unicode/schriter.h"
#include "third_party/icu/public/common/unicode/uchar.h"
#include "third_party/icu/public/common/unicode/uscript.h"
#include "third_party/icu/public/common/unicode/uset.h"
#include "third_party/icu/public/i18n/unicode/ulocdata.h"

SpellcheckCharAttribute::SpellcheckCharAttribute() {
InitializeScriptTable();
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "third_party/skia/include/core/SkShader.h"
#include "third_party/icu38/public/common/unicode/ubidi.h"
#include "third_party/icu/public/common/unicode/ubidi.h"
#include "views/widget/widget.h"

#if defined(OS_WIN)
Expand Down
44 changes: 22 additions & 22 deletions chrome/chrome.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,8 @@
'../ipc/ipc.gyp:ipc',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/sqlite/sqlite.gyp:sqlite',
'../third_party/zlib/zlib.gyp:zlib',
Expand Down Expand Up @@ -671,8 +671,8 @@
'../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
'../third_party/bzip2/bzip2.gyp:bzip2',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/hunspell/hunspell.gyp:hunspell',
Expand Down Expand Up @@ -2674,8 +2674,8 @@
'chrome_strings',
'theme_resources',
'../skia/skia.gyp:skia',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
],
'include_dirs': [
'..',
Expand Down Expand Up @@ -2722,8 +2722,8 @@
'chrome_strings',
'../media/media.gyp:media',
'../skia/skia.gyp:skia',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/hunspell/hunspell.gyp:hunspell',
Expand Down Expand Up @@ -2781,8 +2781,8 @@
'chrome_strings',
'../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/npapi/npapi.gyp:npapi',
'../webkit/webkit.gyp:glue',
'../webkit/webkit.gyp:webkit',
Expand Down Expand Up @@ -3744,8 +3744,8 @@
'../build/temp_gyp/googleurl.gyp:googleurl',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libxml/libxml.gyp:libxml',
],
'include_dirs': [
Expand Down Expand Up @@ -3898,8 +3898,8 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/bzip2/bzip2.gyp:bzip2',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
],
Expand Down Expand Up @@ -5179,7 +5179,7 @@
'../third_party/hunspell/hunspell.gyp:hunspell',
'../net/net.gyp:net_resources',
'../skia/skia.gyp:skia',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/libpng/libpng.gyp:libpng',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/zlib/zlib.gyp:zlib',
Expand Down Expand Up @@ -5309,8 +5309,8 @@
'../base/base.gyp:test_support_base',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
],
'include_dirs': [
'..',
Expand Down Expand Up @@ -5381,7 +5381,7 @@
'../third_party/bzip2/bzip2.gyp:*',
'../third_party/cld/cld.gyp:cld',
'../third_party/codesighs/codesighs.gyp:*',
'../third_party/icu38/icu38.gyp:*',
'../third_party/icu/icu.gyp:*',
'../third_party/libjpeg/libjpeg.gyp:*',
'../third_party/libpng/libpng.gyp:*',
'../third_party/libxml/libxml.gyp:*',
Expand Down Expand Up @@ -5511,8 +5511,8 @@
'../webkit/webkit.gyp:webkit',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
],
Expand Down Expand Up @@ -5594,8 +5594,8 @@
'../base/base.gyp:test_support_base',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
],
'include_dirs': [
'..',
Expand Down
2 changes: 1 addition & 1 deletion chrome/common/common.vsprops
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
ProjectType="Visual C++"
Version="8.00"
Name="common (chrome)"
InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\chrome\third_party\wtl\using_wtl.vsprops;$(SolutionDir)\common\extra_defines.vsprops"
InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu\build\using_icu.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\chrome\third_party\wtl\using_wtl.vsprops;$(SolutionDir)\common\extra_defines.vsprops"
>
</VisualStudioPropertySheet>
4 changes: 2 additions & 2 deletions chrome/installer/installer.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
'../chrome.gyp:chrome_strings',
'../../courgette/courgette.gyp:courgette_lib',
'../../third_party/bspatch/bspatch.gyp:bspatch',
'../../third_party/icu38/icu38.gyp:icui18n',
'../../third_party/icu38/icu38.gyp:icuuc',
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
'../../third_party/libxml/libxml.gyp:libxml',
'../../third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
],
Expand Down
2 changes: 1 addition & 1 deletion chrome/installer/mini_installer.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
'<(PRODUCT_DIR)/chrome.exe',
'<(PRODUCT_DIR)/chrome.dll',
'<(PRODUCT_DIR)/locales/en-US.dll',
'<(PRODUCT_DIR)/icudt38.dll',
'<(PRODUCT_DIR)/icudt42.dll',
],
'outputs': [
'xxx.out',
Expand Down
2 changes: 1 addition & 1 deletion chrome/installer/mini_installer/chrome.release
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ chrome.exe: %(ChromeDir)s\
wow_helper.exe: %(ChromeDir)s\
Dictionaries\en-US.bdic: %(ChromeDir)s\Dictionaries
chrome.dll: %(VersionDir)s\
icudt38.dll: %(VersionDir)s\
icudt42.dll: %(VersionDir)s\
gears.dll: %(VersionDir)s\
Themes\default.dll: %(VersionDir)s\Themes
locales\*.dll: %(VersionDir)s\Locales
Expand Down
2 changes: 1 addition & 1 deletion chrome/tools/build/win/FILES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ chrome.dll
crash_service.exe
First Run
gears.dll
icudt38.dll
icudt42.dll
locales/ar.dll
locales/bg.dll
locales/bn.dll
Expand Down
2 changes: 1 addition & 1 deletion chrome/tools/build/win/server.rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
DisplayName="Scan Server DLLs"
CommandLine="$(SolutionDir)..\third_party\python_24\python.exe $(SolutionDir)tools\build\win\scan_server_dlls.py --output_dir=&quot;$(OutDir)&quot; --input_file=&quot;$(InputPath)&quot; --header_output_dir=&quot;$(IntDir)&quot; --distribution=$(CHROMIUM_BUILD)"
Outputs="$(OutDir)/registered_dlls.h;"
AdditionalDependencies="$(SolutionDir)\tools\build\win\scan_server_dlls.py;$(OutDir)\chrome.exe;$(OutDir)\crash_reporter.exe;$(OutDir)\chrome.dll;$(OutDir)\locales\en-US.dll;$(OutDir)\icudt38.dll"
AdditionalDependencies="$(SolutionDir)\tools\build\win\scan_server_dlls.py;$(OutDir)\chrome.exe;$(OutDir)\crash_reporter.exe;$(OutDir)\chrome.dll;$(OutDir)\locales\en-US.dll;$(OutDir)\icudt42.dll"
FileExtensions="*.release"
ExecutionDescription="Scanning for COM Server DLLs..."
ShowOnlyRuleProperties="false"
Expand Down
4 changes: 2 additions & 2 deletions net/base/net_util_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ const IDNTestCase idn_cases[] = {
{"xn--bcher-kva.de", L"b\x00fc" L"cher.de",
{true, false, false, false, false,
false, false, false, false, true,
true, true, false, false, false,
true, false, false, false, false,
true, false, false, false, false,
false}},
// a with diaeresis
Expand All @@ -173,7 +173,7 @@ const IDNTestCase idn_cases[] = {
{"xn--caf-dma.fr", L"caf\x00e9.fr",
{true, false, false, false, false,
false, false, false, false, true,
false, true, false, false, false,
false, true, true, false, false,
false, false, false, false, false,
false}},
// c-cedillla and a with tilde (Portuguese)
Expand Down
Loading

0 comments on commit 2806294

Please sign in to comment.