Skip to content

Commit

Permalink
Bump version and NEWS for v1.5.15
Browse files Browse the repository at this point in the history
  • Loading branch information
tbeu committed Mar 29, 2019
1 parent d3721db commit f8cd397
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ after_success:
- if [[ "$COVERITY_SCAN_BRANCH" != 1 ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-4.8" ]] && [[ "$HDF5_VERSION_DIR" == "hdf5_1_8_21" ]] && [[ "$ENABLE_MAT73" == "yes" ]] && [[ "$ENABLE_EXTENDED_SPARSE" == "yes" ]] && [[ "$WITH_ZLIB" == "yes" ]] && [[ "$MAX_RANK" == 3 ]]; then make pdf; fi
- if [[ "$COVERITY_SCAN_BRANCH" != 1 ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-4.8" ]] && [[ "$HDF5_VERSION_DIR" == "hdf5_1_8_21" ]] && [[ "$ENABLE_MAT73" == "yes" ]] && [[ "$ENABLE_EXTENDED_SPARSE" == "yes" ]] && [[ "$WITH_ZLIB" == "yes" ]] && [[ "$MAX_RANK" == 3 ]]; then make dist-gzip; fi
- if [[ "$COVERITY_SCAN_BRANCH" != 1 ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-4.8" ]] && [[ "$HDF5_VERSION_DIR" == "hdf5_1_8_21" ]] && [[ "$ENABLE_MAT73" == "yes" ]] && [[ "$ENABLE_EXTENDED_SPARSE" == "yes" ]] && [[ "$WITH_ZLIB" == "yes" ]] && [[ "$MAX_RANK" == 3 ]] && [[ "$TRAVIS_PULL_REQUEST" == "false" ]] && [[ "$TRAVIS_BRANCH" == "master" ]]; then sh ./upload-to-bitbucket.sh tbeu $BBPASS /tbeu/downloads/downloads ./documentation/matio_user_guide.pdf; fi
- if [[ "$COVERITY_SCAN_BRANCH" != 1 ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-4.8" ]] && [[ "$HDF5_VERSION_DIR" == "hdf5_1_8_21" ]] && [[ "$ENABLE_MAT73" == "yes" ]] && [[ "$ENABLE_EXTENDED_SPARSE" == "yes" ]] && [[ "$WITH_ZLIB" == "yes" ]] && [[ "$MAX_RANK" == 3 ]] && [[ "$TRAVIS_PULL_REQUEST" == "false" ]] && [[ "$TRAVIS_BRANCH" == "master" ]]; then sh ./upload-to-bitbucket.sh tbeu $BBPASS /tbeu/downloads/downloads ./matio-1.5.14.tar.gz; fi
- if [[ "$COVERITY_SCAN_BRANCH" != 1 ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-4.8" ]] && [[ "$HDF5_VERSION_DIR" == "hdf5_1_8_21" ]] && [[ "$ENABLE_MAT73" == "yes" ]] && [[ "$ENABLE_EXTENDED_SPARSE" == "yes" ]] && [[ "$WITH_ZLIB" == "yes" ]] && [[ "$MAX_RANK" == 3 ]] && [[ "$TRAVIS_PULL_REQUEST" == "false" ]] && [[ "$TRAVIS_BRANCH" == "master" ]]; then sh ./upload-to-bitbucket.sh tbeu $BBPASS /tbeu/downloads/downloads ./matio-1.5.15.tar.gz; fi

notifications:
email: false
Expand Down
9 changes: 9 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
Changes in 1.5.15 (29 March 2019)
* Added new API function Mat_GetHeader to retrieve header string of a MAT file
* Fixed integer multiplication overflows when calculating total number of
elements from (crafted) MAT file
* Fixed bug reading character array from (compressed) v5 MAT file (regression
of v1.5.14)
* Fixed number of variables for repeated calls of Mat_GetDir
* Fixed memory leak in Mat_VarFree for function class

Changes in 1.5.14 (11 March 2019)
* Deprecated usage of Mat_VarWriteInfo/Mat_VarWriteData in favor of
Mat_VarWrite/Mat_VarWriteAppend
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.14],[[email protected]],[],
AC_INIT([MATIO],[1.5.15],[[email protected]],[],
[https://sourceforge.net/projects/matio])
AC_CONFIG_SRCDIR([src/matio.h])
AC_CONFIG_AUX_DIR([config])
Expand All @@ -39,10 +39,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],14,[Matio release level number])
AC_DEFINE_UNQUOTED([MATIO_VERSION],1514,[Matio version number])
PACKAGE_RELEASE_DATE="11 March 2019"
AC_DEFINE_UNQUOTED([MATIO_VERSION_STR],"1.5.14",[Matio version number])
AC_DEFINE_UNQUOTED([MATIO_RELEASE_LEVEL],15,[Matio release level number])
AC_DEFINE_UNQUOTED([MATIO_VERSION],1515,[Matio version number])
PACKAGE_RELEASE_DATE="29 March 2019"
AC_DEFINE_UNQUOTED([MATIO_VERSION_STR],"1.5.15",[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.14
@subtitle for version 1.5.15
@subtitle March 2019
@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
Expand Up @@ -5,8 +5,8 @@ VS_VERSION_INFO VERSIONINFO
#else
VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
#endif
FILEVERSION 1,5,14,0
PRODUCTVERSION 1,5,14,0
FILEVERSION 1,5,15,0
PRODUCTVERSION 1,5,15,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS 1
Expand All @@ -23,12 +23,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.14\0"
VALUE "FileVersion", "1.5.15\0"
VALUE "InternalName", "libmatio.dll\0"
VALUE "LegalCopyright", "(C) 2005-2019, Christopher Hulbert\0"
VALUE "OriginalFilename", "libmatio.dll\0"
VALUE "ProductName", "libmatio\0"
VALUE "ProductVersion", "1.5.14\0"
VALUE "ProductVersion", "1.5.15\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 @@ -228,7 +228,7 @@
#define PACKAGE_NAME "MATIO"

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

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

/* Define to the version of this package. */
#define PACKAGE_VERSION "1.5.14"
#define PACKAGE_VERSION "1.5.15"

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

/* Version number of package */
#define VERSION "1.5.14"
#define VERSION "1.5.15"

/* 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 14
#define MATIO_RELEASE_LEVEL 15

/* Matio version number */
#define MATIO_VERSION 1514
#define MATIO_VERSION 1515

/* Matio version string */
#define MATIO_VERSION_STR "1.5.14"
#define MATIO_VERSION_STR "1.5.15"

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

0 comments on commit f8cd397

Please sign in to comment.