From 677aae3ffd5162ea9b630f051d4be17091ed1a16 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 13 Nov 2021 16:38:45 +0000 Subject: Generate a minimal meson.build to have vala language server --- Makefile.am | 1 + README | 43 ++++--------------------------------------- gen-meson.build | 31 +++++++++++++++++++++++++++++++ meson.am | 21 +++++++++++++++++++++ 4 files changed, 57 insertions(+), 39 deletions(-) create mode 100755 gen-meson.build create mode 100644 meson.am diff --git a/Makefile.am b/Makefile.am index 3d629ab..16f3e50 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,7 @@ include doc/Makefile.am include tests/Makefile.am include icons.am include settings.am +include meson.am EXTRA_DIST += $(top_srcdir)/.version $(top_srcdir)/.release-date BUILT_SOURCES += $(top_srcdir)/.version $(top_srcdir)/.release-date diff --git a/README b/README index 0324bd2..cca85be 100644 --- a/README +++ b/README @@ -41,47 +41,12 @@ These are the run-time dependencies: To build, first run the =bootstrap= script, then =./configure=, =make=. You can run the program without installing it, by running -=./pre-inst-env guile src/disfluid=, or you can install it with -=make install=. +=./pre-inst-env guile src/disfluid=, or you can install it with =make +install=. If you want to have VLS (Vala Language Server) support, run +=make meson.build= to generate a partial meson project definition, at +least for vala code. * Running Once installed, you get a program named =disfluid=. Run it with =-h= to get the options. - -* Running as a docker image -The =guix/vkraus/systems/test.scm= contains a couple of servers, one -for [[http://localhost:8081/alice#me]] (the password is "alice"), and one -for [[http://localhost:8082/bob#me]] (the password is "bob"). Both servers -running on localhost:8081 and localhost:8082 are aware that they are -http-only and run on these ports. - -Once you have the Guix channel installed, you can build the image as: - -#+begin_src shell - sudo docker load -i $(guix system docker-image guix/vkraus/systems/test.scm) \ - && sudo docker tag guix:latest vivienkraus/disfluid:test-bench -#+end_src - -I try to publish recent versions of the test bench on Docker Hub, but -I may forget. Don’t forget to remind me if you think it’s too old. - -Then, you will need to start the container: - -#+begin_src shell - export container_id="$(sudo docker create vivienkraus/disfluid:test-bench)" - sudo docker start $container_id -#+end_src - -You can enter the container to check the log files, for instance: - -#+begin_src shell - sudo docker exec -it $container_id /run/current-system/profile/bin/bash --login -#+end_src - -Unfortunately, I don’t know how to let the host access the 8081 and -8082 ports. - -# Local Variables: -# mode: org -# End: diff --git a/gen-meson.build b/gen-meson.build new file mode 100755 index 0000000..4896fbd --- /dev/null +++ b/gen-meson.build @@ -0,0 +1,31 @@ +#!/bin/sh + +cat <. + +EXTRA_DIST += %reldir%/gen-meson.build + +meson.build: %reldir%/gen-meson.build config.status + $(AM_V_GEN) PACKAGE="$(PACKAGE)" src_ui_disfluid_gui_SOURCES="$(src_ui_disfluid_gui_SOURCES)" AM_VALAFLAGS="$(AM_VALAFLAGS)" $(SHELL) $< > $@-t + @mv $@-t $@ -- cgit v1.2.3