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

Delta Between Two Patch Sets: adblockplus.gyp

Issue 10945039: Switch to gyp (Closed)
Left Patch Set: This version actually compiles, needs some testing however. build_release.py and installer still ne… Created June 21, 2013, 7:30 a.m.
Right Patch Set: Final version Created June 21, 2013, 2:16 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 | « AdblockPlusPlugin.vcxproj ('k') | build_release.py » ('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': ['defaults.gypi'],
3
2 'variables': { 4 'variables': {
3 'build_type%': 'devbuild', 5 'build_type%': 'devbuild',
4 'build_version%': '', 6 'build_version%': '',
5 'shared_files': [ 7 'shared_files': [
6 'src/shared/AutoHandle.cpp', 8 'src/shared/AutoHandle.cpp',
7 'src/shared/Communication.cpp', 9 'src/shared/Communication.cpp',
8 'src/shared/Dictionary.cpp', 10 'src/shared/Dictionary.cpp',
9 'src/shared/Utils.cpp', 11 'src/shared/Utils.cpp',
10 ] 12 ]
11 }, 13 },
12 14
13 'target_defaults': { 15 'target_defaults': {
14 'configurations': {
15 'Debug': {
16 'defines': [ '_DEBUG' ],
17 'msvs_settings': {
18 'VCCLCompilerTool': {
19 'Optimization': '0',
20
21 'conditions': [
22 ['component=="shared_library"', {
23 'RuntimeLibrary': '3', # /MDd
24 }, {
25 'RuntimeLibrary': '1', # /MTd
26 }]
27 ],
28 },
29 },
30 },
31 'Release': {
32 'defines': [ 'NDEBUG' ],
33 'msvs_settings': {
34 'VCCLCompilerTool': {
35 'Optimization': '2',
36 'InlineFunctionExpansion': '2',
37 'EnableIntrinsicFunctions': 'true',
38 'FavorSizeOrSpeed': '0',
39 'StringPooling': 'true',
40 'WholeProgramOptimization': 'true',
41 'EnableFunctionLevelLinking': 'true',
42
43 'conditions': [
44 ['component=="shared_library"', {
45 'RuntimeLibrary': '2', # /MD
46 }, {
47 'RuntimeLibrary': '0', # /MT
48 }]
49 ],
50 },
51 'VCLinkerTool': {
52 'EnableCOMDATFolding': 2, # true
53 'OptimizeReferences': 2, # true
54 },
55 },
56 },
57 },
58 'defines': ['WIN32', '_WINDOWS'],
59 'msvs_configuration_attributes': {
60 'CharacterSet': '1', # Unicode
61 },
62 'msvs_settings': {
63 'VCCLCompilerTool': {
64 'WarningLevel': 3, # Level3
65 },
66 'VCLinkerTool': {
67 'SubSystem': '2', # Windows
68 'GenerateDebugInformation': 'true',
69 },
70 'VCMIDLTool': {
71 'TypeLibraryName': '$(TargetName).tlb',
72 },
73 },
74 'conditions': [ 16 'conditions': [
75 [ 17 [
76 'build_type=="devbuild"', 18 'build_type=="devbuild"',
77 { 19 {
78 'defines': ['ADBLOCK_PLUS_TEST_MODE', 'ADBLOCKPLUS_TEST_MODE'], 20 'defines': ['ADBLOCK_PLUS_TEST_MODE', 'ADBLOCKPLUS_TEST_MODE'],
79 }, 21 },
80 { 22 {
81 'defines': ['ADBLOCK_PLUS_PRODUCTION_MODE', 'ADBLOCKPLUS_PRODUCTION_MO DE'], 23 'defines': ['ADBLOCK_PLUS_PRODUCTION_MODE', 'ADBLOCKPLUS_PRODUCTION_MO DE'],
82 }, 24 },
83 ], 25 ],
84 [ 26 [
85 'build_version!=""', 27 'build_version!=""',
86 { 28 {
87 'defines': [ 29 'defines': [
88 'IEPLUGIN_VERSION=L"<(version)"', 30 'IEPLUGIN_VERSION=L"<(build_version)"',
89 'VERSIONINFO_VERSION=<!(python -c "import sys; print sys.argv[1].rep lace(\'.\', \',\')" <(version).0)', 31 'VERSIONINFO_VERSION=<!(python -c "import sys; print sys.argv[1].rep lace(\'.\', \',\')" <(build_version).0)',
90 'VERSIONINFO_VERSION_STR=\\"<(version).0\\"', 32 'VERSIONINFO_VERSION_STR=\\"<(build_version).0\\"',
91 ], 33 ],
92 } 34 }
93 ], 35 ],
94 ], 36 ],
95 }, 37 },
96 38
97 'targets': [{ 39 'targets': [{
98 'target_name': 'AdblockPlusEngine', 40 'target_name': 'AdblockPlusEngine',
99 'type': 'executable', 41 'type': 'executable',
100 'dependencies': [ 42 'dependencies': [
(...skipping 12 matching lines...) Expand all
113 '-luser32', 55 '-luser32',
114 '-lshell32', 56 '-lshell32',
115 '-lshlwapi', 57 '-lshlwapi',
116 ], 58 ],
117 'msbuild_toolset': 'v110_xp', 59 'msbuild_toolset': 'v110_xp',
118 'msvs_settings': { 60 'msvs_settings': {
119 'VCLinkerTool': { 61 'VCLinkerTool': {
120 'DelayLoadDLLs': ['Shell32.dll'], 62 'DelayLoadDLLs': ['Shell32.dll'],
121 }, 63 },
122 }, 64 },
123 }, { 65 },
66
67 {
124 'target_name': 'AdblockPlus', 68 'target_name': 'AdblockPlus',
125 'type': 'shared_library', 69 'type': 'shared_library',
126 'sources': [ 70 'sources': [
127 'src/plugin/AdblockPlusClient.cpp', 71 'src/plugin/AdblockPlusClient.cpp',
128 'src/plugin/AdblockPlusDomTraverser.cpp', 72 'src/plugin/AdblockPlusDomTraverser.cpp',
129 'src/plugin/AdblockPlusTab.cpp', 73 'src/plugin/AdblockPlusTab.cpp',
130 'src/plugin/Plugin.cpp', 74 'src/plugin/Plugin.cpp',
131 'src/plugin/PluginChecksum.cpp', 75 'src/plugin/PluginChecksum.cpp',
132 'src/plugin/PluginClass.cpp', 76 'src/plugin/PluginClass.cpp',
133 'src/plugin/PluginClassThread.cpp', 77 'src/plugin/PluginClassThread.cpp',
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 '$(WINDDKDIR)/lib/ATL/amd64', 141 '$(WINDDKDIR)/lib/ATL/amd64',
198 ], 142 ],
199 } 143 }
200 ]], 144 ]],
201 'AdditionalLibraryDirectories': [ 145 'AdditionalLibraryDirectories': [
202 '$(VCInstallDir)atlmfc/lib', 146 '$(VCInstallDir)atlmfc/lib',
203 ], 147 ],
204 'DelayLoadDLLs': ['Shell32.dll'], 148 'DelayLoadDLLs': ['Shell32.dll'],
205 }, 149 },
206 }, 150 },
207 }, { 151 },
152
153 {
208 'target_name': 'tests', 154 'target_name': 'tests',
209 'type': 'executable', 155 'type': 'executable',
210 'dependencies': [ 156 'dependencies': [
211 'libadblockplus/third_party/googletest.gyp:googletest_main', 157 'libadblockplus/third_party/googletest.gyp:googletest_main',
212 ], 158 ],
213 'sources': [ 159 'sources': [
214 '<@(shared_files)',
215 'test/CommunicationTest.cpp', 160 'test/CommunicationTest.cpp',
216 'test/DictionaryTest.cpp', 161 'test/DictionaryTest.cpp',
162 '<@(shared_files)',
217 ], 163 ],
218 'defines': ['WINVER=0x0501'], 164 'defines': ['WINVER=0x0501'],
219 'link_settings': { 165 'link_settings': {
220 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 166 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
221 }, 167 },
222 'msvs_settings': { 168 'msvs_settings': {
223 'VCLinkerTool': { 169 'VCLinkerTool': {
224 'SubSystem': '1', # Console 170 'SubSystem': '1', # Console
225 'EntryPointSymbol': 'mainCRTStartup', 171 'EntryPointSymbol': 'mainCRTStartup',
226 }, 172 },
227 }, 173 },
228 }] 174 }]
229 } 175 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld