fix: update build files

Add `install` stanza to `dune` files to install std and runtime to
expected directories

Delete manual copying from `install` scenario in `Makefile`
This commit is contained in:
deker104 2024-11-12 07:14:21 +00:00
parent 5da0273afa
commit 91b18d023b
7 changed files with 31 additions and 9 deletions

View file

@ -15,14 +15,6 @@ build:
install: all
dune b @install --profile=release
dune install --profile=release
$(MKDIR) -p `opam var share`/Lama/x64
$(INSTALL) $(shell ls _build/default/stdlib/x64/*.[oi] _build/default/stdlib/x64/stdlib/*.lama \
runtime/runtime.a runtime/Std.i) \
`opam var share`/Lama/x64
$(MKDIR) -p `opam var share`/Lama/x32
$(INSTALL) $(shell ls _build/default/stdlib/x32/*.[oi] _build/default/stdlib/x32/stdlib/*.lama \
runtime32/runtime.a runtime32/Std.i) \
`opam var share`/Lama/x32
_build/default/Lama.install:
dune b @install

View file

@ -1,4 +1,6 @@
(lang dune 3.3)
(lang dune 3.11)
(name Lama)
(cram enable)

View file

@ -5,3 +5,9 @@
(deps Makefile gc.c gc.h runtime_common.h runtime.c runtime.h printf.S)
(action
(run make)))
(install
(section share)
(files
(runtime.a as x64/runtime.a)
(Std.i as x64/Std.i)))

View file

@ -7,3 +7,9 @@
(deps Makefile gc_runtime.s runtime.c runtime.h)
(action
(run make -j2)))
(install
(section share)
(files
(runtime.a as x32/runtime.a)
(Std.i as x32/Std.i)))

5
stdlib/dune Normal file
View file

@ -0,0 +1,5 @@
(install
(section share)
(files
(glob_files (*.lama with_prefix x64))
(glob_files (*.lama with_prefix x32))))

View file

@ -60,3 +60,8 @@
LAMAC
"../../src/Driver.exe -32 -I ../../runtime32"
(run make -j2 -f ../Makefile all)))))))
(install
(section share)
(files
(glob_files (*.i with_prefix x32))
(glob_files (*.o with_prefix x32))))

View file

@ -57,3 +57,9 @@
LAMAC
"../../src/Driver.exe -64 -I ../../runtime"
(run make -j2 -f ../Makefile all)))))))
(install
(section share)
(files
(glob_files (*.i with_prefix x64))
(glob_files (*.o with_prefix x64))))