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

Delta Between Two Patch Sets: meson.build

Issue 29537638: Issue 6226 - Use mesonbuild as a build system (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Left Patch Set: Missing wrap_make. Added Win32 support (untested) Created March 23, 2018, 11:04 p.m.
Right Patch Set: Support NDK r16b Created April 25, 2018, 10:01 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 | « cross/r16b/android-x86.in ('k') | wrap_make » ('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 project('libadblockplus', 'cpp', default_options : ['cpp_std=c++14'], meson_vers ion: '>0.40.0') 1 project('libadblockplus', 'cpp', default_options : ['cpp_std=c++14'], meson_vers ion: '>0.40.0')
2 2
3 V8_DIR='third_party/v8' 3 V8_DIR=join_paths('third_party', 'v8')
4 V8_GYP=meson.source_root() + '/third_party/gyp/gyp' 4
5 #
6 # A quick note about the terms.
7 # -HOST_MACHINE is the machine we build on.
8 # -TARGET_MACHINE is the machine we build for (like the Android phone)
9 #
10 # However, meson use the GNU terms where build_machine is HOST_MACHINE,
11 # host_machine is TARGET_MACHINE, and target_machine isn't relevant here
12 # since we are not building a compiler.
13 # See http://mesonbuild.com/Cross-compilation.html for details
14 #
15 # We will not use the meson (GNU) terms, unless stricly necessary.
16 #
17 host_arch = run_command('python',
18 join_paths('third_party',
19 'detect_v8_host_arch.py')).stdout().strip()
5 20
6 have_curl = dependency('curl', required: false) 21 have_curl = dependency('curl', required: false)
7 incdir = include_directories('include', V8_DIR + '/include') 22 incdir = include_directories('include', join_paths(V8_DIR, 'include'))
8 23
9 ensure_dependencies = run_target('ensure_dependencies', 24 ensure_dependencies = run_target('ensure_dependencies',
10 command: ['python', 'ensure_dependencies.py']) 25 command: ['python', 'ensure_dependencies.py'])
11 26
12 sources = files( 27 sources = files(
13 'include/AdblockPlus/ITimer.h', 28 'include/AdblockPlus/ITimer.h',
14 'include/AdblockPlus/IWebRequest.h', 29 'include/AdblockPlus/IWebRequest.h',
15 'include/AdblockPlus/IFileSystem.h', 30 'include/AdblockPlus/IFileSystem.h',
16 'include/AdblockPlus/Scheduler.h', 31 'include/AdblockPlus/Scheduler.h',
17 'include/AdblockPlus/Platform.h', 32 'include/AdblockPlus/Platform.h',
18 'src/ActiveObject.cpp', 33 'src/ActiveObject.cpp',
19 'src/AsyncExecutor.cpp', 34 'src/AsyncExecutor.cpp',
20 'src/AppInfoJsObject.cpp', 35 'src/AppInfoJsObject.cpp',
(...skipping 13 matching lines...) Expand all
34 'src/JsError.cpp', 49 'src/JsError.cpp',
35 'src/JsValue.cpp', 50 'src/JsValue.cpp',
36 'src/Notification.cpp', 51 'src/Notification.cpp',
37 'src/Platform.cpp', 52 'src/Platform.cpp',
38 'src/ReferrerMapping.cpp', 53 'src/ReferrerMapping.cpp',
39 'src/Thread.cpp', 54 'src/Thread.cpp',
40 'src/Utils.cpp', 55 'src/Utils.cpp',
41 'src/WebRequestJsObject.cpp', 56 'src/WebRequestJsObject.cpp',
42 ) 57 )
43 58
44 os = target_machine.system() 59
45 60 buildtype = get_option('buildtype')
46 if os == 'windows' 61 if buildtype.startswith('debug')
62 BUILD_CONFIG_DIR='Debug'
63 BUILD_FLAVOUR='BUILDTYPE=Debug'
64 else
65 BUILD_CONFIG_DIR='Release'
66 BUILD_FLAVOUR='BUILDTYPE=Release'
67 endif
68
69 android_target = false
70 target_os = host_machine.system()
71 if target_os == 'windows'
47 sources += files('src/DefaultWebRequestWinInet.cpp') 72 sources += files('src/DefaultWebRequestWinInet.cpp')
48 elif have_curl.found() == 1 73 elif have_curl.found()
49 sources += files('src/DefaultWebRequestCurl.cpp') 74 sources += files('src/DefaultWebRequestCurl.cpp')
50 else 75 else
51 sources += files('src/DefaultWebRequestDummy.cpp') 76 sources += files('src/DefaultWebRequestDummy.cpp')
52 endif 77 endif
53 78 if target_os == 'darwin'
54 if os == 'darwin' 79 target_os = 'mac'
55 os = 'mac' 80 elif target_os == 'android'
56 endif 81 android_target = true
57 GYP_PARAMETERS=[ '-D', 'host_arch=x86_64', '-D', 'OS=' + os, 82 endif
58 '-D', 'target_arch=x86_64' ] 83
59 84 target_arch = host_machine.cpu_family()
60 build_v8 = custom_target('build_v8', input: files('build-v8.gypi', V8_DIR + '/sr c/v8.gyp'), output: 'Makefile', 85 if target_arch == 'x86'
61 command: [ V8_GYP, GYP_PARAMETERS, '--depth=.', '-f', 'make', '-I', '@INPUT0 @', '--generator-output=v8', '@INPUT1@' ]) 86 target_arch = 'ia32'
62 87 elif target_arch == 'x86_64'
63 OUT_DIR=join_paths(meson.build_root(), 'v8', 'out', 'Debug') 88 target_arch = 'x64'
64 89 elif target_arch == 'aarch64'
65 WRAP_MAKE=join_paths(meson.source_root(), 'wrap_make') 90 target_arch = 'arm64'
66 91 endif
67 v8 = custom_target('v8', input: build_v8, 92
68 output: [ 'libv8_base.a', 'libv8_libbase.a' ], 93 GYP_PARAMETERS = [ '-D', 'host_arch=' + host_arch,
69 command: [ WRAP_MAKE, '@OUTPUT@', '-C', 'v8', 'v8_base' ]) 94 '-D', 'OS=' + target_os,
95 '-D', 'target_arch=' + target_arch ]
96
97 if android_target
98 GYP_PARAMETERS += [ '-D', 'v8_target_arch=' + target_arch ]
99 V8_BUILD_GYP_FILE = join_paths(meson.source_root(), V8_DIR,
100 'gypfiles', 'standalone.gypi')
101 V8_GYP_FILE = join_paths('src', 'v8.gyp')
102 V8_GYP = [ join_paths(meson.source_root(), 'wrap_make_gyp'), V8_DIR ]
103 V8_GYP_OUTPUT = meson.build_root()
104 else
105 V8_BUILD_GYP_FILE = files('build-v8.gypi')
106 V8_GYP_FILE = files(join_paths(V8_DIR, 'src', 'v8.gyp'))
107 V8_GYP = [ join_paths(meson.source_root(), 'third_party', 'gyp', 'gyp')]
108 V8_GYP_OUTPUT = join_paths(meson.build_root(), 'v8')
109 endif
110
111 GYP_COMMAND = V8_GYP + [ GYP_PARAMETERS, '--depth=.', '-I', V8_BUILD_GYP_FILE,
112 '--generator-output=' + V8_GYP_OUTPUT, V8_GYP_FILE ]
113
114 if android_target
115 GYP_COMMAND += [ '-S.android_' + target_arch + '.release',
116 '-I../../android-v8-options.gypi' ]
117 V8_BUILDDIR = '.'
118 V8_BUILDOUT = join_paths(meson.build_root(),
119 'android_' + target_arch + '.release')
120 build_v8 = custom_target('build_v8',
121 output: 'Makefile.android_' + target_arch + '.releas e',
122 command: GYP_COMMAND)
123 V8_ANDROID_MAKE = [
124 '-f', build_v8, 'BUILDTYPE=Release', 'builddir=' + V8_BUILDOUT
125 ]
126 else
127 GYP_COMMAND += [ '-f', 'make' ]
128 V8_BUILDDIR = 'v8'
129 V8_BUILDOUT = join_paths(meson.build_root(), 'v8', 'out', BUILD_CONFIG_DIR)
130 build_v8 = custom_target('build_v8', output: 'Makefile',
131 command: GYP_COMMAND)
132 V8_ANDROID_MAKE = []
133 endif
134
135 WRAP_MAKE = [ join_paths(meson.source_root(), 'wrap_make') ]
136 if android_target
137 WRAP_MAKE += [ '-a', target_arch ]
138 endif
139
140 if target_os == 'windows'
141 PLATFORM_LIBRARIES = [ 'v8_libplatform.lib', 'v8_libbase.lib',
142 'v8_base_0.lib', 'v8_base_1.lib',
143 'v8_base_2.lib', 'v8_base_3.lib' ]
144 SAMPLER_LIBRARIES = 'v8_libsampler.lib'
145 SNAPSHOT_LIBRARIES = 'v8_snapshot.lib'
146 else
147 PLATFORM_LIBRARIES = [ 'libv8_libplatform.a' ]
148 SAMPLER_LIBRARIES = [ 'libv8_libsampler.a' ]
149 SNAPSHOT_LIBRARIES = [ 'libv8_snapshot.a', 'libv8_libbase.a',
150 'libv8_base.a' ]
151 endif
70 v8_libplatform = custom_target('v8_libplatform', 152 v8_libplatform = custom_target('v8_libplatform',
71 input: [ build_v8, v8 ], output: 'libv8_libplatform.a', 153 input: [ build_v8 ],
72 command: [ WRAP_MAKE, '@OUTPUT@', '-C', 'v8', 'v8_libplatform' ]) 154 output: PLATFORM_LIBRARIES,
155 command: [ WRAP_MAKE, '@OUTPUT@', '-D', V8_BUILDOUT,
156 '-C', V8_BUILDDIR, 'v8_libplatform', BUILD_FLAVOUR ] + V8_ANDROID _MAKE)
73 v8_libsampler = custom_target('v8_libsampler', 157 v8_libsampler = custom_target('v8_libsampler',
74 input: [ build_v8, v8_libplatform ], output: 'libv8_libsampler.a', 158 input: [ build_v8 ], output: SAMPLER_LIBRARIES,
75 command: [ WRAP_MAKE, '@OUTPUT@', '-C', 'v8', 'v8_libsampler' ]) 159 command: [ WRAP_MAKE, '@OUTPUT@', '-D', V8_BUILDOUT,
160 '-C', V8_BUILDDIR, 'v8_libsampler', BUILD_FLAVOUR ] + V8_ANDROID_ MAKE)
76 v8_snapshot = custom_target('v8_snapshot', 161 v8_snapshot = custom_target('v8_snapshot',
77 input: [ build_v8, v8_libsampler ], output: 'libv8_snapshot.a', 162 input: [ build_v8 ], output: SNAPSHOT_LIBRARIES,
78 command: [ WRAP_MAKE, '@OUTPUT@', '-C', 'v8', 'v8_snapshot' ]) 163 command: [ WRAP_MAKE, '@OUTPUT@', '-D', V8_BUILDOUT,
79 164 '-C', V8_BUILDDIR, 'v8_snapshot', BUILD_FLAVOUR ] + V8_ANDROID_MA KE)
80 165
81 library_files = files( 166 library_files = files(
82 'lib/info.js', 167 'lib/info.js',
83 'lib/io.js', 168 'lib/io.js',
84 'lib/prefs.js', 169 'lib/prefs.js',
85 'lib/utils.js', 170 'lib/utils.js',
86 'lib/elemHideHitRegistration.js', 171 'lib/elemHideHitRegistration.js',
87 'adblockpluscore/lib/events.js', 172 'adblockpluscore/lib/events.js',
88 'adblockpluscore/lib/coreUtils.js', 173 'adblockpluscore/lib/coreUtils.js',
89 'adblockpluscore/lib/filterNotifier.js', 174 'adblockpluscore/lib/filterNotifier.js',
(...skipping 24 matching lines...) Expand all
114 199
115 js_sources = custom_target('js_sources', 200 js_sources = custom_target('js_sources',
116 input: load_before_files + load_after_files + library_files, 201 input: load_before_files + load_after_files + library_files,
117 output: 'adblockplus.js.cpp', 202 output: 'adblockplus.js.cpp',
118 command: [ 'python', join_paths(meson.source_root(), 'convert_js.py'), 203 command: [ 'python', join_paths(meson.source_root(), 'convert_js.py'),
119 '@OUTPUT@', 204 '@OUTPUT@',
120 '--before', load_before_files, 205 '--before', load_before_files,
121 '--convert', library_files, 206 '--convert', library_files,
122 '--after', load_after_files ]) 207 '--after', load_after_files ])
123 208
209 CXX_FLAGS = [ '-std=c++14' ]
124 LIBRARIES = [] 210 LIBRARIES = []
125 if os == 'windows' 211 if target_os == 'windows'
126 LIBRARIES = [ 'shlwapi.lib', 'winhttp.lib', 'winmm.lib' ] 212 LIBRARIES = [ 'shlwapi.lib', 'winhttp.lib', 'winmm.lib' ]
213 else
214 CXX_FLAGS += '-fPIC'
215 endif
216 LD_FLAGS = []
217 if android_target
218 LD_FLAGS += '-Wl,--allow-multiple-definition'
127 endif 219 endif
128 adblockplus = shared_library('adblockplus', sources, js_sources, 220 adblockplus = shared_library('adblockplus', sources, js_sources,
129 v8, v8_libplatform, 221 v8_snapshot, v8_libsampler, v8_libplatform,
130 v8_libsampler, v8_snapshot,
131 include_directories: incdir, 222 include_directories: incdir,
223 cpp_args: CXX_FLAGS,
224 link_args: LD_FLAGS,
132 link_with: LIBRARIES, 225 link_with: LIBRARIES,
133 dependencies: [ have_curl ]) 226 dependencies: [ have_curl ])
134 227
135 test_sources = files( 228 test_sources = files(
136 'test/AsyncExecutor.cpp', 229 'test/AsyncExecutor.cpp',
137 'test/BaseJsTest.h', 230 'test/BaseJsTest.h',
138 'test/BaseJsTest.cpp', 231 'test/BaseJsTest.cpp',
139 'test/AppInfoJsObject.cpp', 232 'test/AppInfoJsObject.cpp',
140 'test/ConsoleJsObject.cpp', 233 'test/ConsoleJsObject.cpp',
141 'test/DefaultFileSystem.cpp', 234 'test/DefaultFileSystem.cpp',
142 'test/FileSystemJsObject.cpp', 235 'test/FileSystemJsObject.cpp',
143 'test/FilterEngine.cpp', 236 'test/FilterEngine.cpp',
144 'test/GlobalJsObject.cpp', 237 'test/GlobalJsObject.cpp',
145 'test/JsEngine.cpp', 238 'test/JsEngine.cpp',
146 'test/JsValue.cpp', 239 'test/JsValue.cpp',
147 'test/Notification.cpp', 240 'test/Notification.cpp',
148 'test/Prefs.cpp', 241 'test/Prefs.cpp',
149 'test/ReferrerMapping.cpp', 242 'test/ReferrerMapping.cpp',
150 'test/UpdateCheck.cpp', 243 'test/UpdateCheck.cpp',
151 'test/WebRequest.cpp', 244 'test/WebRequest.cpp',
152 'third_party/googletest/googletest/src/gtest_main.cc' 245 'third_party/googletest/googletest/src/gtest_main.cc'
153 ) 246 )
154 247
155 GTEST_DIR = join_paths('third_party', 'googletest', 'googletest') 248 if not android_target
156 GTEST_PARAMS = [] 249 GTEST_DIR = join_paths('third_party', 'googletest', 'googletest')
157 LINK_PARAMS = [] 250 GTEST_PARAMS = []
158 compiler = meson.get_compiler('cpp') 251 LINK_PARAMS = []
159 if compiler.has_argument('-pthread') 252 compiler = meson.get_compiler('cpp')
160 GTEST_PARAMS += '-pthread' 253 if compiler.has_argument('-pthread')
161 LINK_PARAMS += '-lpthread' 254 GTEST_PARAMS += '-pthread'
162 endif 255 LINK_PARAMS += '-lpthread'
163 256 endif
164 gtest = static_library('gtest', 257
165 files(join_paths(GTEST_DIR, 'src', 'gtest-all.cc')), 258 gtest = static_library('gtest',
166 include_directories: [ 259 files(join_paths(GTEST_DIR, 'src', 'gtest-all.cc')),
167 include_directories(join_paths(GTEST_DIR, 'include'), is_system: true), 260 include_directories: [
168 include_directories(GTEST_DIR) 261 include_directories(join_paths(GTEST_DIR, 'include' ), is_system: true),
169 ], 262 include_directories(GTEST_DIR)
170 cpp_args: GTEST_PARAMS) 263 ],
171 264 cpp_args: GTEST_PARAMS)
172 tests = executable('tests', test_sources, 265
173 link_with: [adblockplus, gtest], 266 tests = executable('tests', test_sources,
174 link_args: LINK_PARAMS, 267 link_with: [adblockplus, gtest],
175 include_directories: [ 268 link_args: LINK_PARAMS,
176 incdir, 269 include_directories: [
177 include_directories(join_paths(GTEST_DIR, 'include')) 270 incdir,
178 ]) 271 include_directories(join_paths(GTEST_DIR, 'include'))
179 272 ])
180 test('tests', tests) 273
274 # Adjust the timeout to run the test. Default value is 30sec.
275 #
276 test('tests', tests, timeout: 60)
277 endif
LEFTRIGHT

Powered by Google App Engine
This is Rietveld