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

Delta Between Two Patch Sets: adblockplus.gyp

Issue 5187613258416128: Issue #1234 - Rewrite internals of debug facility (Closed)
Left Patch Set: small fixes from comment #7 Created May 19, 2015, 3:13 p.m.
Right Patch Set: rebase only Created Nov. 26, 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/plugin/Console.h » ('j') | src/plugin/PluginDebug.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': [
3 'defaults.gypi',
4 'common/common.gypi',
5 ],
3 6
4 'variables': { 7 'variables': {
5 'build_type%': 'devbuild', 8 'build_type%': 'devbuild',
6 'build_version%': '', 9 'build_version%': '',
7 }, 10 },
8 11
9 'target_defaults': { 12 'target_defaults': {
10 'conditions': [ 13 'conditions': [
11 [ 14 [
12 'build_type=="devbuild"', 15 'build_type=="devbuild"',
(...skipping 13 matching lines...) Expand all
26 'VERSIONINFO_VERSION_STR=\\"<(build_version).0\\"', 29 'VERSIONINFO_VERSION_STR=\\"<(build_version).0\\"',
27 ], 30 ],
28 } 31 }
29 ], 32 ],
30 ], 33 ],
31 }, 34 },
32 35
33 'targets': [{ 36 'targets': [{
34 'target_name': 'shared', 37 'target_name': 'shared',
35 'type': 'static_library', 38 'type': 'static_library',
39 'dependencies': [
40 'common',
41 ],
36 'sources': [ 42 'sources': [
37 'src/shared/AutoHandle.cpp', 43 'src/shared/AutoHandle.cpp',
44 'src/shared/AutoHandle.h',
38 'src/shared/Communication.cpp', 45 'src/shared/Communication.cpp',
46 'src/shared/Communication.h',
47 'src/shared/CriticalSection.h',
39 'src/shared/Dictionary.cpp', 48 'src/shared/Dictionary.cpp',
49 'src/shared/Dictionary.h',
40 'src/shared/Utils.cpp', 50 'src/shared/Utils.cpp',
41 'src/shared/Registry.h', 51 'src/shared/Utils.h',
42 'src/shared/Registry.cpp', 52 'src/shared/Version.h',
43 'src/shared/IE_version.h', 53 'src/shared/MsHTMLUtils.cpp',
44 'src/shared/IE_version.cpp', 54 'src/shared/MsHTMLUtils.h',
45 ] 55 ]
46 }, 56 },
47 57
48 { 58 {
49 'target_name': 'AdblockPlusEngine', 59 'target_name': 'AdblockPlusEngine',
50 'type': 'executable', 60 'type': 'executable',
51 'dependencies': [ 61 'dependencies': [
52 'shared', 62 'shared',
53 'libadblockplus/libadblockplus.gyp:libadblockplus', 63 'libadblockplus/libadblockplus.gyp:libadblockplus',
54 ], 64 ],
55 'sources': [ 65 'sources': [
56 'src/engine/Main.cpp', 66 'src/engine/Main.cpp',
67 'src/engine/NotificationWindow.cpp',
68 'src/engine/NotificationWindow.h',
57 'src/engine/Debug.cpp', 69 'src/engine/Debug.cpp',
58 'src/engine/UpdateInstallDialog.cpp', 70 'src/engine/UpdateInstallDialog.cpp',
59 'src/engine/Updater.cpp', 71 'src/engine/Updater.cpp',
60 'src/engine/engine.rc', 72 'src/engine/engine.rc',
61 ], 73 ],
62 'libraries': [ 74 'libraries': [
63 '-ladvapi32', 75 '-ladvapi32',
64 '-lole32', 76 '-lole32',
65 '-luser32', 77 '-luser32',
66 '-lshell32', 78 '-lshell32',
(...skipping 19 matching lines...) Expand all
86 'src/plugin/AdblockPlus.idl', 98 'src/plugin/AdblockPlus.idl',
87 'src/plugin/AdblockPlus.rc', 99 'src/plugin/AdblockPlus.rc',
88 'src/plugin/AdblockPlus.rgs', 100 'src/plugin/AdblockPlus.rgs',
89 'src/plugin/AdblockPlusClient.cpp', 101 'src/plugin/AdblockPlusClient.cpp',
90 'src/plugin/AdblockPlusClient.h', 102 'src/plugin/AdblockPlusClient.h',
91 'src/plugin/AdblockPlusDomTraverser.cpp', 103 'src/plugin/AdblockPlusDomTraverser.cpp',
92 'src/plugin/AdblockPlusDomTraverser.h', 104 'src/plugin/AdblockPlusDomTraverser.h',
93 'src/plugin/AdblockPlusGuids.h', 105 'src/plugin/AdblockPlusGuids.h',
94 'src/plugin/ATL_Deprecate.cpp', 106 'src/plugin/ATL_Deprecate.cpp',
95 'src/plugin/ATL_Deprecate.h', 107 'src/plugin/ATL_Deprecate.h',
96 'src/plugin/BuildVariant.h',
97 'src/plugin/Config.h', 108 'src/plugin/Config.h',
98 'src/plugin/NotificationMessage.cpp', 109 'src/plugin/NotificationMessage.cpp',
99 'src/plugin/NotificationMessage.h', 110 'src/plugin/NotificationMessage.h',
100 'src/plugin/Plugin.cpp', 111 'src/plugin/Plugin.cpp',
101 'src/plugin/Plugin.h', 112 'src/plugin/Plugin.h',
102 'src/plugin/PluginClass.cpp', 113 'src/plugin/PluginClass.cpp',
103 'src/plugin/PluginClass.h', 114 'src/plugin/PluginClass.h',
104 'src/plugin/PluginClient.h',
105 'src/plugin/PluginClientBase.cpp', 115 'src/plugin/PluginClientBase.cpp',
106 'src/plugin/PluginClientBase.h', 116 'src/plugin/PluginClientBase.h',
107 'src/plugin/PluginClientFactory.cpp', 117 'src/plugin/PluginClientFactory.cpp',
108 'src/plugin/PluginClientFactory.h', 118 'src/plugin/PluginClientFactory.h',
109 'src/plugin/PluginDebug.cpp', 119 'src/plugin/PluginDebug.cpp',
110 'src/plugin/PluginDebug.h', 120 'src/plugin/PluginDebug.h',
111 'src/plugin/PluginDomTraverserBase.h', 121 'src/plugin/PluginDomTraverserBase.h',
112 'src/plugin/PluginErrorCodes.h', 122 'src/plugin/PluginErrorCodes.h',
113 'src/plugin/PluginFilter.cpp', 123 'src/plugin/PluginFilter.cpp',
114 'src/plugin/PluginFilter.h', 124 'src/plugin/PluginFilter.h',
115 'src/plugin/PluginMimeFilterClient.cpp', 125 'src/plugin/PluginMimeFilterClient.cpp',
116 'src/plugin/PluginMimeFilterClient.h', 126 'src/plugin/PluginMimeFilterClient.h',
117 'src/plugin/PluginMutex.cpp', 127 'src/plugin/PluginMutex.cpp',
118 'src/plugin/PluginMutex.h', 128 'src/plugin/PluginMutex.h',
119 'src/plugin/PluginPassthroughObject.h', 129 'src/plugin/PluginPassthroughObject.h',
120 'src/plugin/PluginSettings.cpp', 130 'src/plugin/PluginSettings.cpp',
121 'src/plugin/PluginSettings.h', 131 'src/plugin/PluginSettings.h',
122 'src/plugin/PluginStdAfx.cpp', 132 'src/plugin/PluginStdAfx.cpp',
123 'src/plugin/PluginStdAfx.h', 133 'src/plugin/PluginStdAfx.h',
124 'src/plugin/PluginSystem.cpp', 134 'src/plugin/PluginSystem.cpp',
125 'src/plugin/PluginSystem.h', 135 'src/plugin/PluginSystem.h',
126 'src/plugin/PluginTabBase.cpp', 136 'src/plugin/PluginTabBase.cpp',
127 'src/plugin/PluginTabBase.h', 137 'src/plugin/PluginTabBase.h',
128 'src/plugin/PluginUserSettings.cpp', 138 'src/plugin/PluginUserSettings.cpp',
129 'src/plugin/PluginUserSettings.h', 139 'src/plugin/PluginUserSettings.h',
130 'src/plugin/PluginUtil.cpp', 140 'src/plugin/PluginUtil.cpp',
131 'src/plugin/PluginUtil.h', 141 'src/plugin/PluginUtil.h',
132 'src/plugin/PluginWbPassThrough.cpp', 142 'src/plugin/PluginWbPassThrough.cpp',
133 'src/plugin/PluginWbPassThrough.h', 143 'src/plugin/PluginWbPassThrough.h',
134 'src/plugin/ProtocolCF.h',
135 'src/plugin/ProtocolCF.inl',
136 'src/plugin/ProtocolImpl.h',
137 'src/plugin/ProtocolImpl.inl',
138 'src/plugin/Resource.h', 144 'src/plugin/Resource.h',
139 'src/plugin/SinkPolicy.h', 145 'src/plugin/passthroughapp/ProtocolCF.h',
140 'src/plugin/SinkPolicy.inl', 146 'src/plugin/passthroughapp/ProtocolCF.inl',
147 'src/plugin/passthroughapp/ProtocolImpl.h',
148 'src/plugin/passthroughapp/ProtocolImpl.inl',
149 'src/plugin/passthroughapp/SinkPolicy.h',
150 'src/plugin/passthroughapp/SinkPolicy.inl',
141 ], 151 ],
142 'include_dirs': [ 152 'include_dirs': [
143 '$(WindowsSDK_IncludePath)', 153 '$(WindowsSDK_IncludePath)',
144 '$(VCInstallDir)atlmfc/include', 154 '$(VCInstallDir)atlmfc/include',
145 '$(WINDDKDIR)/inc/atl71', 155 '$(WINDDKDIR)/inc/atl71',
146 ], 156 ],
147 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL 157 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
148 # That Is Brought into a Process" on the link here: 158 # That Is Brought into a Process" on the link here:
149 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests 159 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests
150 'defines': ['ISOLATION_AWARE_ENABLED'], 160 'defines': ['ISOLATION_AWARE_ENABLED'],
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 { 206 {
197 'target_name': 'tests', 207 'target_name': 'tests',
198 'type': 'executable', 208 'type': 'executable',
199 'dependencies': [ 209 'dependencies': [
200 'shared', 210 'shared',
201 'libadblockplus/third_party/googletest.gyp:googletest_main', 211 'libadblockplus/third_party/googletest.gyp:googletest_main',
202 ], 212 ],
203 'sources': [ 213 'sources': [
204 'test/CommunicationTest.cpp', 214 'test/CommunicationTest.cpp',
205 'test/DictionaryTest.cpp', 215 'test/DictionaryTest.cpp',
206 'test/RegistryTest.cpp',
207 'test/UtilTest.cpp', 216 'test/UtilTest.cpp',
208 'test/UtilGetQueryStringTest.cpp', 217 'test/UtilGetQueryStringTest.cpp',
209 'test/UtilGetSchemeAndHierarchicalPartTest.cpp', 218 'test/UtilGetSchemeAndHierarchicalPartTest.cpp',
210 ], 219 ],
211 'defines': ['WINVER=0x0501'], 220 'defines': ['WINVER=0x0501'],
212 'link_settings': { 221 'link_settings': {
213 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 222 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
214 }, 223 },
215 'msvs_settings': { 224 'msvs_settings': {
216 'VCLinkerTool': { 225 'VCLinkerTool': {
217 'SubSystem': '1', # Console 226 'SubSystem': '1', # Console
218 'EntryPointSymbol': 'mainCRTStartup', 227 'EntryPointSymbol': 'mainCRTStartup',
219 }, 228 },
220 }, 229 },
221 }, 230 },
222 231
223 { 232 {
224 'target_name': 'tests_plugin', 233 'target_name': 'tests_plugin',
225 'type': 'executable', 234 'type': 'executable',
226 'dependencies': [ 235 'dependencies': [
227 'shared', 236 'shared',
228 'libadblockplus/libadblockplus.gyp:libadblockplus', 237 'libadblockplus/libadblockplus.gyp:libadblockplus',
229 'libadblockplus/third_party/googletest.gyp:googletest_main', 238 'libadblockplus/third_party/googletest.gyp:googletest_main',
230 ], 239 ],
231 'sources': [ 240 'sources': [
232 'src/plugin/PluginUserSettings.cpp', 241 'src/plugin/PluginUserSettings.cpp',
233 'src/plugin/PluginUserSettings.h', 242 'src/plugin/PluginUserSettings.h',
234 'test/plugin/UserSettingsTest.cpp', 243 'test/plugin/UserSettingsTest.cpp',
244 'src/plugin/PluginUtil.h',
245 'test/plugin/UtilTest.cpp',
235 # 246 #
236 # required only for linking 247 # required only for linking
237 # 248 #
238 'src/plugin/AdblockPlusClient.cpp', 249 'src/plugin/AdblockPlusClient.cpp',
239 'src/plugin/AdblockPlusDomTraverser.cpp', 250 'src/plugin/AdblockPlusDomTraverser.cpp',
240 'src/plugin/ATL_Deprecate.cpp', 251 'src/plugin/ATL_Deprecate.cpp',
241 'src/plugin/NotificationMessage.cpp', 252 'src/plugin/NotificationMessage.cpp',
242 'src/plugin/Plugin.cpp', 253 'src/plugin/Plugin.cpp',
243 'src/plugin/PluginClientBase.cpp', 254 'src/plugin/PluginClientBase.cpp',
244 'src/plugin/PluginClientFactory.cpp', 255 'src/plugin/PluginClientFactory.cpp',
(...skipping 13 matching lines...) Expand all
258 ], 269 ],
259 'defines': [ 270 'defines': [
260 'WINVER=0x0501', 271 'WINVER=0x0501',
261 'PRODUCT_ADBLOCKPLUS' 272 'PRODUCT_ADBLOCKPLUS'
262 ], 273 ],
263 'link_settings': { 274 'link_settings': {
264 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '], 275 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '],
265 }, 276 },
266 'msvs_settings': { 277 'msvs_settings': {
267 'VCLinkerTool': { 278 'VCLinkerTool': {
268 'SubSystem': '1', # Console 279 'SubSystem': '1', # Console
269 'EntryPointSymbol': 'mainCRTStartup', 280 'EntryPointSymbol': 'mainCRTStartup',
270 'conditions': [[ 281 'conditions': [[
271 'target_arch=="ia32"', { 282 'target_arch=="ia32"', {
272 'AdditionalLibraryDirectories': [ 283 'AdditionalLibraryDirectories': [
273 '$(VCInstallDir)atlmfc/lib', 284 '$(VCInstallDir)atlmfc/lib',
274 '$(WindowsSDK_LibraryPath_x86)', 285 '$(WindowsSDK_LibraryPath_x86)',
275 '$(WINDDKDIR)/lib/ATL/i386', 286 '$(WINDDKDIR)/lib/ATL/i386',
276 ], 287 ],
277 }, { 288 }, {
278 'AdditionalLibraryDirectories': [ 289 'AdditionalLibraryDirectories': [
(...skipping 17 matching lines...) Expand all
296 'Release': { 307 'Release': {
297 'msvs_settings': { 308 'msvs_settings': {
298 'VCLinkerTool': { 309 'VCLinkerTool': {
299 'AdditionalDependencies': ['atls.lib'], 310 'AdditionalDependencies': ['atls.lib'],
300 }, 311 },
301 }, 312 },
302 }, 313 },
303 }, 314 },
304 }] 315 }]
305 } 316 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld