Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(919)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/remoting.gyp

Issue 9148043: Rename webapp_it2me to remoting_webapp and move it from webapp/me2mom to webapp/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add webapp_it2me back Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/webapp/_locales.official/ar/messages.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 56ce7b47400763287d839ad473236dea7f2f9ec1..7b84fd673b1dcbb35fb99c27aaa3752134e85f7d 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -49,96 +49,96 @@
['branding=="Chrome"', {
# Must match host/plugin/constants.h
'host_plugin_name': 'Chrome Remote Desktop Host',
- 'remoting_it2me_locale_files': [
- 'webapp/me2mom/_locales.official/ar/messages.json',
- 'webapp/me2mom/_locales.official/bg/messages.json',
- 'webapp/me2mom/_locales.official/ca/messages.json',
- 'webapp/me2mom/_locales.official/cs/messages.json',
- 'webapp/me2mom/_locales.official/da/messages.json',
- 'webapp/me2mom/_locales.official/de/messages.json',
- 'webapp/me2mom/_locales.official/el/messages.json',
- 'webapp/me2mom/_locales.official/en/messages.json',
- 'webapp/me2mom/_locales.official/en_GB/messages.json',
- 'webapp/me2mom/_locales.official/es/messages.json',
- 'webapp/me2mom/_locales.official/es_419/messages.json',
- 'webapp/me2mom/_locales.official/et/messages.json',
- 'webapp/me2mom/_locales.official/fi/messages.json',
- 'webapp/me2mom/_locales.official/fil/messages.json',
- 'webapp/me2mom/_locales.official/fr/messages.json',
- 'webapp/me2mom/_locales.official/he/messages.json',
- 'webapp/me2mom/_locales.official/hi/messages.json',
- 'webapp/me2mom/_locales.official/hr/messages.json',
- 'webapp/me2mom/_locales.official/hu/messages.json',
- 'webapp/me2mom/_locales.official/id/messages.json',
- 'webapp/me2mom/_locales.official/it/messages.json',
- 'webapp/me2mom/_locales.official/ja/messages.json',
- 'webapp/me2mom/_locales.official/ko/messages.json',
- 'webapp/me2mom/_locales.official/lt/messages.json',
- 'webapp/me2mom/_locales.official/lv/messages.json',
- 'webapp/me2mom/_locales.official/nb/messages.json',
- 'webapp/me2mom/_locales.official/nl/messages.json',
- 'webapp/me2mom/_locales.official/pl/messages.json',
- 'webapp/me2mom/_locales.official/pt_BR/messages.json',
- 'webapp/me2mom/_locales.official/pt_PT/messages.json',
- 'webapp/me2mom/_locales.official/ro/messages.json',
- 'webapp/me2mom/_locales.official/ru/messages.json',
- 'webapp/me2mom/_locales.official/sk/messages.json',
- 'webapp/me2mom/_locales.official/sl/messages.json',
- 'webapp/me2mom/_locales.official/sr/messages.json',
- 'webapp/me2mom/_locales.official/sv/messages.json',
- 'webapp/me2mom/_locales.official/th/messages.json',
- 'webapp/me2mom/_locales.official/tr/messages.json',
- 'webapp/me2mom/_locales.official/uk/messages.json',
- 'webapp/me2mom/_locales.official/vi/messages.json',
- 'webapp/me2mom/_locales.official/zh_CN/messages.json',
- 'webapp/me2mom/_locales.official/zh_TW/messages.json',
+ 'remoting_webapp_locale_files': [
+ 'webapp/_locales.official/ar/messages.json',
+ 'webapp/_locales.official/bg/messages.json',
+ 'webapp/_locales.official/ca/messages.json',
+ 'webapp/_locales.official/cs/messages.json',
+ 'webapp/_locales.official/da/messages.json',
+ 'webapp/_locales.official/de/messages.json',
+ 'webapp/_locales.official/el/messages.json',
+ 'webapp/_locales.official/en/messages.json',
+ 'webapp/_locales.official/en_GB/messages.json',
+ 'webapp/_locales.official/es/messages.json',
+ 'webapp/_locales.official/es_419/messages.json',
+ 'webapp/_locales.official/et/messages.json',
+ 'webapp/_locales.official/fi/messages.json',
+ 'webapp/_locales.official/fil/messages.json',
+ 'webapp/_locales.official/fr/messages.json',
+ 'webapp/_locales.official/he/messages.json',
+ 'webapp/_locales.official/hi/messages.json',
+ 'webapp/_locales.official/hr/messages.json',
+ 'webapp/_locales.official/hu/messages.json',
+ 'webapp/_locales.official/id/messages.json',
+ 'webapp/_locales.official/it/messages.json',
+ 'webapp/_locales.official/ja/messages.json',
+ 'webapp/_locales.official/ko/messages.json',
+ 'webapp/_locales.official/lt/messages.json',
+ 'webapp/_locales.official/lv/messages.json',
+ 'webapp/_locales.official/nb/messages.json',
+ 'webapp/_locales.official/nl/messages.json',
+ 'webapp/_locales.official/pl/messages.json',
+ 'webapp/_locales.official/pt_BR/messages.json',
+ 'webapp/_locales.official/pt_PT/messages.json',
+ 'webapp/_locales.official/ro/messages.json',
+ 'webapp/_locales.official/ru/messages.json',
+ 'webapp/_locales.official/sk/messages.json',
+ 'webapp/_locales.official/sl/messages.json',
+ 'webapp/_locales.official/sr/messages.json',
+ 'webapp/_locales.official/sv/messages.json',
+ 'webapp/_locales.official/th/messages.json',
+ 'webapp/_locales.official/tr/messages.json',
+ 'webapp/_locales.official/uk/messages.json',
+ 'webapp/_locales.official/vi/messages.json',
+ 'webapp/_locales.official/zh_CN/messages.json',
+ 'webapp/_locales.official/zh_TW/messages.json',
],
}, { # else: branding!="Chrome"
# Must match host/plugin/constants.h
'host_plugin_name': 'Chromoting Host',
- 'remoting_it2me_locale_files': [
- 'webapp/me2mom/_locales/en/messages.json',
+ 'remoting_webapp_locale_files': [
+ 'webapp/_locales/en/messages.json',
],
}],
],
- 'remoting_it2me_files': [
+ 'remoting_webapp_files': [
'resources/icon_cross.png',
'resources/icon_host.png',
'resources/icon_pencil.png',
'resources/icon_warning.png',
- 'webapp/me2mom/choice.css',
- 'webapp/me2mom/choice.html',
- 'webapp/me2mom/client_screen.js',
- 'webapp/me2mom/client_session.js',
- 'webapp/me2mom/cs_oauth2_trampoline.js',
- 'webapp/me2mom/debug_log.css',
- 'webapp/me2mom/debug_log.js',
- 'webapp/me2mom/dividerbottom.png',
- 'webapp/me2mom/dividertop.png',
- 'webapp/me2mom/event_handlers.js',
- 'webapp/me2mom/host_list.js',
- 'webapp/me2mom/host_screen.js',
- 'webapp/me2mom/host_session.js',
- 'webapp/me2mom/host_table_entry.js',
- 'webapp/me2mom/l10n.js',
- 'webapp/me2mom/log_to_server.js',
- 'webapp/me2mom/main.css',
- 'webapp/me2mom/manifest.json',
- 'webapp/me2mom/oauth2.js',
- 'webapp/me2mom/oauth2_callback.html',
- 'webapp/me2mom/plugin_settings.js',
- 'webapp/me2mom/remoting.js',
- 'webapp/me2mom/scale-to-fit.png',
- 'webapp/me2mom/server_log_entry.js',
- 'webapp/me2mom/spinner.gif',
- 'webapp/me2mom/stats_accumulator.js',
- 'webapp/me2mom/toolbar.css',
- 'webapp/me2mom/toolbar.js',
- 'webapp/me2mom/ui_mode.js',
- 'webapp/me2mom/util.js',
- 'webapp/me2mom/wcs.js',
- 'webapp/me2mom/wcs_loader.js',
- 'webapp/me2mom/xhr.js',
+ 'webapp/choice.css',
+ 'webapp/choice.html',
+ 'webapp/client_screen.js',
+ 'webapp/client_session.js',
+ 'webapp/cs_oauth2_trampoline.js',
+ 'webapp/debug_log.css',
+ 'webapp/debug_log.js',
+ 'webapp/dividerbottom.png',
+ 'webapp/dividertop.png',
+ 'webapp/event_handlers.js',
+ 'webapp/host_list.js',
+ 'webapp/host_screen.js',
+ 'webapp/host_session.js',
+ 'webapp/host_table_entry.js',
+ 'webapp/l10n.js',
+ 'webapp/log_to_server.js',
+ 'webapp/main.css',
+ 'webapp/manifest.json',
+ 'webapp/oauth2.js',
+ 'webapp/oauth2_callback.html',
+ 'webapp/plugin_settings.js',
+ 'webapp/remoting.js',
+ 'webapp/scale-to-fit.png',
+ 'webapp/server_log_entry.js',
+ 'webapp/spinner.gif',
+ 'webapp/stats_accumulator.js',
+ 'webapp/toolbar.css',
+ 'webapp/toolbar.js',
+ 'webapp/ui_mode.js',
+ 'webapp/util.js',
+ 'webapp/wcs.js',
+ 'webapp/wcs_loader.js',
+ 'webapp/xhr.js',
'resources/chromoting16.png',
'resources/chromoting48.png',
'resources/chromoting128.png',
@@ -344,7 +344,12 @@
}],
],
}, # end of target 'remoting_host_plugin'
+
{
+ # This is a deprecated target that has been replaced with remoting_it2me.
+ # It is kept here because there are some pieces that still depend on
+ # this target.
+ # TODO(sergeyu): Remove this target.
'target_name': 'webapp_it2me',
'type': 'none',
'dependencies': [
@@ -352,9 +357,50 @@
],
'sources': [
'webapp/build-webapp.py',
+ '<@(remoting_webapp_files)',
+ '<@(remoting_webapp_locale_files)',
+ ],
+ 'actions': [
+ {
+ 'action_name': 'Build Remoting WebApp',
+ 'output_dir': '<(PRODUCT_DIR)/remoting/it2me.webapp',
+ 'plugin_path': '<(PRODUCT_DIR)/<(host_plugin_prefix)remoting_host_plugin.<(host_plugin_extension)',
+ 'zip_path': '<(PRODUCT_DIR)/remoting-it2me.zip',
+ 'inputs': [
+ 'webapp/build-webapp.py',
+ '<(_plugin_path)',
+ '<@(remoting_webapp_files)',
+ '<@(remoting_webapp_locale_files)',
+ ],
+ 'outputs': [
+ '<(_output_dir)',
+ '<(_zip_path)',
+ ],
+ 'action': [
+ 'python', 'webapp/build-webapp.py',
+ '<(buildtype)',
+ '<(host_plugin_mime_type)',
+ '<(_output_dir)',
+ '<(_zip_path)',
+ '<(_plugin_path)',
+ '<@(remoting_webapp_files)',
+ '--locales',
+ '<@(remoting_webapp_locale_files)',
+ ],
+ },
+ ],
+ }, # end of target 'remoting_webapp'
+ {
+ 'target_name': 'remoting_webapp',
+ 'type': 'none',
+ 'dependencies': [
+ 'remoting_host_plugin',
+ ],
+ 'sources': [
+ 'webapp/build-webapp.py',
'webapp/verify-webapp.py',
- '<@(remoting_it2me_files)',
- '<@(remoting_it2me_locale_files)',
+ '<@(remoting_webapp_files)',
+ '<@(remoting_webapp_locale_files)',
],
# Can't use a 'copies' because we need to manipulate
# the manifest file to get the right plugin name.
@@ -364,41 +410,41 @@
# when the actual project is generated.
'actions': [
{
- 'action_name': 'Verify It2Me WebApp i18n',
+ 'action_name': 'Verify Remoting WebApp i18n',
'inputs': [
'webapp/verify-webapp.py',
- 'webapp/me2mom/_locales/en/messages.json',
- 'webapp/me2mom/choice.html',
- 'webapp/me2mom/host_table_entry.js',
- 'webapp/me2mom/manifest.json',
- 'webapp/me2mom/remoting.js',
+ 'webapp/_locales/en/messages.json',
+ 'webapp/choice.html',
+ 'webapp/host_table_entry.js',
+ 'webapp/manifest.json',
+ 'webapp/remoting.js',
'host/plugin/host_script_object.cc',
],
'outputs': [
- '<(PRODUCT_DIR)/remoting/it2me_verified.stamp',
+ '<(PRODUCT_DIR)/remoting/webapp_verified.stamp',
],
'action': [
'python',
'webapp/verify-webapp.py',
- '<(PRODUCT_DIR)/remoting/it2me_verified.stamp',
- 'webapp/me2mom/_locales/en/messages.json',
- 'webapp/me2mom/choice.html',
- 'webapp/me2mom/host_table_entry.js',
- 'webapp/me2mom/manifest.json',
- 'webapp/me2mom/remoting.js',
+ '<(PRODUCT_DIR)/remoting/webapp_verified.stamp',
+ 'webapp/_locales/en/messages.json',
+ 'webapp/choice.html',
+ 'webapp/host_table_entry.js',
+ 'webapp/manifest.json',
+ 'webapp/remoting.js',
'host/plugin/host_script_object.cc',
],
},
{
- 'action_name': 'Build It2Me WebApp',
- 'output_dir': '<(PRODUCT_DIR)/remoting/it2me.webapp',
+ 'action_name': 'Build Remoting WebApp',
+ 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp',
'plugin_path': '<(PRODUCT_DIR)/<(host_plugin_prefix)remoting_host_plugin.<(host_plugin_extension)',
- 'zip_path': '<(PRODUCT_DIR)/remoting-it2me.zip',
+ 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip',
'inputs': [
'webapp/build-webapp.py',
'<(_plugin_path)',
- '<@(remoting_it2me_files)',
- '<@(remoting_it2me_locale_files)',
+ '<@(remoting_webapp_files)',
+ '<@(remoting_webapp_locale_files)',
],
'outputs': [
'<(_output_dir)',
@@ -411,13 +457,13 @@
'<(_output_dir)',
'<(_zip_path)',
'<(_plugin_path)',
- '<@(remoting_it2me_files)',
+ '<@(remoting_webapp_files)',
'--locales',
- '<@(remoting_it2me_locale_files)',
+ '<@(remoting_webapp_locale_files)',
],
},
],
- }, # end of target 'webapp_it2me'
+ }, # end of target 'remoting_webapp'
{
'target_name': 'remoting_base',
'type': 'static_library',
« no previous file with comments | « no previous file | remoting/webapp/_locales.official/ar/messages.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698