From 70ca0d8d6a86751d541678add3b66d45a6b36bf9 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 8 May 2017 19:14:39 +0200 Subject: [PATCH 1/3] ARROW-813: [Python] setup.py sdist must also bundle dependent cmake modules --- python/CMakeLists.txt | 5 ----- python/cmake_modules/BuildUtils.cmake | 1 + python/cmake_modules/CompilerInfo.cmake | 1 + python/cmake_modules/FindNumPy.cmake | 1 + python/cmake_modules/FindPythonLibsNew.cmake | 1 + python/cmake_modules/SetupCxxFlags.cmake | 1 + 6 files changed, 5 insertions(+), 5 deletions(-) create mode 120000 python/cmake_modules/BuildUtils.cmake create mode 120000 python/cmake_modules/CompilerInfo.cmake create mode 120000 python/cmake_modules/FindNumPy.cmake create mode 120000 python/cmake_modules/FindPythonLibsNew.cmake create mode 120000 python/cmake_modules/SetupCxxFlags.cmake diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 0d34bcdfa6e..a9db4d877fb 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -23,9 +23,6 @@ project(pyarrow) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules") -# Use common cmake modules from Arrow C++ if available -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../cpp/cmake_modules") - include(CMakeParseArguments) # Compatibility with CMake 3.1 @@ -34,8 +31,6 @@ if(POLICY CMP0054) cmake_policy(SET CMP0054 NEW) endif() -set(BUILD_SUPPORT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../cpp/build-support") - # Allow "make install" to not depend on all targets. # # Must be declared in the top-level CMakeLists.txt. diff --git a/python/cmake_modules/BuildUtils.cmake b/python/cmake_modules/BuildUtils.cmake new file mode 120000 index 00000000000..e3c98c8fc53 --- /dev/null +++ b/python/cmake_modules/BuildUtils.cmake @@ -0,0 +1 @@ +../../cpp/cmake_modules/BuildUtils.cmake \ No newline at end of file diff --git a/python/cmake_modules/CompilerInfo.cmake b/python/cmake_modules/CompilerInfo.cmake new file mode 120000 index 00000000000..559ac3240c3 --- /dev/null +++ b/python/cmake_modules/CompilerInfo.cmake @@ -0,0 +1 @@ +../../cpp/cmake_modules/CompilerInfo.cmake \ No newline at end of file diff --git a/python/cmake_modules/FindNumPy.cmake b/python/cmake_modules/FindNumPy.cmake new file mode 120000 index 00000000000..767b320ec7e --- /dev/null +++ b/python/cmake_modules/FindNumPy.cmake @@ -0,0 +1 @@ +../../cpp/cmake_modules/FindNumPy.cmake \ No newline at end of file diff --git a/python/cmake_modules/FindPythonLibsNew.cmake b/python/cmake_modules/FindPythonLibsNew.cmake new file mode 120000 index 00000000000..7087123cb23 --- /dev/null +++ b/python/cmake_modules/FindPythonLibsNew.cmake @@ -0,0 +1 @@ +../../cpp/cmake_modules/FindPythonLibsNew.cmake \ No newline at end of file diff --git a/python/cmake_modules/SetupCxxFlags.cmake b/python/cmake_modules/SetupCxxFlags.cmake new file mode 120000 index 00000000000..3121a89926d --- /dev/null +++ b/python/cmake_modules/SetupCxxFlags.cmake @@ -0,0 +1 @@ +../../cpp/cmake_modules/SetupCxxFlags.cmake \ No newline at end of file From 5b3b4a4ab7737c2979ae4298941d847c9cdf9343 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 9 May 2017 21:04:10 +0200 Subject: [PATCH 2/3] Symlink fixes --- appveyor.yml | 2 ++ dev/release/run-rat.sh | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index f2954a92e9e..297c15728a7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,6 +28,8 @@ environment: BOOST_LIBRARYDIR: C:\Libraries\boost_1_63_0\lib64-msvc-14.0 init: + - git config core.symlinks true + - git reset --hard - set MINICONDA=C:\Miniconda35-x64 - set PATH=%MINICONDA%;%MINICONDA%/Scripts;%MINICONDA%/Library/bin;%PATH% diff --git a/dev/release/run-rat.sh b/dev/release/run-rat.sh index 3ff9ef083e5..f225c66268a 100755 --- a/dev/release/run-rat.sh +++ b/dev/release/run-rat.sh @@ -34,7 +34,11 @@ $RAT $1 \ -e status.h \ -e asan_symbolize.py \ -e cpplint.py \ + -e BuildUtils.cmake \ -e FindPythonLibsNew.cmake \ + -e FindNumPy.cmake \ + -e SetupCxxFlags.cmake \ + -e CompilerInfo.cmake \ -e pax_global_header \ -e MANIFEST.in \ -e __init__.pxd \ From 47459ba37bc284b090502eb59bf68caa4fbcd493 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 10 May 2017 08:28:44 +0200 Subject: [PATCH 3/3] Call git later --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 297c15728a7..802d43bad4e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,10 +28,10 @@ environment: BOOST_LIBRARYDIR: C:\Libraries\boost_1_63_0\lib64-msvc-14.0 init: - - git config core.symlinks true - - git reset --hard - set MINICONDA=C:\Miniconda35-x64 - set PATH=%MINICONDA%;%MINICONDA%/Scripts;%MINICONDA%/Library/bin;%PATH% build_script: - - call ci\msvc-build.bat + - git config core.symlinks true + - git reset --hard + - call ci\msvc-build.bat