diff --git a/Makefile b/Makefile index d4cb1a599..a3db3ef57 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,10 @@ BUILDDIR = _build .DEFAULT_GOAL := build -all: build test +all: build build: - dune b src runtime runtime32 stdlib tutorial + dune b src runtime stdlib tutorial install: all dune b @install --profile=release diff --git a/stdlib/dune b/stdlib/dune index 9de0d64d9..511a28e68 100644 --- a/stdlib/dune +++ b/stdlib/dune @@ -2,4 +2,5 @@ (section share) (files (glob_files (*.lama with_prefix x64)) - (glob_files (*.lama with_prefix x32)))) + ;(glob_files (*.lama with_prefix x32)) + )) diff --git a/stdlib/x32/dune b/stdlib/x32/dune index 2320ae8a0..f43fa7906 100644 --- a/stdlib/x32/dune +++ b/stdlib/x32/dune @@ -1,67 +1,67 @@ -(rule - (enabled_if - (= %{system} "linux")) - (deps - ../Makefile - ../../runtime32/Std.i - ../List.lama - ../Array.lama - ../Buffer.lama - ../Collection.lama - ../Data.lama - ../Fun.lama - ../Lazy.lama - ../List.lama - ../Matcher.lama - ../Ostap.lama - ../Random.lama - ../Ref.lama - ../STM.lama - ../Timer.lama - %{project_root}/src/Driver.exe) - (targets - Array.i - Array.o - Buffer.i - Buffer.o - Collection.i - Collection.o - Data.i - Data.o - Fun.i - Fun.o - Lazy.i - Lazy.o - List.i - List.o - Matcher.i - Matcher.o - Ostap.i - Ostap.o - Random.i - Random.o - Ref.i - Ref.o - STM.i - STM.o - Timer.i - Timer.o) - (mode - (promote (until-clean))) - (action - (progn - (setenv - SRCDIR - ".." - (setenv - LAMA - "../../runtime32" - (setenv - 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)))) +; (rule +; (enabled_if +; (= %{system} "linux")) +; (deps +; ../Makefile +; ../../runtime32/Std.i +; ../List.lama +; ../Array.lama +; ../Buffer.lama +; ../Collection.lama +; ../Data.lama +; ../Fun.lama +; ../Lazy.lama +; ../List.lama +; ../Matcher.lama +; ../Ostap.lama +; ../Random.lama +; ../Ref.lama +; ../STM.lama +; ../Timer.lama +; %{project_root}/src/Driver.exe) +; (targets +; Array.i +; Array.o +; Buffer.i +; Buffer.o +; Collection.i +; Collection.o +; Data.i +; Data.o +; Fun.i +; Fun.o +; Lazy.i +; Lazy.o +; List.i +; List.o +; Matcher.i +; Matcher.o +; Ostap.i +; Ostap.o +; Random.i +; Random.o +; Ref.i +; Ref.o +; STM.i +; STM.o +; Timer.i +; Timer.o) +; (mode +; (promote (until-clean))) +; (action +; (progn +; (setenv +; SRCDIR +; ".." +; (setenv +; LAMA +; "../../runtime32" +; (setenv +; 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)))) diff --git a/tutorial/dune b/tutorial/dune index 2e0df6f9c..a89d08777 100644 --- a/tutorial/dune +++ b/tutorial/dune @@ -1,25 +1,25 @@ - -(rule - (targets Expressions.x32.exe) -; (enabled_if (= %{ocaml-config:os_type} "linux")) - (enabled_if (= %{system} "linux")) - (deps (:lama Expressions.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i) - (mode - (promote (until-clean))) - (action - (setenv - LAMA - "../runtime32" - (run - %{project_root}/src/Driver.exe - -32 - %{lama} - -I - ../stdlib/x32 - -runtime - ../runtime32 - -o - %{targets})))) +; +; (rule +; (targets Expressions.x32.exe) +; ; (enabled_if (= %{ocaml-config:os_type} "linux")) +; (enabled_if (= %{system} "linux")) +; (deps (:lama Expressions.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i) +; (mode +; (promote (until-clean))) +; (action +; (setenv +; LAMA +; "../runtime32" +; (run +; %{project_root}/src/Driver.exe +; -32 +; %{lama} +; -I +; ../stdlib/x32 +; -runtime +; ../runtime32 +; -o +; %{targets})))) (rule (targets Expressions.x64.exe) @@ -42,28 +42,28 @@ -o %{targets})))) -(rule - (targets Functions.x32.exe) -; (enabled_if (= %{ocaml-config:os_type} "linux")) - (enabled_if (= %{system} "linux")) - (deps (:lama Functions.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i) - (mode - (promote (until-clean))) - (action - (setenv - LAMA - "../runtime32" - (run - %{project_root}/src/Driver.exe - -32 - %{lama} - -I - ../stdlib/x32 - -runtime - ../runtime32 - -o - %{targets})))) - +; (rule +; (targets Functions.x32.exe) +; ; (enabled_if (= %{ocaml-config:os_type} "linux")) +; (enabled_if (= %{system} "linux")) +; (deps (:lama Functions.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i) +; (mode +; (promote (until-clean))) +; (action +; (setenv +; LAMA +; "../runtime32" +; (run +; %{project_root}/src/Driver.exe +; -32 +; %{lama} +; -I +; ../stdlib/x32 +; -runtime +; ../runtime32 +; -o +; %{targets})))) +; (rule (targets Functions.x64.exe) @@ -85,27 +85,27 @@ -o %{targets})))) -(rule - (targets Hello.x32.exe) -; (enabled_if (= %{ocaml-config:os_type} "linux")) - (enabled_if (= %{system} "linux")) - (deps (:lama Hello.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i) - (mode - (promote (until-clean))) - (action - (setenv - LAMA - "../runtime32" - (run - %{project_root}/src/Driver.exe - -32 - %{lama} - -I - ../stdlib/x32 - -runtime - ../runtime32 - -o - %{targets})))) +; (rule +; (targets Hello.x32.exe) +; ; (enabled_if (= %{ocaml-config:os_type} "linux")) +; (enabled_if (= %{system} "linux")) +; (deps (:lama Hello.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i) +; (mode +; (promote (until-clean))) +; (action +; (setenv +; LAMA +; "../runtime32" +; (run +; %{project_root}/src/Driver.exe +; -32 +; %{lama} +; -I +; ../stdlib/x32 +; -runtime +; ../runtime32 +; -o +; %{targets})))) (rule (targets Hello.x64.exe) @@ -128,27 +128,27 @@ -o %{targets})))) -(rule - (targets PatternMatching.x32.exe) -; (enabled_if (= %{ocaml-config:os_type} "linux")) - (enabled_if (= %{system} "linux")) - (deps (:lama PatternMatching.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i) - (mode - (promote (until-clean))) - (action - (setenv - LAMA - "../runtime32" - (run - %{project_root}/src/Driver.exe - -32 - %{lama} - -I - ../stdlib/x32 - -runtime - ../runtime32 - -o - %{targets})))) +; (rule +; (targets PatternMatching.x32.exe) +; ; (enabled_if (= %{ocaml-config:os_type} "linux")) +; (enabled_if (= %{system} "linux")) +; (deps (:lama PatternMatching.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i) +; (mode +; (promote (until-clean))) +; (action +; (setenv +; LAMA +; "../runtime32" +; (run +; %{project_root}/src/Driver.exe +; -32 +; %{lama} +; -I +; ../stdlib/x32 +; -runtime +; ../runtime32 +; -o +; %{targets})))) (rule (targets PatternMatching.x64.exe) @@ -171,27 +171,27 @@ -o %{targets})))) -(rule - (targets Values.x32.exe) -; (enabled_if (= %{ocaml-config:os_type} "linux")) - (enabled_if (= %{system} "linux")) - (deps (:lama Values.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i) - (mode - (promote (until-clean))) - (action - (setenv - LAMA - "../runtime32" - (run - %{project_root}/src/Driver.exe - -32 - %{lama} - -I - ../stdlib/x32 - -runtime - ../runtime32 - -o - %{targets})))) +; (rule +; (targets Values.x32.exe) +; ; (enabled_if (= %{ocaml-config:os_type} "linux")) +; (enabled_if (= %{system} "linux")) +; (deps (:lama Values.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i) +; (mode +; (promote (until-clean))) +; (action +; (setenv +; LAMA +; "../runtime32" +; (run +; %{project_root}/src/Driver.exe +; -32 +; %{lama} +; -I +; ../stdlib/x32 +; -runtime +; ../runtime32 +; -o +; %{targets})))) (rule (targets Values.x64.exe)