EN, mf, DO YOU SPEAK IT?

No more symbolic links in the .app.  Except for the ones that codesign adds.

The en_US.lproj directory should not exist, there should be only en.lproj.
Formerly, there was a symbolic link from en.lproj to en_US.lproj.

BUG=25578, 19165
TEST= - find C.app -name en_US.lproj should return nothing.
      - find C.app -name en.lproj should show en.lproj in C.app,
        C F.framework, and C H.app.
      - find C.app -type l should return nothing, however, on a signed build,
        it will still show symbolic links for CodeResources.
      - Say "What" again.  Say "What" again.  I dare you.  I double-dare you.
      - With English or U.S. English as the top or only choices in the
        International (10.5) or Language & Text (10.6) system preference
        pane's Language tab, the localized language should be English.
      - In this configuration, the Accept-Language header field should be
        "en-US,en;q=0.8".  See http://whatsmyuseragent.com/ and look for
        HTTP_ACCEPT_LANGUAGE.
Review URL: http://codereview.chromium.org/345057

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

1 files changed, 39 insertions, 13 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index c1fe430..6aa894d 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -149,7 +149,9 @@
       },],
       ['OS=="mac"', {
         'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist',
-        'symlink_lprojs_path': 'tools/build/mac/symlink_lprojs',
+        # TODO(mark): Remove after November 17, 2009, allowing two weeks for
+        # the transition.
+        'transition_lprojs_path': 'tools/build/mac/transition_lprojs',
         'nacl_defines': [
           'NACL_WINDOWS=0',
           'NACL_LINUX=0',
@@ -3659,6 +3661,18 @@
           ],
           'actions': [
             {
+              # Clean up the old .lproj structure, where English was in
+              # en_US.lproj, and en.lproj was a symbolic link.  This must run
+              # before the "Generating InfoPlist.strings files" action.
+              #
+              # TODO(mark): Remove after November 17, 2009, allowing two weeks
+              # for the transition.
+              'action_name': 'Temporary .lproj transition',
+              'action': ['<(transition_lprojs_path)'],
+              'inputs': [],  # Always run.
+              'outputs': [],
+            },
+            {
               # Generate the InfoPlist.strings file
               'action_name': 'Generating InfoPlist.strings files',
               'variables': {
@@ -3733,10 +3747,6 @@
                          '<(mac_bundle_id)'],
             },
             {
-              'postbuild_name': 'Make .lproj links',
-              'action': ['<(symlink_lprojs_path)'],
-            },
-            {
               'postbuild_name': 'Clean up old versions',
               'action': [
                 'tools/build/mac/clean_up_old_versions',
@@ -5748,6 +5758,18 @@
                 'repack_path': '../tools/data_pack/repack.py',
               },
               'actions': [
+                {
+                  # Clean up the old .lproj structure, where English was in
+                  # en_US.lproj, and en.lproj was a symbolic link.  This must
+                  # run before the "repack_locales" action.
+                  #
+                  # TODO(mark): Remove after November 17, 2009, allowing two
+                  # weeks for the transition.
+                  'action_name': 'Temporary .lproj transition',
+                  'action': ['<(transition_lprojs_path)'],
+                  'inputs': [],  # Always run.
+                  'outputs': [],
+                },
                 # TODO(mark): These actions are duplicated for Linux and
                 # FreeBSD in the chrome target.  Can they be unified?
                 {
@@ -5825,10 +5847,6 @@
                              '<(mac_bundle_id)'],
                 },
                 {
-                  'postbuild_name': 'Make .lproj links',
-                  'action': ['<(symlink_lprojs_path)'],
-                },
-                {
                   'postbuild_name': 'Symlink Libraries',
                   'action': [
                     'ln',
@@ -5977,6 +5995,18 @@
           ],
           'actions': [
             {
+              # Clean up the old .lproj structure, where English was in
+              # en_US.lproj, and en.lproj was a symbolic link.  This must run
+              # before the "Generating InfoPlist.strings files" action.
+              #
+              # TODO(mark): Remove after November 17, 2009, allowing two weeks
+              # for the transition.
+              'action_name': 'Temporary .lproj transition',
+              'action': ['<(transition_lprojs_path)'],
+              'inputs': [],  # Always run.
+              'outputs': [],
+            },
+            {
               # Generate the InfoPlist.strings file
               'action_name': 'Generating InfoPlist.strings files',
               'variables': {
@@ -6049,10 +6079,6 @@
                          '<(branding)',
                          '<(mac_bundle_id)'],
             },
-            {
-              'postbuild_name': 'Make .lproj links',
-              'action': ['<(symlink_lprojs_path)'],
-            },
           ],
           'conditions': [
             ['mac_breakpad==1', {