From c83d0406befca17b44b6ea6b77dc9b2661c76243 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Thu, 10 Mar 2016 13:24:39 +0100
Subject: [PATCH] Fix the version number (that was shifted by 1) used when
generating package name.
---
Makefile.dev | 4 ++--
Makefile.version | 4 ++--
_oasis | 2 +-
doc/version.tex | 6 +++---
src/META | 4 ++--
src/lutilsVersion.ml | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Makefile.dev b/Makefile.dev
index b265cf2..371f325 100644
--- a/Makefile.dev
+++ b/Makefile.dev
@@ -1,6 +1,6 @@
#######################################################################################
# Workflow:
-# C=git commit ; A=git amend ; U=update_version ; O=opam pack
+# C=git commit ; A=git amend ; U=update_version ; P=opam pack
# to make sure the sha and the version are good, one should never
# do U and then A.
# to avoid such problems, legal trace are defined by this automata:
@@ -60,7 +60,7 @@ tags:
# opam-ing
NAME=lutils
-PACKNAME=$(NAME).$(VERSION)
+PACKNAME=$(NAME).$(PRE_VERSION)
WWW=/import/www/DIST-TOOLS/SYNCHRONE
HTTP=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE
diff --git a/Makefile.version b/Makefile.version
index f9e635d..3fc2680 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -3,10 +3,10 @@
SHA:=$(shell git log -1 --pretty=format:"%h")
COMMIT_NB:=$(shell git log --pretty=oneline | wc -l)
-
+PRE_COMMIT_NB:=$(shell echo $(COMMIT_NB) - 1 | bc)
+PRE_VERSION:=1.$(PRE_COMMIT_NB)
VERSION:=1.$(COMMIT_NB)
-
del_version:
rm -f lutils/src/lutilsVersion.ml
diff --git a/_oasis b/_oasis
index 9a92a91..01adbae 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lutils
-Version: 1.7
+Version: 1.8
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: GPL-3
diff --git a/doc/version.tex b/doc/version.tex
index 950f483..2d85e55 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,4 +1,4 @@
-\newcommand{\version}{1.7}
-\newcommand{\sha}{e22be85}
+\newcommand{\version}{1.8}
+\newcommand{\sha}{43d317b}
\newcommand{\versionname}{none}
-\newcommand{\versiondate}{09-03-16}
+\newcommand{\versiondate}{10-03-16}
diff --git a/src/META b/src/META
index 060fe36..0cffff0 100644
--- a/src/META
+++ b/src/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 5e7d63573d3c2595f6f7f9782cd1529a)
-version = "1.7"
+# DO NOT EDIT (digest: a51f894db3601ae2c79d6727aca7452d)
+version = "1.8"
description = "shared by Verimag/synchronous tools (lustre, lutin, rdbg)."
requires = "unix str camlp4 num"
archive(byte) = "lutils.cma"
diff --git a/src/lutilsVersion.ml b/src/lutilsVersion.ml
index cf99dba..43b130f 100644
--- a/src/lutilsVersion.ml
+++ b/src/lutilsVersion.ml
@@ -1,2 +1,2 @@
-let str="1.7"
-let sha="e22be85"
+let str="1.8"
+let sha="43d317b"
--
GitLab