Delta Between Two Patch Sets: libadblockplus.gyp
Issue 10296001:
Implement File API (Closed)
Left Patch Set: Address issues
Created April 15, 2013, 1:42 p.m.
Right Patch Set: Addressed the new issues
Created April 16, 2013, 1:37 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« lib/io.js ('k')
|
shell/src/Main.cpp » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 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/DefaultFileSystem.cpp', | |
| 21 'src/ErrorCallback.cpp', | 22 'src/ErrorCallback.cpp', |
| 22 'src/FileSystemJsObject.cpp', | 23 'src/FileSystemJsObject.cpp', |
| 23 'src/FilterEngine.cpp', | 24 'src/FilterEngine.cpp', |
| 24 'src/GlobalJsObject.cpp', | 25 'src/GlobalJsObject.cpp', |
| 25 'src/JsEngine.cpp', | 26 'src/JsEngine.cpp', |
| 26 'src/Thread.cpp', | 27 'src/Thread.cpp', |
| 27 'src/Utils.cpp', | 28 'src/Utils.cpp', |
| 28 'src/WebRequest.cpp', | |
| 29 'src/WebRequestJsObject.cpp', | 29 'src/WebRequestJsObject.cpp', |
| 30 '<(INTERMEDIATE_DIR)/adblockplus.js.cc' | 30 '<(INTERMEDIATE_DIR)/adblockplus.js.cc' |
| 31 ], | 31 ], |
| 32 'direct_dependent_settings': { | 32 'direct_dependent_settings': { |
| 33 'include_dirs': ['include'] | 33 'include_dirs': ['include'] |
| 34 }, | 34 }, |
| 35 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 35 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
| 36 'conditions': [ | 36 'conditions': [ |
| 37 ['have_curl==1', | 37 ['have_curl==1', |
| 38 { | 38 { |
| 39 'defines': ['HAVE_CURL'], | 39 'sources': [ |
| 40 'src/DefaultWebRequestCurl.cpp', | |
| 41 ], | |
| 40 'all_dependent_settings': { | 42 'all_dependent_settings': { |
| 41 'defines': ['HAVE_CURL'], | 43 'defines': ['HAVE_CURL'], |
| 42 'libraries': ['-lcurl'] | 44 'libraries': ['-lcurl'] |
| 43 } | 45 } |
| 46 } | |
| 47 ], | |
| 48 ['have_curl!=1', | |
| 49 { | |
| 50 'sources': [ | |
| 51 'src/DefaultWebRequestDummy.cpp', | |
| 52 ] | |
| 44 } | 53 } |
| 45 ] | 54 ] |
| 46 ], | 55 ], |
| 47 'actions': [{ | 56 'actions': [{ |
| 48 'action_name': 'convert_js', | 57 'action_name': 'convert_js', |
| 49 'variables': { | 58 'variables': { |
| 50 'core_library_files': [ | 59 'core_library_files': [ |
| 51 'lib/info.js', | 60 'lib/info.js', |
| 52 'lib/io.js', | 61 'lib/io.js', |
| 53 'lib/prefs.js', | 62 'lib/prefs.js', |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 86 }, | 95 }, |
| 87 { | 96 { |
| 88 'target_name': 'tests', | 97 'target_name': 'tests', |
| 89 'type': 'executable', | 98 'type': 'executable', |
| 90 'dependencies': [ | 99 'dependencies': [ |
| 91 'third_party/googletest.gyp:googletest_main', | 100 'third_party/googletest.gyp:googletest_main', |
| 92 'libadblockplus' | 101 'libadblockplus' |
| 93 ], | 102 ], |
| 94 'sources': [ | 103 'sources': [ |
| 95 'test/ConsoleJsObject.cpp', | 104 'test/ConsoleJsObject.cpp', |
| 105 'test/DefaultFileSystem.cpp', | |
| 96 'test/FileSystemJsObject.cpp', | 106 'test/FileSystemJsObject.cpp', |
| 97 'test/FilterEngineStubs.cpp', | 107 'test/FilterEngineStubs.cpp', |
| 98 'test/GlobalJsObject.cpp', | 108 'test/GlobalJsObject.cpp', |
| 99 'test/JsEngine.cpp', | 109 'test/JsEngine.cpp', |
| 100 'test/Thread.cpp', | 110 'test/Thread.cpp', |
| 101 'test/WebRequest.cpp' | 111 'test/WebRequest.cpp' |
| 102 ] | 112 ] |
| 103 }] | 113 }] |
| 104 } | 114 } |
| LEFT | RIGHT |
« lib/io.js ('k')
|
shell/src/Main.cpp » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
