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

Side by Side Diff: ash/ash.gyp

Issue 9307037: Reland http://codereview.chromium.org/9121050/ with fix for aura_win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add .rc file Created 8 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 10
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'ash', 13 'target_name': 'ash',
14 'type': '<(component)', 14 'type': '<(component)',
15 'dependencies': [ 15 'dependencies': [
16 'ash_strings',
16 '../base/base.gyp:base', 17 '../base/base.gyp:base',
17 '../base/base.gyp:base_i18n', 18 '../base/base.gyp:base_i18n',
18 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
19 '../build/temp_gyp/googleurl.gyp:googleurl', 20 '../build/temp_gyp/googleurl.gyp:googleurl',
20 '../net/net.gyp:net', 21 '../net/net.gyp:net',
21 '../skia/skia.gyp:skia', 22 '../skia/skia.gyp:skia',
22 '../third_party/icu/icu.gyp:icui18n', 23 '../third_party/icu/icu.gyp:icui18n',
23 '../third_party/icu/icu.gyp:icuuc', 24 '../third_party/icu/icu.gyp:icuuc',
24 '../ui/aura/aura.gyp:aura', 25 '../ui/aura/aura.gyp:aura',
25 '../ui/base/strings/ui_strings.gyp:ui_strings', 26 '../ui/base/strings/ui_strings.gyp:ui_strings',
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 '../ui/aura/aura.gyp:aura', 192 '../ui/aura/aura.gyp:aura',
192 '../ui/aura/aura.gyp:test_support_aura', 193 '../ui/aura/aura.gyp:test_support_aura',
193 '../ui/gfx/compositor/compositor.gyp:compositor', 194 '../ui/gfx/compositor/compositor.gyp:compositor',
194 '../ui/gfx/compositor/compositor.gyp:compositor_test_support', 195 '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
195 '../ui/ui.gyp:gfx_resources', 196 '../ui/ui.gyp:gfx_resources',
196 '../ui/ui.gyp:ui', 197 '../ui/ui.gyp:ui',
197 '../ui/ui.gyp:ui_resources', 198 '../ui/ui.gyp:ui_resources',
198 '../ui/ui.gyp:ui_resources_standard', 199 '../ui/ui.gyp:ui_resources_standard',
199 '../ui/views/views.gyp:views', 200 '../ui/views/views.gyp:views',
200 'ash', 201 'ash',
202 'ash_strings',
201 ], 203 ],
202 'sources': [ 204 'sources': [
203 '../ui/views/test/test_views_delegate.cc', 205 '../ui/views/test/test_views_delegate.cc',
204 '../ui/views/test/test_views_delegate.h', 206 '../ui/views/test/test_views_delegate.h',
205 'accelerators/accelerator_controller_unittest.cc', 207 'accelerators/accelerator_controller_unittest.cc',
206 'accelerators/accelerator_filter_unittest.cc', 208 'accelerators/accelerator_filter_unittest.cc',
207 'drag_drop/drag_drop_controller_unittest.cc', 209 'drag_drop/drag_drop_controller_unittest.cc',
208 'ime/input_method_event_filter_unittest.cc', 210 'ime/input_method_event_filter_unittest.cc',
209 'launcher/launcher_model_unittest.cc', 211 'launcher/launcher_model_unittest.cc',
210 'launcher/launcher_unittest.cc', 212 'launcher/launcher_unittest.cc',
(...skipping 23 matching lines...) Expand all
234 'wm/shelf_layout_manager_unittest.cc', 236 'wm/shelf_layout_manager_unittest.cc',
235 'wm/toplevel_layout_manager_unittest.cc', 237 'wm/toplevel_layout_manager_unittest.cc',
236 'wm/toplevel_window_event_filter_unittest.cc', 238 'wm/toplevel_window_event_filter_unittest.cc',
237 'wm/video_detector_unittest.cc', 239 'wm/video_detector_unittest.cc',
238 'wm/visibility_controller_unittest.cc', 240 'wm/visibility_controller_unittest.cc',
239 'wm/window_cycle_controller_unittest.cc', 241 'wm/window_cycle_controller_unittest.cc',
240 'wm/window_modality_controller_unittest.cc', 242 'wm/window_modality_controller_unittest.cc',
241 'wm/workspace_controller_unittest.cc', 243 'wm/workspace_controller_unittest.cc',
242 'wm/workspace/workspace_manager_unittest.cc', 244 'wm/workspace/workspace_manager_unittest.cc',
243 245
246 '<(SHARED_INTERMEDIATE_DIR)/ash_strings/ash_strings.rc',
244 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 247 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
245 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 248 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
246 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 249 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
247 ], 250 ],
248 'conditions': [ 251 'conditions': [
249 ['use_ibus==1', { 252 ['use_ibus==1', {
250 'dependencies': [ 253 'dependencies': [
251 '../build/linux/system.gyp:ibus', 254 '../build/linux/system.gyp:ibus',
252 ], 255 ],
253 }], 256 }],
254 ['OS=="mac"', { 257 ['OS=="mac"', {
255 'sources/': [ 258 'sources/': [
256 ['exclude', 'accelerators/accelerator_filter_unittest.cc'], 259 ['exclude', 'accelerators/accelerator_filter_unittest.cc'],
257 ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'], 260 ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'],
258 ['exclude', 'tooltips/tooltip_controller_unittest.cc'], 261 ['exclude', 'tooltips/tooltip_controller_unittest.cc'],
259 ], 262 ],
260 'dependencies': [ 263 'dependencies': [
261 # Mac tests access resources via the 'AuraShell.app' directory. 264 # Mac tests access resources via the 'AuraShell.app' directory.
262 'ash_shell', 265 'ash_shell',
263 ], 266 ],
264 # Special linker instructions that avoids stripping Obj-C classes that 267 # Special linker instructions that avoids stripping Obj-C classes that
265 # are not referenced in code, but are referenced in nibs. 268 # are not referenced in code, but are referenced in nibs.
266 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 269 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
267 }], 270 }],
271 ['use_glib == 1', {
272 'dependencies': [
273 'aura_shell_unittests_strings',
274 ],
275 }],
268 ], 276 ],
269 }, 277 },
270 { 278 {
271 'target_name': 'ash_shell', 279 'target_name': 'ash_shell',
272 'type': 'executable', 280 'type': 'executable',
273 'dependencies': [ 281 'dependencies': [
274 '../base/base.gyp:base', 282 '../base/base.gyp:base',
275 '../base/base.gyp:base_i18n', 283 '../base/base.gyp:base_i18n',
276 '../chrome/chrome_resources.gyp:packed_resources', 284 '../chrome/chrome_resources.gyp:packed_resources',
277 '../skia/skia.gyp:skia', 285 '../skia/skia.gyp:skia',
(...skipping 17 matching lines...) Expand all
295 'shell/lock_view.cc', 303 'shell/lock_view.cc',
296 'shell/shell_main.cc', 304 'shell/shell_main.cc',
297 'shell/shell_main_parts.cc', 305 'shell/shell_main_parts.cc',
298 'shell/shell_main_parts.h', 306 'shell/shell_main_parts.h',
299 'shell/shell_main_parts_mac.mm', 307 'shell/shell_main_parts_mac.mm',
300 'shell/toplevel_window.cc', 308 'shell/toplevel_window.cc',
301 'shell/toplevel_window.h', 309 'shell/toplevel_window.h',
302 'shell/widgets.cc', 310 'shell/widgets.cc',
303 'shell/window_type_launcher.cc', 311 'shell/window_type_launcher.cc',
304 'shell/window_type_launcher.h', 312 'shell/window_type_launcher.h',
305 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 313 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
Jói 2012/02/03 09:05:57 presumably, you would also need ash_strings.rc her
306 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 314 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
307 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 315 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
308 '../ui/views/test/test_views_delegate.cc', 316 '../ui/views/test/test_views_delegate.cc',
309 ], 317 ],
310 'conditions': [ 318 'conditions': [
311 ['OS=="mac"', { 319 ['OS=="mac"', {
312 'product_name': 'AuraShell', 320 'product_name': 'AuraShell',
313 'mac_bundle': 1, 321 'mac_bundle': 1,
314 'sources/': [ 322 'sources/': [
315 ['exclude', 'shell/shell_main_parts.cc'], 323 ['exclude', 'shell/shell_main_parts.cc'],
316 ], 324 ],
317 'mac_bundle_resources': [ 325 'mac_bundle_resources': [
318 'shell/cocoa/app.icns', 326 'shell/cocoa/app.icns',
319 'shell/cocoa/app-Info.plist', 327 'shell/cocoa/app-Info.plist',
320 'shell/cocoa/nibs/MainMenu.xib', 328 'shell/cocoa/nibs/MainMenu.xib',
321 'shell/cocoa/nibs/RootWindow.xib', 329 'shell/cocoa/nibs/RootWindow.xib',
322 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', 330 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
323 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_I NTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', 331 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_I NTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
324 ], 332 ],
325 'mac_bundle_resources!': [ 333 'mac_bundle_resources!': [
326 'shell/cocoa/app-Info.plist', 334 'shell/cocoa/app-Info.plist',
327 ], 335 ],
328 'xcode_settings': { 336 'xcode_settings': {
329 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 337 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
330 }, 338 },
331 }], 339 }],
332 ], 340 ],
333 }, 341 },
342 {
343 'target_name': 'ash_strings',
344 'type': 'none',
345 'actions': [
346 # Localizable resources.
347 {
348 'action_name': 'ash_strings',
349 'variables': {
350 'grit_grd_file': 'ash_strings.grd',
351 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash_strings',
352 },
353 'includes': [ '../build/grit_action.gypi' ],
354 },
355 ],
356 'direct_dependent_settings': {
357 'include_dirs': [
358 '<(SHARED_INTERMEDIATE_DIR)/ash_strings',
359 ],
360 },
361 },
362 ],
363 'conditions': [
364 ['os_posix == 1 and OS != "mac"', {
365 'targets': [{
366 'target_name': 'aura_shell_unittests_strings',
367 'type': 'none',
368 'variables': {
369 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
370 },
371 'actions': [
372 {
373 'action_name': 'repack_aura_shell_unittests_strings',
374 'variables': {
375 'pak_inputs': [
376 '<(SHARED_INTERMEDIATE_DIR)/ash_strings/ash_strings_en-US.pak',
377 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
378 '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_se ttings_en-US.pak',
379 ],
380 },
381 'inputs': [
382 '<(repack_path)',
383 '<@(pak_inputs)',
384 ],
385 'outputs': [
386 '<(PRODUCT_DIR)/aura_shell_unittests_strings/en-US.pak',
387 ],
388 'action': ['python', '<(repack_path)', '<@(_outputs)',
389 '<@(pak_inputs)'],
390 },
391 ],
392 }],
393 }],
334 ], 394 ],
335 } 395 }
OLDNEW
« no previous file with comments | « ash/DEPS ('k') | ash/ash_strings.grd » ('j') | ash/test/test_suite.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698