Add back icudt38.dll to the list of files to archive and the list of files fo...

Add back icudt38.dll to the list of files to archive and the list of files for which symbols should not be uploaded.

This is necessary because build scripts are used by both pre-ICU upgrade builds (e.g. 3.0 branch) and trunk builds. 

This patch will be accompanied by another that takes care of the internal slave scripts.


BUG=NONE
TEST=For both 3.0 branch and trunk builds, archive_build works fine.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=25865

[M-A Ruel, 2009-09-10 13:17:30]

lgtm

[Mark Mentovai, 2009-09-10 13:48:01]

Jungshik, can we change the DLL to be just "icudt.dll" so that this
does not become an ongoing maintenance task during future ICU
upgrades?

jshin@chromium.org wrote:
> Reviewers: Marc-Antoine Ruel,
>
> Description:
> Add back icudt38.dll to the list of files to archive and the list of file=
s
> for
> which symbols should not be uploaded.
>
> This is necessary because build scripts are used by both pre-ICU upgrade
> builds
> (e.g. 3.0 branch) and trunk builds.
>
> This patch will be accompanied by another that takes care of the internal
> slave
> scripts.
>
>
> BUG=3DNONE
> TEST=3DFor both 3.0 branch and trunk builds, archive_build works fine.
>
>
> Please review this at http://codereview.chromium.org/200074
>
> SVN Base: svn://chrome-svn/chrome/trunk/tools/
>
> Affected files:
> =A0M =A0 =A0 buildbot/scripts/common/chromium_config.py
> =A0M =A0 =A0 buildbot/scripts/slave/chromium/archive_build.py
>
>
> Index: buildbot/scripts/common/chromium_config.py
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- buildbot/scripts/common/chromium_config.py =A0(revision 25714)
> +++ buildbot/scripts/common/chromium_config.py =A0(working copy)
> @@ -123,7 +123,10 @@
>
> =A0 # List of symbol files to save, but not to upload to the symbol serve=
r
> =A0 # (generally because they have no symbols and thus would produce an
> error).
> - =A0symbols_to_skip_upload =3D ['icudt42.dll', 'rlz.dll',]
> + =A0# TODO(jungshik): make the name of icudt dll independent of the ICU
> version.
> + =A0# For now, we list both icudt{38,42}.dll because this script is used=
 by
> + =A0# pre-ICU 4.2 builds as well.
> + =A0symbols_to_skip_upload =3D ['icudt38.dll', 'icudt42.dll', 'rlz.dll',=
]
>
> =A0 if os.environ.get('CHROMIUM_BUILD', '') =3D=3D '_google_chrome':
> =A0 =A0 exes_to_skip_entirely =3D []
> @@ -148,9 +151,13 @@
> =A0 installer_exe =3D Installer.installer_exe
>
> =A0 # Test files to archive.
> + =A0# TODO(jungshik): make the name of icudt dll independent of the ICU
> version.
> + =A0# For now, we list both icudt{38,42}.dll because this script is used=
 by
> + =A0# pre-ICU 4.2 builds as well.
> =A0 tests_to_archive =3D ['reliability_tests.exe',
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 'test_shell.exe',
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 'automated_ui_tests.exe',
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0'icudt38.dll',
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 'icudt42.dll',
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 'plugins\\npapi_layout_test_p=
lugin.dll',
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0]
> Index: buildbot/scripts/slave/chromium/archive_build.py
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- buildbot/scripts/slave/chromium/archive_build.py =A0 =A0(revision 257=
13)
> +++ buildbot/scripts/slave/chromium/archive_build.py =A0 =A0(working copy=
)
> @@ -347,10 +347,15 @@
>
> =A0 =A0 =A0 for test_dir in test_dirs:
> =A0 =A0 =A0 =A0 print 'chromium_utils.MaybeMakeDirectory(%s)' % test_dir
> - =A0 =A0 =A0for test_file in test_files:
> + =A0 =A0 =A0for test_file in test_files[:]:
> =A0 =A0 =A0 =A0 relative_dir =3D os.path.dirname(test_file[len(base_src_d=
ir):])
> =A0 =A0 =A0 =A0 test_dir =3D os.path.join(www_dir, 'chrome-win32.test', r=
elative_dir)
> - =A0 =A0 =A0 =A0print 'chromium_utils.CopyFileToDir(%s, %s)' % (test_fil=
e,
> test_dir)
> + =A0 =A0 =A0 =A0if os.path.exists(test_file):
> + =A0 =A0 =A0 =A0 =A0print 'chromium_utils.CopyFileToDir(%s, %s)' % (test=
_file,
> test_dir)
> + =A0 =A0 =A0 =A0else
> + =A0 =A0 =A0 =A0 =A0print '%s does not exist and is skipped.' % test_fil=
e
> + =A0 =A0 =A0 =A0 =A0test_files.remove(test_file)
> +
> =A0 =A0 =A0 if not DRY_RUN:
> =A0 =A0 =A0 =A0 for test_dir in test_dirs:
> =A0 =A0 =A0 =A0 =A0 chromium_utils.MaybeMakeDirectory(test_dir)
>
>
>

[jungshik at Google, 2009-09-10 16:56:34]

On 2009/09/10 13:48:01, Mark Mentovai wrote:
> Jungshik, can we change the DLL to be just "icudt.dll" so that this
> does not become an ongoing maintenance task during future ICU
> upgrades?

Yes, that's the plan (my TODO comment). I just double-checked with an ICU folk
that it's perfectly ok to drop 'NN' from the data dll name as long as the data
entry point inside  the DLL is versioned. 

BTW, for this script, we still have to pay one-time cost of adding 'icudt.dll'
to the list, but that's certainly cheaper adding 'icudtNN.dll' whenever we
upgrade ICU :-)