Skip to content

Commit dc593fd

Browse files
committedJan 2, 2023
fix: copy config files, +fix compilation of test binary
1 parent 1ddf07b commit dc593fd

File tree

2 files changed

+37
-4
lines changed

2 files changed

+37
-4
lines changed
 

‎buildall.ps1

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Remove-Item builddir -Force -Recurse
33
meson setup builddir
44
Copy-Item -Path .\index.html -Destination .\builddir\index.html -Force
55
Copy-Item -Path .\cpp_favicon.ico -Destination .\builddir\cpp_favicon.ico -Force
6+
Copy-Item -Path .\config.json -Destination .\builddir\config.json -Force
7+
Copy-Item -Path .\server_config.json -Destination .\builddir\server_config.json -Force
68
Copy-Item -Path .\styles.css -Destination .\builddir\styles.css -Force
79
Copy-Item -Path .\vendor -Destination .\builddir\ -Recurse -Force
810
Copy-Item -Path .\videos -Destination .\builddir\ -Recurse -Force

‎meson.build

+35-4
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ videos_dir = 'videos'
5151
# favicon
5252
favicon_path = 'cpp_favicon.ico'
5353

54+
# config files
55+
drogon_config = 'config.json'
56+
server_config = 'server_config.json'
57+
5458
db_dir = src_root / 'database'
5559
controllers_dir = src_root / 'controllers'
5660
models_dir = src_root / 'models'
@@ -197,14 +201,25 @@ sources += server_src
197201
sources += views_src
198202
sources += dtos_src
199203

204+
#--------------
200205
# test sources
206+
#--------------
207+
# Include those sources that need to be tested.
208+
# Alternatively, create multiple partial tests
209+
# to keep binaries smaller.
201210
test_sources = [test_main_cpp]
211+
#test_sources += controllers_src
212+
#test_sources += db_src
213+
test_sources += server_src
214+
#test_sources += views_src
215+
#test_sources += dtos_src
202216

203217
# includes
204218
incdir = include_directories(
205219
[
206220
project_includes,
207221
db_dir,
222+
server_dir,
208223
models_dir,
209224
views_dir,
210225
dtos_dir,
@@ -219,7 +234,7 @@ incdir = include_directories(
219234
],
220235
)
221236

222-
test_incdir = [criterion_includes]
237+
test_incdir = [incdir, criterion_includes]
223238

224239
# find libraries
225240
cpp = meson.get_compiler('cpp')
@@ -419,6 +434,22 @@ if os != 'windows'
419434
join_paths(meson.source_root(), favicon_path),
420435
join_paths(meson.build_root(), favicon_path),
421436
)
437+
438+
# copy Drogon's config.json to build directory
439+
run_command(
440+
copy,
441+
'-r',
442+
join_paths(meson.source_root(), drogon_config),
443+
join_paths(meson.build_root(), drogon_config),
444+
)
445+
446+
# copy server_config.json to build directory
447+
run_command(
448+
copy,
449+
'-r',
450+
join_paths(meson.source_root(), server_config),
451+
join_paths(meson.build_root(), server_config),
452+
)
422453
endif
423454

424455
deps = [
@@ -460,7 +491,7 @@ executable(
460491
cpp_args: cpp_args,
461492
link_args: link_args,
462493
install: true,
463-
include_directories: [incdir],
494+
include_directories: incdir,
464495
dependencies: deps,
465496
)
466497

@@ -472,8 +503,8 @@ test_exe = executable(
472503
cpp_args: cpp_args_debug,
473504
link_args: link_args,
474505
install: true,
475-
include_directories: [test_incdir],
476-
dependencies: [test_deps],
506+
include_directories: test_incdir,
507+
dependencies: test_deps,
477508
)
478509

479510
test('basic', test_exe)

0 commit comments

Comments
 (0)