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: Unbitrotted the patch Created April 11, 2013, 4:33 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': { 15 'all_dependent_settings': {
16 'defines': ['FILTER_ENGINE_STUBS=1'] 16 'defines': ['FILTER_ENGINE_STUBS=1']
17 }, 17 },
18 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], 18 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'],
19 'sources': [ 19 'sources': [
20 'src/ConsoleJsObject.cpp', 20 'src/ConsoleJsObject.cpp',
21 'src/ErrorCallback.cpp', 21 'src/ErrorCallback.cpp',
22 'src/FileReader.cpp', 22 'src/FileReader.cpp',
23 'src/FilterEngine.cpp', 23 'src/FilterEngine.cpp',
24 'src/GlobalJsObject.cpp', 24 'src/GlobalJsObject.cpp',
25 'src/JsEngine.cpp', 25 'src/JsEngine.cpp',
26 'src/Thread.cpp', 26 'src/Thread.cpp',
27 'src/WebRequest.cpp',
28 'src/WebRequestJsObject.cpp', 27 'src/WebRequestJsObject.cpp',
29 '<(INTERMEDIATE_DIR)/adblockplus.js.cc' 28 '<(INTERMEDIATE_DIR)/adblockplus.js.cc'
30 ], 29 ],
31 'direct_dependent_settings': { 30 'direct_dependent_settings': {
32 'include_dirs': ['include'] 31 'include_dirs': ['include']
33 }, 32 },
34 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], 33 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
35 'conditions': [ 34 'conditions': [
36 ['have_curl==1', 35 ['have_curl==1',
37 { 36 {
38 'defines': ['HAVE_CURL'], 37 'sources': [
38 'src/DefaultWebRequestCurl.cpp',
39 ],
39 'all_dependent_settings': { 40 'all_dependent_settings': {
40 'defines': ['HAVE_CURL'], 41 'defines': ['HAVE_CURL'],
41 'libraries': ['-lcurl'] 42 'libraries': ['-lcurl']
42 } 43 }
44 }
45 ],
46 ['have_curl!=1',
47 {
48 'sources': [
49 'src/DefaultWebRequestDummy.cpp',
50 ]
43 } 51 }
44 ] 52 ]
45 ], 53 ],
46 'actions': [{ 54 'actions': [{
47 'action_name': 'convert_js', 55 'action_name': 'convert_js',
48 'variables': { 56 'variables': {
49 'core_library_files': [ 57 'core_library_files': [
50 'lib/info.js', 58 'lib/info.js',
51 'lib/io.js', 59 'lib/io.js',
52 'lib/prefs.js', 60 'lib/prefs.js',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 'sources': [ 101 'sources': [
94 'test/ConsoleJsObject.cpp', 102 'test/ConsoleJsObject.cpp',
95 'test/FilterEngineStubs.cpp', 103 'test/FilterEngineStubs.cpp',
96 'test/GlobalJsObject.cpp', 104 'test/GlobalJsObject.cpp',
97 'test/JsEngine.cpp', 105 'test/JsEngine.cpp',
98 'test/Thread.cpp', 106 'test/Thread.cpp',
99 'test/WebRequest.cpp' 107 'test/WebRequest.cpp'
100 ] 108 ]
101 }] 109 }]
102 } 110 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld