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

Delta Between Two Patch Sets: libadblockplus.gyp

Issue 29449592: Issue 5183 - Provide async interface for FileSystem (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Left Patch Set: Remove a #include Utils.h from test. Created June 2, 2017, 7:38 p.m.
Right Patch Set: Rebase on master. Last changes. Created July 7, 2017, 1:36 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 | « include/AdblockPlus/JsValue.h ('k') | src/DefaultFileSystem.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 'conditions': [[ 2 'conditions': [[
3 # We don't want to use curl on Windows and Android, skip the check there 3 # We don't want to use curl on Windows and Android, skip the check there
4 'OS=="win" or OS=="android"', 4 'OS=="win" or OS=="android"',
5 { 5 {
6 'variables': { 6 'variables': {
7 'have_curl': 0 7 'have_curl': 0
8 } 8 }
9 }, 9 },
10 { 10 {
11 'variables': { 11 'variables': {
12 'have_curl': '<!(python check_curl.py)' 12 'have_curl': '<!(python check_curl.py)'
13 } 13 }
14 } 14 }
15 ],
16 [
17 'OS=="win"', {
18 'targets': [{
19 'target_name': 'build-v8',
20 'type': 'none',
21 'actions': [{
22 'action_name': 'build-v8',
23 'inputs': ['build-v8.cmd'],
24 'outputs': [
25 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libplatform. lib',
26 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_0.lib',
27 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_1.lib',
28 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_2.lib',
29 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_3.lib',
30 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libbase.lib' ,
31 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libsampler.l ib',
32 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_snapshot.lib ',
33 ],
34 'action': [
35 'cmd',
36 '/C',
37 'build-v8.cmd',
38 '$(MSBuildBinPath)',
39 '<(target_arch)',
40 '<(CONFIGURATION_NAME)',
41 '$(PlatformToolset)'
42 ]
43 }],
44 }]
45 }
15 ]], 46 ]],
16 'includes': ['third_party/v8/build/features.gypi', 47 'includes': ['shell/shell.gyp'],
17 'third_party/v8/build/toolchain.gypi',
18 'shell/shell.gyp'],
19 'targets': [{ 48 'targets': [{
20 'target_name': 'ensure_dependencies',
21 'type': 'none',
22 'actions': [{
23 'action_name': 'ensure_dependencies',
24 'inputs': ['ensure_dependencies.py'],
25 'outputs': ['ensure_dependencies_phony_output'],
26 'action': ['python', 'ensure_dependencies.py'],
27 }],
28 },
29 {
30 'target_name': 'libadblockplus', 49 'target_name': 'libadblockplus',
31 'type': '<(library)', 50 'type': '<(library)',
32 'dependencies': ['ensure_dependencies'], 51 'xcode_settings':{},
33 'include_dirs': [ 52 'include_dirs': [
34 'include', 53 'include',
35 'third_party/v8/include', 54 'third_party/v8/include',
55 'third_party/v8',
36 ], 56 ],
37 'sources': [ 57 'sources': [
38 'include/AdblockPlus/ITimer.h', 58 'include/AdblockPlus/ITimer.h',
39 'include/AdblockPlus/IWebRequest.h', 59 'include/AdblockPlus/IWebRequest.h',
40 'include/AdblockPlus/DefaultWebRequest.h', 60 'include/AdblockPlus/DefaultWebRequest.h',
41 'include/AdblockPlus/IFileSystem.h', 61 'include/AdblockPlus/IFileSystem.h',
42 'include/AdblockPlus/DefaultFileSystem.h', 62 'include/AdblockPlus/DefaultFileSystem.h',
43 'src/AppInfoJsObject.cpp', 63 'src/AppInfoJsObject.cpp',
44 'src/ConsoleJsObject.cpp', 64 'src/ConsoleJsObject.cpp',
45 'src/DefaultLogSystem.cpp', 65 'src/DefaultLogSystem.cpp',
46 'src/DefaultFileSystem.cpp', 66 'src/DefaultFileSystem.cpp',
47 'src/DefaultTimer.cpp', 67 'src/DefaultTimer.cpp',
48 'src/DefaultTimer.h', 68 'src/DefaultTimer.h',
49 'src/DefaultWebRequest.cpp', 69 'src/DefaultWebRequest.cpp',
50 'src/FileSystemJsObject.cpp', 70 'src/FileSystemJsObject.cpp',
51 'src/FilterEngine.cpp', 71 'src/FilterEngine.cpp',
52 'src/GlobalJsObject.cpp', 72 'src/GlobalJsObject.cpp',
53 'src/JsContext.cpp', 73 'src/JsContext.cpp',
54 'src/JsEngine.cpp', 74 'src/JsEngine.cpp',
55 'src/JsError.cpp', 75 'src/JsError.cpp',
56 'src/JsValue.cpp', 76 'src/JsValue.cpp',
57 'src/Notification.cpp', 77 'src/Notification.cpp',
58 'src/ReferrerMapping.cpp', 78 'src/ReferrerMapping.cpp',
59 'src/Thread.cpp', 79 'src/Thread.cpp',
60 'src/Utils.cpp', 80 'src/Utils.cpp',
61 'src/WebRequestJsObject.cpp', 81 'src/WebRequestJsObject.cpp',
62 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' 82 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
63 ], 83 ],
64 'direct_dependent_settings': { 84 'direct_dependent_settings': {
65 'include_dirs': ['include'] 85 'include_dirs': ['include'],
86 'msvs_settings': {
87 'VCLinkerTool': {
88 'AdditionalLibraryDirectories': ['v8/build/<(CONFIGURATION_NAME)'],
89 }
90 },
66 }, 91 },
67 'conditions': [ 92 'conditions': [
68 ['OS=="android"', { 93 ['OS=="linux" or OS=="mac"', {
69 'link_settings': { 94 'link_settings': {
70 'libraries': [ 95 'libraries': [
71 'android_<(ANDROID_ARCH).release/obj.target/tools/gyp/libv8_base.<(A NDROID_ARCH).a', 96 'v8/out/<(CONFIGURATION_NAME)/libv8_libplatform.a',
72 'android_<(ANDROID_ARCH).release/obj.target/tools/gyp/libv8_snapshot .a', 97 'v8/out/<(CONFIGURATION_NAME)/libv8_base.a',
98 'v8/out/<(CONFIGURATION_NAME)/libv8_snapshot.a',
99 'v8/out/<(CONFIGURATION_NAME)/libv8_libbase.a',
100 'v8/out/<(CONFIGURATION_NAME)/libv8_libsampler.a',
101 ]
102 }
103 }],
104 ['OS=="win"', {
105 'dependencies': ['build-v8'],
106 'link_settings': {
107 'libraries': [
108 '-lv8_libplatform',
109 '-lv8_base_0',
110 '-lv8_base_1',
111 '-lv8_base_2',
112 '-lv8_base_3',
113 '-lv8_libbase',
114 '-lv8_libsampler',
115 '-lv8_snapshot',
116 '-lwinmm'
73 ], 117 ],
74 }, 118 },
119 }],
120 ['OS=="android"', {
121 'user_libraries': [
122 'android_<(target_arch).release/libv8_libplatform.a',
123 'android_<(target_arch).release/libv8_base.a',
124 'android_<(target_arch).release/libv8_snapshot.a',
125 'android_<(target_arch).release/libv8_libbase.a',
126 'android_<(target_arch).release/libv8_libsampler.a',
127 ],
75 'standalone_static_library': 1, # disable thin archives 128 'standalone_static_library': 1, # disable thin archives
76 }, {
77 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'],
78 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
79 }], 129 }],
80 ['have_curl==1', 130 ['have_curl==1',
81 { 131 {
82 'sources': [ 132 'sources': [
83 'src/DefaultWebRequestCurl.cpp', 133 'src/DefaultWebRequestCurl.cpp',
84 ], 134 ],
85 'link_settings': { 135 'link_settings': {
86 'libraries': ['-lcurl'] 136 'libraries': ['-lcurl']
87 }, 137 },
88 'all_dependent_settings': { 138 'all_dependent_settings': {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 '<@(_outputs)', 211 '<@(_outputs)',
162 '--before', '<@(load_before_files)', 212 '--before', '<@(load_before_files)',
163 '--convert', '<@(library_files)', 213 '--convert', '<@(library_files)',
164 '--after', '<@(load_after_files)', 214 '--after', '<@(load_after_files)',
165 ] 215 ]
166 }] 216 }]
167 }, 217 },
168 { 218 {
169 'target_name': 'tests', 219 'target_name': 'tests',
170 'type': 'executable', 220 'type': 'executable',
221 'xcode_settings': {},
171 'dependencies': [ 222 'dependencies': [
172 'third_party/googletest.gyp:googletest_main', 223 'googletest.gyp:googletest_main',
173 'libadblockplus' 224 'libadblockplus'
174 ], 225 ],
175 'sources': [ 226 'sources': [
176 'test/BaseJsTest.h', 227 'test/BaseJsTest.h',
177 'test/BaseJsTest.cpp', 228 'test/BaseJsTest.cpp',
178 'test/AppInfoJsObject.cpp', 229 'test/AppInfoJsObject.cpp',
179 'test/ConsoleJsObject.cpp', 230 'test/ConsoleJsObject.cpp',
180 'test/DefaultFileSystem.cpp', 231 'test/DefaultFileSystem.cpp',
181 'test/FileSystemJsObject.cpp', 232 'test/FileSystemJsObject.cpp',
182 'test/FilterEngine.cpp', 233 'test/FilterEngine.cpp',
183 'test/GlobalJsObject.cpp', 234 'test/GlobalJsObject.cpp',
184 'test/JsEngine.cpp', 235 'test/JsEngine.cpp',
185 'test/JsValue.cpp', 236 'test/JsValue.cpp',
186 'test/Notification.cpp', 237 'test/Notification.cpp',
187 'test/Prefs.cpp', 238 'test/Prefs.cpp',
188 'test/ReferrerMapping.cpp', 239 'test/ReferrerMapping.cpp',
189 'test/Thread.cpp', 240 'test/Thread.cpp',
190 'test/UpdateCheck.cpp', 241 'test/UpdateCheck.cpp',
191 'test/WebRequest.cpp' 242 'test/WebRequest.cpp'
192 ], 243 ],
193 'msvs_settings': { 244 'msvs_settings': {
194 'VCLinkerTool': { 245 'VCLinkerTool': {
195 'SubSystem': '1', # Console 246 'SubSystem': '1', # Console
196 'EntryPointSymbol': 'mainCRTStartup', 247 'EntryPointSymbol': 'mainCRTStartup',
197 }, 248 },
198 }, 249 },
199 }] 250 }]
200 } 251 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld