Linux: make it possible to build with third_party/xdg-utils directory removed...

Linux: make it possible to build with third_party/xdg-utils directory removed

This is useful for Linux distributions that remove third party directories
to ensure that the bundled versions will not be used.

In fact, this is upstreaming a Gentoo Linux patch.

TEST=none
BUG=none

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

[Evan Martin, 2011-01-18 16:31:39]

Lgtm

brevity due to phone
On Jan 18, 2011 12:18 AM, <phajdan.jr@chromium.org> wrote:
> Reviewers: Evan Martin, Mike Mammarella,
>
> Description:
> Linux: make it possible to build with third_party/xdg-utils directory
> removed
>
> This is useful for Linux distributions that remove third party directories
> to ensure that the bundled versions will not be used.
>
> In fact, this is upstreaming a Gentoo Linux patch.
>
> TEST=none
> BUG=none
>
> Please review this at http://codereview.chromium.org/6282005/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
> M chrome/chrome_exe.gypi
>
>
> Index: chrome/chrome_exe.gypi
> ===================================================================
> --- chrome/chrome_exe.gypi (revision 71594)
> +++ chrome/chrome_exe.gypi (working copy)
> @@ -141,6 +141,7 @@
> 'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC',
> 'variables': {
> 'chrome_exe_target': 1,
> + 'use_system_xdg_utils%': 0,
> },
> 'conditions': [
> ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
> @@ -203,23 +204,27 @@
> 'app/chrome_main.cc',
> 'app/chrome_dll_resource.h',
> ],
> - 'copies': [
> - {
> - 'destination': '<(PRODUCT_DIR)',
> - 'files': ['tools/build/linux/chrome-wrapper',
> - '../third_party/xdg-utils/scripts/xdg-mime',
> - '../third_party/xdg-utils/scripts/xdg-settings',
> - ],
> - # The wrapper script above may need to generate a .desktop
> file,
> - # which requires an icon. So, copy one next to the script.
> - 'conditions': [
> - ['branding=="Chrome"', {
> - 'files': ['app/theme/google_chrome/product_logo_48.png']
> - }, { # else: 'branding!="Chrome"
> - 'files': ['app/theme/chromium/product_logo_48.png']
> - }],
> + 'conditions': [
> + ['use_system_xdg_utils==0', {
> + 'copies': [
> + {
> + 'destination': '<(PRODUCT_DIR)',
> + 'files': ['tools/build/linux/chrome-wrapper',
> + '../third_party/xdg-utils/scripts/xdg-mime',
> + '../third_party/xdg-utils/scripts/xdg-settings',
> + ],
> + # The wrapper script above may need to generate
> a .desktop file,
> + # which requires an icon. So, copy one next to the
> script.
> + 'conditions': [
> + ['branding=="Chrome"', {
> + 'files':
> ['app/theme/google_chrome/product_logo_48.png']
> + }, { # else: 'branding!="Chrome"
> + 'files': ['app/theme/chromium/product_logo_48.png']
> + }],
> + ],
> + },
> ],
> - },
> + }],
> ],
> }],
> ['OS=="mac"', {
>
>

[Mike Mammarella, 2011-01-18 18:17:19]

http://codereview.chromium.org/6282005/diff/3001/chrome/chrome_exe.gypi
File chrome/chrome_exe.gypi (right):

http://codereview.chromium.org/6282005/diff/3001/chrome/chrome_exe.gypi#newco...
chrome/chrome_exe.gypi:144: 'use_system_xdg_utils%': 0,
Would it be possible to put this constant along with the other similar constants
that control whether bundled stuff is used? It seems like it will be
increasingly annoying for distributions to patch all these changes into the gyp
files if the constants they're changing are scattered about.

http://codereview.chromium.org/6282005/diff/3001/chrome/chrome_exe.gypi#newco...
chrome/chrome_exe.gypi:195: 'files': ['tools/build/linux/chrome-wrapper',
The chrome-wrapper script isn't part of xdg-utils; you probably want to copy it
below, not inside this condition. Maybe a separate condition for it is warranted
though, if distributions don't want this script either and have their own
version instead.

[Mike Mammarella, 2011-01-18 18:34:19]

On 2011/01/18 18:17:19, Mike Mammarella wrote:
> http://codereview.chromium.org/6282005/diff/3001/chrome/chrome_exe.gypi
> File chrome/chrome_exe.gypi (right):
> 
>
http://codereview.chromium.org/6282005/diff/3001/chrome/chrome_exe.gypi#newco...
> chrome/chrome_exe.gypi:144: 'use_system_xdg_utils%': 0,
> Would it be possible to put this constant along with the other similar
constants
> that control whether bundled stuff is used? It seems like it will be
> increasingly annoying for distributions to patch all these changes into the
gyp
> files if the constants they're changing are scattered about.
> 
>
http://codereview.chromium.org/6282005/diff/3001/chrome/chrome_exe.gypi#newco...
> chrome/chrome_exe.gypi:195: 'files': ['tools/build/linux/chrome-wrapper',
> The chrome-wrapper script isn't part of xdg-utils; you probably want to copy
it
> below, not inside this condition. Maybe a separate condition for it is
warranted
> though, if distributions don't want this script either and have their own
> version instead.

(discussed in IRC, LGTM)