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

Delta Between Two Patch Sets: adblockplus.gyp

Issue 5979045791531008: create utils project with shared files (Closed)
Left Patch Set: Created July 16, 2014, 12:23 p.m.
Right Patch Set: rename project name "utils"->"shared" Created July 16, 2014, 4:30 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 | no next file » | 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': ['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 13 matching lines...) Expand all
24 'IEPLUGIN_VERSION=L"<(build_version)"', 24 'IEPLUGIN_VERSION=L"<(build_version)"',
25 'VERSIONINFO_VERSION=<!(python -c "import sys; print sys.argv[1].rep lace(\'.\', \',\')" <(build_version).0)', 25 'VERSIONINFO_VERSION=<!(python -c "import sys; print sys.argv[1].rep lace(\'.\', \',\')" <(build_version).0)',
26 'VERSIONINFO_VERSION_STR=\\"<(build_version).0\\"', 26 'VERSIONINFO_VERSION_STR=\\"<(build_version).0\\"',
27 ], 27 ],
28 } 28 }
29 ], 29 ],
30 ], 30 ],
31 }, 31 },
32 32
33 'targets': [{ 33 'targets': [{
34 'target_name': 'utils', 34 'target_name': 'shared',
Felix Dahlke 2014/07/16 15:17:19 I'd vote for calling this "shared", like the direc
sergei 2014/07/16 15:50:18 Would it have more semantically sense to rename th
35 'type': 'static_library', 35 'type': 'static_library',
36 'sources': [ 36 'sources': [
37 'src/shared/AutoHandle.cpp', 37 'src/shared/AutoHandle.cpp',
38 'src/shared/Communication.cpp', 38 'src/shared/Communication.cpp',
39 'src/shared/Dictionary.cpp', 39 'src/shared/Dictionary.cpp',
40 'src/shared/Utils.cpp', 40 'src/shared/Utils.cpp',
41 ] 41 ]
42 }, 42 },
43 43
44 { 44 {
45 'target_name': 'AdblockPlusEngine', 45 'target_name': 'AdblockPlusEngine',
46 'type': 'executable', 46 'type': 'executable',
47 'dependencies': [ 47 'dependencies': [
48 'utils', 48 'shared',
49 'libadblockplus/libadblockplus.gyp:libadblockplus', 49 'libadblockplus/libadblockplus.gyp:libadblockplus',
50 ], 50 ],
51 'sources': [ 51 'sources': [
52 'src/engine/Main.cpp', 52 'src/engine/Main.cpp',
53 'src/engine/Debug.cpp', 53 'src/engine/Debug.cpp',
54 'src/engine/UpdateInstallDialog.cpp', 54 'src/engine/UpdateInstallDialog.cpp',
55 'src/engine/Updater.cpp', 55 'src/engine/Updater.cpp',
56 'src/engine/engine.rc', 56 'src/engine/engine.rc',
57 ], 57 ],
58 'libraries': [ 58 'libraries': [
59 '-ladvapi32', 59 '-ladvapi32',
60 '-lole32', 60 '-lole32',
61 '-luser32', 61 '-luser32',
62 '-lshell32', 62 '-lshell32',
63 '-lshlwapi', 63 '-lshlwapi',
64 ], 64 ],
65 'msbuild_toolset': 'v110_xp', 65 'msbuild_toolset': 'v110_xp',
66 'msvs_settings': { 66 'msvs_settings': {
67 'VCLinkerTool': { 67 'VCLinkerTool': {
68 'DelayLoadDLLs': ['Shell32.dll'], 68 'DelayLoadDLLs': ['Shell32.dll'],
69 }, 69 },
70 }, 70 },
71 }, 71 },
72 72
73 { 73 {
74 'target_name': 'AdblockPlus', 74 'target_name': 'AdblockPlus',
75 'type': 'shared_library', 75 'type': 'shared_library',
76 'dependencies': [ 76 'dependencies': [
77 'utils' 77 'shared'
78 ], 78 ],
79 'sources': [ 79 'sources': [
80 'src/plugin/AdblockPlusClient.cpp', 80 'src/plugin/AdblockPlusClient.cpp',
81 'src/plugin/AdblockPlusDomTraverser.cpp', 81 'src/plugin/AdblockPlusDomTraverser.cpp',
82 'src/plugin/AdblockPlusTab.cpp', 82 'src/plugin/AdblockPlusTab.cpp',
83 'src/plugin/NotificationMessage.cpp', 83 'src/plugin/NotificationMessage.cpp',
84 'src/plugin/Plugin.cpp', 84 'src/plugin/Plugin.cpp',
85 'src/plugin/PluginClass.cpp', 85 'src/plugin/PluginClass.cpp',
86 'src/plugin/PluginClientBase.cpp', 86 'src/plugin/PluginClientBase.cpp',
87 'src/plugin/PluginClientFactory.cpp', 87 'src/plugin/PluginClientFactory.cpp',
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 ]], 151 ]],
152 'DelayLoadDLLs': ['Shell32.dll'], 152 'DelayLoadDLLs': ['Shell32.dll'],
153 }, 153 },
154 }, 154 },
155 }, 155 },
156 156
157 { 157 {
158 'target_name': 'tests', 158 'target_name': 'tests',
159 'type': 'executable', 159 'type': 'executable',
160 'dependencies': [ 160 'dependencies': [
161 'utils', 161 'shared',
162 'libadblockplus/third_party/googletest.gyp:googletest_main', 162 'libadblockplus/third_party/googletest.gyp:googletest_main',
163 ], 163 ],
164 'sources': [ 164 'sources': [
165 'test/CommunicationTest.cpp', 165 'test/CommunicationTest.cpp',
166 'test/DictionaryTest.cpp', 166 'test/DictionaryTest.cpp',
167 ], 167 ],
168 'defines': ['WINVER=0x0501'], 168 'defines': ['WINVER=0x0501'],
169 'link_settings': { 169 'link_settings': {
170 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 170 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
171 }, 171 },
172 'msvs_settings': { 172 'msvs_settings': {
173 'VCLinkerTool': { 173 'VCLinkerTool': {
174 'SubSystem': '1', # Console 174 'SubSystem': '1', # Console
175 'EntryPointSymbol': 'mainCRTStartup', 175 'EntryPointSymbol': 'mainCRTStartup',
176 }, 176 },
177 }, 177 },
178 }] 178 }]
179 } 179 }
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld