LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

fixed recursive web_assets handling (closes issue #430)

Browse Source
This commit is contained in:
Aaron Griffith
2011-07-12 18:39:49 -04:00
parent f4636520dd
commit af63ff9992
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MANIFEST.in
View File

@@ -4,6 +4,6 @@ include CONTRIBUTORS.rst
include overviewer.py include overviewer.py
include sample.settings.py include sample.settings.py
recursive-include contrib/ *.py recursive-include contrib/ *.py
recursive-include overviewer_core/*.py recursive-include overviewer_core/ *.py
recursive-include overviewer_core/src/ *.c *.h recursive-include overviewer_core/src/ *.c *.h
recursive-include overviewer_core/data/ *.png *.js index.html style.css recursive-include overviewer_core/data/ *

31
setup.py
View File

@@ -75,6 +75,17 @@ def recursive_data_files(src, dest=None):
ret.append((current_dest, current_sources)) ret.append((current_dest, current_sources))
return ret return ret
# helper to create a 'package_data'-type sequence recursively for a given dir
def recursive_package_data(src, package_dir='overviewer_core'):
full_src = os.path.join(package_dir, src)
ret = []
for dirpath, dirnames, filenames in os.walk(full_src, topdown=False):
current_path = os.path.relpath(dirpath, package_dir)
for filename in filenames:
ret.append(os.path.join(current_path, filename))
return ret
# #
# py2exe options # py2exe options
# #
@@ -106,9 +117,8 @@ if py2app is not None:
setup_kwargs['packages'] = ['overviewer_core'] setup_kwargs['packages'] = ['overviewer_core']
setup_kwargs['scripts'] = ['overviewer.py'] setup_kwargs['scripts'] = ['overviewer.py']
setup_kwargs['package_data'] = {'overviewer_core': setup_kwargs['package_data'] = {'overviewer_core': recursive_package_data('data/textures') + recursive_package_data('data/web_assets')}
['data/textures/*',
'data/web_assets/*']}
if py2exe is None: if py2exe is None:
setup_kwargs['data_files'] = [('share/doc/minecraft-overviewer', doc_files)] setup_kwargs['data_files'] = [('share/doc/minecraft-overviewer', doc_files)]
@@ -176,12 +186,15 @@ class CustomClean(clean):
pretty_fname) pretty_fname)
versionpath = os.path.join("overviewer_core", "overviewer_version.py") versionpath = os.path.join("overviewer_core", "overviewer_version.py")
try: if os.path.exists(versionpath):
if not self.dry_run: try:
os.remove(versionpath) if not self.dry_run:
log.info("removing '%s'", versionpath) os.remove(versionpath)
except OSError: log.info("removing '%s'", versionpath)
log.warn("'%s' could not be cleaned -- permission denied", versionpath) except OSError:
log.warn("'%s' could not be cleaned -- permission denied", versionpath)
else:
log.debug("'%s' does not exist -- can't clean it", versionpath)
# now try to purge all *.pyc files # now try to purge all *.pyc files
for root, dirs, files in os.walk(os.path.join(os.path.dirname(__file__), ".")): for root, dirs, files in os.walk(os.path.join(os.path.dirname(__file__), ".")):