Version 1.2.1

OCamlPro · Jun 3, 2013 · 6043fd0 · 6043fd0
1 parent df2e915
commit 6043fd0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+## 1.2.1
+* Fixed bugs with GADTs, comments at end of modules
+* Fixed compilation with OCaml trunk (warnings as errors)
+* New vim script, contributed by Jonathan Derque
+* New option "strict_else" to allow unindenting after else
+
 ## 1.2.0
 * Lots of fixes
 * Switched most operators and constructs with parentheses to column aligned by

diff --git 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.2.0.
+# Generated by GNU Autoconf 2.69 for ocp-indent 1.2.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -578,8 +578,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ocp-indent'
 PACKAGE_TARNAME='ocp-indent'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='ocp-indent 1.2.0'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='ocp-indent 1.2.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1195,7 +1195,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.2.0 to adapt to many kinds of systems.
+\`configure' configures ocp-indent 1.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1256,7 +1256,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ocp-indent 1.2.0:";;
+     short | recursive ) echo "Configuration of ocp-indent 1.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1335,7 +1335,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ocp-indent configure 1.2.0
+ocp-indent configure 1.2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1392,7 +1392,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.2.0, which was
+It was created by ocp-indent $as_me 1.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4079,7 +4079,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.2.0, which was
+This file was extended by ocp-indent $as_me 1.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4132,7 +4132,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.2.0
+ocp-indent config.status 1.2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(ocp-indent,1.2.0)
+AC_INIT(ocp-indent,1.2.1)
 AC_COPYRIGHT(Copyright 2013 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/tests/failing.html b/tests/failing.html
@@ -2,7 +2,7 @@
  "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <head>
-    <title>Failing tests, ocp-indent version 1.2.0+16 (2013-05-27)</title>
+    <title>Failing tests, ocp-indent version 1.2.1 (2013-06-03)</title>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
     <style>
       TABLE { border-collapse: collapse; border-spacing: 0px; margin: auto; }
@@ -16,7 +16,7 @@
     </style>
 </head>
 <body>
-<h1>Failing tests, ocp-indent version 1.2.0+16 (2013-05-27)</h1>
+<h1>Failing tests, ocp-indent version 1.2.1 (2013-06-03)</h1>
 <div>
 <h2>Differences in js-args.ml</h2>
 <table>