- setup procedure corrected

.gitignore

@@ -47,3 +47,4 @@ OLDSTUFF
 .pytest_cache
 *.c
 *.pyd
+docs/*

DevScripts/Readme-DevScripts.md

-Folder "DevScripts"
-===================
-
-This folder contains helper scripts for the development of DHParser.
-**These scripts are experimental and horribly outdated!**
-
-* collect_symbols.py - Lists all exported symbols from DHParser modules
-
-* create_standalone.py - merges the DHParser modules into a standalone
-                        DHParser.py module for easier deployment.

MANIFEST.in

@@ -2,18 +2,33 @@ include *.py
 include *.txt
 include *.md
 include LICENSE.*
-include MANIFEST.*
-include *.sh
-include *.cfg
 include test/run.py
+recursive-exclude docs *
+recursive-exclude DHParser *.c
+recursive-exclude DHParser *.so
+
 include examples/EBNF/EBNF.ebnf
 include examples/Tutorial/Lyrik.ebnf
 include examples/Tutorial/recompile_grammar.py
 include examples/Tutorial/Lyrisches_Intermezzo_IV.xml
 include examples/Tutorial/Lyrisches_Intermezzo_IV.txt
-recursive-exclude examples/LaTeX *
 recursive-exclude examples/CommonMark *
 recursive-exclude examples/MLW *
 recursive-exclude examples/Arithmetic *
+recursive-exclude examples/ArithmeticRightRecursive *
+recursive-exclude examples/BibTeX *
+recursive-exclude examples/XMLSnippet *
+
+recursive-exclude build *
+recursive-exclude DevScripts *
+recursive-exclude dist *
 recursive-exclude experimental *
-recursive-exclude OLDSTUFF *
+recursive-exclude external_resources *
+
+exclude .noseids
+exclude buildpackages.bat
+exclude buildpackages.sh
+exclude upload.sh
+exclude upload_test.sh
+
+

buildpackages.sh

 #!/bin/sh
+cd documentation_src
+make html
+cd ..
 
-python3 setup.py sdist # bdist_wheel
+python3 setup.py sdist bdist_wheel

documentation/Makefile → documentation_src/Makefile

@@ -6,7 +6,8 @@ SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 SPHINXPROJ    = DHParser
 SOURCEDIR     = .
-BUILDDIR      = _build
+BUILDDIR      = ../docs
+PYTHONPATH    = %PYTHONPATH:../
 
 # Put it first so that "make" without argument is like "make help".
 help:

examples/Arithmetic/ArithmeticCompiler.py

@@ -59,7 +59,7 @@ class ArithmeticGrammar(Grammar):
     r"""Parser for an Arithmetic source file.
     """
     expression = Forward()
-    source_hash__ = "a8a1011bf1a9e1204d87031054b831f4"
+    source_hash__ = "6faf44b68f841558886fbdec4e0e13f7"
     static_analysis_pending__ = [True]
     parser_initialization__ = ["upon instantiation"]
     resume_rules__ = {}

examples/ArithmeticRightRecursive/ArithmeticRightRecursiveCompiler.py

@@ -63,7 +63,7 @@ class ArithmeticRightRecursiveGrammar(Grammar):
     sign = Forward()
     tail = Forward()
     term = Forward()
-    source_hash__ = "57a303f28ffb50a84b86e98c71ea2e32"
+    source_hash__ = "59dabcef8ed22bb237a3d16649cfd49b"
     static_analysis_pending__ = [True]
     parser_initialization__ = ["upon instantiation"]
     resume_rules__ = {}

examples/ArithmeticSimple/ArithmeticRightRecursiveCompiler.py

@@ -60,7 +60,7 @@ class ArithmeticRightRecursiveGrammar(Grammar):
     """
     expression = Forward()
     term = Forward()
-    source_hash__ = "de949295be0b4c5b67cee8aa9cd1a73e"
+    source_hash__ = "a4c454a8ffa4576989f457a1377636ff"
     static_analysis_pending__ = [True]
     parser_initialization__ = ["upon instantiation"]
     resume_rules__ = {}

examples/ArithmeticSimple/ArithmeticSimpleCompiler.py

@@ -59,7 +59,7 @@ class ArithmeticSimpleGrammar(Grammar):
     r"""Parser for an ArithmeticSimple source file.
     """
     expression = Forward()
-    source_hash__ = "f38b228d19529d9527400ded8f94c63b"
+    source_hash__ = "1c40730b32be73985d09f105e76bb4c4"
     static_analysis_pending__ = [True]
     parser_initialization__ = ["upon instantiation"]
     resume_rules__ = {}

examples/BibTeX/BibTeXCompiler.py

@@ -57,7 +57,7 @@ class BibTeXGrammar(Grammar):
     r"""Parser for a BibTeX source file.
     """
     text = Forward()
-    source_hash__ = "5a291c267f7f53949384137254282b62"
+    source_hash__ = "ff0929f0cf7acc756b10afe64c0a390d"
     static_analysis_pending__ = [True]
     parser_initialization__ = ["upon instantiation"]
     resume_rules__ = {}
@@ -84,7 +84,7 @@ class BibTeXGrammar(Grammar):
     root__ = bibliography
     
 def get_grammar() -> BibTeXGrammar:
-    global GLOBALS
+    """Returns a thread/process-exclusive BibTeXGrammar-singleton."""
     try:
         grammar = GLOBALS.BibTeX_00000001_grammar_singleton
     except AttributeError:

examples/EBNF/EBNFCompiler.py

@@ -59,7 +59,7 @@ class EBNFGrammar(Grammar):
     r"""Parser for an EBNF source file.
     """
     expression = Forward()
-    source_hash__ = "428380dcdcff7b2a3cbed187b71d248b"
+    source_hash__ = "ed51d49519baa3216def989ff9c32e7c"
     static_analysis_pending__ = [True]
     parser_initialization__ = ["upon instantiation"]
     resume_rules__ = {}

examples/LaTeX/LaTeXCompiler.py

@@ -57,7 +57,7 @@ class LaTeXGrammar(Grammar):
     paragraph = Forward()
     tabular_config = Forward()
     text_element = Forward()
-    source_hash__ = "30f9fd1ad9257035ba83975dd2f46856"
+    source_hash__ = "ce7ad2f909c81bc5eb6aeee0c38874c0"
     static_analysis_pending__ = [True]
     parser_initialization__ = ["upon instantiation"]
     resume_rules__ = {}

examples/Tutorial/LyrikCompiler.py

@@ -59,7 +59,7 @@ def get_preprocessor() -> PreprocessorFunc:
 class LyrikGrammar(Grammar):
     r"""Parser for a Lyrik source file.
     """
-    source_hash__ = "3ff2e39f8bfc07d37ea5481d61d026bb"
+    source_hash__ = "5b004b12da92b1fd4f6fc899f435c205"
     static_analysis_pending__ = [True]
     parser_initialization__ = ["upon instantiation"]
     resume_rules__ = {}

examples/Tutorial/Lyrik_explicit_whitespaceCompiler.py

@@ -58,7 +58,7 @@ def get_preprocessor() -> PreprocessorFunc:
 class Lyrik_explicit_whitespaceGrammar(Grammar):
     r"""Parser for a Lyrik_explicit_whitespace source file.
     """
-    source_hash__ = "2a7f0e987e796860b804a7e162df7e7b"
+    source_hash__ = "3ff7de61fcafd6028ec4faf6bce8df2d"
     static_analysis_pending__ = [True]
     parser_initialization__ = ["upon instantiation"]
     resume_rules__ = {}

examples/XML/XMLCompiler.py

@@ -67,7 +67,7 @@ class XMLGrammar(Grammar):
     extSubsetDecl = Forward()
     ignoreSectContents = Forward()
     markupdecl = Forward()
-    source_hash__ = "05c24553a9c13db86136495bd1b5fed8"
+    source_hash__ = "6b03acd8cd6587cbfe1f01d384710fe7"
     static_analysis_pending__ = [True]
     parser_initialization__ = ["upon instantiation"]
     resume_rules__ = {}

examples/XMLSnippet/XMLSnippetCompiler.py

@@ -60,7 +60,7 @@ class XMLSnippetGrammar(Grammar):
     """
     Name = Forward()
     element = Forward()
-    source_hash__ = "d3c46a530b258f47d6ae47ccf8297702"
+    source_hash__ = "97b3e235d06ed7435fd3f4aeef5c2a89"
     static_analysis_pending__ = [True]
     parser_initialization__ = ["upon instantiation"]
     resume_rules__ = {}

examples/check_examples.py

@@ -9,7 +9,7 @@ import platform
 
 if __name__ == "__main__":
     scriptdir = os.path.dirname(os.path.realpath(__file__))
-    rootdir = scriptdir[:scriptdir.find('DHParser') + 8]
+    rootdir = scriptdir[:-8]
 
     if platform.system() != "Windows":
         interpreter = 'python3 '

setup.cfg

+[metadata]
+license_files = LICENSE.txt
+
 [bdist_wheel]
-universal=1
+universal=0
 

setup.py

 #from distutils.core import setup
-from setuptools import setup
+from setuptools import setup, find_packages
 try:
     from Cython.Build import cythonize
 except ImportError:
@@ -14,7 +14,8 @@ with open('README.md', encoding='utf-8') as f:
 setup(
     name='DHParser',
     version=__version__,
-    packages=['DHParser'],
+    packages=find_packages(exclude=['build', 'DevScripts', 'dist', 'documentation_src',
+                                    'experimental', 'external_resources']),
     ext_modules=cythonize(['DHParser/stringview.py',
                            'DHParser/toolkit.py',
                            'DHParser/preprocess.py',
@@ -52,7 +53,7 @@ setup(
     ],
     entry_points={
         'console_scripts': [
-            'dhparser = dhparser.py'
+            'dhparser=dhparser.main'
         ]
     }
 )