Merge pull request #6410 from EOSIO/feature/port-1.5.x

port 1.5.x to develop

CMakeLists.txt

@@ -35,7 +35,14 @@ set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 5)
-set(VERSION_PATCH 0-rc1)
+set(VERSION_PATCH 0)
+set(VERSION_SUFFIX rc1)
+
+if(VERSION_SUFFIX)
+    set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")
+else()
+    set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+endif()
 
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
 set( NODE_EXECUTABLE_NAME nodeos )

CMakeModules/EosioTester.cmake.in

@@ -1,10 +1,10 @@
 cmake_minimum_required( VERSION 3.5 )
-message(STATUS "Setting up Eosio Tester @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ at @EOS_ROOT_DIR@")
+message(STATUS "Setting up Eosio Tester @VERSION_FULL@ at @EOS_ROOT_DIR@")
 
 set(CMAKE_CXX_COMPILER @CMAKE_CXX_COMPILER@)
 set(CMAKE_C_COMPILER   @CMAKE_C_COMPILER@)
 
-set(EOSIO_VERSION "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@")
+set(EOSIO_VERSION "@VERSION_FULL@")
 
 enable_testing()
 

CMakeModules/EosioTesterBuild.cmake.in

@@ -1,10 +1,10 @@
 cmake_minimum_required( VERSION 3.5 )
-message(STATUS "Setting up Eosio Tester @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ at @EOS_ROOT_DIR@")
+message(STATUS "Setting up Eosio Tester @VERSION_FULL@ at @EOS_ROOT_DIR@")
 
 set(CMAKE_CXX_COMPILER @CMAKE_CXX_COMPILER@)
 set(CMAKE_C_COMPILER   @CMAKE_C_COMPILER@)
 
-set(EOSIO_VERSION "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@")
+set(EOSIO_VERSION "@VERSION_FULL@")
 
 enable_testing()
 

CMakeModules/doxygen.cmake

@@ -5,7 +5,7 @@ include(FindDoxygen)
 if(NOT DOXYGEN_FOUND)
   message(STATUS "Doxygen not found.  Contract documentation will not be generated.")
 else()
-  set(DOXY_EOS_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" CACHE INTERNAL "Version string used in PROJECT_NUMBER.")
+  set(DOXY_EOS_VERSION "${VERSION_FULL}" CACHE INTERNAL "Version string used in PROJECT_NUMBER.")
   # CMake strips trailing path separators off of variables it knows are paths,
   # so the trailing '/' Doxygen expects is embedded in the doxyfile.
   set(DOXY_DOC_DEST_DIR "${CMAKE_BINARY_DIR}/docs" CACHE PATH "Path to the doxygen output")

eosio.version.in

@@ -1,6 +1,6 @@
 #pragma once
 
-/// VERSION @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+/// VERSION @VERSION_FULL@
 namespace eosio {
    enum version {
       MAJOR @VERSION_MAJOR@,

scripts/generate_package.sh.in

@@ -2,8 +2,9 @@
 
 VARIANT=$1
 
-VERSION="@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@"
-
+VERSION_NO_SUFFIX="@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@"
+VERSION_SUFFIX="@VERSION_SUFFIX@"
+VERSION="@VERSION_FULL@"
 BUILD_DIR="@CMAKE_BINARY_DIR@"
 
 VENDOR="@VENDOR@"
@@ -13,6 +14,8 @@ URL="@URL@"
 EMAIL="@EMAIL@"
 
 export BUILD_DIR
+export VERSION_NO_SUFFIX
+export VERSION_SUFFIX
 export VERSION
 export VENDOR
 export PROJECT

scripts/generate_rpm.sh

@@ -1,10 +1,17 @@
 #! /bin/bash
 
-NAME="${PROJECT}-${VERSION}-1"
 PREFIX="usr"
 SPREFIX=${PREFIX}
 SUBPREFIX="opt/${PROJECT}/${VERSION}"
 SSUBPREFIX="opt\/${PROJECT}\/${VERSION}"
+RELEASE="${VERSION_SUFFIX}"
+
+# default release to "1" if there is no suffix
+if [[ -z $RELEASE ]]; then
+  RELEASE="1"
+fi
+
+NAME="${PROJECT}-${VERSION_NO_SUFFIX}-${RELEASE}"
 
 export PREFIX
 export SUBPREFIX
@@ -26,15 +33,15 @@ echo -e ${PFILES} &> ~/rpmbuild/BUILD/filenames.txt
 
 mkdir -p ${PROJECT} 
 echo -e "Name: ${PROJECT} 
-Version: ${VERSION}
+Version: ${VERSION_NO_SUFFIX}
 License: MIT
 Vendor: ${VENDOR} 
 Source: ${URL} 
 Requires: openssl-devel, gmp-devel, libstdc++-devel, bzip2, bzip2-devel, mongodb, mongodb-server
 URL: ${URL} 
 Packager: ${VENDOR} <${EMAIL}>
 Summary: ${DESC}
-Release: 1
+Release: ${RELEASE}
 %description
 ${DESC}
 %files -f filenames.txt" &> ${PROJECT}.spec