From a17c0527c2b0076db0404fb7ef9dfb8d7fe4d21b Mon Sep 17 00:00:00 2001 From: Axel Naumann <Axel.Naumann@cern.ch> Date: Wed, 29 May 2019 09:35:26 +0200 Subject: [PATCH] Update ROOT version files to v6.17/02. --- build/version_number | 2 +- core/base/inc/RVersion.h | 8 +++--- rootx/src/rootcoreteam.h | 61 +++++++++++++++++++--------------------- 3 files changed, 34 insertions(+), 37 deletions(-) diff --git a/build/version_number b/build/version_number index 361be93c7ec..9dc9927ac10 100644 --- a/build/version_number +++ b/build/version_number @@ -1 +1 @@ -6.17/01 +6.17/02 diff --git a/core/base/inc/RVersion.h b/core/base/inc/RVersion.h index 39d047eee8b..c4e4f0ef0e4 100644 --- a/core/base/inc/RVersion.h +++ b/core/base/inc/RVersion.h @@ -14,10 +14,10 @@ * */ -#define ROOT_RELEASE "6.17/01" -#define ROOT_RELEASE_DATE "Nov 14 2018" -#define ROOT_RELEASE_TIME "08:11:25" +#define ROOT_RELEASE "6.17/02" +#define ROOT_RELEASE_DATE "May 29 2019" +#define ROOT_RELEASE_TIME "09:35:25" #define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -#define ROOT_VERSION_CODE ROOT_VERSION(6,17,1) /* 397569 */ +#define ROOT_VERSION_CODE ROOT_VERSION(6,17,2) /* 397570 */ #endif diff --git a/rootx/src/rootcoreteam.h b/rootx/src/rootcoreteam.h index b1f3fab33cc..96841f91ad0 100644 --- a/rootx/src/rootcoreteam.h +++ b/rootx/src/rootcoreteam.h @@ -1,41 +1,38 @@ #ifndef ROOT_ROOTCoreTeam #define ROOT_ROOTCoreTeam +// This file is automatically generated with names from "git shortlog". +// with a terminating 0 - that is what our rootxx.cxx and rootx-cocoa.mm expect. +// Do not modify this file directly but run "make version" or +// "build/unix/coreteam.sh". + namespace ROOT { namespace ROOTX { -//This file is automatically generated with names from http://root.cern.ch/gitstats/authors.html. -//The names are sorted in an alphabetical order (sorted by a family name). -//Please note the structure: it should be always like this - names as -//string literals in an array's initializer -//with a terminating 0 - that's what our rootxx.cxx and rootx-cocoa.mm expect. -//The array (or its elements actually) has an internal linkage -//(it has a definition here, not in rootxx.cxx or rootx-cocoa.mm files. -//Please, do not modify this file. +const char *gROOTCoreTeam[] = { + "Rene Brun", + "Fons Rademakers", + "Philippe Canal", + "Axel Naumann", + "Olivier Couet", + "Lorenzo Moneta", + "Vassil Vassilev", + "Danilo Piparo", + "Gerardo Ganis", + "Bertrand Bellenot", + "Sergey Linev", + "Wouter Verkerke", + "Enrico Guiraud", + "Pere Mato Vila", + "Timur Pocheptsov", + "Guilherme Amadio", + "Matevz Tadel", + "Wim Lavrijsen", + "Ilka Antcheva", + "Enric Tejedor Saavedra", + 0 }; -const char * gROOTCoreTeam[] = { - "Rene Brun", - "Fons Rademakers", - "Philippe Canal", - "Axel Naumann", - "Olivier Couet", - "Lorenzo Moneta", - "Vassil Vassilev", - "Gerardo Ganis", - "Bertrand Bellenot", - "Danilo Piparo", - "Wouter Verkerke", - "Timur Pocheptsov", - "Matevz Tadel", - "Pere Mato", - "Wim Lavrijsen", - "Ilka Antcheva", - "Paul Russo", - "Andrei Gheata", - "Anirudha Bose", - "Valeri Onuchine", - 0}; -} -} +} // namespace ROOTX +} // namespace ROOT #endif -- GitLab