diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 13:57:10 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 13:57:10 +0000 |
| commit | 60741b476f12d0a9a7a0adac446d1af75d1208af (patch) | |
| tree | 97cf98a024b22840a7a0f1b3a0520cce8d919949 /printing/printing.gyp | |
| parent | 12b38f6e0866c6a88f0724395ed8a60a8eaf1bd3 (diff) | |
| download | chromium_src-60741b476f12d0a9a7a0adac446d1af75d1208af.zip chromium_src-60741b476f12d0a9a7a0adac446d1af75d1208af.tar.gz chromium_src-60741b476f12d0a9a7a0adac446d1af75d1208af.tar.bz2 | |
Fix printing project on linux.
Enable compilation of every files and fix tests.
TEST=unit tests
BUG=9847
Review URL: http://codereview.chromium.org/193086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/printing.gyp')
| -rw-r--r-- | printing/printing.gyp | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/printing/printing.gyp b/printing/printing.gyp index c10b92b..c6340ec 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -51,7 +51,7 @@ 'printed_pages_source.h', 'printing_context.h', 'printing_context_linux.cc', - 'printing_context_mac.cc', + 'printing_context_mac.cc', 'printing_context_win.cc', 'units.cc', 'units.h', @@ -64,15 +64,9 @@ 'conditions': [ ['OS!="linux"', {'sources/': [['exclude', '_linux\\.cc$']]}], ['OS!="mac"', {'sources/': [['exclude', '_mac\\.(cc|mm?)$']]}], - ['OS!="win"', { - 'sources/': [ - ['exclude', '_win\\.cc$'], - ['exclude', - 'printed_document.cc', - ] - ] - }, { # else: OS=="win" - 'sources/': [['exclude', '_posix\\.cc$']] + ['OS!="win"', {'sources/': [['exclude', '_win\\.cc$']] + }, { # else: OS=="win" + 'sources/': [['exclude', '_posix\\.cc$']] }], ], }, @@ -100,26 +94,16 @@ 'conditions': [ ['OS!="linux"', {'sources/': [['exclude', '_linux_unittest\\.cc$']]}], ['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}], - ['OS!="win"', { - 'sources/': [ - ['exclude', '_win_unittest\\.cc$'], - - # Most of the printing functionailty is Windows only for now. - ['exclude', '.*'], - ['include', 'page_range_unittest.cc'], - ['include', 'page_setup_unittest.cc'], - ['include', 'units_unittest.cc'], - ] - }, { # else: OS=="win" - 'sources/': [['exclude', '_posix_unittest\\.cc$']] - }], + ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']] + }, { # else: OS=="win" + 'sources/': [['exclude', '_posix_unittest\\.cc$']] + } + ], ['OS=="linux"', { - 'dependencies': [ - '../base/base.gyp:base_gfx', - ], - 'sources/': [ - ['include', 'pdf_ps_metafile_linux_unittest.cc'], - ] + 'dependencies': [ + '../build/linux/system.gyp:fontconfig', + '../build/linux/system.gyp:gtk', + ], }], ], }, |