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

MANIFEST.in

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

overviewer_core/assetmanager.py

@@ -146,11 +146,6 @@ directory.
             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:
         global_assets = os.path.join(util.get_program_path(), "overviewer_core", "data", "web_assets")
         if not os.path.isdir(global_assets):
@@ -171,13 +166,12 @@ directory.
                     if not js.endswith("overviewer.js") and js.endswith(".js"):
                         with open(os.path.join(js_src,js)) as f:
                             fout.write(f.read())
-        # helper function to get a label for the given rendermode
-        def get_render_mode_label(rendermode):
-            info = get_render_mode_info(rendermode)
-            if 'label' in info:
-                return info['label']
-            return rendermode.capitalize()
         
+        # write out config
+        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")
         
         # Add time and version in index.html
         indexpath = os.path.join(self.outputdir, "index.html")

setup.py

@@ -124,7 +124,7 @@ if py2app is not None:
 
 setup_kwargs['packages'] = ['overviewer_core']
 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:
     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")
         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):
                 try:
                     log.info("removing '%s'", fname)