From 3fa54aff2685e14a118a8457d762ff3481556097 Mon Sep 17 00:00:00 2001 From: Aaron Griffith Date: Tue, 29 Mar 2011 11:10:24 -0400 Subject: [PATCH] initial work at reorganizing source tree --- .gitignore | 8 +++---- blockcounter.py => contrib/blockcounter.py | 0 overviewer.py | 13 ++++------ overviewer/__init__.py | 0 chunk.py => overviewer/chunk.py | 0 composite.py => overviewer/composite.py | 0 configParser.py => overviewer/configParser.py | 0 googlemap.py => overviewer/googlemap.py | 0 nbt.py => overviewer/nbt.py | 0 .../optimizeimages.py | 0 quadtree.py => overviewer/quadtree.py | 0 rendernode.py => overviewer/rendernode.py | 0 {src => overviewer/src}/composite.c | 0 {src => overviewer/src}/endian.c | 0 {src => overviewer/src}/iterate.c | 4 ++-- {src => overviewer/src}/main.c | 0 {src => overviewer/src}/overviewer.h | 0 {src => overviewer/src}/rendermode-lighting.c | 0 {src => overviewer/src}/rendermode-night.c | 0 {src => overviewer/src}/rendermode-normal.c | 0 {src => overviewer/src}/rendermode-spawn.c | 0 {src => overviewer/src}/rendermodes.c | 0 {src => overviewer/src}/rendermodes.h | 0 textures.py => overviewer/textures.py | 0 util.py => overviewer/util.py | 3 ++- world.py => overviewer/world.py | 0 setup.py | 24 ++++++++++++------- 27 files changed, 29 insertions(+), 23 deletions(-) rename blockcounter.py => contrib/blockcounter.py (100%) create mode 100644 overviewer/__init__.py rename chunk.py => overviewer/chunk.py (100%) rename composite.py => overviewer/composite.py (100%) rename configParser.py => overviewer/configParser.py (100%) rename googlemap.py => overviewer/googlemap.py (100%) rename nbt.py => overviewer/nbt.py (100%) rename optimizeimages.py => overviewer/optimizeimages.py (100%) rename quadtree.py => overviewer/quadtree.py (100%) rename rendernode.py => overviewer/rendernode.py (100%) rename {src => overviewer/src}/composite.c (100%) rename {src => overviewer/src}/endian.c (100%) rename {src => overviewer/src}/iterate.c (99%) rename {src => overviewer/src}/main.c (100%) rename {src => overviewer/src}/overviewer.h (100%) rename {src => overviewer/src}/rendermode-lighting.c (100%) rename {src => overviewer/src}/rendermode-night.c (100%) rename {src => overviewer/src}/rendermode-normal.c (100%) rename {src => overviewer/src}/rendermode-spawn.c (100%) rename {src => overviewer/src}/rendermodes.c (100%) rename {src => overviewer/src}/rendermodes.h (100%) rename textures.py => overviewer/textures.py (100%) rename util.py => overviewer/util.py (93%) rename world.py => overviewer/world.py (100%) diff --git a/.gitignore b/.gitignore index 5871f26..1a71f3c 100644 --- a/.gitignore +++ b/.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 diff --git a/blockcounter.py b/contrib/blockcounter.py similarity index 100% rename from blockcounter.py rename to contrib/blockcounter.py diff --git a/overviewer.py b/overviewer.py index b16f835..c7a84d7 100755 --- a/overviewer.py +++ b/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] diff --git a/overviewer/__init__.py b/overviewer/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/chunk.py b/overviewer/chunk.py similarity index 100% rename from chunk.py rename to overviewer/chunk.py diff --git a/composite.py b/overviewer/composite.py similarity index 100% rename from composite.py rename to overviewer/composite.py diff --git a/configParser.py b/overviewer/configParser.py similarity index 100% rename from configParser.py rename to overviewer/configParser.py diff --git a/googlemap.py b/overviewer/googlemap.py similarity index 100% rename from googlemap.py rename to overviewer/googlemap.py diff --git a/nbt.py b/overviewer/nbt.py similarity index 100% rename from nbt.py rename to overviewer/nbt.py diff --git a/optimizeimages.py b/overviewer/optimizeimages.py similarity index 100% rename from optimizeimages.py rename to overviewer/optimizeimages.py diff --git a/quadtree.py b/overviewer/quadtree.py similarity index 100% rename from quadtree.py rename to overviewer/quadtree.py diff --git a/rendernode.py b/overviewer/rendernode.py similarity index 100% rename from rendernode.py rename to overviewer/rendernode.py diff --git a/src/composite.c b/overviewer/src/composite.c similarity index 100% rename from src/composite.c rename to overviewer/src/composite.c diff --git a/src/endian.c b/overviewer/src/endian.c similarity index 100% rename from src/endian.c rename to overviewer/src/endian.c diff --git a/src/iterate.c b/overviewer/src/iterate.c similarity index 99% rename from src/iterate.c rename to overviewer/src/iterate.c index 71bd7e3..4cf63c1 100644 --- a/src/iterate.c +++ b/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"); diff --git a/src/main.c b/overviewer/src/main.c similarity index 100% rename from src/main.c rename to overviewer/src/main.c diff --git a/src/overviewer.h b/overviewer/src/overviewer.h similarity index 100% rename from src/overviewer.h rename to overviewer/src/overviewer.h diff --git a/src/rendermode-lighting.c b/overviewer/src/rendermode-lighting.c similarity index 100% rename from src/rendermode-lighting.c rename to overviewer/src/rendermode-lighting.c diff --git a/src/rendermode-night.c b/overviewer/src/rendermode-night.c similarity index 100% rename from src/rendermode-night.c rename to overviewer/src/rendermode-night.c diff --git a/src/rendermode-normal.c b/overviewer/src/rendermode-normal.c similarity index 100% rename from src/rendermode-normal.c rename to overviewer/src/rendermode-normal.c diff --git a/src/rendermode-spawn.c b/overviewer/src/rendermode-spawn.c similarity index 100% rename from src/rendermode-spawn.c rename to overviewer/src/rendermode-spawn.c diff --git a/src/rendermodes.c b/overviewer/src/rendermodes.c similarity index 100% rename from src/rendermodes.c rename to overviewer/src/rendermodes.c diff --git a/src/rendermodes.h b/overviewer/src/rendermodes.h similarity index 100% rename from src/rendermodes.h rename to overviewer/src/rendermodes.h diff --git a/textures.py b/overviewer/textures.py similarity index 100% rename from textures.py rename to overviewer/textures.py diff --git a/util.py b/overviewer/util.py similarity index 93% rename from util.py rename to overviewer/util.py index f39798a..12d21fd 100644 --- a/util.py +++ b/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]) diff --git a/world.py b/overviewer/world.py similarity index 100% rename from world.py rename to overviewer/world.py diff --git a/setup.py b/setup.py index 62cc86e..759efba 100644 --- a/setup.py +++ b/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: