LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

setup.py install (and the debian packages) should now work

Browse Source
This commit is contained in:
Aaron Griffith
2012-03-03 17:14:12 -05:00
parent 1de47c060c
commit fb7f382675
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MANIFEST.in
View File

@@ -2,9 +2,12 @@ include COPYING.txt
include README.rst include README.rst
include CONTRIBUTORS.rst include CONTRIBUTORS.rst
include overviewer.py include overviewer.py
include sample.settings.py include contribManager.py
recursive-include contrib/ *.py include sample_config.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/src/primitives/ *.c *.h recursive-include overviewer_core/src/primitives/ *.c *.h
recursive-include overviewer_core/data/ * recursive-include overviewer_core/data/ *
recursive-include contrib/ *.py
recursive-include docs/ *
prune docs/_build

20
overviewer_core/assetmanager.py
View File

@@ -146,11 +146,6 @@ directory.
blank.save(os.path.join(self.outputdir, tileset.options.get('name'), "blank." + tileset.options.get('imgformat'))) blank.save(os.path.join(self.outputdir, tileset.options.get('name'), "blank." + tileset.options.get('imgformat')))
jsondump = json.dumps(dump, indent=4)
with util.FileReplacer(os.path.join(self.outputdir, "overviewerConfig.js")) as tmpfile:
with codecs.open(tmpfile, 'w', encoding='UTF-8') as f:
f.write("var overviewerConfig = " + jsondump + ";\n")
# copy web assets into destdir: # copy web assets into destdir:
global_assets = os.path.join(util.get_program_path(), "overviewer_core", "data", "web_assets") global_assets = os.path.join(util.get_program_path(), "overviewer_core", "data", "web_assets")
if not os.path.isdir(global_assets): if not os.path.isdir(global_assets):
@@ -171,14 +166,13 @@ directory.
if not js.endswith("overviewer.js") and js.endswith(".js"): if not js.endswith("overviewer.js") and js.endswith(".js"):
with open(os.path.join(js_src,js)) as f: with open(os.path.join(js_src,js)) as f:
fout.write(f.read()) fout.write(f.read())
# helper function to get a label for the given rendermode
def get_render_mode_label(rendermode): # write out config
info = get_render_mode_info(rendermode) jsondump = json.dumps(dump, indent=4)
if 'label' in info: with util.FileReplacer(os.path.join(self.outputdir, "overviewerConfig.js")) as tmpfile:
return info['label'] with codecs.open(tmpfile, 'w', encoding='UTF-8') as f:
return rendermode.capitalize() f.write("var overviewerConfig = " + jsondump + ";\n")
# Add time and version in index.html # Add time and version in index.html
indexpath = os.path.join(self.outputdir, "index.html") indexpath = os.path.join(self.outputdir, "index.html")

0
overviewer_core/signals.py Executable file → Normal file
View File

4
setup.py
View File

@@ -124,7 +124,7 @@ 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': recursive_package_data('data/textures') + recursive_package_data('data/web_assets')} setup_kwargs['package_data'] = {'overviewer_core': recursive_package_data('data/textures') + recursive_package_data('data/web_assets') + recursive_package_data('data/js_src')}
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)]
@@ -187,7 +187,7 @@ class CustomClean(clean):
versionpath = os.path.join("overviewer_core", "overviewer_version.py") versionpath = os.path.join("overviewer_core", "overviewer_version.py")
primspath = os.path.join("overviewer_core", "src", "primitives.h") primspath = os.path.join("overviewer_core", "src", "primitives.h")
for fname in [ext_fname, versionpath, primspath]: for fname in [ext_fname, primspath]:
if os.path.exists(fname): if os.path.exists(fname):
try: try:
log.info("removing '%s'", fname) log.info("removing '%s'", fname)