From 29fc49199d3c42e1df9fc2ba0ba7bf40635f19e0 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 31 Jul 2019 14:29:18 -0500 Subject: [PATCH] Update versions after tag, set DEVELOPMENT_FLAG/DEV_SNAPSHOT --- configure/CONFIG_BASE_VERSION | 10 +++++----- modules/ca/configure/CONFIG_CA_VERSION | 12 ++++++++++-- modules/database/configure/CONFIG_DATABASE_VERSION | 12 ++++++++++-- modules/libcom/configure/CONFIG_LIBCOM_VERSION | 12 ++++++++++-- 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index 53753d7e4..4e61e48cd 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -52,12 +52,12 @@ EPICS_MODIFICATION = 3 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement) # Not included in the official EPICS version number if zero -EPICS_PATCH_LEVEL = 0 +EPICS_PATCH_LEVEL = 1 -# Between official releases, the EPICS_PATCH_LEVEL gets incremented -# and a -DEV suffix is added (similar to the Maven -SNAPSHOT versions) -EPICS_DEV_SNAPSHOT= -#EPICS_DEV_SNAPSHOT=-DEV +# Immediately after an official release the EPICS_PATCH_LEVEL is incremented +# and the -DEV suffix is added (similar to the Maven -SNAPSHOT versions) +#EPICS_DEV_SNAPSHOT= +EPICS_DEV_SNAPSHOT=-DEV #EPICS_DEV_SNAPSHOT=-pre1 #EPICS_DEV_SNAPSHOT=-pre1-DEV #EPICS_DEV_SNAPSHOT=-pre2 diff --git a/modules/ca/configure/CONFIG_CA_VERSION b/modules/ca/configure/CONFIG_CA_VERSION index 8a6649666..cac0fcbfe 100644 --- a/modules/ca/configure/CONFIG_CA_VERSION +++ b/modules/ca/configure/CONFIG_CA_VERSION @@ -1,4 +1,12 @@ +# Version number for the Channel Access API and shared library + EPICS_CA_MAJOR_VERSION = 4 EPICS_CA_MINOR_VERSION = 13 -EPICS_CA_MAINTENANCE_VERSION = 4 -EPICS_CA_DEVELOPMENT_FLAG = 0 +EPICS_CA_MAINTENANCE_VERSION = 5 + +# Development flag, must be zero for official release versions + +EPICS_CA_DEVELOPMENT_FLAG = 1 + +# Immediately after an official release the MAINTENANCE_VERSION +# will be incremented and the DEVELOPMENT_FLAG set to 1 diff --git a/modules/database/configure/CONFIG_DATABASE_VERSION b/modules/database/configure/CONFIG_DATABASE_VERSION index ad8d54ab5..a43738cfb 100644 --- a/modules/database/configure/CONFIG_DATABASE_VERSION +++ b/modules/database/configure/CONFIG_DATABASE_VERSION @@ -1,4 +1,12 @@ +# Version number for the database APIs and shared library + EPICS_DATABASE_MAJOR_VERSION = 3 EPICS_DATABASE_MINOR_VERSION = 17 -EPICS_DATABASE_MAINTENANCE_VERSION = 4 -EPICS_DATABASE_DEVELOPMENT_FLAG = 0 +EPICS_DATABASE_MAINTENANCE_VERSION = 5 + +# Development flag, must be zero for official release versions + +EPICS_DATABASE_DEVELOPMENT_FLAG = 1 + +# Immediately after an official release the MAINTENANCE_VERSION +# will be incremented and the DEVELOPMENT_FLAG set to 1 diff --git a/modules/libcom/configure/CONFIG_LIBCOM_VERSION b/modules/libcom/configure/CONFIG_LIBCOM_VERSION index f5d91037c..92c374f88 100644 --- a/modules/libcom/configure/CONFIG_LIBCOM_VERSION +++ b/modules/libcom/configure/CONFIG_LIBCOM_VERSION @@ -1,4 +1,12 @@ +# Version number for the libcom APIs and shared library + EPICS_LIBCOM_MAJOR_VERSION = 3 EPICS_LIBCOM_MINOR_VERSION = 17 -EPICS_LIBCOM_MAINTENANCE_VERSION = 5 -EPICS_LIBCOM_DEVELOPMENT_FLAG = 0 +EPICS_LIBCOM_MAINTENANCE_VERSION = 6 + +# Development flag, must be zero for official release versions + +EPICS_LIBCOM_DEVELOPMENT_FLAG = 1 + +# Immediately after an official release the MAINTENANCE_VERSION +# will be incremented and the DEVELOPMENT_FLAG set to 1