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

Delta Between Two Patch Sets: libadblockplus.gyp

Issue 10198022: Pass application data into libadblockplus (Closed)
Left Patch Set: Created April 12, 2013, 1:23 p.m.
Right Patch Set: Merged upstream, addressed issues, renamed AppInfo fields Created April 17, 2013, 2:47 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
« no previous file with change/comment | « lib/info.js ('k') | shell/src/Main.cpp » ('j') | src/AppInfoJsObject.cpp » ('J')
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=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/AppInfoJsObject.cpp', 20 'src/AppInfoJsObject.cpp',
21 'src/ConsoleJsObject.cpp', 21 'src/ConsoleJsObject.cpp',
22 'src/DefaultFileSystem.cpp',
22 'src/ErrorCallback.cpp', 23 'src/ErrorCallback.cpp',
23 'src/FileReader.cpp', 24 'src/FileSystemJsObject.cpp',
24 'src/FilterEngine.cpp', 25 'src/FilterEngine.cpp',
25 'src/GlobalJsObject.cpp', 26 'src/GlobalJsObject.cpp',
26 'src/JsEngine.cpp', 27 'src/JsEngine.cpp',
28 'src/JsValue.cpp',
27 'src/Thread.cpp', 29 'src/Thread.cpp',
28 'src/WebRequest.cpp', 30 'src/Utils.cpp',
29 'src/WebRequestJsObject.cpp', 31 'src/WebRequestJsObject.cpp',
30 '<(INTERMEDIATE_DIR)/adblockplus.js.cc' 32 '<(INTERMEDIATE_DIR)/adblockplus.js.cc'
31 ], 33 ],
32 'direct_dependent_settings': { 34 'direct_dependent_settings': {
33 'include_dirs': ['include'] 35 'include_dirs': ['include']
34 }, 36 },
35 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], 37 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
36 'conditions': [ 38 'conditions': [
37 ['have_curl==1', 39 ['have_curl==1',
38 { 40 {
39 'defines': ['HAVE_CURL'], 41 'sources': [
42 'src/DefaultWebRequestCurl.cpp',
43 ],
40 'all_dependent_settings': { 44 'all_dependent_settings': {
41 'defines': ['HAVE_CURL'], 45 'defines': ['HAVE_CURL'],
42 'libraries': ['-lcurl'] 46 'libraries': ['-lcurl']
43 } 47 }
48 }
49 ],
50 ['have_curl!=1',
51 {
52 'sources': [
53 'src/DefaultWebRequestDummy.cpp',
54 ]
44 } 55 }
45 ] 56 ]
46 ], 57 ],
47 'actions': [{ 58 'actions': [{
48 'action_name': 'convert_js', 59 'action_name': 'convert_js',
49 'variables': { 60 'variables': {
50 'core_library_files': [ 61 'library_files': [
62 'lib/info.js',
51 'lib/io.js', 63 'lib/io.js',
52 'lib/prefs.js', 64 'lib/prefs.js',
53 'lib/utils.js', 65 'lib/utils.js',
54 'lib/elemHideHitRegistration.js', 66 'lib/elemHideHitRegistration.js',
55 'adblockplus/lib/filterNotifier.js', 67 'adblockplus/lib/filterNotifier.js',
56 'adblockplus/lib/filterClasses.js', 68 'adblockplus/lib/filterClasses.js',
57 'adblockplus/lib/subscriptionClasses.js', 69 'adblockplus/lib/subscriptionClasses.js',
58 'adblockplus/lib/filterStorage.js', 70 'adblockplus/lib/filterStorage.js',
59 'adblockplus/lib/elemHide.js', 71 'adblockplus/lib/elemHide.js',
60 'adblockplus/lib/matcher.js', 72 'adblockplus/lib/matcher.js',
61 'adblockplus/lib/filterListener.js', 73 'adblockplus/lib/filterListener.js',
62 'adblockplus/lib/synchronizer.js', 74 'adblockplus/lib/synchronizer.js',
63 ], 75 ],
64 'additional_library_files': [ 76 'load_before_files': [
65 'lib/compat.js' 77 'lib/compat.js'
78 ],
79 'load_after_files': [
80 'lib/api.js'
66 ], 81 ],
67 }, 82 },
68 'inputs': [ 83 'inputs': [
69 'convert_js.py', 84 'convert_js.py',
70 '<@(core_library_files)', 85 '<@(library_files)',
71 '<@(additional_library_files)', 86 '<@(load_before_files)',
87 '<@(load_after_files)',
72 ], 88 ],
73 'outputs': [ 89 'outputs': [
74 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' 90 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
75 ], 91 ],
76 'action': [ 92 'action': [
77 'python', 93 'python',
78 'convert_js.py', 94 'convert_js.py',
79 '<@(core_library_files)', 95 'before=<@(load_before_files)',
80 '--', 96 '<@(library_files)',
81 '<@(additional_library_files)', 97 'after=<@(load_after_files)',
82 '<@(_outputs)', 98 '<@(_outputs)',
83 ] 99 ]
84 }] 100 }]
85 }, 101 },
86 { 102 {
87 'target_name': 'tests', 103 'target_name': 'tests',
88 'type': 'executable', 104 'type': 'executable',
89 'dependencies': [ 105 'dependencies': [
90 'third_party/googletest.gyp:googletest_main', 106 'third_party/googletest.gyp:googletest_main',
91 'libadblockplus' 107 'libadblockplus'
92 ], 108 ],
93 'sources': [ 109 'sources': [
94 'test/AppInfoJsObject.cpp', 110 'test/AppInfoJsObject.cpp',
95 'test/ConsoleJsObject.cpp', 111 'test/ConsoleJsObject.cpp',
112 'test/DefaultFileSystem.cpp',
113 'test/FileSystemJsObject.cpp',
96 'test/FilterEngineStubs.cpp', 114 'test/FilterEngineStubs.cpp',
97 'test/GlobalJsObject.cpp', 115 'test/GlobalJsObject.cpp',
98 'test/JsEngine.cpp', 116 'test/JsEngine.cpp',
117 'test/JsValue.cpp',
99 'test/Thread.cpp', 118 'test/Thread.cpp',
100 'test/WebRequest.cpp' 119 'test/WebRequest.cpp'
101 ] 120 ]
102 }] 121 }]
103 } 122 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld