Side by Side Diff: libadblockplus.gyp
Issue 10252013:
Implemented curl support for web requests (Closed)
Patch Set: Made abpshell use DefaultWebRequest
Created April 11, 2013, 3:55 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« include/AdblockPlus/WebRequest.h ('k')
|
shell/src/Main.cpp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'variables': { | |
| 3 'have_curl': '<!(python check_curl.py)' | |
| 4 }, | |
| 2 'includes': ['third_party/v8/build/common.gypi', | 5 'includes': ['third_party/v8/build/common.gypi', |
| 3 'shell/shell.gyp'], | 6 'shell/shell.gyp'], |
| 4 'targets': [{ | 7 'targets': [{ |
| 5 'target_name': 'libadblockplus', | 8 'target_name': 'libadblockplus', |
| 6 'type': '<(library)', | 9 'type': '<(library)', |
| 7 'include_dirs': [ | 10 'include_dirs': [ |
| 8 'include', | 11 'include', |
| 9 'third_party/v8/include' | 12 'third_party/v8/include' |
| 10 ], | 13 ], |
| 11 'defines': ['FILTER_ENGINE_STUBS=1'], | 14 'defines': ['FILTER_ENGINE_STUBS=1'], |
| 12 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 15 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
| 13 'sources': [ | 16 'sources': [ |
| 14 'src/ConsoleJsObject.cpp', | 17 'src/ConsoleJsObject.cpp', |
| 15 'src/ErrorCallback.cpp', | 18 'src/ErrorCallback.cpp', |
| 16 'src/FileReader.cpp', | 19 'src/FileReader.cpp', |
| 17 'src/FilterEngine.cpp', | 20 'src/FilterEngine.cpp', |
| 18 'src/GlobalJsObject.cpp', | 21 'src/GlobalJsObject.cpp', |
| 19 'src/JsEngine.cpp', | 22 'src/JsEngine.cpp', |
| 20 'src/Thread.cpp', | 23 'src/Thread.cpp', |
| 21 'src/WebRequest.cpp', | 24 'src/WebRequest.cpp', |
| 22 'src/WebRequestJsObject.cpp', | 25 'src/WebRequestJsObject.cpp', |
| 23 '<(INTERMEDIATE_DIR)/adblockplus.js.cc' | 26 '<(INTERMEDIATE_DIR)/adblockplus.js.cc' |
| 24 ], | 27 ], |
| 25 'direct_dependent_settings': { | 28 'direct_dependent_settings': { |
| 26 'include_dirs': ['include'] | 29 'include_dirs': ['include'] |
| 27 }, | 30 }, |
| 28 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 31 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
| 32 'conditions': [ | |
| 33 ['have_curl==1', | |
| 34 { | |
| 35 'defines': ['HAVE_CURL'], | |
| 36 'all_dependent_settings': { | |
| 37 'defines': ['HAVE_CURL'], | |
| 38 'libraries': ['-lcurl'] | |
| 39 } | |
| 40 } | |
| 41 ] | |
| 42 ], | |
| 29 'actions': [{ | 43 'actions': [{ |
| 30 'action_name': 'convert_js', | 44 'action_name': 'convert_js', |
| 31 'variables': { | 45 'variables': { |
| 32 'core_library_files': [ | 46 'core_library_files': [ |
| 33 'lib/info.js', | 47 'lib/info.js', |
| 34 'lib/io.js', | 48 'lib/io.js', |
| 35 'lib/prefs.js', | 49 'lib/prefs.js', |
| 36 'lib/utils.js', | 50 'lib/utils.js', |
| 37 'lib/elemHideHitRegistration.js', | 51 'lib/elemHideHitRegistration.js', |
| 38 'adblockplus/lib/filterNotifier.js', | 52 'adblockplus/lib/filterNotifier.js', |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 77 'sources': [ | 91 'sources': [ |
| 78 'test/ConsoleJsObject.cpp', | 92 'test/ConsoleJsObject.cpp', |
| 79 'test/FilterEngineStubs.cpp', | 93 'test/FilterEngineStubs.cpp', |
| 80 'test/GlobalJsObject.cpp', | 94 'test/GlobalJsObject.cpp', |
| 81 'test/JsEngine.cpp', | 95 'test/JsEngine.cpp', |
| 82 'test/Thread.cpp', | 96 'test/Thread.cpp', |
| 83 'test/WebRequest.cpp' | 97 'test/WebRequest.cpp' |
| 84 ] | 98 ] |
| 85 }] | 99 }] |
| 86 } | 100 } |
| OLD | NEW |
« no previous file with comments
|
« include/AdblockPlus/WebRequest.h ('k')
|
shell/src/Main.cpp » ('j')
|
no next file with comments »
