This is an automated email from the ASF dual-hosted git repository. okislal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/madlib.git
commit 67a32465b219076fa2b46db537967c114f65801b Author: Orhan Kislal <okis...@apache.org> AuthorDate: Thu Feb 24 18:45:22 2022 -0500 Revert "Build: Add OSX tarball for release" This reverts commit ccb0314347d512e9c8bf3e5c01ee91a14f9eaad5. The OSX tarball has permission and security related issues. Better to shelf this for a later release. --- CMakeLists.txt | 30 ++---------------------------- deploy/CMakeLists.txt | 12 ------------ deploy/Readme_OSX | 24 ------------------------ deploy/link_madlib_folders.sh | 19 ------------------- 4 files changed, 2 insertions(+), 83 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2990a55..1d9199e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -313,14 +313,8 @@ install( DESTINATION . COMPONENT core ) -if(APPLE) - install( - FILES - "${CMAKE_CURRENT_SOURCE_DIR}/deploy/Readme_OSX" - "${CMAKE_CURRENT_SOURCE_DIR}/deploy/link_madlib_folders.sh" - DESTINATION . - ) -endif() + + # -- Add subdirectories -------------------------------------------------------- add_subdirectory(src) @@ -389,23 +383,3 @@ install(CODE " ) ") -if(APPLE) - install(CODE " - EXECUTE_PROCESS(COMMAND mv - ${CMAKE_MADLIB_ROOT}/Current/Readme_OSX - ${CMAKE_MADLIB_ROOT}/Readme_OSX - ) - ") - install(CODE " - EXECUTE_PROCESS(COMMAND mv - ${CMAKE_MADLIB_ROOT}/Current/link_madlib_folders.sh - ${CMAKE_MADLIB_ROOT}/link_madlib_folders.sh - ) - ") - install(CODE " - EXECUTE_PROCESS(COMMAND chmod - a+x - ${CMAKE_MADLIB_ROOT}/link_madlib_folders.sh - ) - ") -endif() diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt index 6cb8c62..e727e92 100644 --- a/deploy/CMakeLists.txt +++ b/deploy/CMakeLists.txt @@ -129,15 +129,3 @@ foreach(PORT_COMPONENT ${PORT_COMPONENTS}) include("${PORT_COMPONENT}") endforeach(PORT_COMPONENT) -if(APPLE) - configure_file( - link_madlib_folders.sh - "${CMAKE_CURRENT_BINARY_DIR}/link_madlib_folders.sh" - USE_SOURCE_PERMISSIONS - ) - configure_file( - Readme_OSX - "${CMAKE_CURRENT_BINARY_DIR}/Readme_OSX" - @ONLY - ) -endif() diff --git a/deploy/Readme_OSX b/deploy/Readme_OSX deleted file mode 100644 index f430734..0000000 --- a/deploy/Readme_OSX +++ /dev/null @@ -1,24 +0,0 @@ -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to You under the Apache License, Version 2.0 -(the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -MADlib Package Usage for OSX - -This tarball is generated for using MADlib on OSX devices. -Please run the link_madlib_folders.sh file to create links necessary for usage. -Note that this file needs to be run from the directory that it's located in. If -it's run from somewhere else, it will not work and that it might have unintended -side effects like an unrelated file getting deleted. - -Please note that this package cannot be used in any other operation system. diff --git a/deploy/link_madlib_folders.sh b/deploy/link_madlib_folders.sh deleted file mode 100755 index ceb78df..0000000 --- a/deploy/link_madlib_folders.sh +++ /dev/null @@ -1,19 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -rm Current bin doc -ln -nsf Versions/$(ls -r Versions/ | head -1) ./Current -ln -nsf Current/bin ./bin -ln -nsf Current/doc ./doc