From cdc2dc40b26320d17a916241c4ca66546d3a8d9e Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 19 Jul 2007 20:07:54 -0500
Subject: [PATCH] Move to clearer src/{python,cpp} structure.

---
 setup.py                             | 7 ++++---
 src/{ => cpp}/foreign_array.hpp      | 0
 src/{ => cpp}/foreign_array_wrap.hpp | 0
 src/{ => cpp}/predicates.cpp         | 0
 src/{ => cpp}/tetgen.cpp             | 0
 src/{ => cpp}/tetgen.h               | 0
 src/{ => cpp}/triangle.c             | 0
 src/{ => cpp}/triangle.h             | 0
 src/{ => cpp}/wrap_tetgen.cpp        | 0
 src/{ => cpp}/wrap_triangle.cpp      | 0
 {meshpy => src/python}/__init__.py   | 0
 {meshpy => src/python}/common.py     | 0
 {meshpy => src/python}/tet.py        | 0
 {meshpy => src/python}/triangle.py   | 0
 14 files changed, 4 insertions(+), 3 deletions(-)
 rename src/{ => cpp}/foreign_array.hpp (100%)
 rename src/{ => cpp}/foreign_array_wrap.hpp (100%)
 rename src/{ => cpp}/predicates.cpp (100%)
 rename src/{ => cpp}/tetgen.cpp (100%)
 rename src/{ => cpp}/tetgen.h (100%)
 rename src/{ => cpp}/triangle.c (100%)
 rename src/{ => cpp}/triangle.h (100%)
 rename src/{ => cpp}/wrap_tetgen.cpp (100%)
 rename src/{ => cpp}/wrap_triangle.cpp (100%)
 rename {meshpy => src/python}/__init__.py (100%)
 rename {meshpy => src/python}/common.py (100%)
 rename {meshpy => src/python}/tet.py (100%)
 rename {meshpy => src/python}/triangle.py (100%)

diff --git a/setup.py b/setup.py
index debfc38..ff0324f 100644
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ INCLUDE_DIRS = BOOST_INCLUDE_DIRS
 LIBRARY_DIRS = BOOST_LIBRARY_DIRS
 LIBRARIES = BPL_LIBRARIES
 
-execfile("meshpy/__init__.py")
+execfile("src/python/__init__.py")
 setup(name="MeshPy",
       version=version,
       description="A wrapper around the TetGen and Triangle",
@@ -47,10 +47,11 @@ setup(name="MeshPy",
       license = "BSD for the wrapper/non-commercial MIT for the meshers",
       url="http://news.tiker.net/software/meshpy",
       packages = [ "meshpy" ],
+      package_dir={"meshpy": "src/python"},
       ext_modules = [
         Extension(
           "meshpy._triangle", 
-          ["src/wrap_triangle.cpp","src/triangle.c"],
+          ["src/cpp/wrap_triangle.cpp","src/cpp/triangle.c"],
           include_dirs=INCLUDE_DIRS,
           library_dirs=LIBRARY_DIRS,
           libraries=LIBRARIES,
@@ -58,7 +59,7 @@ setup(name="MeshPy",
           ),
         Extension(
           "meshpy._tetgen", 
-          ["src/tetgen.cpp", "src/predicates.cpp", "src/wrap_tetgen.cpp"],
+          ["src/cpp/tetgen.cpp", "src/cpp/predicates.cpp", "src/cpp/wrap_tetgen.cpp"],
           include_dirs=INCLUDE_DIRS,
           library_dirs=LIBRARY_DIRS,
           libraries=LIBRARIES,
diff --git a/src/foreign_array.hpp b/src/cpp/foreign_array.hpp
similarity index 100%
rename from src/foreign_array.hpp
rename to src/cpp/foreign_array.hpp
diff --git a/src/foreign_array_wrap.hpp b/src/cpp/foreign_array_wrap.hpp
similarity index 100%
rename from src/foreign_array_wrap.hpp
rename to src/cpp/foreign_array_wrap.hpp
diff --git a/src/predicates.cpp b/src/cpp/predicates.cpp
similarity index 100%
rename from src/predicates.cpp
rename to src/cpp/predicates.cpp
diff --git a/src/tetgen.cpp b/src/cpp/tetgen.cpp
similarity index 100%
rename from src/tetgen.cpp
rename to src/cpp/tetgen.cpp
diff --git a/src/tetgen.h b/src/cpp/tetgen.h
similarity index 100%
rename from src/tetgen.h
rename to src/cpp/tetgen.h
diff --git a/src/triangle.c b/src/cpp/triangle.c
similarity index 100%
rename from src/triangle.c
rename to src/cpp/triangle.c
diff --git a/src/triangle.h b/src/cpp/triangle.h
similarity index 100%
rename from src/triangle.h
rename to src/cpp/triangle.h
diff --git a/src/wrap_tetgen.cpp b/src/cpp/wrap_tetgen.cpp
similarity index 100%
rename from src/wrap_tetgen.cpp
rename to src/cpp/wrap_tetgen.cpp
diff --git a/src/wrap_triangle.cpp b/src/cpp/wrap_triangle.cpp
similarity index 100%
rename from src/wrap_triangle.cpp
rename to src/cpp/wrap_triangle.cpp
diff --git a/meshpy/__init__.py b/src/python/__init__.py
similarity index 100%
rename from meshpy/__init__.py
rename to src/python/__init__.py
diff --git a/meshpy/common.py b/src/python/common.py
similarity index 100%
rename from meshpy/common.py
rename to src/python/common.py
diff --git a/meshpy/tet.py b/src/python/tet.py
similarity index 100%
rename from meshpy/tet.py
rename to src/python/tet.py
diff --git a/meshpy/triangle.py b/src/python/triangle.py
similarity index 100%
rename from meshpy/triangle.py
rename to src/python/triangle.py
-- 
GitLab