Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: libadblockplus.gyp

Issue 10329009: Changes to convert_js.py to support gyp restrictions (Closed)
Patch Set: Created April 18, 2013, 6:56 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « convert_js.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'have_curl': '<!(python check_curl.py)' 3 'python%': 'python',
Wladimir Palant 2013/04/19 13:31:19 You might want to explain briefly why you need Pyt
Eric 2013/04/19 13:55:50 Comment added in my working version. It'll be pres
4 }, 4 },
5 'conditions': [
6 [
7 # Put OS values known not to support curl in the expression below
8 'OS=="win"',
9 { 'variables': { 'have_curl': 0 }},
10 { 'variables' :{ 'have_curl': '<!(<(python) check_curl.py' }}
11 ]
12 ],
5 'includes': ['third_party/v8/build/common.gypi', 13 'includes': ['third_party/v8/build/common.gypi',
6 'shell/shell.gyp'], 14 'shell/shell.gyp'],
7 'targets': [{ 15 'targets': [{
8 'target_name': 'libadblockplus', 16 'target_name': 'libadblockplus',
9 'type': '<(library)', 17 'type': '<(library)',
18 'msvs_cygwin_shell': 0,
Wladimir Palant 2013/04/19 13:31:19 Wouldn't we want that setting for all targets?
Eric 2013/04/19 13:55:50 We would, in fact, but the msvs generator does not
10 'include_dirs': [ 19 'include_dirs': [
11 'include', 20 'include',
12 'third_party/v8/include' 21 'third_party/v8/include'
13 ], 22 ],
14 'defines': ['FILTER_ENGINE_STUBS=0'], 23 'defines': ['FILTER_ENGINE_STUBS=0'],
15 'all_dependent_settings': { 24 'all_dependent_settings': {
16 'defines': ['FILTER_ENGINE_STUBS=0'] 25 'defines': ['FILTER_ENGINE_STUBS=0']
17 }, 26 },
18 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], 27 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'],
19 'sources': [ 28 'sources': [
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 }, 92 },
84 'inputs': [ 93 'inputs': [
85 'convert_js.py', 94 'convert_js.py',
86 '<@(library_files)', 95 '<@(library_files)',
87 '<@(load_before_files)', 96 '<@(load_before_files)',
88 '<@(load_after_files)', 97 '<@(load_after_files)',
89 ], 98 ],
90 'outputs': [ 99 'outputs': [
91 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' 100 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
92 ], 101 ],
102 'msvs_quote_cmd': 0,
93 'action': [ 103 'action': [
94 'python', 104 '<(python)',
95 'convert_js.py', 105 'convert_js.py',
96 'before=<@(load_before_files)',
97 '<@(library_files)',
98 'after=<@(load_after_files)',
99 '<@(_outputs)', 106 '<@(_outputs)',
107 '--before', '<@(load_before_files)',
108 '--convert', '<@(library_files)',
109 '--after', '<@(load_after_files)',
100 ] 110 ]
101 }] 111 }]
102 }, 112 },
103 { 113 {
104 'target_name': 'tests', 114 'target_name': 'tests',
105 'type': 'executable', 115 'type': 'executable',
106 'dependencies': [ 116 'dependencies': [
107 'third_party/googletest.gyp:googletest_main', 117 'third_party/googletest.gyp:googletest_main',
108 'libadblockplus' 118 'libadblockplus'
109 ], 119 ],
110 'sources': [ 120 'sources': [
111 'test/AppInfoJsObject.cpp', 121 'test/AppInfoJsObject.cpp',
112 'test/ConsoleJsObject.cpp', 122 'test/ConsoleJsObject.cpp',
113 'test/DefaultFileSystem.cpp', 123 'test/DefaultFileSystem.cpp',
114 'test/FileSystemJsObject.cpp', 124 'test/FileSystemJsObject.cpp',
115 'test/FilterEngineStubs.cpp', 125 'test/FilterEngineStubs.cpp',
116 'test/GlobalJsObject.cpp', 126 'test/GlobalJsObject.cpp',
117 'test/JsEngine.cpp', 127 'test/JsEngine.cpp',
118 'test/JsValue.cpp', 128 'test/JsValue.cpp',
119 'test/Thread.cpp', 129 'test/Thread.cpp',
120 'test/WebRequest.cpp' 130 'test/WebRequest.cpp'
121 ] 131 ]
122 }] 132 }]
123 } 133 }
OLDNEW
« no previous file with comments | « convert_js.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld