You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@madlib.apache.org by nk...@apache.org on 2018/10/09 21:32:28 UTC
madlib git commit: Build: Include preflight and postflight scripts
for mac
Repository: madlib
Updated Branches:
refs/heads/master 754725962 -> 2e47b2f3d
Build: Include preflight and postflight scripts for mac
Commit 441f16bd55d2a26e4dd59df6129c6092f099cbca introduced a bug where
the preflight and postflight scripts for mac were not getting included
in the .dmg file. This commit adds an if check for the APPLE platform to
include these scripts necessary for dmg installation.
Closes #331
Project: http://git-wip-us.apache.org/repos/asf/madlib/repo
Commit: http://git-wip-us.apache.org/repos/asf/madlib/commit/2e47b2f3
Tree: http://git-wip-us.apache.org/repos/asf/madlib/tree/2e47b2f3
Diff: http://git-wip-us.apache.org/repos/asf/madlib/diff/2e47b2f3
Branch: refs/heads/master
Commit: 2e47b2f3d428140d94a8d9ddd4a89c885ad51a9c
Parents: 7547259
Author: Nikhil Kak <nk...@pivotal.io>
Authored: Tue Oct 9 12:07:06 2018 -0700
Committer: Nikhil Kak <nk...@pivotal.io>
Committed: Tue Oct 9 14:31:59 2018 -0700
----------------------------------------------------------------------
deploy/CMakeLists.txt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/madlib/blob/2e47b2f3/deploy/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt
index d25839a..e727e92 100644
--- a/deploy/CMakeLists.txt
+++ b/deploy/CMakeLists.txt
@@ -86,12 +86,14 @@ add_subdirectory(gppkg)
# -- Finally do the packaging! -------------------------------------------------
-if(IS_REDHAT)
- set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm_post.sh")
- set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm_post_uninstall.sh")
+if(APPLE)
set(CPACK_PREFLIGHT_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/preflight.sh)
set(CPACK_POSTFLIGHT_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/postflight.sh)
set(CPACK_MONOLITHIC_INSTALL 1)
+elseif(IS_REDHAT)
+ set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm_post.sh")
+ set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm_post_uninstall.sh")
+ set(CPACK_MONOLITHIC_INSTALL 1)
elseif(IS_DEBIAN)
if(NOT CREATE_RPM_FOR_UBUNTU)
set(CPACK_PACKAGE_FILE_NAME