diff options
| -rw-r--r-- | chrome/chrome.gyp | 2 | ||||
| -rw-r--r-- | chrome/installer/installer.gyp | 117 | ||||
| -rw-r--r-- | chrome/installer/util/prebuild/util_prebuild.gyp | 39 | ||||
| -rw-r--r-- | chrome/installer/util/util.gyp | 88 | ||||
| -rw-r--r-- | third_party/lzma_sdk/lzma_sdk.gyp | 3 |
5 files changed, 121 insertions, 128 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 3afa478..4eab0fb 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1640,7 +1640,7 @@ 'dependencies': [ 'views', '../google_update/google_update.gyp:google_update', - 'installer/util/util.gyp:installer_util', + 'installer/installer.gyp:installer_util', '../printing/printing.gyp:printing', ], 'export_dependent_settings': [ diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp new file mode 100644 index 0000000..9e3615f --- /dev/null +++ b/chrome/installer/installer.gyp @@ -0,0 +1,117 @@ +{ + 'includes': [ + '../../build/common.gypi', + ], + 'targets': [ + { + 'target_name': 'installer_util', + 'type': '<(library)', + 'dependencies': [ + 'installer_util_strings', + '../chrome.gyp:common', + '../chrome.gyp:chrome_resources', + '../chrome.gyp:chrome_strings', + '../../net/net.gyp:net_resources', + '../../media/media.gyp:media', + '../../skia/skia.gyp:skia', + '../../third_party/icu38/icu38.gyp:icui18n', + '../../third_party/icu38/icu38.gyp:icuuc', + '../../third_party/libxml/libxml.gyp:libxml', + '../../third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk', + '../../third_party/npapi/npapi.gyp:npapi', + '../third_party/hunspell/hunspell.gyp:hunspell', + ], + 'include_dirs': [ + '../..', + ], + 'sources': [ + 'util/browser_distribution.cc', + 'util/browser_distribution.h', + 'util/compat_checks.cc', + 'util/compat_checks.h', + 'util/copy_tree_work_item.cc', + 'util/copy_tree_work_item.h', + 'util/create_dir_work_item.cc', + 'util/create_dir_work_item.h', + 'util/create_reg_key_work_item.cc', + 'util/create_reg_key_work_item.h', + 'util/delete_reg_value_work_item.cc', + 'util/delete_reg_value_work_item.h', + 'util/delete_tree_work_item.cc', + 'util/delete_tree_work_item.h', + 'util/google_chrome_distribution.cc', + 'util/google_chrome_distribution.h', + 'util/google_update_constants.cc', + 'util/google_update_constants.h', + 'util/google_update_settings.cc', + 'util/google_update_settings.h', + 'util/helper.cc', + 'util/helper.h', + 'util/html_dialog.h', + 'util/html_dialog_impl.cc', + 'util/install_util.cc', + 'util/install_util.h', + 'util/l10n_string_util.cc', + 'util/l10n_string_util.h', + 'util/logging_installer.cc', + 'util/logging_installer.h', + 'util/lzma_util.cc', + 'util/lzma_util.h', + 'util/master_preferences.cc', + 'util/master_preferences.h', + 'util/move_tree_work_item.cc', + 'util/move_tree_work_item.h', + 'util/self_reg_work_item.cc', + 'util/self_reg_work_item.h', + 'util/set_reg_value_work_item.cc', + 'util/set_reg_value_work_item.h', + 'util/shell_util.cc', + 'util/shell_util.h', + 'util/util_constants.cc', + 'util/util_constants.h', + 'util/version.cc', + 'util/version.h', + 'util/work_item.cc', + 'util/work_item.h', + 'util/work_item_list.cc', + 'util/work_item_list.h', + ], + }, + { + 'target_name': 'installer_util_strings', + 'type': 'none', + 'actions': [ + { + # TODO(sgk): Clean this up so that we pass in the + # file names to the script instead of having it hard-code + # matching path names internally. + 'action_name': 'installer_util_strings', + 'inputs': [ + 'util/prebuild/create_string_rc.py', + '../app/generated_resources.grd', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc', + '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.h', + ], + 'action': [ + # The create_string_rc.py script requires the checked-in + # python.exe that has google modules installed, and + # a PYTHONPATH pointing to grit so it can import FP. + # TODO: clean this up + 'set PYTHONPATH=../../tools/grit/grit/extern', '&&', + '../../third_party/python_24/python.exe', + 'util/prebuild/create_string_rc.py', + '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings' + ], + 'msvs_cygwin_shell': 0, + }, + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', + ], + }, + }, + ], +} diff --git a/chrome/installer/util/prebuild/util_prebuild.gyp b/chrome/installer/util/prebuild/util_prebuild.gyp deleted file mode 100644 index 13ac74e..0000000 --- a/chrome/installer/util/prebuild/util_prebuild.gyp +++ /dev/null @@ -1,39 +0,0 @@ -{ - 'includes': [ - '../../../../build/common.gypi', - ], - 'targets': [ - { - 'target_name': 'installer_util_prebuild', - 'type': 'none', - 'actions': [ - { - 'action_name': 'installer_util_strings', - 'inputs': [ - 'create_string_rc.bat', - 'create_string_rc.py', - '../../../app/generated_resoruces.grd', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/installer_util_prebuild/installer_util_strings.rc', - '<(SHARED_INTERMEDIATE_DIR)/installer_util_prebuild/installer_util_strings.h', - ], - 'action': [ - './create_string_rc.bat', - '<(SHARED_INTERMEDIATE_DIR)/installer_util_prebuild' - ], - }, - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/installer_util_prebuild', - ], - }, - 'conditions': [ - ['OS=="win"', { - 'dependencies': ['../../../../build/win/system.gyp:cygwin'], - }], - ], - }, - ], -} diff --git a/chrome/installer/util/util.gyp b/chrome/installer/util/util.gyp deleted file mode 100644 index f3be1a9..0000000 --- a/chrome/installer/util/util.gyp +++ /dev/null @@ -1,88 +0,0 @@ -{ - 'includes': [ - '../../../build/common.gypi', - ], - 'targets': [ - { - 'target_name': 'installer_util', - 'type': '<(library)', - 'dependencies': [ - 'prebuild/util_prebuild.gyp:installer_util_prebuild', - '../../chrome.gyp:common', - '../../chrome.gyp:chrome_resources', - '../../chrome.gyp:chrome_strings', - '../../../net/net.gyp:net_resources', - '../../../media/media.gyp:media', - '../../../skia/skia.gyp:skia', - '../../../third_party/icu38/icu38.gyp:icui18n', - '../../../third_party/icu38/icu38.gyp:icuuc', - '../../../third_party/libxml/libxml.gyp:libxml', - '../../../third_party/npapi/npapi.gyp:npapi', - '../../third_party/hunspell/hunspell.gyp:hunspell', - ], - 'include_dirs': [ - '../../..', - # TODO(bradnelson): this should probably come from a using using_lzma - # file but I'll put it here for now. - '../../../third_party/lzma_sdk', - ], - 'defines': [ - # TODO(bradnelson): this should probably come from a using using_lzma - # file but I'll put it here for now. - '_LZMA_IN_CB', - ], - 'sources': [ - 'browser_distribution.cc', - 'browser_distribution.h', - 'compat_checks.cc', - 'compat_checks.h', - 'copy_tree_work_item.cc', - 'copy_tree_work_item.h', - 'create_dir_work_item.cc', - 'create_dir_work_item.h', - 'create_reg_key_work_item.cc', - 'create_reg_key_work_item.h', - 'delete_reg_value_work_item.cc', - 'delete_reg_value_work_item.h', - 'delete_tree_work_item.cc', - 'delete_tree_work_item.h', - 'google_chrome_distribution.cc', - 'google_chrome_distribution.h', - 'google_update_constants.cc', - 'google_update_constants.h', - 'google_update_settings.cc', - 'google_update_settings.h', - 'helper.cc', - 'helper.h', - 'html_dialog.h', - 'html_dialog_impl.cc', - 'install_util.cc', - 'install_util.h', - 'l10n_string_util.cc', - 'l10n_string_util.h', - 'logging_installer.cc', - 'logging_installer.h', - 'lzma_util.cc', - 'lzma_util.h', - 'master_preferences.cc', - 'master_preferences.h', - 'move_tree_work_item.cc', - 'move_tree_work_item.h', - 'self_reg_work_item.cc', - 'self_reg_work_item.h', - 'set_reg_value_work_item.cc', - 'set_reg_value_work_item.h', - 'shell_util.cc', - 'shell_util.h', - 'util_constants.cc', - 'util_constants.h', - 'version.cc', - 'version.h', - 'work_item.cc', - 'work_item.h', - 'work_item_list.cc', - 'work_item_list.h', - ], - }, - ], -} diff --git a/third_party/lzma_sdk/lzma_sdk.gyp b/third_party/lzma_sdk/lzma_sdk.gyp index 0fef094..3efe5ff 100644 --- a/third_party/lzma_sdk/lzma_sdk.gyp +++ b/third_party/lzma_sdk/lzma_sdk.gyp @@ -51,6 +51,9 @@ 'Types.h', ], 'direct_dependent_settings': { + 'defines': [ + '_LZMA_IN_CB', + ], 'include_dirs': [ '.', ], |