Fixup static libraries in development server

This commit is contained in:
Janne Heß
2025-08-02 13:52:35 +02:00
committed by ahuston-0
parent f9d7629f95
commit 15e742c8c2
3 changed files with 8 additions and 12 deletions

2
.gitignore vendored
View File

@@ -2,6 +2,8 @@
/.direnv/ /.direnv/
.test_info.* .test_info.*
/src/root/static/bootstrap /src/root/static/bootstrap
/src/root/static/fontawesome
/src/root/static/js/flot
/src/sql/hydra-postgresql.sql /src/sql/hydra-postgresql.sql
/src/sql/hydra-sqlite.sql /src/sql/hydra-sqlite.sql
/src/sql/tmp.sqlite /src/sql/tmp.sqlite

View File

@@ -81,6 +81,8 @@ You can use the provided shell.nix to get a working development environment:
``` ```
$ nix develop $ nix develop
$ ln -svf ../../../build/src/bootstrap src/root/static/bootstrap $ ln -svf ../../../build/src/bootstrap src/root/static/bootstrap
$ ln -svf ../../../build/src/fontawesome src/root/static/fontawesome
$ ln -svf ../../../../build/src/flot src/root/static/js/flot
$ meson setup build $ meson setup build
$ ninja -C build $ ninja -C build
``` ```

View File

@@ -57,20 +57,12 @@ fontawesome = custom_target(
command: ['unzip', '-u', '-d', '@OUTDIR@', '@INPUT@'], command: ['unzip', '-u', '-d', '@OUTDIR@', '@INPUT@'],
) )
custom_target( custom_target(
'name-fontawesome-css', 'name-fontawesome',
input: fontawesome, input: fontawesome,
output: 'css', output: 'fontawesome',
command: ['cp', '-r', '@INPUT@/css', '@OUTPUT@'], command: ['cp', '-r', '@INPUT@' , '@OUTPUT@'],
install: true, install: true,
install_dir: hydra_libexecdir_static / 'fontawesome', install_dir: hydra_libexecdir_static,
)
custom_target(
'name-fontawesome-webfonts',
input: fontawesome,
output: 'webfonts',
command: ['cp', '-r', '@INPUT@/webfonts', '@OUTPUT@'],
install: true,
install_dir: hydra_libexecdir_static / 'fontawesome',
) )
# Scripts # Scripts