diff --git a/CHANGELOG b/CHANGELOG index 232b05a8..4daed0d2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +## 1.6.1 +* fixes related to ppx extensions +* fixed regression on indentation within record types + ## 1.6.0 * fixes some cases of comments * supports new cases of ppx diff --git a/META b/META index 525349a7..2522336d 100644 --- a/META +++ b/META @@ -1,25 +1,25 @@ package "lib" ( - version = "1.6.0" + version = "1.6.1" directory = "lib" archive(byte) = "ocp-indent.lib.cma" archive(native) = "ocp-indent.lib.cmxa" requires = "ocp-indent.lexer ocp-indent.utils" ) package "utils" ( - version = "1.6.0" + version = "1.6.1" directory = "utils" archive(byte) = "ocp-indent.utils.cma" archive(native) = "ocp-indent.utils.cmxa" requires = "ocp-indent.lexer" ) package "lexer" ( - version = "1.6.0" + version = "1.6.1" directory = "lexer" archive(byte) = "ocp-indent.lexer.cma" archive(native) = "ocp-indent.lexer.cmxa" ) package "dynlink" ( - version = "1.6.0" + version = "1.6.1" directory = "dynlink" archive(byte) = "ocp-indent.dynlink.cma" archive(native) = "ocp-indent.dynlink.cmxa" diff --git a/configure b/configure index f67d92fc..faad4840 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ocp-indent 1.6.0. +# Generated by GNU Autoconf 2.69 for ocp-indent 1.6.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -9,7 +9,7 @@ # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. # -# Copyright 2013-2014 OcamlPro SAS +# Copyright 2013-2017 OcamlPro SAS ## -------------------- ## ## M4sh Initialization. ## ## -------------------- ## @@ -578,8 +578,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ocp-indent' PACKAGE_TARNAME='ocp-indent' -PACKAGE_VERSION='1.6.0' -PACKAGE_STRING='ocp-indent 1.6.0' +PACKAGE_VERSION='1.6.1' +PACKAGE_STRING='ocp-indent 1.6.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1206,7 +1206,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ocp-indent 1.6.0 to adapt to many kinds of systems. +\`configure' configures ocp-indent 1.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ocp-indent 1.6.0:";; + short | recursive ) echo "Configuration of ocp-indent 1.6.1:";; esac cat <<\_ACEOF @@ -1347,14 +1347,14 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ocp-indent configure 1.6.0 +ocp-indent configure 1.6.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -Copyright 2013-2014 OcamlPro SAS +Copyright 2013-2017 OcamlPro SAS _ACEOF exit fi @@ -1404,7 +1404,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ocp-indent $as_me 1.6.0, which was +It was created by ocp-indent $as_me 1.6.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4091,7 +4091,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ocp-indent $as_me 1.6.0, which was +This file was extended by ocp-indent $as_me 1.6.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4144,7 +4144,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ocp-indent config.status 1.6.0 +ocp-indent config.status 1.6.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 95cbdf9f..fe4d2f68 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(ocp-indent,1.6.0) -AC_COPYRIGHT(Copyright 2013-2014 OcamlPro SAS) +AC_INIT(ocp-indent,1.6.1) +AC_COPYRIGHT(Copyright 2013-2017 OcamlPro SAS) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_CC diff --git a/opam b/opam index 8e9ae671..de7c31e7 100644 --- a/opam +++ b/opam @@ -1,6 +1,6 @@ opam-version: "1.2" name: "ocp-indent" -version: "1.6.0" +version: "1.6.1" maintainer: "contact@ocamlpro.com" authors: [ "Louis Gesbert "