Skip to content

Commit

Permalink
Bump version and NEWS for v1.5.21
Browse files Browse the repository at this point in the history
  • Loading branch information
tbeu committed Mar 25, 2021
1 parent e357754 commit b3e56ed
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ branches:
except:
- coverity_scan

version: 1.5.20+build.{build}
version: 1.5.21+build.{build}

cache:
- C:\cygwin-setup-cache
Expand Down
2 changes: 1 addition & 1 deletion .ci/travis_after_success.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ fi

sh ./upload-to-bitbucket.sh tbeu $BBPASS /tbeu/downloads/downloads ./documentation/matio_user_guide.html
sh ./upload-to-bitbucket.sh tbeu $BBPASS /tbeu/downloads/downloads ./documentation/matio_user_guide.pdf
sh ./upload-to-bitbucket.sh tbeu $BBPASS /tbeu/downloads/downloads ./matio-1.5.20.tar.gz
sh ./upload-to-bitbucket.sh tbeu $BBPASS /tbeu/downloads/downloads ./matio-1.5.21.tar.gz
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if(POLICY CMP0074)
endif()

project(matio
VERSION 1.5.20
VERSION 1.5.21
LANGUAGES C CXX
)

Expand Down
5 changes: 5 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Changes in 1.5.21 (25 March 2021)
* Fixed: Avoid usage of strlen when creating MAT_T_UTF8 encoded character array
(regression of v1.5.20)
* Fixed reading of compression flag from HDF5 MAT file

Changes in 1.5.20 (21 March 2021)
* Added support for writing MAT_T_UTF8 encoded character array to HDF5 MAT file
(by conversion to UTF-16 if in BMP)
Expand Down
10 changes: 5 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dnl CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY
dnl OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

AC_INIT([MATIO],[1.5.20],[t-beu@users.sourceforge.net],[],[https://sourceforge.net/projects/matio])
AC_INIT([MATIO],[1.5.21],[t-beu@users.sourceforge.net],[],[https://sourceforge.net/projects/matio])
AC_CONFIG_SRCDIR([src/matio.h])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([config])
Expand All @@ -38,10 +38,10 @@ AC_CANONICAL_HOST
AC_DEFINE_UNQUOTED([MATIO_PLATFORM],"${host}",[Platform])
AC_DEFINE_UNQUOTED([MATIO_MAJOR_VERSION],1,[Matio major version number])
AC_DEFINE_UNQUOTED([MATIO_MINOR_VERSION],5,[Matio minor version number])
AC_DEFINE_UNQUOTED([MATIO_RELEASE_LEVEL],20,[Matio release level number])
AC_DEFINE_UNQUOTED([MATIO_VERSION],1520,[Matio version number])
PACKAGE_RELEASE_DATE="21 March 2021"
AC_DEFINE_UNQUOTED([MATIO_VERSION_STR],"1.5.20",[Matio version number])
AC_DEFINE_UNQUOTED([MATIO_RELEASE_LEVEL],21,[Matio release level number])
AC_DEFINE_UNQUOTED([MATIO_VERSION],1521,[Matio version number])
PACKAGE_RELEASE_DATE="25 March 2021"
AC_DEFINE_UNQUOTED([MATIO_VERSION_STR],"1.5.21",[Matio version number])
AC_SUBST(PACKAGE_RELEASE_DATE)

AC_ARG_VAR([FCLDFLAGS],[Fortran compiler-specific flags at link time])
Expand Down
2 changes: 1 addition & 1 deletion documentation/matio_user_guide.texi
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
@sp 0
@title
@subtitle User Manual
@subtitle for version 1.5.20
@subtitle for version 1.5.21
@subtitle March 2021
@author Christopher C. Hulbert
@page
Expand Down
8 changes: 4 additions & 4 deletions visual_studio/matio.rc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,5,20,0
PRODUCTVERSION 1,5,20,0
FILEVERSION 1,5,21,0
PRODUCTVERSION 1,5,21,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS 1
Expand All @@ -19,12 +19,12 @@ BEGIN
//language ID = U.S. English, char set = Windows, Multilingual
BEGIN
VALUE "FileDescription", "MATLAB MAT file I/O library\0"
VALUE "FileVersion", "1.5.20\0"
VALUE "FileVersion", "1.5.21\0"
VALUE "InternalName", "libmatio.dll\0"
VALUE "LegalCopyright", "(C) 2005-2021, Christopher Hulbert\0"
VALUE "OriginalFilename", "libmatio.dll\0"
VALUE "ProductName", "libmatio\0"
VALUE "ProductVersion", "1.5.20\0"
VALUE "ProductVersion", "1.5.21\0"
VALUE "Comments","\0"
END
END
Expand Down
6 changes: 3 additions & 3 deletions visual_studio/matioConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
#define PACKAGE_NAME "MATIO"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "MATIO 1.5.20"
#define PACKAGE_STRING "MATIO 1.5.21"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "matio"
Expand All @@ -247,7 +247,7 @@
#define PACKAGE_URL "https://sourceforge.net/projects/matio"

/* Define to the version of this package. */
#define PACKAGE_VERSION "1.5.20"
#define PACKAGE_VERSION "1.5.21"

/* The size of `char', as computed by sizeof. */
#define SIZEOF_CHAR 1
Expand Down Expand Up @@ -286,7 +286,7 @@
#undef STDC_HEADERS

/* Version number of package */
#define VERSION "1.5.20"
#define VERSION "1.5.21"

/* Z prefix */
#undef Z_PREFIX
6 changes: 3 additions & 3 deletions visual_studio/matio_pubconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
#define MATIO_MINOR_VERSION 5

/* Matio release level number */
#define MATIO_RELEASE_LEVEL 20
#define MATIO_RELEASE_LEVEL 21

/* Matio version number */
#define MATIO_VERSION 1520
#define MATIO_VERSION 1521

/* Matio version string */
#define MATIO_VERSION_STR "1.5.20"
#define MATIO_VERSION_STR "1.5.21"

/* Default file format */
#define MAT_FT_DEFAULT MAT_FT_MAT5
Expand Down

0 comments on commit b3e56ed

Please sign in to comment.