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: Rename to IeVersion*.*; fix URL in copyright notice Created Feb. 27, 2015, 1:50 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 'libadblockplus/libadblockplus.gyp:libadblockplus', 84 'libadblockplus/libadblockplus.gyp:libadblockplus',
85 ], 85 ],
86 'sources': [ 86 'sources': [
87 'src/plugin/abp.h',
88 'src/plugin/AdblockPlus.def', 87 'src/plugin/AdblockPlus.def',
89 'src/plugin/AdblockPlus.idl', 88 'src/plugin/AdblockPlus.idl',
90 'src/plugin/AdblockPlus.rc', 89 'src/plugin/AdblockPlus.rc',
91 'src/plugin/AdblockPlus.rgs', 90 'src/plugin/AdblockPlus.rgs',
92 'src/plugin/AdblockPlusClient.cpp', 91 'src/plugin/AdblockPlusClient.cpp',
93 'src/plugin/AdblockPlusClient.h', 92 'src/plugin/AdblockPlusClient.h',
94 'src/plugin/AdblockPlusDomTraverser.cpp', 93 'src/plugin/AdblockPlusDomTraverser.cpp',
95 'src/plugin/AdblockPlusDomTraverser.h', 94 'src/plugin/AdblockPlusDomTraverser.h',
96 'src/plugin/AdblockPlusGuids.h', 95 'src/plugin/AdblockPlusGuids.h',
97 'src/plugin/ATL_Deprecate.cpp', 96 'src/plugin/ATL_Deprecate.cpp',
98 'src/plugin/ATL_Deprecate.h', 97 'src/plugin/ATL_Deprecate.h',
99 'src/plugin/BuildVariant.h', 98 'src/plugin/BuildVariant.h',
100 'src/plugin/Config.h', 99 'src/plugin/Config.h',
101 'src/plugin/Console.h', 100 'src/plugin/Console.h',
102 'src/plugin/NotificationMessage.cpp', 101 'src/plugin/NotificationMessage.cpp',
103 'src/plugin/NotificationMessage.h', 102 'src/plugin/NotificationMessage.h',
104 'src/plugin/Plugin.cpp', 103 'src/plugin/Plugin.cpp',
105 'src/plugin/Plugin.h', 104 'src/plugin/Plugin.h',
106 'src/plugin/PluginClass.cpp', 105 'src/plugin/PluginClass.cpp',
107 'src/plugin/PluginClass.h', 106 'src/plugin/PluginClass.h',
108 'src/plugin/PluginClient.h', 107 'src/plugin/PluginClient.h',
109 'src/plugin/PluginClientBase.cpp', 108 'src/plugin/PluginClientBase.cpp',
110 'src/plugin/PluginClientBase.h', 109 'src/plugin/PluginClientBase.h',
111 'src/plugin/PluginClientFactory.cpp', 110 'src/plugin/PluginClientFactory.cpp',
112 'src/plugin/PluginClientFactory.h', 111 'src/plugin/PluginClientFactory.h',
113 'src/plugin/PluginDebug.cpp', 112 'src/plugin/PluginDebug.cpp',
114 'src/plugin/PluginDebug.h', 113 'src/plugin/PluginDebug.h',
115 'src/plugin/PluginDebugMacros.h',
116 'src/plugin/PluginDomTraverserBase.h', 114 'src/plugin/PluginDomTraverserBase.h',
117 'src/plugin/PluginErrorCodes.h', 115 'src/plugin/PluginErrorCodes.h',
118 'src/plugin/PluginFilter.cpp', 116 'src/plugin/PluginFilter.cpp',
119 'src/plugin/PluginFilter.h', 117 'src/plugin/PluginFilter.h',
120 'src/plugin/PluginMimeFilterClient.cpp', 118 'src/plugin/PluginMimeFilterClient.cpp',
121 'src/plugin/PluginMimeFilterClient.h', 119 'src/plugin/PluginMimeFilterClient.h',
122 'src/plugin/PluginMutex.cpp', 120 'src/plugin/PluginMutex.cpp',
123 'src/plugin/PluginMutex.h', 121 'src/plugin/PluginMutex.h',
124 'src/plugin/PluginPassthroughObject.h', 122 'src/plugin/PluginPassthroughObject.h',
125 'src/plugin/PluginSettings.cpp', 123 'src/plugin/PluginSettings.cpp',
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 'target_name': 'tests', 200 'target_name': 'tests',
203 'type': 'executable', 201 'type': 'executable',
204 'dependencies': [ 202 'dependencies': [
205 'shared', 203 'shared',
206 'libadblockplus/third_party/googletest.gyp:googletest_main', 204 'libadblockplus/third_party/googletest.gyp:googletest_main',
207 ], 205 ],
208 'sources': [ 206 'sources': [
209 'test/CommunicationTest.cpp', 207 'test/CommunicationTest.cpp',
210 'test/DictionaryTest.cpp', 208 'test/DictionaryTest.cpp',
211 'test/UtilTest.cpp', 209 'test/UtilTest.cpp',
210 'test/UtilGetQueryStringTest.cpp',
211 'test/UtilGetSchemeAndHierarchicalPartTest.cpp',
212 ], 212 ],
213 'defines': ['WINVER=0x0501'], 213 'defines': ['WINVER=0x0501'],
214 'link_settings': { 214 'link_settings': {
215 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 215 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
216 }, 216 },
217 'msvs_settings': { 217 'msvs_settings': {
218 'VCLinkerTool': { 218 'VCLinkerTool': {
219 'SubSystem': '1', # Console 219 'SubSystem': '1', # Console
220 'EntryPointSymbol': 'mainCRTStartup', 220 'EntryPointSymbol': 'mainCRTStartup',
221 }, 221 },
222 }, 222 },
223 }, 223 },
224 224
225 { 225 {
226 'target_name': 'tests_plugin', 226 'target_name': 'tests_plugin',
227 'type': 'executable', 227 'type': 'executable',
228 'dependencies': [ 228 'dependencies': [
229 'shared', 229 'shared',
(...skipping 30 matching lines...) Expand all
260 ], 260 ],
261 'defines': [ 261 'defines': [
262 'WINVER=0x0501', 262 'WINVER=0x0501',
263 'PRODUCT_ADBLOCKPLUS' 263 'PRODUCT_ADBLOCKPLUS'
264 ], 264 ],
265 'link_settings': { 265 'link_settings': {
266 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '], 266 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '],
267 }, 267 },
268 'msvs_settings': { 268 'msvs_settings': {
269 'VCLinkerTool': { 269 'VCLinkerTool': {
270 'SubSystem': '1', # Console 270 'SubSystem': '1', # Console
271 'EntryPointSymbol': 'mainCRTStartup', 271 'EntryPointSymbol': 'mainCRTStartup',
272 'conditions': [[ 272 'conditions': [[
273 'target_arch=="ia32"', { 273 'target_arch=="ia32"', {
274 'AdditionalLibraryDirectories': [ 274 'AdditionalLibraryDirectories': [
275 '$(VCInstallDir)atlmfc/lib', 275 '$(VCInstallDir)atlmfc/lib',
276 '$(WindowsSDK_LibraryPath_x86)', 276 '$(WindowsSDK_LibraryPath_x86)',
277 '$(WINDDKDIR)/lib/ATL/i386', 277 '$(WINDDKDIR)/lib/ATL/i386',
278 ], 278 ],
279 }, { 279 }, {
280 'AdditionalLibraryDirectories': [ 280 'AdditionalLibraryDirectories': [
(...skipping 17 matching lines...) Expand all
298 'Release': { 298 'Release': {
299 'msvs_settings': { 299 'msvs_settings': {
300 'VCLinkerTool': { 300 'VCLinkerTool': {
301 'AdditionalDependencies': ['atls.lib'], 301 'AdditionalDependencies': ['atls.lib'],
302 }, 302 },
303 }, 303 },
304 }, 304 },
305 }, 305 },
306 }] 306 }]
307 } 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