diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:50:46 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-22 22:02:15 +0000 |
commit | c5282c3479294f8d1c3ce310585aa9e3a8c4f4d7 (patch) | |
tree | bf4141bdf2aa48b69786d66514b4319a211462c7 /src/core/resources | |
parent | cd776aebe0a6505141b0392b79cca117de3c5ac3 (diff) |
Remove gyp handling
Remove now dead GYP related code.
Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/resources')
-rw-r--r-- | src/core/resources/grit_action.gypi | 41 | ||||
-rw-r--r-- | src/core/resources/repack_locales.gypi | 26 | ||||
-rw-r--r-- | src/core/resources/repack_resources.gypi | 16 | ||||
-rw-r--r-- | src/core/resources/resources.gyp | 96 |
4 files changed, 0 insertions, 179 deletions
diff --git a/src/core/resources/grit_action.gypi b/src/core/resources/grit_action.gypi deleted file mode 100644 index e8b98b43d..000000000 --- a/src/core/resources/grit_action.gypi +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file is meant to be included into an action to invoke grit in a -# consistent manner. To use this the following variables need to be -# defined: -# grit_grd_file: string: grd file path -# grit_out_dir: string: the output directory path - -# It would be really nice to do this with a rule instead of actions, but it -# would need to determine inputs and outputs via grit_info on a per-file -# basis. GYP rules don’t currently support that. They could be extended to -# do this, but then every generator would need to be updated to handle this. - -{ - 'variables': { - 'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'], - 'grit_resource_ids%': '<(DEPTH)/tools/gritsettings/resource_ids', - # This makes it possible to add more defines in specific targets, - # instead of build/common.gypi . - 'grit_additional_defines%': [], - }, - 'inputs': [ - '<!@pymod_do_main(grit_info <@(grit_defines) <@(grit_additional_defines) ' - '--inputs <(grit_grd_file) -f "<(grit_resource_ids)")', - ], - 'outputs': [ - '<!@pymod_do_main(grit_info <@(grit_defines) <@(grit_additional_defines) ' - '--outputs \'<(grit_out_dir)\' ' - '<(grit_grd_file) -f "<(grit_resource_ids)")', - ], - 'action': ['<@(grit_cmd)', - '-i', '<(grit_grd_file)', 'build', - '-f', '<(grit_resource_ids)', - '-o', '<(grit_out_dir)', - '<@(grit_defines)', - '<@(grit_additional_defines)' ], - 'msvs_cygwin_shell': 0, - 'message': 'Generating resources from <(grit_grd_file)', -} diff --git a/src/core/resources/repack_locales.gypi b/src/core/resources/repack_locales.gypi deleted file mode 100644 index d24da1b5d..000000000 --- a/src/core/resources/repack_locales.gypi +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'repack_extra_flags%': [], - 'repack_output_dir%': '<(SHARED_INTERMEDIATE_DIR)', - 'repack_locales_script%': ['python', '<(qtwebengine_root)/tools/buildscripts/repack_locales.py'], - }, - 'inputs': [ - '<(qtwebengine_root)/tools/buildscripts/repack_locales.py', - '<!@pymod_do_main(repack_locales -i -p <(OS) -s <(SHARED_INTERMEDIATE_DIR) -x <(repack_output_dir) <(repack_extra_flags) <(locales))' - ], - 'outputs': [ - '<@(locale_files)' - ], - 'action': [ - '<@(repack_locales_script)', - '-p', '<(OS)', - '-s', '<(SHARED_INTERMEDIATE_DIR)', - '-x', '<(repack_output_dir)/.', - '<@(repack_extra_flags)', - '<@(locales)', - ], -} diff --git a/src/core/resources/repack_resources.gypi b/src/core/resources/repack_resources.gypi deleted file mode 100644 index ce224e625..000000000 --- a/src/core/resources/repack_resources.gypi +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'variables': { - 'repack_path': '<(chromium_src_dir)/tools/grit/grit/format/repack.py', - }, - 'inputs': [ - '<(repack_path)', - '<@(pak_inputs)', - ], - 'outputs': [ - '<@(pak_outputs)', - ], - 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], -} diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp deleted file mode 100644 index 8b7d520a9..000000000 --- a/src/core/resources/resources.gyp +++ /dev/null @@ -1,96 +0,0 @@ -{ - 'variables': { - # Used in repack_locales - 'locales': [ - 'am', 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', - 'en-US', 'es-419', 'es', 'et', 'fa', 'fi', 'fil', 'fr', 'gu', 'he', - 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv', - 'ml', 'mr', 'ms', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', - 'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk', - 'vi', 'zh-CN', 'zh-TW', - ], - 'locale_files': ['<!@pymod_do_main(repack_locales -o -p <(OS) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))'], - 'qt_install_data%': '', - 'qt_install_translations%': '', - }, - 'targets': [ - { - 'target_name': 'qtwebengine_resources', - 'type': 'none', - 'dependencies': [ - '<(chromium_src_dir)/content/app/strings/content_strings.gyp:content_strings', - '<(chromium_src_dir)/content/browser/devtools/devtools_resources.gyp:devtools_resources', - '<(chromium_src_dir)/components/components_resources.gyp:components_resources', - '<(chromium_src_dir)/components/components_strings.gyp:components_strings', - '<(chromium_src_dir)/third_party/WebKit/public/blink_resources.gyp:blink_resources', - '<(qtwebengine_root)/src/core/chrome_qt.gyp:chrome_resources', - ], - 'actions' : [ - { - 'action_name': 'repack_resources', - 'variables': { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', - ], - 'pak_outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources.pak' - ] - }, - 'includes': [ 'repack_resources.gypi' ], - }, - { - 'action_name': 'repack_resources_100_percent', - 'variables': { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_image_resources_100_percent.pak', - ], - 'pak_outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_100p.pak' - ] - }, - 'includes': [ 'repack_resources.gypi' ], - }, - { - 'action_name': 'repack_resources_200_percent', - 'variables': { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_image_resources_200_percent.pak', - ], - 'pak_outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_200p.pak' - ] - }, - 'includes': [ 'repack_resources.gypi' ], - }, - { - 'action_name': 'repack_resources_devtools', - 'variables': { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak', - ], - 'pak_outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_devtools_resources.pak' - ] - }, - 'includes': [ 'repack_resources.gypi' ], - }, - { - 'action_name': 'repack_locales', - 'includes': [ 'repack_locales.gypi' ], - }, - ], - } - ] -} |