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

Unified Diff: adblockplus.gyp

Issue 6267413888761856: Issue #1163 - add unit tests for CPluginUserSettings (Closed)
Patch Set: Created Aug. 14, 2014, 3:09 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | test/plugin/UserSettingsTest.cpp » ('j') | test/plugin/UserSettingsTest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: adblockplus.gyp
===================================================================
--- a/adblockplus.gyp
+++ b/adblockplus.gyp
@@ -217,5 +217,88 @@
'EntryPointSymbol': 'mainCRTStartup',
},
},
+ },
+
+ {
Felix Dahlke 2014/09/30 13:50:59 Not really a fan of duplicating source listing, in
Eric 2014/10/07 16:58:10 You noticed part of what was bothering me when I o
Felix Dahlke 2014/11/03 04:21:56 I'd generally find a static library cleaner, but I
+ 'target_name': 'tests_plugin',
+ 'type': 'executable',
+ 'dependencies': [
+ 'shared',
+ 'libadblockplus/third_party/googletest.gyp:googletest_main',
+ ],
+ 'sources': [
+ 'src/plugin/PluginUserSettings.cpp',
+ 'src/plugin/PluginUserSettings.h',
+ 'test/plugin/UserSettingsTest.cpp',
+ #
+ # required only for linking
+ #
+ 'src/plugin/AdblockPlusClient.cpp',
+ 'src/plugin/AdblockPlusDomTraverser.cpp',
+ 'src/plugin/AdblockPlusTab.cpp',
+ 'src/plugin/ATL_Deprecate.cpp',
+ 'src/plugin/NotificationMessage.cpp',
+ 'src/plugin/Plugin.cpp',
+ 'src/plugin/PluginClientBase.cpp',
+ 'src/plugin/PluginClientFactory.cpp',
+ 'src/plugin/PluginClass.cpp',
+ 'src/plugin/PluginDebug.cpp',
+ 'src/plugin/PluginFilter.cpp',
+ 'src/plugin/PluginMimeFilterClient.cpp',
+ 'src/plugin/PluginMutex.cpp',
+ 'src/plugin/PluginSettings.cpp',
+ 'src/plugin/PluginSystem.cpp',
+ 'src/plugin/PluginTabBase.cpp',
+ 'src/plugin/PluginUtil.cpp',
+ 'src/plugin/PluginWbPassthrough.cpp',
+ ],
+ 'include_dirs': [
+ '$(WINDDKDIR)/inc/atl71',
+ ],
+ 'defines': [
+ 'WINVER=0x0501',
+ 'PRODUCT_ADBLOCKPLUS'
+ ],
+ 'link_settings': {
+ 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32'],
+ },
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'SubSystem': '1', # Console
+ 'EntryPointSymbol': 'mainCRTStartup',
+ 'conditions': [[
+ 'target_arch=="ia32"', {
+ 'AdditionalLibraryDirectories': [
+ '$(VCInstallDir)atlmfc/lib',
+ '$(WindowsSDK_LibraryPath_x86)',
+ '$(WINDDKDIR)/lib/ATL/i386',
+ ],
+ }, {
+ 'AdditionalLibraryDirectories': [
+ '$(VCInstallDir)atlmfc/lib/amd64',
+ '$(WindowsSDK_LibraryPath_x64)',
+ '$(WINDDKDIR)/lib/ATL/amd64',
+ ],
+ }
+ ]],
+ },
+ },
+ 'configurations': {
+ # 'libraries' is not allowed under 'configurations' :-(
+ 'Debug': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalDependencies': ['atlsd.lib'],
+ },
+ },
+ },
+ 'Release': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalDependencies': ['atls.lib'],
+ },
+ },
+ },
+ },
}]
}
« no previous file with comments | « no previous file | test/plugin/UserSettingsTest.cpp » ('j') | test/plugin/UserSettingsTest.cpp » ('J')

Powered by Google App Engine
This is Rietveld