From d4e6c582630930243338287dcef83c1f4b8a1baf Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Fri, 15 Mar 2019 08:28:27 +0100
Subject: [PATCH] Update: rename the source dir src (was bin)
For some reason, I believed that the source dir containing the main
program need to be named bin for dune to work smoothly. But actually,
it seems to work fine with src, so let's go for it.
---
Makefile.version | 16 ----------------
{bin => src}/Makefile | 0
{bin => src}/demon.ml | 0
{bin => src}/demon.mli | 0
{bin => src}/dune | 0
{bin => src}/env.ml | 0
{bin => src}/env.mli | 0
{bin => src}/genLutin.ml | 0
{bin => src}/genLutin.mli | 0
{bin => src}/process.ml | 0
{bin => src}/process.mli | 0
{bin => src}/rifRead.ml | 0
{bin => src}/rifRead.mli | 0
{bin => src}/sasArg.ml | 0
{bin => src}/sasa.ml | 0
{bin => src}/sasa.opam | 0
{bin => src}/sasaVersion.ml | 4 ++--
{bin => src}/stringOf.ml | 0
{bin => src}/topology.ml | 0
{bin => src}/topology.mli | 0
20 files changed, 2 insertions(+), 18 deletions(-)
delete mode 100644 Makefile.version
rename {bin => src}/Makefile (100%)
rename {bin => src}/demon.ml (100%)
rename {bin => src}/demon.mli (100%)
rename {bin => src}/dune (100%)
rename {bin => src}/env.ml (100%)
rename {bin => src}/env.mli (100%)
rename {bin => src}/genLutin.ml (100%)
rename {bin => src}/genLutin.mli (100%)
rename {bin => src}/process.ml (100%)
rename {bin => src}/process.mli (100%)
rename {bin => src}/rifRead.ml (100%)
rename {bin => src}/rifRead.mli (100%)
rename {bin => src}/sasArg.ml (100%)
rename {bin => src}/sasa.ml (100%)
rename {bin => src}/sasa.opam (100%)
rename {bin => src}/sasaVersion.ml (63%)
rename {bin => src}/stringOf.ml (100%)
rename {bin => src}/topology.ml (100%)
rename {bin => src}/topology.mli (100%)
diff --git a/Makefile.version b/Makefile.version
deleted file mode 100644
index 3ff72133..00000000
--- a/Makefile.version
+++ /dev/null
@@ -1,16 +0,0 @@
-
-SHA:=$(shell git log -1 --pretty=format:"%h"|| echo "err")
-BRANCH:=$(shell git branch | grep "*" | cut -d ' ' -f 2 || echo "err")
-
-VERSION=$(shell git describe --tags)
-
-del_version:
- rm -f bin/sasaVersion.ml
-
-gen_version: del_version bin/sasaVersion.ml
-
-bin/sasaVersion.ml:
- echo "(* generated by ../Makefile.version *)" > bin/sasaVersion.ml ; \
- echo "let str=\"$(VERSION)\"" >> bin/sasaVersion.ml ; \
- echo "let sha=\"$(SHA)\"" >> bin/sasaVersion.ml ; \
- echo "let branch=\"$(BRANCH)\"" >> bin/sasaVersion.ml
diff --git a/bin/Makefile b/src/Makefile
similarity index 100%
rename from bin/Makefile
rename to src/Makefile
diff --git a/bin/demon.ml b/src/demon.ml
similarity index 100%
rename from bin/demon.ml
rename to src/demon.ml
diff --git a/bin/demon.mli b/src/demon.mli
similarity index 100%
rename from bin/demon.mli
rename to src/demon.mli
diff --git a/bin/dune b/src/dune
similarity index 100%
rename from bin/dune
rename to src/dune
diff --git a/bin/env.ml b/src/env.ml
similarity index 100%
rename from bin/env.ml
rename to src/env.ml
diff --git a/bin/env.mli b/src/env.mli
similarity index 100%
rename from bin/env.mli
rename to src/env.mli
diff --git a/bin/genLutin.ml b/src/genLutin.ml
similarity index 100%
rename from bin/genLutin.ml
rename to src/genLutin.ml
diff --git a/bin/genLutin.mli b/src/genLutin.mli
similarity index 100%
rename from bin/genLutin.mli
rename to src/genLutin.mli
diff --git a/bin/process.ml b/src/process.ml
similarity index 100%
rename from bin/process.ml
rename to src/process.ml
diff --git a/bin/process.mli b/src/process.mli
similarity index 100%
rename from bin/process.mli
rename to src/process.mli
diff --git a/bin/rifRead.ml b/src/rifRead.ml
similarity index 100%
rename from bin/rifRead.ml
rename to src/rifRead.ml
diff --git a/bin/rifRead.mli b/src/rifRead.mli
similarity index 100%
rename from bin/rifRead.mli
rename to src/rifRead.mli
diff --git a/bin/sasArg.ml b/src/sasArg.ml
similarity index 100%
rename from bin/sasArg.ml
rename to src/sasArg.ml
diff --git a/bin/sasa.ml b/src/sasa.ml
similarity index 100%
rename from bin/sasa.ml
rename to src/sasa.ml
diff --git a/bin/sasa.opam b/src/sasa.opam
similarity index 100%
rename from bin/sasa.opam
rename to src/sasa.opam
diff --git a/bin/sasaVersion.ml b/src/sasaVersion.ml
similarity index 63%
rename from bin/sasaVersion.ml
rename to src/sasaVersion.ml
index 0786504e..680831c1 100644
--- a/bin/sasaVersion.ml
+++ b/src/sasaVersion.ml
@@ -1,4 +1,4 @@
(* generated by ../Makefile.version *)
-let str="0.10"
-let sha="28068e9"
+let str="1.0.1"
+let sha="622c02c"
let branch="master"
diff --git a/bin/stringOf.ml b/src/stringOf.ml
similarity index 100%
rename from bin/stringOf.ml
rename to src/stringOf.ml
diff --git a/bin/topology.ml b/src/topology.ml
similarity index 100%
rename from bin/topology.ml
rename to src/topology.ml
diff --git a/bin/topology.mli b/src/topology.mli
similarity index 100%
rename from bin/topology.mli
rename to src/topology.mli
--
GitLab