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

Delta Between Two Patch Sets: libadblockplus.gyp

Issue 10252013: Implemented curl support for web requests (Closed)
Left Patch Set: Created April 11, 2013, 3:52 p.m.
Right Patch Set: Addressed review comments Created April 12, 2013, 1:37 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
LEFTRIGHT
1 { 1 {
2 'variables': { 2 'variables': {
3 'have_curl': '<!(python check_curl.py)' 3 'have_curl': '<!(python check_curl.py)'
4 }, 4 },
5 'includes': ['third_party/v8/build/common.gypi', 5 'includes': ['third_party/v8/build/common.gypi',
6 'shell/shell.gyp'], 6 'shell/shell.gyp'],
7 'targets': [{ 7 'targets': [{
8 'target_name': 'libadblockplus', 8 'target_name': 'libadblockplus',
9 'type': '<(library)', 9 'type': '<(library)',
10 'include_dirs': [ 10 'include_dirs': [
11 'include', 11 'include',
12 'third_party/v8/include' 12 'third_party/v8/include'
13 ], 13 ],
14 'defines': ['FILTER_ENGINE_STUBS=1'], 14 'defines': ['FILTER_ENGINE_STUBS=1'],
15 'all_dependent_settings': {
16 'defines': ['FILTER_ENGINE_STUBS=1']
17 },
15 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], 18 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'],
16 'sources': [ 19 'sources': [
17 'src/ConsoleJsObject.cpp', 20 'src/ConsoleJsObject.cpp',
18 'src/ErrorCallback.cpp', 21 'src/ErrorCallback.cpp',
19 'src/FileReader.cpp', 22 'src/FileReader.cpp',
20 'src/FilterEngine.cpp', 23 'src/FilterEngine.cpp',
21 'src/GlobalJsObject.cpp', 24 'src/GlobalJsObject.cpp',
22 'src/JsEngine.cpp', 25 'src/JsEngine.cpp',
23 'src/Thread.cpp', 26 'src/Thread.cpp',
24 'src/WebRequest.cpp',
25 'src/WebRequestJsObject.cpp', 27 'src/WebRequestJsObject.cpp',
26 '<(INTERMEDIATE_DIR)/adblockplus.js.cc' 28 '<(INTERMEDIATE_DIR)/adblockplus.js.cc'
27 ], 29 ],
28 'direct_dependent_settings': { 30 'direct_dependent_settings': {
29 'include_dirs': ['include'] 31 'include_dirs': ['include']
30 }, 32 },
31 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], 33 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
32 'conditions': [ 34 'conditions': [
33 ['have_curl==1', 35 ['have_curl==1',
34 { 36 {
35 'defines': ['HAVE_CURL'], 37 'sources': [
38 'src/DefaultWebRequestCurl.cpp',
39 ],
36 'all_dependent_settings': { 40 'all_dependent_settings': {
37 'defines': ['HAVE_CURL'], 41 'defines': ['HAVE_CURL'],
38 'libraries': ['-lcurl'] 42 'libraries': ['-lcurl']
39 } 43 }
44 }
45 ],
46 ['have_curl!=1',
47 {
48 'sources': [
49 'src/DefaultWebRequestDummy.cpp',
50 ]
40 } 51 }
41 ] 52 ]
42 ], 53 ],
43 'actions': [{ 54 'actions': [{
44 'action_name': 'convert_js', 55 'action_name': 'convert_js',
45 'variables': { 56 'variables': {
46 'core_library_files': [ 57 'core_library_files': [
47 'lib/info.js', 58 'lib/info.js',
48 'lib/io.js', 59 'lib/io.js',
49 'lib/prefs.js', 60 'lib/prefs.js',
(...skipping 26 matching lines...) Expand all
76 '<@(core_library_files)', 87 '<@(core_library_files)',
77 '--', 88 '--',
78 '<@(additional_library_files)', 89 '<@(additional_library_files)',
79 '<@(_outputs)', 90 '<@(_outputs)',
80 ] 91 ]
81 }] 92 }]
82 }, 93 },
83 { 94 {
84 'target_name': 'tests', 95 'target_name': 'tests',
85 'type': 'executable', 96 'type': 'executable',
86 'defines': ['FILTER_ENGINE_STUBS=1'],
87 'dependencies': [ 97 'dependencies': [
88 'third_party/googletest.gyp:googletest_main', 98 'third_party/googletest.gyp:googletest_main',
89 'libadblockplus' 99 'libadblockplus'
90 ], 100 ],
91 'sources': [ 101 'sources': [
92 'test/ConsoleJsObject.cpp', 102 'test/ConsoleJsObject.cpp',
93 'test/FilterEngineStubs.cpp', 103 'test/FilterEngineStubs.cpp',
94 'test/GlobalJsObject.cpp', 104 'test/GlobalJsObject.cpp',
95 'test/JsEngine.cpp', 105 'test/JsEngine.cpp',
96 'test/Thread.cpp', 106 'test/Thread.cpp',
97 'test/WebRequest.cpp' 107 'test/WebRequest.cpp'
98 ] 108 ]
99 }] 109 }]
100 } 110 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld