From 021480ca9a0882a084be8f62335de0f9e1e965e5 Mon Sep 17 00:00:00 2001
From: RusAnon <rusanon@dollchan.ru>
Date: Mon, 3 May 2010 14:06:46 +1100
Subject: [PATCH] Made proper egg package

---
 .gitignore                                    |  3 ++-
 dfhack/python/__init__.py                     |  0
 dfhack/python/{ => pydfhack}/blocks.py        |  0
 dfhack/python/{ => pydfhack}/pydfapi.py       |  0
 dfhack/python/{ => pydfhack}/pydfhackflags.py |  0
 dfhack/python/{ => pydfhack}/pydftypes.py     |  0
 dfhack/python/setup.py                        | 19 +++++++++++++++++--
 7 files changed, 19 insertions(+), 3 deletions(-)
 delete mode 100644 dfhack/python/__init__.py
 rename dfhack/python/{ => pydfhack}/blocks.py (100%)
 rename dfhack/python/{ => pydfhack}/pydfapi.py (100%)
 rename dfhack/python/{ => pydfhack}/pydfhackflags.py (100%)
 rename dfhack/python/{ => pydfhack}/pydftypes.py (100%)

diff --git a/.gitignore b/.gitignore
index e32a8290c..0facefd9a 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 e69de29bb..000000000
diff --git a/dfhack/python/blocks.py b/dfhack/python/pydfhack/blocks.py
similarity index 100%
rename from dfhack/python/blocks.py
rename to dfhack/python/pydfhack/blocks.py
diff --git a/dfhack/python/pydfapi.py b/dfhack/python/pydfhack/pydfapi.py
similarity index 100%
rename from dfhack/python/pydfapi.py
rename to dfhack/python/pydfhack/pydfapi.py
diff --git a/dfhack/python/pydfhackflags.py b/dfhack/python/pydfhack/pydfhackflags.py
similarity index 100%
rename from dfhack/python/pydfhackflags.py
rename to dfhack/python/pydfhack/pydfhackflags.py
diff --git a/dfhack/python/pydftypes.py b/dfhack/python/pydfhack/pydftypes.py
similarity index 100%
rename from dfhack/python/pydftypes.py
rename to dfhack/python/pydfhack/pydftypes.py
diff --git a/dfhack/python/setup.py b/dfhack/python/setup.py
index 5c60e8379..6421ff17d 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],
+    )