initial work at reorganizing source tree

.gitignore

@@ -14,10 +14,10 @@ ImPlatform.h
 Imaging.h
 
 # various forms of compiled c_overviewer extensions
-c_overviewer.so
-c_overviewer.pyd
-c_overviewer_d.pyd
-c_overviewer.dylib
+overviewer/c_overviewer.so
+overviewer/c_overviewer.pyd
+overviewer/c_overviewer_d.pyd
+overviewer/c_overviewer.dylib
 
 # Mac OS X noise
 .DS_Store

overviewer.py

@@ -22,29 +22,26 @@ if not (sys.version_info[0] == 2 and sys.version_info[1] >= 6):
 
 import os
 import os.path
-from configParser import ConfigOptionParser
 import re
 import subprocess
 import multiprocessing
 import time
 import logging
-import util
 
 logging.basicConfig(level=logging.INFO,format="%(asctime)s [%(levelname)s] %(message)s")
 
 # make sure the c_overviewer extension is available
 try:
-    import c_overviewer
+    import overviewer.c_overviewer as c_overviewer
 except ImportError:
     print "You need to compile the c_overviewer module to run Minecraft Overviewer."
     print "Run `python setup.py build`, or see the README for details."
     sys.exit(1)
 
-import optimizeimages
-import world
-import quadtree
-import googlemap
-import rendernode
+from overviewer.configParser import ConfigOptionParser
+from overviewer import optimizeimages, world, quadtree
+from overviewer import googlemap, rendernode, util
+
 
 helptext = """
 %prog [OPTIONS] <World # / Name / Path to World> <tiles dest dir>

overviewer/src/iterate.c

@@ -31,7 +31,7 @@ int init_chunk_render(void) {
      * */
     if (blockmap) return 1;
 
-    textures = PyImport_ImportModule("textures");
+    textures = PyImport_ImportModule("overviewer.textures");
     /* ensure none of these pointers are NULL */    
     if ((!textures)) {
         fprintf(stderr, "\ninit_chunk_render failed to load; textures\n");
@@ -39,7 +39,7 @@ int init_chunk_render(void) {
         return 1;
     }
 
-    chunk_mod = PyImport_ImportModule("chunk");
+    chunk_mod = PyImport_ImportModule("overviewer.chunk");
     /* ensure none of these pointers are NULL */    
     if ((!chunk_mod)) {
         fprintf(stderr, "\ninit_chunk_render failed to load; chunk\n");

overviewer/util.py

@@ -27,7 +27,8 @@ def get_program_path():
         return os.path.dirname(sys.executable)
     else:
         try:
-            return os.path.dirname(__file__)
+            # normally, we're in ./overviewer/util.py
+            return os.path.dirname(os.path.dirname(__file__))
         except NameError:
             return os.path.dirname(sys.argv[0])
 

setup.py

@@ -27,9 +27,6 @@ setup_kwargs['cmdclass'] = {}
 
 if py2exe is not None:
     setup_kwargs['console'] = ['overviewer.py']
-    setup_kwargs['data_files'] = [('textures', ['textures/lava.png', 'textures/water.png', 'textures/fire.png']),
-                                  ('', ['config.js', 'COPYING.txt', 'README.rst']),
-                                  ('web_assets', glob.glob('web_assets/*'))]
     setup_kwargs['zipfile'] = None
     if platform.system() == 'Windows' and '64bit' in platform.architecture():
         b = 3
@@ -37,6 +34,17 @@ if py2exe is not None:
         b = 1
     setup_kwargs['options']['py2exe'] = {'bundle_files' : b, 'excludes': 'Tkinter'}
 
+#
+# script, package, and data
+#
+
+setup_kwargs['packages'] = ['overviewer']
+setup_kwargs['scripts'] = ['overviewer.py']
+setup_kwargs['data_files'] = [('textures', glob.glob('textures/*')),
+                              ('', ['config.js', 'COPYING.txt', 'README.rst']),
+                              ('web_assets', glob.glob('web_assets/*'))]
+
+
 #
 # c_overviewer extension
 #
@@ -50,10 +58,10 @@ except AttributeError:
     numpy_include = numpy.get_numpy_include()
 
 
-c_overviewer_files = ['src/main.c', 'src/composite.c', 'src/iterate.c', 'src/endian.c']
-c_overviewer_files += ['src/rendermodes.c', 'src/rendermode-normal.c', 'src/rendermode-lighting.c', 'src/rendermode-night.c', 'src/rendermode-spawn.c']
-c_overviewer_includes = ['src/overviewer.h', 'src/rendermodes.h']
-setup_kwargs['ext_modules'].append(Extension('c_overviewer', c_overviewer_files, include_dirs=['.', numpy_include], depends=c_overviewer_includes, extra_link_args=[]))
+c_overviewer_files = ['overviewer/src/main.c', 'overviewer/src/composite.c', 'overviewer/src/iterate.c', 'overviewer/src/endian.c']
+c_overviewer_files += ['overviewer/src/rendermodes.c', 'overviewer/src/rendermode-normal.c', 'overviewer/src/rendermode-lighting.c', 'overviewer/src/rendermode-night.c', 'overviewer/src/rendermode-spawn.c']
+c_overviewer_includes = ['overviewer/src/overviewer.h', 'overviewer/src/rendermodes.h']
+setup_kwargs['ext_modules'].append(Extension('overviewer.c_overviewer', c_overviewer_files, include_dirs=['.', numpy_include], depends=c_overviewer_includes, extra_link_args=[]))
 # tell build_ext to build the extension in-place
 # (NOT in build/)
 setup_kwargs['options']['build_ext'] = {'inplace' : 1}
@@ -69,7 +77,7 @@ class CustomClean(clean):
         # try to remove '_composite.{so,pyd,...}' extension,
         # regardless of the current system's extension name convention
         build_ext = self.get_finalized_command('build_ext')
-        pretty_fname = build_ext.get_ext_filename('c_overviewer')
+        pretty_fname = build_ext.get_ext_filename('overviewer.c_overviewer')
         fname = pretty_fname
         if os.path.exists(fname):
             try: