Skip to content

Commit f45ba89

Browse files
authored
Merge pull request #1963 from jedwards4b/pio2.6.0rc1
update version
2 parents d858d79 + a644bb6 commit f45ba89

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ project (PIO C)
99

1010
# The project version number.
1111
set(VERSION_MAJOR 2 CACHE STRING "Project major version number.")
12-
set(VERSION_MINOR 5 CACHE STRING "Project minor version number.")
13-
set(VERSION_PATCH 10 CACHE STRING "Project patch version number.")
12+
set(VERSION_MINOR 6 CACHE STRING "Project minor version number.")
13+
set(VERSION_PATCH 0 CACHE STRING "Project patch version number.")
1414
mark_as_advanced(VERSION_MAJOR VERSION_MINOR VERSION_PATCH)
1515

1616
# Create version info in autotools parlance for pio_meta.h.

configure.ac

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
## Ed Hartnett 8/16/17
33

44
# Initialize autoconf and automake.
5-
AC_INIT(pio, 2.5.10)
5+
AC_INIT(pio, 2.6.0)
66
AC_CONFIG_SRCDIR(src/clib/pio_darray.c)
77
AM_INIT_AUTOMAKE([foreign serial-tests])
88

99

1010
# The PIO version, again. Use AC_SUBST for pio_meta.h and
1111
# AC_DEFINE_UNQUOTED for config.h.
1212
AC_SUBST([PIO_VERSION_MAJOR]) PIO_VERSION_MAJOR=2
13-
AC_SUBST([PIO_VERSION_MINOR]) PIO_VERSION_MINOR=5
14-
AC_SUBST([PIO_VERSION_PATCH]) PIO_VERSION_PATCH=10
13+
AC_SUBST([PIO_VERSION_MINOR]) PIO_VERSION_MINOR=6
14+
AC_SUBST([PIO_VERSION_PATCH]) PIO_VERSION_PATCH=0
1515
AC_DEFINE_UNQUOTED([PIO_VERSION_MAJOR], [$PIO_VERSION_MAJOR], [PIO major version])
1616
AC_DEFINE_UNQUOTED([PIO_VERSION_MINOR], [$PIO_VERSION_MINOR], [PIO minor version])
1717
AC_DEFINE_UNQUOTED([PIO_VERSION_PATCH], [$PIO_VERSION_PATCH], [PIO patch version])
1818

1919
# Once more for the documentation.
2020
AC_SUBST([VERSION_MAJOR], [2])
21-
AC_SUBST([VERSION_MINOR], [5])
22-
AC_SUBST([VERSION_PATCH], [10])
21+
AC_SUBST([VERSION_MINOR], [6])
22+
AC_SUBST([VERSION_PATCH], [0])
2323

2424

2525
# The m4 directory holds macros for autoconf.

0 commit comments

Comments
 (0)