Drop the icu version number from the name of icu data file on Windows.

This is to avoid having to change a bunch of build/release configuration files
everytime ICU version is changed. 

This will bring in the following two CLs in ICU and googleurl:

http://codereview.chromium.org/6625032
http://codereview.chromium.org/6623060





BUG=74076
TEST=Chrome can be built and a binary built runs fine with an accompanying Chrome CL in place.

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

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

6 files changed, 6 insertions, 5 deletions

diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index d566d0a..f58911d 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -197,7 +197,7 @@
                 '<(PRODUCT_DIR)/nacl64.dll',
                 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
                 '<(PRODUCT_DIR)/locales/en-US.dll',
-                '<(PRODUCT_DIR)/icudt46.dll',
+                '<(PRODUCT_DIR)/icudt.dll',
               ],
               'outputs': [
                 'xxx.out',
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index d1883e4..aa3589f 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -35,7 +35,7 @@ chrome.dll: %(VersionDir)s\
 nacl64.exe: %(VersionDir)s\
 nacl64.dll: %(VersionDir)s\
 ppGoogleNaClPluginChrome.dll: %(VersionDir)s\
-icudt46.dll: %(VersionDir)s\
+icudt.dll: %(VersionDir)s\
 gears.dll: %(VersionDir)s\
 resources.pak: %(VersionDir)s\
 locales\*.dll: %(VersionDir)s\Locales
diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES
index d9e7e6a..5136ca7 100644
--- a/chrome/tools/build/win/FILES
+++ b/chrome/tools/build/win/FILES
@@ -9,7 +9,7 @@ crash_service.exe
 First Run
 gears.dll
 ppGoogleNaClPluginChrome.dll
-icudt46.dll
+icudt.dll
 locales/ar.dll
 locales/bg.dll
 locales/bn.dll
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index a8f4034..4817b15 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -66,7 +66,7 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'icudt46.dll',
+    'filename': 'icudt.dll',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
diff --git a/chrome/tools/build/win/TESTS b/chrome/tools/build/win/TESTS
index 3656046..a3028aa 100644
--- a/chrome/tools/build/win/TESTS
+++ b/chrome/tools/build/win/TESTS
@@ -4,6 +4,7 @@ automated_ui_tests.exe
 icudt38.dll

 icudt42.dll

 icudt46.dll

+icudt.dll

 plugins\npTestNetscapePlugIn.dll

 pyautolib.py

 _pyautolib.pyd

diff --git a/chrome/tools/build/win/server.rules b/chrome/tools/build/win/server.rules
index d49f19d..69f82e4 100644
--- a/chrome/tools/build/win/server.rules
+++ b/chrome/tools/build/win/server.rules
@@ -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)\icudt46.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)\icudt.dll"

 			FileExtensions="*.release"

 			ExecutionDescription="Scanning for COM Server DLLs..."

 			ShowOnlyRuleProperties="false"