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

Side by Side Diff: libadblockplus.gyp

Issue 10213003: Make JsEngine::Evaluate() return a wrapper for v8::Value to accessdifferent variable types easily (Closed)
Patch Set: Added tests, resolved type conversion ambiguities, implemented some missing API calls Created April 15, 2013, 6:23 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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/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/JsValue.cpp',
26 'src/Thread.cpp', 27 'src/Thread.cpp',
27 'src/WebRequestJsObject.cpp', 28 'src/WebRequestJsObject.cpp',
28 '<(INTERMEDIATE_DIR)/adblockplus.js.cc' 29 '<(INTERMEDIATE_DIR)/adblockplus.js.cc'
29 ], 30 ],
30 'direct_dependent_settings': { 31 'direct_dependent_settings': {
31 'include_dirs': ['include'] 32 'include_dirs': ['include']
32 }, 33 },
33 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], 34 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
34 'conditions': [ 35 'conditions': [
35 ['have_curl==1', 36 ['have_curl==1',
(...skipping 11 matching lines...) Expand all
47 { 48 {
48 'sources': [ 49 'sources': [
49 'src/DefaultWebRequestDummy.cpp', 50 'src/DefaultWebRequestDummy.cpp',
50 ] 51 ]
51 } 52 }
52 ] 53 ]
53 ], 54 ],
54 'actions': [{ 55 'actions': [{
55 'action_name': 'convert_js', 56 'action_name': 'convert_js',
56 'variables': { 57 'variables': {
57 'core_library_files': [ 58 'library_files': [
58 'lib/info.js', 59 'lib/info.js',
59 'lib/io.js', 60 'lib/io.js',
60 'lib/prefs.js', 61 'lib/prefs.js',
61 'lib/utils.js', 62 'lib/utils.js',
62 'lib/elemHideHitRegistration.js', 63 'lib/elemHideHitRegistration.js',
63 'adblockplus/lib/filterNotifier.js', 64 'adblockplus/lib/filterNotifier.js',
64 'adblockplus/lib/filterClasses.js', 65 'adblockplus/lib/filterClasses.js',
65 'adblockplus/lib/subscriptionClasses.js', 66 'adblockplus/lib/subscriptionClasses.js',
66 'adblockplus/lib/filterStorage.js', 67 'adblockplus/lib/filterStorage.js',
67 'adblockplus/lib/elemHide.js', 68 'adblockplus/lib/elemHide.js',
68 'adblockplus/lib/matcher.js', 69 'adblockplus/lib/matcher.js',
69 'adblockplus/lib/filterListener.js', 70 'adblockplus/lib/filterListener.js',
70 'adblockplus/lib/synchronizer.js', 71 'adblockplus/lib/synchronizer.js',
71 ], 72 ],
72 'additional_library_files': [ 73 'load_before_files': [
73 'lib/compat.js' 74 'lib/compat.js'
74 ], 75 ],
76 'load_after_files': [
77 'lib/api.js'
78 ],
75 }, 79 },
76 'inputs': [ 80 'inputs': [
77 'convert_js.py', 81 'convert_js.py',
78 '<@(core_library_files)', 82 '<@(library_files)',
79 '<@(additional_library_files)', 83 '<@(load_before_files)',
84 '<@(load_after_files)',
80 ], 85 ],
81 'outputs': [ 86 'outputs': [
82 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' 87 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
83 ], 88 ],
84 'action': [ 89 'action': [
85 'python', 90 'python',
86 'convert_js.py', 91 'convert_js.py',
87 '<@(core_library_files)', 92 'before=<@(load_before_files)',
88 '--', 93 '<@(library_files)',
89 '<@(additional_library_files)', 94 'after=<@(load_after_files)',
90 '<@(_outputs)', 95 '<@(_outputs)',
91 ] 96 ]
92 }] 97 }]
93 }, 98 },
94 { 99 {
95 'target_name': 'tests', 100 'target_name': 'tests',
96 'type': 'executable', 101 'type': 'executable',
97 'dependencies': [ 102 'dependencies': [
98 'third_party/googletest.gyp:googletest_main', 103 'third_party/googletest.gyp:googletest_main',
99 'libadblockplus' 104 'libadblockplus'
100 ], 105 ],
101 'sources': [ 106 'sources': [
102 'test/ConsoleJsObject.cpp', 107 'test/ConsoleJsObject.cpp',
103 'test/FilterEngineStubs.cpp', 108 'test/FilterEngineStubs.cpp',
104 'test/GlobalJsObject.cpp', 109 'test/GlobalJsObject.cpp',
105 'test/JsEngine.cpp', 110 'test/JsEngine.cpp',
111 'test/JsValue.cpp',
106 'test/Thread.cpp', 112 'test/Thread.cpp',
107 'test/WebRequest.cpp' 113 'test/WebRequest.cpp'
108 ] 114 ]
109 }] 115 }]
110 } 116 }
OLDNEW

Powered by Google App Engine
This is Rietveld