Generate the icu data binaries at compile time instead of checking in binaries

icu.gyp

Index: icu.gyp
diff --git a/icu.gyp b/icu.gyp
index 910fe68e6f94189f10b1db778f961950f69360ed..897798d017271f8fb7095c6b8f4dff7fcc3181e2 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -77,102 +77,102 @@
   'conditions': [
     ['use_system_icu==0 or want_separate_host_toolset==1', {
       'targets': [
-        {
-          'target_name': 'copy_icudtl_dat',
-          'type': 'none',
-          # icudtl.dat is the same for both host/target, so this only supports a
-          # single toolset. If a target requires that the .dat file be copied
-          # to the output directory, it should explicitly depend on this target
-          # with the host toolset (like copy_icudtl_dat#host).
-          'toolsets': [ 'host' ],
-          'copies': [{
-            'destination': '<(PRODUCT_DIR)',
-            'conditions': [
-              ['OS == "android"', {
-                'files': [
-                  'android/icudtl.dat',
-                ],
-              } , { # else: OS != android
-                'files': [
-                  'source/data/in/icudtl.dat',
-                ],
-              }],
-            ],
-          }],
-        },
-        {
-          'target_name': 'icudata',
-          'type': 'static_library',
-          'defines': [
-            'U_HIDE_DATA_SYMBOL',
-          ],
-          'sources': [
-             # These are hand-generated, but will do for now.  The linux
-             # version is an identical copy of the (mac) icudtl_dat.S file,
-             # modulo removal of the .private_extern and .const directives and
-             # with no leading underscore on the icudt52_dat symbol.
-             'android/icudtl_dat.S',
-             'linux/icudtl_dat.S',
-             'mac/icudtl_dat.S',
-          ],
-          'conditions': [
-            [ 'use_system_icu==1 and want_separate_host_toolset==1', {
-              'toolsets': ['host'],
-            }],
-            [ 'use_system_icu==0 and want_separate_host_toolset==1', {
-              'toolsets': ['host', 'target'],
-            }],
-            [ 'use_system_icu==0 and want_separate_host_toolset==0', {
-              'toolsets': ['target'],
-            }],
-            [ 'OS == "win" and icu_use_data_file_flag==0', {
-              'type': 'none',
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)',
-                  'files': [
-                    'windows/icudt.dll',
-                  ],
-                },
-              ],
-            }],
-            [ 'icu_use_data_file_flag==1', {
-              'type': 'none',
-              # Remove any assembly data file.
-              'sources/': [['exclude', 'icudtl_dat']],
+        # {
+        #   'target_name': 'copy_icudtl_dat',
+        #   'type': 'none',
+        #   # icudtl.dat is the same for both host/target, so this only supports a
+        #   # single toolset. If a target requires that the .dat file be copied
+        #   # to the output directory, it should explicitly depend on this target
+        #   # with the host toolset (like copy_icudtl_dat#host).
+        #   'toolsets': [ 'host' ],
+        #   'copies': [{
+        #     'destination': '<(PRODUCT_DIR)',
+        #     'conditions': [
+        #       ['OS == "android"', {
+        #         'files': [
+        #           'android/icudtl.dat',
+        #         ],
+        #       } , { # else: OS != android
+        #         'files': [
+        #           'source/data/in/icudtl.dat',
+        #         ],
+        #       }],
+        #     ],
+        #   }],
+        # },
+        # {
+        #   'target_name': 'icudata',
+        #   'type': 'static_library',
+        #   'defines': [
+        #     'U_HIDE_DATA_SYMBOL',
+        #   ],
+        #   'sources': [
+        #      # These are hand-generated, but will do for now.  The linux
+        #      # version is an identical copy of the (mac) icudtl_dat.S file,
+        #      # modulo removal of the .private_extern and .const directives and
+        #      # with no leading underscore on the icudt52_dat symbol.
+        #      'android/icudtl_dat.S',
+        #      'linux/icudtl_dat.S',
+        #      'mac/icudtl_dat.S',
+        #   ],
+        #   'conditions': [
+        #     [ 'use_system_icu==1 and want_separate_host_toolset==1', {
+        #       'toolsets': ['host'],
+        #     }],
+        #     [ 'use_system_icu==0 and want_separate_host_toolset==1', {
+        #       'toolsets': ['host', 'target'],
+        #     }],
+        #     [ 'use_system_icu==0 and want_separate_host_toolset==0', {
+        #       'toolsets': ['target'],
+        #     }],
+        #     [ 'OS == "win" and icu_use_data_file_flag==0', {
+        #       'type': 'none',
+        #       'copies': [
+        #         {
+        #           'destination': '<(PRODUCT_DIR)',
+        #           'files': [
+        #             'windows/icudt.dll',
+        #           ],
+        #         },
+        #       ],
+        #     }],
+        #     [ 'icu_use_data_file_flag==1', {
+        #       'type': 'none',
+        #       # Remove any assembly data file.
+        #       'sources/': [['exclude', 'icudtl_dat']],
 
-              # Make sure any binary depending on this gets the data file.
-              'conditions': [
-                ['OS != "ios"', {
-                  'dependencies': [
-                    'copy_icudtl_dat#host',
-                  ],
-                } , { # else: OS=="ios"
-                  'link_settings': {
-                    'mac_bundle_resources': [
-                      'source/data/in/icudtl.dat',
-                    ],
-                  },
-                }], # OS!=ios
-              ], # conditions
-            }], # icu_use_data_file_flag
-          ], # conditions
-          'target_conditions': [
-            [ 'OS == "win" or OS == "mac" or OS == "ios" or '
-              '(OS == "android" and (_toolset != "host" or host_os != "linux")) or '
-              '(OS == "qnx" and (_toolset == "host" and host_os != "linux"))', {
-              'sources!': ['linux/icudtl_dat.S'],
-            }],
-            [ 'OS != "android" or _toolset == "host"', {
-              'sources!': ['android/icudtl_dat.S'],
-            }],
-            [ 'OS != "mac" and OS != "ios" and '
-              '((OS != "android" and OS != "qnx") or '
-              '_toolset != "host" or host_os != "mac")', {
-              'sources!': ['mac/icudtl_dat.S'],
-            }],
-          ], # target_conditions
-        },
+        #       # Make sure any binary depending on this gets the data file.
+        #       'conditions': [
+        #         ['OS != "ios"', {
+        #           'dependencies': [
+        #             'copy_icudtl_dat#host',
+        #           ],
+        #         } , { # else: OS=="ios"
+        #           'link_settings': {
+        #             'mac_bundle_resources': [
+        #               'source/data/in/icudtl.dat',
+        #             ],
+        #           },
+        #         }], # OS!=ios
+        #       ], # conditions
+        #     }], # icu_use_data_file_flag
+        #   ], # conditions
+        #   'target_conditions': [
+        #     [ 'OS == "win" or OS == "mac" or OS == "ios" or '
+        #       '(OS == "android" and (_toolset != "host" or host_os != "linux")) or '
+        #       '(OS == "qnx" and (_toolset == "host" and host_os != "linux"))', {
+        #       'sources!': ['linux/icudtl_dat.S'],
+        #     }],
+        #     [ 'OS != "android" or _toolset == "host"', {
+        #       'sources!': ['android/icudtl_dat.S'],
+        #     }],
+        #     [ 'OS != "mac" and OS != "ios" and '
+        #       '((OS != "android" and OS != "qnx") or '
+        #       '_toolset != "host" or host_os != "mac")', {
+        #       'sources!': ['mac/icudtl_dat.S'],
+        #     }],
+        #   ], # target_conditions
+        # },
         {
           'target_name': 'icui18n',
           'type': '<(component)',
@@ -378,13 +378,13 @@
             }],
           ],
         },
-        {
-          'target_name': 'icudata',
-          'type': 'none',
-          'dependencies': ['system_icu'],
-          'export_dependent_settings': ['system_icu'],
-          'toolsets': ['target'],
-        },
+        # {
+        #   'target_name': 'icudata',
+        #   'type': 'none',
+        #   'dependencies': ['system_icu'],
+        #   'export_dependent_settings': ['system_icu'],
+        #   'toolsets': ['target'],
+        # },
         {
           'target_name': 'icui18n',
           'type': 'none',
@@ -591,4 +591,30 @@
       ], # targets
     }],
   ], # conditions
+    'targets': [
+        {
+            'target_name': 'icudata',
+            'conditions': [
+                ['icu_use_data_file_flag==1',
+                 {
+                     'type': 'none',
+                 },
+                 {
+                     'type': 'static_library',
+                     'defines': [
+                         'U_HIDE_DATA_SYMBOL',
+                     ],
+                     'sources': [
+                         # These are hand-generated, but will do for now.  The linux
+                         # version is an identical copy of the (mac) icudtl_dat.S file,
+                         # modulo removal of the .private_extern and .const directives and
+                         # with no leading underscore on the icudt52_dat symbol.
+                         '<(SHARED_INTERMEDIATE_DIR)/tmp_icudt54l/icudt54l_dat.S',
+                     ],
+                 }],
+            ],
+            'dependencies': ['icu_data.gyp:icu_data'],
+            'toolsets': ['host', 'target'],
+        },
+    ],
 }