bury plang stuff into filters.python

PDAL · Jun 13, 2017 · 62627f8 · 62627f8
1 parent 4701108
commit 62627f8
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -144,8 +144,9 @@ test/data/sbet/pipeline.xml
 
 python/*.egg*
 python/build/*
-python/pdal/libpdalpython.so
-python/pdal/libpdalpython.cpp
+python/dist/*
+python/pdal/libpdalpython*
+python/pdal/libpdalpython*
 test/data/*.json
 test/data/pipeline/*.json
 test/data/filters/*.json

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -179,10 +179,6 @@ if (NOT PDAL_HAVE_JSONCPP)
 endif()
 add_subdirectory(pdal/util)
 add_subdirectory(tools)
-if (BUILD_PLUGIN_PYTHON)
-    set(PYTHON_VERSION_STRING "something" CACHE STRING "Python version" FORCE)
-    add_subdirectory(pdal/plang)
-endif()
 if (BUILD_PLUGIN_MATLAB)
     add_subdirectory(pdal/mlang)
 endif()

diff --git a/plugins/python/filters/CMakeLists.txt b/plugins/python/filters/CMakeLists.txt
@@ -1,5 +1,10 @@
 PDAL_ADD_PLUGIN(python_libname filter python
     FILES
+        ../plang/Array.cpp
+        ../plang/Invocation.cpp
+        ../plang/Environment.cpp
+        ../plang/Redirector.cpp
+        ../plang/Script.cpp
         PythonFilter.cpp
     LINK_WITH ${PDAL_PLANG_LIB_NAME})
 target_include_directories(${python_libname} PRIVATE

diff --git a/plugins/python/filters/PythonFilter.hpp b/plugins/python/filters/PythonFilter.hpp
@@ -37,7 +37,7 @@
 #include <pdal/pdal_internal.hpp>
 #include <pdal/Filter.hpp>
 
-#include <pdal/plang/Invocation.hpp>
+#include "../plang/Invocation.hpp"
 
 #include <json/json.h>
 

diff --git a/pdal/plang/Array.cpp → plugins/python/plang/Array.cpp b/pdal/plang/Array.cpp → plugins/python/plang/Array.cpp
@@ -33,8 +33,8 @@
 * OF SUCH DAMAGE.
 ****************************************************************************/
 
-#include <pdal/plang/Array.hpp>
-#include <pdal/plang/Environment.hpp>
+#include "Array.hpp"
+#include "Environment.hpp"
 
 #include <algorithm>
 

diff --git a/pdal/plang/Array.hpp → plugins/python/plang/Array.hpp b/pdal/plang/Array.hpp → plugins/python/plang/Array.hpp
diff --git a/pdal/plang/CMakeLists.txt → plugins/python/plang/CMakeLists.txt b/pdal/plang/CMakeLists.txt → plugins/python/plang/CMakeLists.txt
diff --git a/pdal/plang/Environment.cpp → plugins/python/plang/Environment.cpp b/pdal/plang/Environment.cpp → plugins/python/plang/Environment.cpp
@@ -36,8 +36,8 @@
 #include <dlfcn.h>
 #endif
 
-#include <pdal/plang/Environment.hpp>
-#include <pdal/plang/Redirector.hpp>
+#include "Environment.hpp"
+#include "Redirector.hpp"
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #define PY_ARRAY_UNIQUE_SYMBOL PDAL_ARRAY_API
 #include <numpy/arrayobject.h>

diff --git a/pdal/plang/Environment.hpp → plugins/python/plang/Environment.hpp b/pdal/plang/Environment.hpp → plugins/python/plang/Environment.hpp
diff --git a/pdal/plang/Invocation.cpp → plugins/python/plang/Invocation.cpp b/pdal/plang/Invocation.cpp → plugins/python/plang/Invocation.cpp
@@ -32,8 +32,8 @@
 * OF SUCH DAMAGE.
 ****************************************************************************/
 
-#include <pdal/plang/Invocation.hpp>
-#include <pdal/plang/Environment.hpp>
+#include "Invocation.hpp"
+#include "Environment.hpp"
 
 #ifdef PDAL_COMPILER_MSVC
 #  pragma warning(disable: 4127) // conditional expression is constant

diff --git a/pdal/plang/Invocation.hpp → plugins/python/plang/Invocation.hpp b/pdal/plang/Invocation.hpp → plugins/python/plang/Invocation.hpp
diff --git a/pdal/plang/Redirector.cpp → plugins/python/plang/Redirector.cpp b/pdal/plang/Redirector.cpp → plugins/python/plang/Redirector.cpp
@@ -6,7 +6,7 @@
 //
 // Blog article: http://mateusz.loskot.net/?p=2819
 
-#include <pdal/plang/Redirector.hpp>
+#include "Redirector.hpp"
 
 #ifdef PDAL_COMPILER_MSVC
 #  pragma warning(disable: 4127)  // conditional expression is constant

diff --git a/pdal/plang/Redirector.hpp → plugins/python/plang/Redirector.hpp b/pdal/plang/Redirector.hpp → plugins/python/plang/Redirector.hpp
diff --git a/pdal/plang/Script.cpp → plugins/python/plang/Script.cpp b/pdal/plang/Script.cpp → plugins/python/plang/Script.cpp
@@ -32,7 +32,7 @@
 * OF SUCH DAMAGE.
 ****************************************************************************/
 
-#include <pdal/plang/Script.hpp>
+#include "../plang/Script.hpp"
 
 #ifdef PDAL_COMPILER_MSVC
 #  pragma warning(disable: 4127) // conditional expression is constant

diff --git a/pdal/plang/Script.hpp → plugins/python/plang/Script.hpp b/pdal/plang/Script.hpp → plugins/python/plang/Script.hpp
diff --git a/plugins/python/test/PythonFilterTest.cpp b/plugins/python/test/PythonFilterTest.cpp
@@ -39,8 +39,9 @@
 #include <io/FauxReader.hpp>
 #include <filters/StatsFilter.hpp>
 
-#include <pdal/plang/Invocation.hpp>
-#include <pdal/plang/Array.hpp>
+#include "../plang/Invocation.hpp"
+#include "../plang/Array.hpp"
+#include "../plang/Environment.hpp"
 
 #include <pdal/StageWrapper.hpp>
 
@@ -49,7 +50,6 @@
 using namespace pdal;
 using namespace pdal::plang;
 
-#include <pdal/plang/Environment.hpp>
 
 class PythonFilterTest : public ::testing::Test
 {