Merge pull request #19 from Kakadu/1.00

Fix version in `opam` and polish `Makefile`
This commit is contained in:
Dmitry Boulytchev 2020-02-20 20:13:06 +03:00 committed by GitHub
commit 21d7a18981
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions

View file

@ -6,9 +6,9 @@ SHELL := /bin/bash
.PHONY: all regression .PHONY: all regression
all: all:
pushd src && make && popd make -C src
pushd runtime && make && popd make -C runtime
pushd stdlib && make && popd make -C stdlib
STD_FILES=$(shell ls stdlib/*.[oi] stdlib/*.lama runtime/runtime.a runtime/Std.i) STD_FILES=$(shell ls stdlib/*.[oi] stdlib/*.lama runtime/runtime.a runtime/Std.i)
#$(info $(STD_FILES)) #$(info $(STD_FILES))
@ -23,14 +23,14 @@ uninstall:
$(RM) `opam var bin`/$(EXECUTABLE) $(RM) `opam var bin`/$(EXECUTABLE)
regression: regression:
pushd regression && make clean check && popd make clean check -C regression
pushd regression/x86only && make clean check && popd make clean check -C regression/x86only
pushd stdlib/regression && make clean check && popd make clean check -C stdlib/regression
clean: clean:
pushd src && make clean && popd make clean -C src
pushd runtime && make clean && popd make clean -C runtime
pushd stdlib && make clean && popd make clean -C stdlib
pushd regression && make clean && popd make clean -C regression

14
opam
View file

@ -1,12 +1,12 @@
opam-version: "2.0" opam-version: "2.0"
name: "Lama" name: "Lama"
version: "0.3" version: "1.0"
synopsis: "Lama programming system" synopsis: "Lama programming system"
maintainer: "dboulytchev@gmail.com" maintainer: "dboulytchev@gmail.com"
authors: "dboulytchev@gmail.com" authors: "dboulytchev@gmail.com"
homepage: "https://github.com/dboulytchev/compiler-workout" homepage: "https://github.com/JetBrains-Research/Lama"
bug-reports: "https://github.com/dboulytchev/compiler-workout/issues" bug-reports: "https://github.com/JetBrains-Research/Lama/issues"
depends: [ depends: [
"ocaml" { >= "4.07.1" } "ocaml" { >= "4.07.1" }
@ -27,6 +27,6 @@ install: [make "install"]
dev-repo: "git+https://github.com/JetBrains-Research/Lama.git" dev-repo: "git+https://github.com/JetBrains-Research/Lama.git"
url { url {
src: "git+https://github.com/JetBrains-Research/Lama.git#fcf" src: "git+https://github.com/JetBrains-Research/Lama.git#1.00"
} }