summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--dfhack/python/__init__.py0
-rw-r--r--dfhack/python/pydfhack/blocks.py (renamed from dfhack/python/blocks.py)0
-rw-r--r--dfhack/python/pydfhack/pydfapi.py (renamed from dfhack/python/pydfapi.py)0
-rw-r--r--dfhack/python/pydfhack/pydfhackflags.py (renamed from dfhack/python/pydfhackflags.py)0
-rw-r--r--dfhack/python/pydfhack/pydftypes.py (renamed from dfhack/python/pydftypes.py)0
-rw-r--r--dfhack/python/setup.py19
7 files changed, 19 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index e32a8290..0facefd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,5 @@ examples/fake-curses.h
# Python binding binaries
*.pyc
-dfhack/python/pydfhack.so
+dfhack/python/pydfhack/_pydfhack.so
+dfhack/python/PyDFHack.egg-info
diff --git a/dfhack/python/__init__.py b/dfhack/python/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/dfhack/python/__init__.py
+++ /dev/null
diff --git a/dfhack/python/blocks.py b/dfhack/python/pydfhack/blocks.py
index 91b2277b..91b2277b 100644
--- a/dfhack/python/blocks.py
+++ b/dfhack/python/pydfhack/blocks.py
diff --git a/dfhack/python/pydfapi.py b/dfhack/python/pydfhack/pydfapi.py
index 0cb4c5be..0cb4c5be 100644
--- a/dfhack/python/pydfapi.py
+++ b/dfhack/python/pydfhack/pydfapi.py
diff --git a/dfhack/python/pydfhackflags.py b/dfhack/python/pydfhack/pydfhackflags.py
index f8c15bef..f8c15bef 100644
--- a/dfhack/python/pydfhackflags.py
+++ b/dfhack/python/pydfhack/pydfhackflags.py
diff --git a/dfhack/python/pydftypes.py b/dfhack/python/pydfhack/pydftypes.py
index 972729bd..972729bd 100644
--- a/dfhack/python/pydftypes.py
+++ b/dfhack/python/pydfhack/pydftypes.py
diff --git a/dfhack/python/setup.py b/dfhack/python/setup.py
index 5c60e837..6421ff17 100644
--- a/dfhack/python/setup.py
+++ b/dfhack/python/setup.py
@@ -1,5 +1,11 @@
# -*- coding: utf-8 -*-
-from distutils.core import setup, Extension
+try:
+ from setuptools import setup, find_packages
+except ImportError:
+ from ez_setup import use_setuptools
+ use_setuptools()
+ from setuptools import setup, find_packages
+from distutils.core import Extension
e = Extension("pydfhack",
sources=["DF_API.cpp", "DF_Buildings.cpp", "DF_Constructions.cpp", "DF_CreatureManager.cpp", "DF_GUI.cpp", "DF_Maps.cpp", "DF_Material.cpp", "DF_Position.cpp", "DF_Translate.cpp", "DF_Vegetation.cpp", "pydfhack.cpp"],
@@ -9,4 +15,13 @@ e = Extension("pydfhack",
libraries=["libdfhack"],
export_symbols=["initpydfhack", "ReadRaw", "WriteRaw"])
-setup(name="PyDFHack", version="1.0", ext_modules=[e])
+setup(
+ name="PyDFHack",
+ description="Python wrapper and bindings for DFHack library",
+ version="1.0",
+ packages=find_packages(exclude=['ez_setup']),
+ include_package_data=True,
+ test_suite='nose.collector',
+ zip_safe=False,
+ ext_modules=[e],
+ )