Ekdohibs/camlboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove need to manually patch the input path

Browse Source
This commit is contained in:
Ekdohibs 2019-06-12 15:25:26 +02:00
parent 6c6d0d8270
commit 24f363fdba
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
miniml/interp/genfile.sh
View File

@ -12,4 +12,6 @@ for i in "${!files[@]}"; do
echo "# $(($(wc -l < $out) + 2)) \"$out\"" >> $out
echo "end" >> $out
echo >> $out
camlboot_path_esc=$(realpath $(dirname $0)/../.. | sed 's_/_\\/_g')
sed -i "s#%CAMLBOOT_PATH%#$camlboot_path_esc#" $out
done

4
miniml/interp/interp.ml
View File

@ -1368,7 +1368,7 @@ let stdlib_modules = [
("Marshal", "marshal.ml");
]
let stdlib_path = "/home/nathanael/Projects/camlboot/_boot/stdlib" (* "/home/nathanael/.opam/4.07.0/lib/stdlib/ocaml" *)
let stdlib_path = "%CAMLBOOT_PATH%/_boot/stdlib"
let stdlib_modules = List.map (fun np -> let (n, p) = np in (n, stdlib_path ^ "/" ^ p)) stdlib_modules
let load_modules env modules =
@ -1511,7 +1511,7 @@ let compiler_modules = [
("Main", "driver/main.ml");
]
let compiler_path = "/home/nathanael/Projects/camlboot/_boot" (* "/home/nathanael/Projects/ocaml" *)
let compiler_path = "%CAMLBOOT_PATH%/_boot"
let compiler_modules = List.map (fun np -> let (n, p) = np in (n, compiler_path ^ "/" ^ p)) compiler_modules
let _ =