You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@madlib.apache.org by ri...@apache.org on 2016/10/25 19:09:07 UTC
incubator-madlib git commit: Remove underscore from gppkg version
input
Repository: incubator-madlib
Updated Branches:
refs/heads/patch/v1.9.1_madpack 07d2c39af -> f14bf2eac
Remove underscore from gppkg version input
Project: http://git-wip-us.apache.org/repos/asf/incubator-madlib/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-madlib/commit/f14bf2ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-madlib/tree/f14bf2ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-madlib/diff/f14bf2ea
Branch: refs/heads/patch/v1.9.1_madpack
Commit: f14bf2eaccb41a3c0fc0cde6a239b4da82e4db98
Parents: 07d2c39
Author: Rahul Iyer <ri...@apache.org>
Authored: Tue Oct 25 12:08:59 2016 -0700
Committer: Rahul Iyer <ri...@apache.org>
Committed: Tue Oct 25 12:08:59 2016 -0700
----------------------------------------------------------------------
CMakeLists.txt | 1 +
deploy/gppkg/gppkg_spec.yml.in | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/f14bf2ea/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 355c2dd..1fbe583 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,6 +117,7 @@ endif()
# Read and parse Version.yml file
file(READ "${MADLIB_VERSION_YML}" _MADLIB_VERSION_CONTENTS)
string(REGEX REPLACE "^.*version:[ \t]*([^\n]*)\n.*" "\\1" MADLIB_VERSION_STRING "${_MADLIB_VERSION_CONTENTS}")
+string(REPLACE "-" "_" MADLIB_VERSION_STRING_NO_UNDERSCORE "${MADLIB_VERSION_STRING}")
string(REGEX REPLACE "([0-9]+).*" "\\1" MADLIB_VERSION_MAJOR "${MADLIB_VERSION_STRING}")
string(REGEX REPLACE "[0-9]+\\.([0-9]+).*" "\\1" MADLIB_VERSION_MINOR "${MADLIB_VERSION_STRING}")
if("${MADLIB_VERSION_STRING}" MATCHES "[0-9]+\\.[0-9]+\\.([0-9]+).*")
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/f14bf2ea/deploy/gppkg/gppkg_spec.yml.in
----------------------------------------------------------------------
diff --git a/deploy/gppkg/gppkg_spec.yml.in b/deploy/gppkg/gppkg_spec.yml.in
index 17dfb5b..f89e143 100644
--- a/deploy/gppkg/gppkg_spec.yml.in
+++ b/deploy/gppkg/gppkg_spec.yml.in
@@ -1,6 +1,6 @@
Pkgname: madlib
Architecture: @CPACK_RPM_PACKAGE_ARCHITECTURE@
-Version: ossv@MADLIB_VERSION_STRING@_pv@MADLIB_GPPKG_VERSION@_@GPDB_VARIANT_SHORT@@GPDB_VERSION_LC@
+Version: ossv@MADLIB_VERSION_STRING_NO_UNDERSCORE@_pv@MADLIB_GPPKG_VERSION@_@GPDB_VARIANT_SHORT@@GPDB_VERSION_LC@
OS: rhel5
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.