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

Delta Between Two Patch Sets: adblockplus.gyp

Issue 5171515343503360: Issue #41 - Bring method of determining IE version up to date (Closed)
Left Patch Set: Created July 23, 2014, 4:55 p.m.
Right Patch Set: Final (?) 2 Created Jan. 5, 2015, 1:02 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 | src/engine/Main.cpp » ('j') | src/plugin/PluginWbPassThrough.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 { 1 {
2 'includes': ['defaults.gypi'], 2 'includes': ['defaults.gypi'],
3 3
4 'variables': { 4 'variables': {
5 'build_type%': 'devbuild', 5 'build_type%': 'devbuild',
6 'build_version%': '', 6 'build_version%': '',
7 }, 7 },
8 8
9 'target_defaults': { 9 'target_defaults': {
10 'conditions': [ 10 'conditions': [
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 }, 74 },
75 }, 75 },
76 76
77 { 77 {
78 'target_name': 'AdblockPlus', 78 'target_name': 'AdblockPlus',
79 'type': 'shared_library', 79 'type': 'shared_library',
80 'dependencies': [ 80 'dependencies': [
81 'shared' 81 'shared'
82 ], 82 ],
83 'sources': [ 83 'sources': [
84 'src/plugin/AdblockPlusClient.cpp', 84 'src/plugin/abp.h',
85 'src/plugin/AdblockPlusDomTraverser.cpp',
86 'src/plugin/AdblockPlusTab.cpp',
87 'src/plugin/NotificationMessage.cpp',
88 'src/plugin/Plugin.cpp',
89 'src/plugin/PluginClass.cpp',
90 'src/plugin/PluginClientBase.cpp',
91 'src/plugin/PluginClientFactory.cpp',
92 'src/plugin/PluginDebug.cpp',
93 'src/plugin/PluginFilter.cpp',
94 'src/plugin/PluginMimeFilterClient.cpp',
95 'src/plugin/PluginMutex.cpp',
96 'src/plugin/PluginSettings.cpp',
97 'src/plugin/PluginStdAfx.cpp',
98 'src/plugin/PluginSystem.cpp',
99 'src/plugin/PluginTabBase.cpp',
100 'src/plugin/PluginUserSettings.cpp',
101 'src/plugin/PluginUtil.cpp',
102 'src/plugin/PluginWbPassThrough.cpp',
103 'src/plugin/AdblockPlus.def', 85 'src/plugin/AdblockPlus.def',
104 'src/plugin/AdblockPlus.idl', 86 'src/plugin/AdblockPlus.idl',
105 'src/plugin/AdblockPlus.rc', 87 'src/plugin/AdblockPlus.rc',
106 'src/plugin/AdblockPlus.rgs', 88 'src/plugin/AdblockPlus.rgs',
89 'src/plugin/AdblockPlusClient.cpp',
90 'src/plugin/AdblockPlusClient.h',
91 'src/plugin/AdblockPlusDomTraverser.cpp',
92 'src/plugin/AdblockPlusDomTraverser.h',
93 'src/plugin/AdblockPlusGuids.h',
94 'src/plugin/AdblockPlusTab.cpp',
95 'src/plugin/AdblockPlusTab.h',
96 'src/plugin/ATL_Deprecate.cpp',
97 'src/plugin/ATL_Deprecate.h',
98 'src/plugin/BuildVariant.h',
99 'src/plugin/Config.h',
100 'src/plugin/Console.h',
101 'src/plugin/NotificationMessage.cpp',
102 'src/plugin/NotificationMessage.h',
103 'src/plugin/Plugin.cpp',
104 'src/plugin/Plugin.h',
105 'src/plugin/PluginClass.cpp',
106 'src/plugin/PluginClass.h',
107 'src/plugin/PluginClient.h',
108 'src/plugin/PluginClientBase.cpp',
109 'src/plugin/PluginClientBase.h',
110 'src/plugin/PluginClientFactory.cpp',
111 'src/plugin/PluginClientFactory.h',
112 'src/plugin/PluginDebug.cpp',
113 'src/plugin/PluginDebug.h',
114 'src/plugin/PluginDebugMacros.h',
115 'src/plugin/PluginDomTraverserBase.h',
116 'src/plugin/PluginErrorCodes.h',
117 'src/plugin/PluginFilter.cpp',
118 'src/plugin/PluginFilter.h',
119 'src/plugin/PluginMimeFilterClient.cpp',
120 'src/plugin/PluginMimeFilterClient.h',
121 'src/plugin/PluginMutex.cpp',
122 'src/plugin/PluginMutex.h',
123 'src/plugin/PluginPassthroughObject.h',
124 'src/plugin/PluginSettings.cpp',
125 'src/plugin/PluginSettings.h',
126 'src/plugin/PluginStdAfx.cpp',
127 'src/plugin/PluginStdAfx.h',
128 'src/plugin/PluginSystem.cpp',
129 'src/plugin/PluginSystem.h',
130 'src/plugin/PluginTab.h',
131 'src/plugin/PluginTabBase.cpp',
132 'src/plugin/PluginTabBase.h',
133 'src/plugin/PluginTypedef.h',
134 'src/plugin/PluginUserSettings.cpp',
135 'src/plugin/PluginUserSettings.h',
136 'src/plugin/PluginUtil.cpp',
137 'src/plugin/PluginUtil.h',
138 'src/plugin/PluginWbPassThrough.cpp',
139 'src/plugin/PluginWbPassThrough.h',
140 'src/plugin/ProtocolCF.h',
141 'src/plugin/ProtocolCF.inl',
142 'src/plugin/ProtocolImpl.h',
143 'src/plugin/ProtocolImpl.inl',
144 'src/plugin/Resource.h',
145 'src/plugin/SinkPolicy.h',
146 'src/plugin/SinkPolicy.inl',
107 ], 147 ],
108 'include_dirs': [ 148 'include_dirs': [
109 '$(WindowsSDK_IncludePath)', 149 '$(WindowsSDK_IncludePath)',
110 '$(VCInstallDir)atlmfc/include', 150 '$(VCInstallDir)atlmfc/include',
111 '$(WINDDKDIR)/inc/atl71', 151 '$(WINDDKDIR)/inc/atl71',
112 ], 152 ],
113 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL 153 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
114 # That Is Brought into a Process" on the link here: 154 # That Is Brought into a Process" on the link here:
115 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests 155 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests
116 'defines': ['PRODUCT_ADBLOCKPLUS', 'ISOLATION_AWARE_ENABLED'], 156 'defines': ['ISOLATION_AWARE_ENABLED'],
117 'libraries': [ 157 'libraries': [
118 '-lwinhttp', 158 '-lwinhttp',
119 '-lshell32', 159 '-lshell32',
120 '-lComctl32', 160 '-lComctl32',
121 '-lGdi32', 161 '-lGdi32',
122 ], 162 ],
123 'configurations': { 163 'configurations': {
124 # 'libraries' is not allowed under 'configurations' :-( 164 # 'libraries' is not allowed under 'configurations' :-(
125 'Debug': { 165 'Debug': {
126 'msvs_settings': { 166 'msvs_settings': {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 'defines': ['WINVER=0x0501'], 214 'defines': ['WINVER=0x0501'],
175 'link_settings': { 215 'link_settings': {
176 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 216 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
177 }, 217 },
178 'msvs_settings': { 218 'msvs_settings': {
179 'VCLinkerTool': { 219 'VCLinkerTool': {
180 'SubSystem': '1', # Console 220 'SubSystem': '1', # Console
181 'EntryPointSymbol': 'mainCRTStartup', 221 'EntryPointSymbol': 'mainCRTStartup',
182 }, 222 },
183 }, 223 },
224 },
225
226 {
227 'target_name': 'tests_plugin',
228 'type': 'executable',
229 'dependencies': [
230 'shared',
231 'libadblockplus/third_party/googletest.gyp:googletest_main',
232 ],
233 'sources': [
234 'src/plugin/PluginUserSettings.cpp',
235 'src/plugin/PluginUserSettings.h',
236 'test/plugin/UserSettingsTest.cpp',
237 #
238 # required only for linking
239 #
240 'src/plugin/AdblockPlusClient.cpp',
241 'src/plugin/AdblockPlusDomTraverser.cpp',
242 'src/plugin/AdblockPlusTab.cpp',
243 'src/plugin/ATL_Deprecate.cpp',
244 'src/plugin/NotificationMessage.cpp',
245 'src/plugin/Plugin.cpp',
246 'src/plugin/PluginClientBase.cpp',
247 'src/plugin/PluginClientFactory.cpp',
248 'src/plugin/PluginClass.cpp',
249 'src/plugin/PluginDebug.cpp',
250 'src/plugin/PluginFilter.cpp',
251 'src/plugin/PluginMimeFilterClient.cpp',
252 'src/plugin/PluginMutex.cpp',
253 'src/plugin/PluginSettings.cpp',
254 'src/plugin/PluginSystem.cpp',
255 'src/plugin/PluginTabBase.cpp',
256 'src/plugin/PluginUtil.cpp',
257 'src/plugin/PluginWbPassthrough.cpp',
258 ],
259 'include_dirs': [
260 '$(WINDDKDIR)/inc/atl71',
261 ],
262 'defines': [
263 'WINVER=0x0501',
264 'PRODUCT_ADBLOCKPLUS'
265 ],
266 'link_settings': {
267 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '],
268 },
269 'msvs_settings': {
270 'VCLinkerTool': {
271 'SubSystem': '1', # Console
272 'EntryPointSymbol': 'mainCRTStartup',
273 'conditions': [[
274 'target_arch=="ia32"', {
275 'AdditionalLibraryDirectories': [
276 '$(VCInstallDir)atlmfc/lib',
277 '$(WindowsSDK_LibraryPath_x86)',
278 '$(WINDDKDIR)/lib/ATL/i386',
279 ],
280 }, {
281 'AdditionalLibraryDirectories': [
282 '$(VCInstallDir)atlmfc/lib/amd64',
283 '$(WindowsSDK_LibraryPath_x64)',
284 '$(WINDDKDIR)/lib/ATL/amd64',
285 ],
286 }
287 ]],
288 },
289 },
290 'configurations': {
291 # 'libraries' is not allowed under 'configurations' :-(
292 'Debug': {
293 'msvs_settings': {
294 'VCLinkerTool': {
295 'AdditionalDependencies': ['atlsd.lib'],
296 },
297 },
298 },
299 'Release': {
300 'msvs_settings': {
301 'VCLinkerTool': {
302 'AdditionalDependencies': ['atls.lib'],
303 },
304 },
305 },
306 },
184 }] 307 }]
185 } 308 }
LEFTRIGHT
« no previous file | src/engine/Main.cpp » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld