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

Delta Between Two Patch Sets: libadblockplus.gyp

Issue 10213003: Make JsEngine::Evaluate() return a wrapper for v8::Value to accessdifferent variable types easily (Closed)
Left Patch Set: Created April 12, 2013, 2:55 p.m.
Right Patch Set: Addressed review comments Created April 17, 2013, 7:56 a.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
« no previous file with change/comment | « lib/compat.js ('k') | src/FilterEngine.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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=0'],
15 'all_dependent_settings': { 15 'all_dependent_settings': {
16 'defines': ['FILTER_ENGINE_STUBS=1'] 16 'defines': ['FILTER_ENGINE_STUBS=0']
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/FileReader.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/JsValue.cpp', 27 'src/JsValue.cpp',
27 'src/Thread.cpp', 28 'src/Thread.cpp',
29 'src/Utils.cpp',
28 'src/WebRequestJsObject.cpp', 30 'src/WebRequestJsObject.cpp',
29 '<(INTERMEDIATE_DIR)/adblockplus.js.cc' 31 '<(INTERMEDIATE_DIR)/adblockplus.js.cc'
30 ], 32 ],
31 'direct_dependent_settings': { 33 'direct_dependent_settings': {
32 'include_dirs': ['include'] 34 'include_dirs': ['include']
33 }, 35 },
34 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], 36 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
35 'conditions': [ 37 'conditions': [
36 ['have_curl==1', 38 ['have_curl==1',
37 { 39 {
(...skipping 10 matching lines...) Expand all
48 { 50 {
49 'sources': [ 51 'sources': [
50 'src/DefaultWebRequestDummy.cpp', 52 'src/DefaultWebRequestDummy.cpp',
51 ] 53 ]
52 } 54 }
53 ] 55 ]
54 ], 56 ],
55 'actions': [{ 57 'actions': [{
56 'action_name': 'convert_js', 58 'action_name': 'convert_js',
57 'variables': { 59 'variables': {
58 'core_library_files': [ 60 'library_files': [
59 'lib/info.js', 61 'lib/info.js',
60 'lib/io.js', 62 'lib/io.js',
61 'lib/prefs.js', 63 'lib/prefs.js',
62 'lib/utils.js', 64 'lib/utils.js',
63 'lib/elemHideHitRegistration.js', 65 'lib/elemHideHitRegistration.js',
64 'adblockplus/lib/filterNotifier.js', 66 'adblockplus/lib/filterNotifier.js',
65 'adblockplus/lib/filterClasses.js', 67 'adblockplus/lib/filterClasses.js',
66 'adblockplus/lib/subscriptionClasses.js', 68 'adblockplus/lib/subscriptionClasses.js',
67 'adblockplus/lib/filterStorage.js', 69 'adblockplus/lib/filterStorage.js',
68 'adblockplus/lib/elemHide.js', 70 'adblockplus/lib/elemHide.js',
69 'adblockplus/lib/matcher.js', 71 'adblockplus/lib/matcher.js',
70 'adblockplus/lib/filterListener.js', 72 'adblockplus/lib/filterListener.js',
71 'adblockplus/lib/synchronizer.js', 73 'adblockplus/lib/synchronizer.js',
72 ], 74 ],
73 'additional_library_files': [ 75 'load_before_files': [
74 'lib/compat.js' 76 'lib/compat.js'
77 ],
78 'load_after_files': [
79 'lib/api.js'
75 ], 80 ],
76 }, 81 },
77 'inputs': [ 82 'inputs': [
78 'convert_js.py', 83 'convert_js.py',
79 '<@(core_library_files)', 84 '<@(library_files)',
80 '<@(additional_library_files)', 85 '<@(load_before_files)',
86 '<@(load_after_files)',
81 ], 87 ],
82 'outputs': [ 88 'outputs': [
83 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' 89 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
84 ], 90 ],
85 'action': [ 91 'action': [
86 'python', 92 'python',
87 'convert_js.py', 93 'convert_js.py',
88 '<@(core_library_files)', 94 'before=<@(load_before_files)',
89 '--', 95 '<@(library_files)',
90 '<@(additional_library_files)', 96 'after=<@(load_after_files)',
91 '<@(_outputs)', 97 '<@(_outputs)',
92 ] 98 ]
93 }] 99 }]
94 }, 100 },
95 { 101 {
96 'target_name': 'tests', 102 'target_name': 'tests',
97 'type': 'executable', 103 'type': 'executable',
98 'dependencies': [ 104 'dependencies': [
99 'third_party/googletest.gyp:googletest_main', 105 'third_party/googletest.gyp:googletest_main',
100 'libadblockplus' 106 'libadblockplus'
101 ], 107 ],
102 'sources': [ 108 'sources': [
103 'test/ConsoleJsObject.cpp', 109 'test/ConsoleJsObject.cpp',
110 'test/DefaultFileSystem.cpp',
111 'test/FileSystemJsObject.cpp',
104 'test/FilterEngineStubs.cpp', 112 'test/FilterEngineStubs.cpp',
105 'test/GlobalJsObject.cpp', 113 'test/GlobalJsObject.cpp',
106 'test/JsEngine.cpp', 114 'test/JsEngine.cpp',
115 'test/JsValue.cpp',
107 'test/Thread.cpp', 116 'test/Thread.cpp',
108 'test/WebRequest.cpp' 117 'test/WebRequest.cpp'
109 ] 118 ]
110 }] 119 }]
111 } 120 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld