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

Delta Between Two Patch Sets: libadblockplus.gyp

Issue 5163715573841920: Issue 768 - Switch from TR1 to C++11 (Closed)
Left Patch Set: Created July 11, 2014, 2:24 p.m.
Right Patch Set: fix including of <memory> Created Aug. 7, 2015, 6:07 a.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 | « include/AdblockPlus/tr1_memory.h ('k') | src/DefaultFileSystem.cpp » ('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 'conditions': [[ 2 'conditions': [[
3 # We don't want to use curl on Windows and Android, skip the check there 3 # We don't want to use curl on Windows and Android, skip the check there
4 'OS=="win" or OS=="android"', 4 'OS=="win" or OS=="android"',
5 { 5 {
6 'variables': { 6 'variables': {
7 'have_curl': 0 7 'have_curl': 0
8 } 8 }
9 }, 9 },
10 { 10 {
11 'variables': { 11 'variables': {
12 'have_curl': '<!(python check_curl.py)' 12 'have_curl': '<!(python check_curl.py)'
13 } 13 }
14 } 14 }
15 ]], 15 ]],
16 'includes': ['third_party/v8/build/common.gypi', 16 'includes': ['third_party/v8/build/features.gypi',
17 'third_party/v8/build/toolchain.gypi',
17 'shell/shell.gyp'], 18 'shell/shell.gyp'],
18 'targets': [{ 19 'targets': [{
20 'target_name': 'ensure_dependencies',
21 'type': 'none',
22 'actions': [{
23 'action_name': 'ensure_dependencies',
24 'inputs': ['ensure_dependencies.py'],
25 'outputs': ['ensure_dependencies_phony_output'],
26 'action': ['python', 'ensure_dependencies.py'],
27 }],
28 },
29 {
19 'target_name': 'libadblockplus', 30 'target_name': 'libadblockplus',
20 'type': '<(library)', 31 'type': '<(library)',
32 'dependencies': ['ensure_dependencies'],
21 'include_dirs': [ 33 'include_dirs': [
22 'include', 34 'include',
23 'third_party/v8/include', 35 'third_party/v8/include',
24 ], 36 ],
25 'sources': [ 37 'sources': [
26 'src/AppInfoJsObject.cpp', 38 'src/AppInfoJsObject.cpp',
27 'src/ConsoleJsObject.cpp', 39 'src/ConsoleJsObject.cpp',
28 'src/DefaultLogSystem.cpp', 40 'src/DefaultLogSystem.cpp',
29 'src/DefaultFileSystem.cpp', 41 'src/DefaultFileSystem.cpp',
30 'src/FileSystemJsObject.cpp', 42 'src/FileSystemJsObject.cpp',
31 'src/FilterEngine.cpp', 43 'src/FilterEngine.cpp',
32 'src/GlobalJsObject.cpp', 44 'src/GlobalJsObject.cpp',
33 'src/JsContext.cpp', 45 'src/JsContext.cpp',
34 'src/JsEngine.cpp', 46 'src/JsEngine.cpp',
35 'src/JsError.cpp', 47 'src/JsError.cpp',
36 'src/JsValue.cpp', 48 'src/JsValue.cpp',
49 'src/Notification.cpp',
50 'src/ReferrerMapping.cpp',
37 'src/Thread.cpp', 51 'src/Thread.cpp',
38 'src/Utils.cpp', 52 'src/Utils.cpp',
39 'src/WebRequestJsObject.cpp', 53 'src/WebRequestJsObject.cpp',
40 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' 54 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
41 ], 55 ],
42 'direct_dependent_settings': { 56 'direct_dependent_settings': {
43 'include_dirs': ['include'] 57 'include_dirs': ['include']
44 }, 58 },
45 'conditions': [ 59 'conditions': [
46 ['OS=="android"', { 60 ['OS=="android"', {
47 'link_settings': { 61 'link_settings': {
48 'libraries': [ 62 'libraries': [
49 'android_arm.release/obj.target/tools/gyp/libv8_base.a', 63 'android_arm.release/obj.target/tools/gyp/libv8_base.arm.a',
50 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a', 64 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a',
51 ], 65 ],
52 }, 66 },
53 'standalone_static_library': 1, # disable thin archives 67 'standalone_static_library': 1, # disable thin archives
54 }, { 68 }, {
55 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], 69 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'],
56 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], 70 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
57 }], 71 }],
58 ['have_curl==1', 72 ['have_curl==1',
59 { 73 {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 'lib/elemHideHitRegistration.js', 111 'lib/elemHideHitRegistration.js',
98 'adblockplus/lib/filterNotifier.js', 112 'adblockplus/lib/filterNotifier.js',
99 'lib/init.js', 113 'lib/init.js',
100 'adblockplus/lib/filterClasses.js', 114 'adblockplus/lib/filterClasses.js',
101 'adblockplus/lib/subscriptionClasses.js', 115 'adblockplus/lib/subscriptionClasses.js',
102 'adblockplus/lib/filterStorage.js', 116 'adblockplus/lib/filterStorage.js',
103 'adblockplus/lib/elemHide.js', 117 'adblockplus/lib/elemHide.js',
104 'adblockplus/lib/matcher.js', 118 'adblockplus/lib/matcher.js',
105 'adblockplus/lib/filterListener.js', 119 'adblockplus/lib/filterListener.js',
106 'adblockplus/lib/downloader.js', 120 'adblockplus/lib/downloader.js',
121 'adblockplus/lib/notification.js',
122 'lib/notificationShowRegistration.js',
107 'adblockplus/lib/synchronizer.js', 123 'adblockplus/lib/synchronizer.js',
108 'lib/filterUpdateRegistration.js', 124 'lib/filterUpdateRegistration.js',
109 'adblockplus/chrome/content/ui/subscriptions.xml', 125 'adblockplus/chrome/content/ui/subscriptions.xml',
110 'lib/updater.js', 126 'lib/updater.js',
111 ], 127 ],
112 'load_before_files': [ 128 'load_before_files': [
113 'lib/compat.js' 129 'lib/compat.js'
114 ], 130 ],
115 'load_after_files': [ 131 'load_after_files': [
116 'lib/api.js', 132 'lib/api.js',
(...skipping 30 matching lines...) Expand all
147 ], 163 ],
148 'sources': [ 164 'sources': [
149 'test/AppInfoJsObject.cpp', 165 'test/AppInfoJsObject.cpp',
150 'test/ConsoleJsObject.cpp', 166 'test/ConsoleJsObject.cpp',
151 'test/DefaultFileSystem.cpp', 167 'test/DefaultFileSystem.cpp',
152 'test/FileSystemJsObject.cpp', 168 'test/FileSystemJsObject.cpp',
153 'test/FilterEngine.cpp', 169 'test/FilterEngine.cpp',
154 'test/GlobalJsObject.cpp', 170 'test/GlobalJsObject.cpp',
155 'test/JsEngine.cpp', 171 'test/JsEngine.cpp',
156 'test/JsValue.cpp', 172 'test/JsValue.cpp',
173 'test/Notification.cpp',
157 'test/Prefs.cpp', 174 'test/Prefs.cpp',
175 'test/ReferrerMapping.cpp',
158 'test/Thread.cpp', 176 'test/Thread.cpp',
159 'test/UpdateCheck.cpp', 177 'test/UpdateCheck.cpp',
160 'test/WebRequest.cpp' 178 'test/WebRequest.cpp'
161 ], 179 ],
162 'msvs_settings': { 180 'msvs_settings': {
163 'VCLinkerTool': { 181 'VCLinkerTool': {
164 'SubSystem': '1', # Console 182 'SubSystem': '1', # Console
165 'EntryPointSymbol': 'mainCRTStartup', 183 'EntryPointSymbol': 'mainCRTStartup',
166 }, 184 },
167 }, 185 },
168 }] 186 }]
169 } 187 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld