Repository: madlib Updated Branches: refs/heads/master 2a113626d -> 32cce1a16
Change madlib gppkg version string JIRA: MADLIB-1183 This commit changes the naming convention for madlib gppkg, after renaming, the format of madlib gppkg will look like: madlib-1.13_dev-gp5-rhel6-x86_64.gppkg madlib-1.12_dev-gp4.3orca-rhel5-x86_64.gppkg Closes #211 Project: http://git-wip-us.apache.org/repos/asf/madlib/repo Commit: http://git-wip-us.apache.org/repos/asf/madlib/commit/32cce1a1 Tree: http://git-wip-us.apache.org/repos/asf/madlib/tree/32cce1a1 Diff: http://git-wip-us.apache.org/repos/asf/madlib/diff/32cce1a1 Branch: refs/heads/master Commit: 32cce1a16fae61e053553f8e1ca5cbd0c1fb79e3 Parents: 2a11362 Author: Jingyi Mei <[email protected]> Authored: Wed Dec 13 16:58:27 2017 -0800 Committer: Orhan Kislal <[email protected]> Committed: Wed Dec 13 17:01:22 2017 -0800 ---------------------------------------------------------------------- cmake/LinuxUtils.cmake | 1 + deploy/CMakeLists.txt | 1 + deploy/gppkg/CMakeLists.txt | 2 +- deploy/gppkg/gppkg_spec.yml.in | 4 ++-- src/ports/greenplum/CMakeLists.txt | 2 +- src/ports/greenplum/cmake/GreenplumUtils.cmake | 5 +++++ 6 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/madlib/blob/32cce1a1/cmake/LinuxUtils.cmake ---------------------------------------------------------------------- diff --git a/cmake/LinuxUtils.cmake b/cmake/LinuxUtils.cmake index bd90433..f30b908 100644 --- a/cmake/LinuxUtils.cmake +++ b/cmake/LinuxUtils.cmake @@ -9,3 +9,4 @@ macro(rh_version OUT_VERSION) set(${OUT_VERSION} "${OUT_VERSION}-NOTFOUND") endif(EXISTS "/etc/redhat-release") endmacro(rh_version) + http://git-wip-us.apache.org/repos/asf/madlib/blob/32cce1a1/deploy/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt index a2d2253..32023bd 100644 --- a/deploy/CMakeLists.txt +++ b/deploy/CMakeLists.txt @@ -83,3 +83,4 @@ file(GLOB PORT_COMPONENTS "${CMAKE_CURRENT_BINARY_DIR}/Component_*.cmake") foreach(PORT_COMPONENT ${PORT_COMPONENTS}) include("${PORT_COMPONENT}") endforeach(PORT_COMPONENT) + http://git-wip-us.apache.org/repos/asf/madlib/blob/32cce1a1/deploy/gppkg/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/deploy/gppkg/CMakeLists.txt b/deploy/gppkg/CMakeLists.txt index d258f3e..b6b1d71 100644 --- a/deploy/gppkg/CMakeLists.txt +++ b/deploy/gppkg/CMakeLists.txt @@ -2,8 +2,8 @@ # Packaging for Greenplum's gppkg # ------------------------------------------------------------------------------ -set(MADLIB_GPPKG_VERSION "1.9.9") set(MADLIB_GPPKG_RELEASE_NUMBER 1) + set(MADLIB_GPPKG_RPM_SOURCE_DIR "${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/RPM/${CPACK_PACKAGE_FILE_NAME}" ) http://git-wip-us.apache.org/repos/asf/madlib/blob/32cce1a1/deploy/gppkg/gppkg_spec.yml.in ---------------------------------------------------------------------- diff --git a/deploy/gppkg/gppkg_spec.yml.in b/deploy/gppkg/gppkg_spec.yml.in index 170cbcd..fc33607 100644 --- a/deploy/gppkg/gppkg_spec.yml.in +++ b/deploy/gppkg/gppkg_spec.yml.in @@ -1,7 +1,7 @@ Pkgname: madlib Architecture: @CPACK_RPM_PACKAGE_ARCHITECTURE@ -Version: ossv@MADLIB_VERSION_STRING_NO_HYPHEN@_pv@MADLIB_GPPKG_VERSION@_@GPDB_VARIANT_SHORT@@GPDB_VERSION_LC@ -OS: rhel5 +Version: @MADLIB_VERSION_STRING_NO_HYPHEN@-@GPDB_VARIANT_SHORT@@GPDB_VERSION_LC@ +OS: rhel@RH_MAJOR_VERSION@ GPDBVersion: @GPDB_VERSION_LC@ Description: Madlib is an open source library which provides scalable in-database analytics. It provides data-parallel implementations of mathematical, statistical and machine learning methods for structured and unstructured data. PostInstall: http://git-wip-us.apache.org/repos/asf/madlib/blob/32cce1a1/src/ports/greenplum/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/ports/greenplum/CMakeLists.txt b/src/ports/greenplum/CMakeLists.txt index 3ff252c..c09d29c 100644 --- a/src/ports/greenplum/CMakeLists.txt +++ b/src/ports/greenplum/CMakeLists.txt @@ -271,7 +271,7 @@ function(add_${PORT_LC}_library IN_PORT_VERSION) # -- 4.4. Generate gppkg deployment scripts. Note: These are generated CMake # scripts! --------------------------------------------------------------- if(NOT (${IN_PORT_VERSION} VERSION_LESS "4.2")) - add_gppkg(${IN_PORT_VERSION} Greenplum gpdb 1.0) + add_gppkg(${IN_PORT_VERSION} Greenplum gp 1.0) endif(NOT (${IN_PORT_VERSION} VERSION_LESS "4.2")) endfunction(add_${PORT_LC}_library) http://git-wip-us.apache.org/repos/asf/madlib/blob/32cce1a1/src/ports/greenplum/cmake/GreenplumUtils.cmake ---------------------------------------------------------------------- diff --git a/src/ports/greenplum/cmake/GreenplumUtils.cmake b/src/ports/greenplum/cmake/GreenplumUtils.cmake index 6ce3d52..9e3aa21 100644 --- a/src/ports/greenplum/cmake/GreenplumUtils.cmake +++ b/src/ports/greenplum/cmake/GreenplumUtils.cmake @@ -17,6 +17,10 @@ function(add_gppkg GPDB_VERSION GPDB_VARIANT GPDB_VARIANT_SHORT UPGRADE_SUPPORT) string(TOLOWER ${GPDB_VERSION} GPDB_VERSION_LC) string(REPLACE "." "_" VERSION_ "${GPDB_VERSION}") + # Get information about the rhel version + rh_version(RH_VERSION) + string(REGEX MATCH "([0-9])" RH_MAJOR_VERSION "${RH_VERSION}") + file(WRITE "${CMAKE_BINARY_DIR}/deploy/gppkg/${GPDB_VARIANT}_${VERSION_}_gppkg.cmake" " file(MAKE_DIRECTORY \"\${CMAKE_CURRENT_BINARY_DIR}/${GPDB_VERSION}/BUILD\" @@ -30,6 +34,7 @@ function(add_gppkg GPDB_VERSION GPDB_VARIANT GPDB_VARIANT_SHORT UPGRADE_SUPPORT) set(GPDB_VARIANT \"${GPDB_VARIANT}\") set(GPDB_VARIANT_SHORT \"${GPDB_VARIANT_SHORT}\") set(UPGRADE_SUPPORT \"${UPGRADE_SUPPORT}\") + set(RH_MAJOR_VERSION \"${RH_MAJOR_VERSION}\") string(TOLOWER \"${GPDB_VARIANT}\" PORT_NAME) configure_file(
