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

Delta Between Two Patch Sets: adblockplus.gyp

Issue 6216090891845632: Issue #404 - Create common library shared between plugin/engine and installer (Closed)
Left Patch Set: Created Jan. 9, 2015, 8:07 p.m.
Right Patch Set: final check after rebase Created May 19, 2015, 3: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 | « no previous file | common/common.gypi » ('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 'includes': [ 2 'includes': [
3 'defaults.gypi', 3 'defaults.gypi',
4 'common/common.gypi', 4 'common/common.gypi',
5 ], 5 ],
6 6
7 'variables': { 7 'variables': {
8 'build_type%': 'devbuild', 8 'build_type%': 'devbuild',
9 'build_version%': '', 9 'build_version%': '',
10 }, 10 },
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 'VCLinkerTool': { 73 'VCLinkerTool': {
74 'DelayLoadDLLs': ['Shell32.dll'], 74 'DelayLoadDLLs': ['Shell32.dll'],
75 }, 75 },
76 }, 76 },
77 }, 77 },
78 78
79 { 79 {
80 'target_name': 'AdblockPlus', 80 'target_name': 'AdblockPlus',
81 'type': 'shared_library', 81 'type': 'shared_library',
82 'dependencies': [ 82 'dependencies': [
83 'shared' 83 'shared',
84 ], 84 'libadblockplus/libadblockplus.gyp:libadblockplus',
85 'sources': [ 85 ],
86 'src/plugin/abp.h', 86 'sources': [
87 'src/plugin/AdblockPlus.def', 87 'src/plugin/AdblockPlus.def',
88 'src/plugin/AdblockPlus.idl', 88 'src/plugin/AdblockPlus.idl',
89 'src/plugin/AdblockPlus.rc', 89 'src/plugin/AdblockPlus.rc',
90 'src/plugin/AdblockPlus.rgs', 90 'src/plugin/AdblockPlus.rgs',
91 'src/plugin/AdblockPlusClient.cpp', 91 'src/plugin/AdblockPlusClient.cpp',
92 'src/plugin/AdblockPlusClient.h', 92 'src/plugin/AdblockPlusClient.h',
93 'src/plugin/AdblockPlusDomTraverser.cpp', 93 'src/plugin/AdblockPlusDomTraverser.cpp',
94 'src/plugin/AdblockPlusDomTraverser.h', 94 'src/plugin/AdblockPlusDomTraverser.h',
95 'src/plugin/AdblockPlusGuids.h', 95 'src/plugin/AdblockPlusGuids.h',
96 'src/plugin/AdblockPlusTab.cpp',
97 'src/plugin/AdblockPlusTab.h',
98 'src/plugin/ATL_Deprecate.cpp', 96 'src/plugin/ATL_Deprecate.cpp',
99 'src/plugin/ATL_Deprecate.h', 97 'src/plugin/ATL_Deprecate.h',
100 'src/plugin/BuildVariant.h', 98 'src/plugin/BuildVariant.h',
101 'src/plugin/Config.h', 99 'src/plugin/Config.h',
102 'src/plugin/Console.h', 100 'src/plugin/Console.h',
103 'src/plugin/NotificationMessage.cpp', 101 'src/plugin/NotificationMessage.cpp',
104 'src/plugin/NotificationMessage.h', 102 'src/plugin/NotificationMessage.h',
105 'src/plugin/Plugin.cpp', 103 'src/plugin/Plugin.cpp',
106 'src/plugin/Plugin.h', 104 'src/plugin/Plugin.h',
107 'src/plugin/PluginClass.cpp', 105 'src/plugin/PluginClass.cpp',
108 'src/plugin/PluginClass.h', 106 'src/plugin/PluginClass.h',
109 'src/plugin/PluginClient.h', 107 'src/plugin/PluginClient.h',
110 'src/plugin/PluginClientBase.cpp', 108 'src/plugin/PluginClientBase.cpp',
111 'src/plugin/PluginClientBase.h', 109 'src/plugin/PluginClientBase.h',
112 'src/plugin/PluginClientFactory.cpp', 110 'src/plugin/PluginClientFactory.cpp',
113 'src/plugin/PluginClientFactory.h', 111 'src/plugin/PluginClientFactory.h',
114 'src/plugin/PluginDebug.cpp', 112 'src/plugin/PluginDebug.cpp',
115 'src/plugin/PluginDebug.h', 113 'src/plugin/PluginDebug.h',
116 'src/plugin/PluginDebugMacros.h',
117 'src/plugin/PluginDomTraverserBase.h', 114 'src/plugin/PluginDomTraverserBase.h',
118 'src/plugin/PluginErrorCodes.h', 115 'src/plugin/PluginErrorCodes.h',
119 'src/plugin/PluginFilter.cpp', 116 'src/plugin/PluginFilter.cpp',
120 'src/plugin/PluginFilter.h', 117 'src/plugin/PluginFilter.h',
121 'src/plugin/PluginMimeFilterClient.cpp', 118 'src/plugin/PluginMimeFilterClient.cpp',
122 'src/plugin/PluginMimeFilterClient.h', 119 'src/plugin/PluginMimeFilterClient.h',
123 'src/plugin/PluginMutex.cpp', 120 'src/plugin/PluginMutex.cpp',
124 'src/plugin/PluginMutex.h', 121 'src/plugin/PluginMutex.h',
125 'src/plugin/PluginPassthroughObject.h', 122 'src/plugin/PluginPassthroughObject.h',
126 'src/plugin/PluginSettings.cpp', 123 'src/plugin/PluginSettings.cpp',
127 'src/plugin/PluginSettings.h', 124 'src/plugin/PluginSettings.h',
128 'src/plugin/PluginStdAfx.cpp', 125 'src/plugin/PluginStdAfx.cpp',
129 'src/plugin/PluginStdAfx.h', 126 'src/plugin/PluginStdAfx.h',
130 'src/plugin/PluginSystem.cpp', 127 'src/plugin/PluginSystem.cpp',
131 'src/plugin/PluginSystem.h', 128 'src/plugin/PluginSystem.h',
132 'src/plugin/PluginTab.h',
133 'src/plugin/PluginTabBase.cpp', 129 'src/plugin/PluginTabBase.cpp',
134 'src/plugin/PluginTabBase.h', 130 'src/plugin/PluginTabBase.h',
135 'src/plugin/PluginTypedef.h',
136 'src/plugin/PluginUserSettings.cpp', 131 'src/plugin/PluginUserSettings.cpp',
137 'src/plugin/PluginUserSettings.h', 132 'src/plugin/PluginUserSettings.h',
138 'src/plugin/PluginUtil.cpp', 133 'src/plugin/PluginUtil.cpp',
139 'src/plugin/PluginUtil.h', 134 'src/plugin/PluginUtil.h',
140 'src/plugin/PluginWbPassThrough.cpp', 135 'src/plugin/PluginWbPassThrough.cpp',
141 'src/plugin/PluginWbPassThrough.h', 136 'src/plugin/PluginWbPassThrough.h',
142 'src/plugin/ProtocolCF.h', 137 'src/plugin/ProtocolCF.h',
143 'src/plugin/ProtocolCF.inl', 138 'src/plugin/ProtocolCF.inl',
144 'src/plugin/ProtocolImpl.h', 139 'src/plugin/ProtocolImpl.h',
145 'src/plugin/ProtocolImpl.inl', 140 'src/plugin/ProtocolImpl.inl',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 { 199 {
205 'target_name': 'tests', 200 'target_name': 'tests',
206 'type': 'executable', 201 'type': 'executable',
207 'dependencies': [ 202 'dependencies': [
208 'shared', 203 'shared',
209 'libadblockplus/third_party/googletest.gyp:googletest_main', 204 'libadblockplus/third_party/googletest.gyp:googletest_main',
210 ], 205 ],
211 'sources': [ 206 'sources': [
212 'test/CommunicationTest.cpp', 207 'test/CommunicationTest.cpp',
213 'test/DictionaryTest.cpp', 208 'test/DictionaryTest.cpp',
209 'test/UtilTest.cpp',
210 'test/UtilGetQueryStringTest.cpp',
211 'test/UtilGetSchemeAndHierarchicalPartTest.cpp',
214 ], 212 ],
215 'defines': ['WINVER=0x0501'], 213 'defines': ['WINVER=0x0501'],
216 'link_settings': { 214 'link_settings': {
217 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 215 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
218 }, 216 },
219 'msvs_settings': { 217 'msvs_settings': {
220 'VCLinkerTool': { 218 'VCLinkerTool': {
221 'SubSystem': '1', # Console 219 'SubSystem': '1', # Console
222 'EntryPointSymbol': 'mainCRTStartup', 220 'EntryPointSymbol': 'mainCRTStartup',
223 }, 221 },
224 }, 222 },
225 }, 223 },
226 224
227 { 225 {
228 'target_name': 'tests_plugin', 226 'target_name': 'tests_plugin',
229 'type': 'executable', 227 'type': 'executable',
230 'dependencies': [ 228 'dependencies': [
231 'shared', 229 'shared',
230 'libadblockplus/libadblockplus.gyp:libadblockplus',
232 'libadblockplus/third_party/googletest.gyp:googletest_main', 231 'libadblockplus/third_party/googletest.gyp:googletest_main',
233 ], 232 ],
234 'sources': [ 233 'sources': [
235 'src/plugin/PluginUserSettings.cpp', 234 'src/plugin/PluginUserSettings.cpp',
236 'src/plugin/PluginUserSettings.h', 235 'src/plugin/PluginUserSettings.h',
237 'test/plugin/UserSettingsTest.cpp', 236 'test/plugin/UserSettingsTest.cpp',
238 # 237 #
239 # required only for linking 238 # required only for linking
240 # 239 #
241 'src/plugin/AdblockPlusClient.cpp', 240 'src/plugin/AdblockPlusClient.cpp',
242 'src/plugin/AdblockPlusDomTraverser.cpp', 241 'src/plugin/AdblockPlusDomTraverser.cpp',
243 'src/plugin/AdblockPlusTab.cpp',
244 'src/plugin/ATL_Deprecate.cpp', 242 'src/plugin/ATL_Deprecate.cpp',
245 'src/plugin/NotificationMessage.cpp', 243 'src/plugin/NotificationMessage.cpp',
246 'src/plugin/Plugin.cpp', 244 'src/plugin/Plugin.cpp',
247 'src/plugin/PluginClientBase.cpp', 245 'src/plugin/PluginClientBase.cpp',
248 'src/plugin/PluginClientFactory.cpp', 246 'src/plugin/PluginClientFactory.cpp',
249 'src/plugin/PluginClass.cpp', 247 'src/plugin/PluginClass.cpp',
250 'src/plugin/PluginDebug.cpp', 248 'src/plugin/PluginDebug.cpp',
251 'src/plugin/PluginFilter.cpp', 249 'src/plugin/PluginFilter.cpp',
252 'src/plugin/PluginMimeFilterClient.cpp', 250 'src/plugin/PluginMimeFilterClient.cpp',
253 'src/plugin/PluginMutex.cpp', 251 'src/plugin/PluginMutex.cpp',
254 'src/plugin/PluginSettings.cpp', 252 'src/plugin/PluginSettings.cpp',
255 'src/plugin/PluginSystem.cpp', 253 'src/plugin/PluginSystem.cpp',
256 'src/plugin/PluginTabBase.cpp', 254 'src/plugin/PluginTabBase.cpp',
257 'src/plugin/PluginUtil.cpp', 255 'src/plugin/PluginUtil.cpp',
258 'src/plugin/PluginWbPassthrough.cpp', 256 'src/plugin/PluginWbPassthrough.cpp',
259 ], 257 ],
260 'include_dirs': [ 258 'include_dirs': [
261 '$(WINDDKDIR)/inc/atl71', 259 '$(WINDDKDIR)/inc/atl71',
262 ], 260 ],
263 'defines': [ 261 'defines': [
264 'WINVER=0x0501', 262 'WINVER=0x0501',
265 'PRODUCT_ADBLOCKPLUS' 263 'PRODUCT_ADBLOCKPLUS'
266 ], 264 ],
267 'link_settings': { 265 'link_settings': {
268 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '], 266 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '],
269 }, 267 },
270 'msvs_settings': { 268 'msvs_settings': {
271 'VCLinkerTool': { 269 'VCLinkerTool': {
272 'SubSystem': '1', # Console 270 'SubSystem': '1', # Console
273 'EntryPointSymbol': 'mainCRTStartup', 271 'EntryPointSymbol': 'mainCRTStartup',
274 'conditions': [[ 272 'conditions': [[
275 'target_arch=="ia32"', { 273 'target_arch=="ia32"', {
276 'AdditionalLibraryDirectories': [ 274 'AdditionalLibraryDirectories': [
277 '$(VCInstallDir)atlmfc/lib', 275 '$(VCInstallDir)atlmfc/lib',
278 '$(WindowsSDK_LibraryPath_x86)', 276 '$(WindowsSDK_LibraryPath_x86)',
279 '$(WINDDKDIR)/lib/ATL/i386', 277 '$(WINDDKDIR)/lib/ATL/i386',
280 ], 278 ],
281 }, { 279 }, {
282 'AdditionalLibraryDirectories': [ 280 'AdditionalLibraryDirectories': [
(...skipping 17 matching lines...) Expand all
300 'Release': { 298 'Release': {
301 'msvs_settings': { 299 'msvs_settings': {
302 'VCLinkerTool': { 300 'VCLinkerTool': {
303 'AdditionalDependencies': ['atls.lib'], 301 'AdditionalDependencies': ['atls.lib'],
304 }, 302 },
305 }, 303 },
306 }, 304 },
307 }, 305 },
308 }] 306 }]
309 } 307 }
LEFTRIGHT
« no previous file | common/common.gypi » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld