Commit 7ab3ac87 authored by POGODALLA Sylvain's avatar POGODALLA Sylvain

Added dependencies to ocf and other required libs

parent 2337a1f7
......@@ -27,6 +27,10 @@ In order to compile the ACG toolkit, you need:
+ bolt (>=1.4) installed (http://bolt.x9c.fr/downloads.html)
+ ANSITerminal (>=0.6.5) installed (https://forge.ocamlcore.org/projects/ansiterminal/)
+ cairo2 (>=0.4.6) installed (http://forge.ocamlcore.org/projects/cairo/)
+ easy-format installed (http://mjambon.com/releases/easy-format/easy-format-1.0.2.tar.gz). Required by biniou
+ biniou (>=1.0.6) installed (http://mjambon.com/biniou.html). Required by yojson
+ yojson (>=1.1.8) installed (http://mjambon.com/yojson.html). Required by ocf
+ ocf (>=0.4.0) installed (http://zoggy.github.io/ocf/)
For best results (correct rendering of symbols in the graphical output),
please also install the free DejaVu fonts (http://dejavu-fonts.org).
......
......@@ -26,7 +26,9 @@ VERSION_BASENAME=1.2
VERSION = $(VERSION_BASENAME)-$(shell date "+%Y%m%d")
RELEASE = acg-$(VERSION)
TAR_RELEASE =acg-$(TAR_VERSION)
#TAR_RELEASE =acg-$(TAR_VERSION)
TAR_RELEASE = $(RELEASE)
prefix = @prefix@
exec_prefix = @exec_prefix@
......
......@@ -2,7 +2,7 @@
* Général
** Avant Prochaine release
** TODO Avant Prochaine release
+ [X] merge avec trunk
+ [X] remplacer tous les gforge.loria en gforge.inria
+ [X] réfléchir si changement de construction des numéros de version
......@@ -11,6 +11,8 @@
+ [X] remove useless reduction.* files (hint: the useful one is in the
acg-data directory)
+ [X] améliorer le pretty-printing des termes
+ [X] ajouter dépendence à ocf
+ [ ] ajouter dépendence à Ocaml 4.02.1 ? (requis par ocf)
** DONE Faire un Bolt package
......@@ -114,3 +116,16 @@
+ [ ] Ajouter un -nooout option pour acgc ?
+ [ ] Vérifier ce qui se passe avec les différents parenthèsages lors
du parsing
* Extension de signatures et lexiques
+ Warning signature: duplicate type or term definition (+ conflict with declaration)
+ Warning lexicon:
+ duplicate type or term interpretation
+ forgotten interpretations
+ Update lexicon if:
+ Interpretation
1. new type/constant declaration in abstract signature => check interpretation
2. new or update type/constant definition in abstract or object signature => recompute lex
+ Composition
1. one of the lexicon was updated => recompute lex
......@@ -77,6 +77,7 @@ AC_DEFUN([AC_LIB_CHECKING],
# si on arrive à l'executer avec la librairie dans le rep de lib de caml
if ($OCAMLC -c $OPTIONS c_check_$STD_FOLDER.ml >& /dev/null) ; then
# pas besoin d'include
LIB_PATH=
LIB_INCLUDE=""
LIB_DIR=`$OCAMLC -where`
FOUND_LIB=yes
......@@ -88,6 +89,7 @@ AC_DEFUN([AC_LIB_CHECKING],
if test "$FOUND_LIB" = "no" ; then
if ($OCAMLC -c $OPTIONS -I +$STD_FOLDER $LIB_FILE.cma c_check_$STD_FOLDER.ml >& /dev/null) ; then
# si ca marche, on s'arrete et on precise le include
LIB_PATH =
LIB_INCLUDE="-I +$STD_FOLDER"
LIB_DIR=`$OCAMLC -where`
LIB_DIR="$LIB_DIR/$STD_FOLDER"
......@@ -105,8 +107,8 @@ AC_DEFUN([AC_LIB_CHECKING],
# on regarde déjà si la lib est installée avec ocamlfind
if $OCAMLFIND query $OFIND_NAME > /dev/null 2>&1 ; then
# si c'est le cas, on recupere le repertoire d'installation et le include correspondant
LIB_INCLUDE=`$OCAMLFIND query $OFIND_NAME`
LIB_INCLUDE="-I $LIB_INCLUDE"
LIB_PATH=`$OCAMLFIND query $OFIND_NAME`
LIB_INCLUDE="-I $LIB_PATH"
# on teste maintenant si on peut exectuer le fichier ml de test
if ($OCAMLC -c $OPTIONS $LIB_INCLUDE $LIB_FILE.cma c_check_$STD_FOLDER.ml >& /dev/null) ; then
......@@ -126,8 +128,8 @@ AC_DEFUN([AC_LIB_CHECKING],
OPAM_OCAML_VERSION=`opam config var ocaml-version`
OCAML_VERSION=`$OCAMLC -version`
if test "$OPAM_OCAML_VERSION" = "$OCAML_VERSION" ; then
LIB_INCLUDE=`$OPAM config var lib`
LIB_INCLUDE="-I $LIB_INCLUDE/$STD_FOLDER"
LIB_PATH=`$OPAM config var lib`
LIB_INCLUDE="-I $LIB_PATH/$STD_FOLDER"
# on teste maintenant si on peut exectuer le fichier ml de test
if ($OCAMLC -c $OPTIONS $LIB_INCLUDE $LIB_FILE.cma c_check_$STD_FOLDER.ml >& /dev/null) ; then
......
......@@ -17,7 +17,7 @@
(* *)
(**************************************************************************)
VERSION="1.2-20150529"
VERSION="1.2-20150709"
AC_INIT([ACG DTK],[$VERSION],[sylvain.pogodalla@loria.fr])
......@@ -179,6 +179,37 @@ if test "$FOUND_LIB" != "no" ; then
AC_SUBST(OCamlCairo2_INCLUDE,$LIB_INCLUDE)
fi
# Look for Easy-format with ocamlfind
AC_ARG_VAR(EASY_FORMAT_PATH,[Directory where to find the Yojson library if not in a standard location])
AC_LIB_CHECKING(Easy-format,easy-format,easy_format,easy-format,easy-format,Easy_format,"",true,$EASY_FORMAT_PATH)
if test "$FOUND_LIB" != "no" ; then
AC_SUBST(EASY_FORMAT_PATH,$LIB_PATH)
fi
# Look for biniou with ocamlfind
AC_ARG_VAR(BINIOU_PATH,[Directory where to find the biniou library if not in a standard location])
AC_LIB_CHECKING(Biniou,biniou,biniou,biniou,biniou,Bi_io,"",true,$BINIOU_PATH)
if test "$FOUND_LIB" != "no" ; then
AC_SUBST(BINIOU_INCLUDE,$LIB_INCLUDE)
fi
# Look for Yojson with ocamlfind
AC_ARG_VAR(YOJSON_PATH,[Directory where to find the Yojson library if not in a standard location])
AC_LIB_CHECKING(Yojson,yojson,yojson,yojson,yojson,Yojson,"",true,$YOJSON_PATH)
if test "$FOUND_LIB" != "no" ; then
AC_SUBST(YOJSON_PATH,$LIB_PATH)
fi
# Look for ocf with ocamlfind
AC_ARG_VAR(OCF_PATH,[Directory where to find the ocf library if not in a standard location])
AC_LIB_CHECKING(ocf,ocf,ocf,ocf,ocf,Ocf,"",true,$OCF_PATH)
if test "$FOUND_LIB" != "no" ; then
AC_SUBST(OCF_INCLUDE,$LIB_INCLUDE)
fi
# What is the OCAML version ?
# we extract Ocaml version number
......
This diff is collapsed.
......@@ -14,6 +14,7 @@ depends: [
"bolt"
"ANSITerminal"
"cairo2"
"ocf"
]
ocaml-version: [ >= "4.00.0" ]
......
archive: "http://calligramme.loria.fr/acg/software/acg-1.2-20150529.tar.gz"
checksum: "98c5f95d40cf2ca6a83cfc4674d3059d"
archive: "http://calligramme.loria.fr/acg/software/acg-1.2-20151126.tar.gz"
checksum: "9a88d47f573ff02eb1eee0b13ee5e3e4"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment