From 6dc747158741a5b30b7cb54270276d5c0464846f Mon Sep 17 00:00:00 2001 From: kakadu Date: Thu, 20 Feb 2020 15:36:50 +0300 Subject: [PATCH 1/2] Opam file updated for right version --- opam | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/opam b/opam index 2e3cb2856..4c4723efa 100644 --- a/opam +++ b/opam @@ -1,12 +1,12 @@ opam-version: "2.0" name: "Lama" -version: "0.3" +version: "1.0" -synopsis: "Lama programming system" -maintainer: "dboulytchev@gmail.com" -authors: "dboulytchev@gmail.com" -homepage: "https://github.com/dboulytchev/compiler-workout" -bug-reports: "https://github.com/dboulytchev/compiler-workout/issues" +synopsis: "Lama programming system" +maintainer: "dboulytchev@gmail.com" +authors: "dboulytchev@gmail.com" +homepage: "https://github.com/JetBrains-Research/Lama" +bug-reports: "https://github.com/JetBrains-Research/Lama/issues" depends: [ "ocaml" { >= "4.07.1" } @@ -27,6 +27,6 @@ install: [make "install"] dev-repo: "git+https://github.com/JetBrains-Research/Lama.git" url { - src: "git+https://github.com/JetBrains-Research/Lama.git#fcf" + src: "git+https://github.com/JetBrains-Research/Lama.git#1.00" } From a6be13ac7e682497ef15cf3bdc22d32ea2cd927d Mon Sep 17 00:00:00 2001 From: kakadu Date: Thu, 20 Feb 2020 15:49:05 +0300 Subject: [PATCH 2/2] Polish Makefile a bit --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index af782a81b..cc6a50790 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,9 @@ SHELL := /bin/bash .PHONY: all regression all: - pushd src && make && popd - pushd runtime && make && popd - pushd stdlib && make && popd + make -C src + make -C runtime + make -C stdlib STD_FILES=$(shell ls stdlib/*.[oi] stdlib/*.lama runtime/runtime.a runtime/Std.i) #$(info $(STD_FILES)) @@ -23,14 +23,14 @@ uninstall: $(RM) `opam var bin`/$(EXECUTABLE) regression: - pushd regression && make clean check && popd - pushd regression/x86only && make clean check && popd - pushd stdlib/regression && make clean check && popd + make clean check -C regression + make clean check -C regression/x86only + make clean check -C stdlib/regression clean: - pushd src && make clean && popd - pushd runtime && make clean && popd - pushd stdlib && make clean && popd - pushd regression && make clean && popd + make clean -C src + make clean -C runtime + make clean -C stdlib + make clean -C regression