Build: Update multiple files for correct verbage JIRA: MADLIB-1098
Project: http://git-wip-us.apache.org/repos/asf/incubator-madlib/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-madlib/commit/6c2f8e39 Tree: http://git-wip-us.apache.org/repos/asf/incubator-madlib/tree/6c2f8e39 Diff: http://git-wip-us.apache.org/repos/asf/incubator-madlib/diff/6c2f8e39 Branch: refs/heads/latest_release Commit: 6c2f8e39fc4f48783eac34ddc2ee9ffe0b56f971 Parents: ef4101e Author: Rahul Iyer <ri...@apache.org> Authored: Thu May 4 14:37:33 2017 -0700 Committer: Rahul Iyer <ri...@apache.org> Committed: Thu May 4 14:37:33 2017 -0700 ---------------------------------------------------------------------- HAWQ_Install.txt | 32 ++++++++++++++++---------------- deploy/PackageMaker/CMakeLists.txt | 2 +- deploy/PackageMaker/Welcome.html | 12 +++++++----- deploy/gppkg/madlib.spec.in | 4 ++-- 4 files changed, 26 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/6c2f8e39/HAWQ_Install.txt ---------------------------------------------------------------------- diff --git a/HAWQ_Install.txt b/HAWQ_Install.txt index 8cef22e..52fd6b1 100644 --- a/HAWQ_Install.txt +++ b/HAWQ_Install.txt @@ -1,11 +1,11 @@ -Installing MADlib on Pivotal HAWQ -================================= +Installing Apache MADlib (incubating) on Apache HAWQ (incubating) +================================================================= -MADlib is a library of statistics and machine learning functions that can be -installed in HAWQ. MADlib is installed separately from the main HAWQ -installation. For a description of the general MADlib installation process, -refer to the MADlib installation guide for PostgreSQL and GPDB: -https://cwiki.apache.org/confluence/display/MADLIB/Installation+Guide +Apache MADlib (incubating) is a library of statistics and machine learning +functions that can be installed in Apache HAWQ. MADlib is installed separately +from the main HAWQ installation. For a description of the general MADlib +installation process, refer to the MADlib installation guide for PostgreSQL and +GPDB: https://cwiki.apache.org/confluence/display/MADLIB/Installation+Guide An installation script, hawq_install.sh, installs the MADlib RPM distribution on the HAWQ master and segment nodes. It installs the MADlib files but does not @@ -17,16 +17,16 @@ After adding new segment nodes to HAWQ, MADlib must be installed on the new segment nodes. This should be done after the HAWQ binaries are properly installed and preferably before running gpexpand. -Upgrading HAWQ from 1.1 to 1.2 ------------------------------- +Apache MADlib is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. -In HAWQ 1.1 a portion of MADlib v0.5 came preinstalled. These functions in their -original form are incompatible with HAWQ 1.2 and will be removed as part of the -HAWQ 1.2 upgrade. Dependencies on MADlib 0.5 should be removed from the -installation before performing the HAWQ 1.2 upgrade. When the HAWQ upgrade is -complete, install MADlib 1.5 or higher and then reinstall the MADlib database -objects using the madpack utility. +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. +While incubation status is not necessarily a reflection of the completeness or +stability of the code, it does indicate that the project has yet to be fully +endorsed by the ASF. Requirements ------------ @@ -76,5 +76,5 @@ Optional Settings Example ------- - hawq_install.sh -r /home/gpadmin/madlib/madlib-1.5-Linux.rpm -f /usr/local/greenplum-db/hostfile + hawq_install.sh -r /home/gpadmin/madlib/madlib-1.11-Linux.rpm -f /usr/local/greenplum-db/hostfile http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/6c2f8e39/deploy/PackageMaker/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/deploy/PackageMaker/CMakeLists.txt b/deploy/PackageMaker/CMakeLists.txt index 81a6dcc..89617b9 100644 --- a/deploy/PackageMaker/CMakeLists.txt +++ b/deploy/PackageMaker/CMakeLists.txt @@ -11,7 +11,7 @@ set(CPACK_RESOURCE_FILE_README "${CPACK_PACKAGE_DESCRIPTION_FILE}" PARENT_SCOPE) set(CPACK_RESOURCE_FILE_LICENSE - "${CMAKE_SOURCE_DIR}/licenses/MADlib.txt" PARENT_SCOPE) + "${CMAKE_SOURCE_DIR}/LICENSE" PARENT_SCOPE) set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/Welcome.html" PARENT_SCOPE) set(CPACK_OSX_PACKAGE_VERSION "10.5" PARENT_SCOPE) http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/6c2f8e39/deploy/PackageMaker/Welcome.html ---------------------------------------------------------------------- diff --git a/deploy/PackageMaker/Welcome.html b/deploy/PackageMaker/Welcome.html index 725cec4..d18338a 100644 --- a/deploy/PackageMaker/Welcome.html +++ b/deploy/PackageMaker/Welcome.html @@ -3,13 +3,15 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<title>Welcome to MADlib</title> +<title>Welcome to Apache MADlib (incubating)</title> <body> -<h2>Welcome to Apache MADlib (incubating)!</h2> -<p>This installer will guide you through the process of installing MADlib onto -your computer.</p> +<h2>Welcome to Apache MADlib (incubating)</h2> <p> -Apache MADlib is an effort undergoing incubation at the Apache Software + This installer will guide you through the process of installing MADlib onto +your computer. +</p> +<p> + Apache MADlib is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/6c2f8e39/deploy/gppkg/madlib.spec.in ---------------------------------------------------------------------- diff --git a/deploy/gppkg/madlib.spec.in b/deploy/gppkg/madlib.spec.in index 123eb1c..414bf5c 100644 --- a/deploy/gppkg/madlib.spec.in +++ b/deploy/gppkg/madlib.spec.in @@ -5,9 +5,9 @@ %define _madlib_version @MADLIB_VERSION_STRING@ BuildRoot: @MADLIB_GPPKG_RPM_SOURCE_DIR@ -Summary: MADlib for @GPDB_VARIANT@ Database +Summary: Apache MADlib (incubating) for @GPDB_VARIANT@ Database License: @CPACK_RPM_PACKAGE_LICENSE@ -Name: madlib +Name: Apache MADlib (incubating) Version: @MADLIB_VERSION_STRING_NO_HYPHEN@ Release: @MADLIB_GPPKG_RELEASE_NUMBER@ Group: @CPACK_RPM_PACKAGE_GROUP@
