Skip to content
Permalink
Browse files

Version bump -> 3.1.3

C/C updated to v3.1.3 tag
Travis config changes for os x
  • Loading branch information...
lawrinn committed Aug 1, 2019
1 parent 8ad44d5 commit 099581ab6e54882bc8e21fdd588218cc4c6be036
@@ -4,18 +4,18 @@ services: docker
addons:
hosts:
- mariadb.example.com
homebrew:
packages:
- openssl
- libiodbc
- mariadb
# homebrew:
# packages:
# - openssl
# - libiodbc
# - mariadb

before_install:
- chmod +x .travis/script.sh
- chmod +x .travis/osx.sh
- chmod +x .travis/gen-ssl.sh
- chmod +x .travis/build/build.sh
- chmod +x .travis/build/docker-entrypoint.sh
#- chmod +x .travis/script.sh
#- chmod +x .travis/osx.sh
#- chmod +x .travis/gen-ssl.sh
#- chmod +x .travis/build/build.sh
#- chmod +x .travis/build/docker-entrypoint.sh
- chmod 777 .travis/build/
- export PROJ_PATH=`pwd`
- export ENTRYPOINT=$PROJ_PATH/.travis/sql
@@ -57,6 +57,13 @@ matrix:
- os: osx
compiler: gcc
env: DB=mariadb:10.4
addons:
mariadb: '10.4'
before_script:
- brew update
- brew install openssl
- brew install libiodbc
- brew install mariadb
- os: linux
env: DB=mariadb:10.2 PACKET=8M MAXSCALE_VERSION=2.1.8
- os: linux
0 .travis/build/build.sh 100644 → 100755
No changes.
No changes.
0 .travis/gen-ssl.sh 100644 → 100755
No changes.
0 .travis/osx.sh 100644 → 100755
No changes.
0 .travis/script.sh 100644 → 100755
No changes.
@@ -22,10 +22,10 @@ cmake_minimum_required(VERSION 2.8)

SET(MARIADB_ODBC_VERSION_MAJOR 3)
SET(MARIADB_ODBC_VERSION_MINOR 1)
SET(MARIADB_ODBC_VERSION_PATCH 2)
SET(MARIADB_ODBC_VERSION_PATCH 3)
SET(MARIADB_ODBC_VERSION_QUALITY "ga")

SET(MARIADB_ODBC_VERSION "03.01.0002")
SET(MARIADB_ODBC_VERSION "03.01.0003")

SET(MARIADB_DEFAULT_PLUGINS_SUBDIR "plugin")
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/ma_odbc_version.h.in
BIN +0 Bytes (100%) maodbca.rc
Binary file not shown.
@@ -50,8 +50,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,1,2,0
PRODUCTVERSION 3,1,2,0
FILEVERSION 3,1,3,0
PRODUCTVERSION 3,1,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MariaDB Corporation AB"
VALUE "FileDescription", "MariaDB ODBC Unicode Driver"
VALUE "FileVersion", "3.1.2.0"
VALUE "FileVersion", "3.1.3.0"
VALUE "InternalName", "ma_odbc_u"
VALUE "LegalCopyright", "Copyright (C) 2013, 2019"
VALUE "OriginalFilename", "maodbc.dll"
VALUE "ProductName", "MariaDB ODBC Unicode Driver"
VALUE "ProductVersion", "3.1.2.0"
VALUE "ProductVersion", "3.1.3.0"
END
END
BLOCK "VarFileInfo"

0 comments on commit 099581a

Please sign in to comment.
You can’t perform that action at this time.