ctypes: move directory out of python/grass (#1898)

* move python/grass/ctypes directory out of python/grass and rename it * reintroduce (now renamed) __init__ and compile ALL files (fixing regression caused by ca2d28a)
OSGeo · Oct 6, 2021 · be35654 · be35654
1 parent 87398fa
commit be35654
Show file tree

Hide file tree

Showing 49 changed files with 11 additions and 9 deletions.
diff --git a/.flake8 b/.flake8
@@ -243,7 +243,7 @@ exclude =
     # Test output directory
     testreport,
     # Not yet compliant
-    python/grass/ctypes,
+    python/libgrass_interface_generator,
     # No tests checked for now
     testsuite,
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -18,7 +18,7 @@ exclude = '''
         | bin\..*
         | dist\..*
     )/
-    | python/grass/ctypes/
+    | python/libgrass_interface_generator/
     # Bug in Black related to r-string prefix capitalization reformats
     # a line in this file unnecessarily. File is however fully Black-formatted
     # at the time of writing.

diff --git a/python/Makefile b/python/Makefile
@@ -3,7 +3,8 @@ MODULE_TOPDIR = ..
 include $(MODULE_TOPDIR)/include/Make/Vars.make
 
 SUBDIRS = \
-	grass
+	grass \
+	libgrass_interface_generator
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 

diff --git a/python/grass/Makefile b/python/grass/Makefile
@@ -9,7 +9,6 @@ SUBDIRS = \
 	app \
 	bandref \
 	benchmark \
-	ctypes \
 	exceptions \
 	grassdb \
 	gunittest \

diff --git a/python/grass/ctypes/Makefile → python/libgrass_interface_generator/Makefile b/python/grass/ctypes/Makefile → python/libgrass_interface_generator/Makefile
@@ -1,4 +1,4 @@
-MODULE_TOPDIR = ../../..
+MODULE_TOPDIR = ../..
 
 PACKAGE = "grasslibs"
 
@@ -75,11 +75,11 @@ PYDIR = $(ETC)/python
 GDIR = $(PYDIR)/grass
 DSTDIR = $(GDIR)/lib
 
-PYFILES  := $(patsubst %,$(DSTDIR)/%.py,$(MODULES))
-PYCFILES  := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES))
+PYFILES  := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__ ctypes_preamble ctypes_loader)
+PYCFILES  := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__ ctypes_preamble ctypes_loader)
 LPYFILES := $(patsubst %,$(OBJDIR)/%.py,$(MODULES))
 
-COPY_FILES = $(DSTDIR)/ctypes_loader.py $(DSTDIR)/ctypes_preamble.py
+COPY_FILES = $(DSTDIR)/ctypes_loader.py $(DSTDIR)/ctypes_preamble.py $(DSTDIR)/__init__.py
 
 ifeq ($(strip $(GRASS_LIBRARY_TYPE)),shlib)
 default: $(COPY_FILES)
@@ -96,6 +96,8 @@ $(DSTDIR)/ctypes_loader.py: ctypesgen/libraryloader.py
 	cp -f $< $@
 $(DSTDIR)/ctypes_preamble.py: ctypesgen/printer_python/preamble/3_2.py
 	cp -f $< $@
+$(DSTDIR)/__init__.py: libgrass__init__.py
+	cp -f $< $@
 
 $(DSTDIR)/%.py: $(OBJDIR)/%.py | $(DSTDIR)
 	$(INSTALL_DATA) $< $@

diff --git a/python/grass/ctypes/README.md → ...on/libgrass_interface_generator/README.md b/python/grass/ctypes/README.md → ...on/libgrass_interface_generator/README.md
@@ -6,7 +6,7 @@ https://github.com/ctypesgen/ctypesgen/commit/0681f8ef1742206c171d44b7872c700f34
 
 ### How to update ctypesgen version
 
-1. Replace the GRASS directory `python/grass/ctypes/ctypesgen` with the `ctypesgen`
+1. Replace the GRASS directory `python/libgrass_interface_generator/ctypesgen` with the `ctypesgen`
    directory from ctypesgen source directory.
 2. Replace `python/grass/ctypes/run.py` with `run.py` from ctypesgen source directory.
 3. Apply the patches below.

diff --git a/python/grass/ctypes/ctypesgen/LICENSE → ...ass_interface_generator/ctypesgen/LICENSE b/python/grass/ctypes/ctypesgen/LICENSE → ...ass_interface_generator/ctypesgen/LICENSE
diff --git a/python/grass/ctypes/ctypesgen/__init__.py → ...interface_generator/ctypesgen/__init__.py b/python/grass/ctypes/ctypesgen/__init__.py → ...interface_generator/ctypesgen/__init__.py
diff --git a/python/grass/ctypes/ctypesgen/ctypedescs.py → ...terface_generator/ctypesgen/ctypedescs.py b/python/grass/ctypes/ctypesgen/ctypedescs.py → ...terface_generator/ctypesgen/ctypedescs.py
diff --git a/...on/grass/ctypes/ctypesgen/descriptions.py → ...rface_generator/ctypesgen/descriptions.py b/...on/grass/ctypes/ctypesgen/descriptions.py → ...rface_generator/ctypesgen/descriptions.py
diff --git a/python/grass/ctypes/ctypesgen/expressions.py → ...erface_generator/ctypesgen/expressions.py b/python/grass/ctypes/ctypesgen/expressions.py → ...erface_generator/ctypesgen/expressions.py
diff --git a/...n/grass/ctypes/ctypesgen/libraryloader.py → ...face_generator/ctypesgen/libraryloader.py b/...n/grass/ctypes/ctypesgen/libraryloader.py → ...face_generator/ctypesgen/libraryloader.py
diff --git a/python/grass/ctypes/ctypesgen/main.py → ...ass_interface_generator/ctypesgen/main.py b/python/grass/ctypes/ctypesgen/main.py → ...ass_interface_generator/ctypesgen/main.py
diff --git a/python/grass/ctypes/ctypesgen/messages.py → ...interface_generator/ctypesgen/messages.py b/python/grass/ctypes/ctypesgen/messages.py → ...interface_generator/ctypesgen/messages.py
diff --git a/python/grass/ctypes/ctypesgen/options.py → ..._interface_generator/ctypesgen/options.py b/python/grass/ctypes/ctypesgen/options.py → ..._interface_generator/ctypesgen/options.py
diff --git a/.../grass/ctypes/ctypesgen/parser/.gitignore → ...ace_generator/ctypesgen/parser/.gitignore b/.../grass/ctypes/ctypesgen/parser/.gitignore → ...ace_generator/ctypesgen/parser/.gitignore
diff --git a/...grass/ctypes/ctypesgen/parser/__init__.py → ...ce_generator/ctypesgen/parser/__init__.py b/...grass/ctypes/ctypesgen/parser/__init__.py → ...ce_generator/ctypesgen/parser/__init__.py
diff --git a/.../ctypes/ctypesgen/parser/cdeclarations.py → ...nerator/ctypesgen/parser/cdeclarations.py b/.../ctypes/ctypesgen/parser/cdeclarations.py → ...nerator/ctypesgen/parser/cdeclarations.py
diff --git a/...grass/ctypes/ctypesgen/parser/cgrammar.py → ...ce_generator/ctypesgen/parser/cgrammar.py b/...grass/ctypes/ctypesgen/parser/cgrammar.py → ...ce_generator/ctypesgen/parser/cgrammar.py
diff --git a/.../grass/ctypes/ctypesgen/parser/cparser.py → ...ace_generator/ctypesgen/parser/cparser.py b/.../grass/ctypes/ctypesgen/parser/cparser.py → ...ace_generator/ctypesgen/parser/cparser.py
diff --git a/...s/ctypes/ctypesgen/parser/ctypesparser.py → ...enerator/ctypesgen/parser/ctypesparser.py b/...s/ctypes/ctypesgen/parser/ctypesparser.py → ...enerator/ctypesgen/parser/ctypesparser.py
diff --git a/.../ctypesgen/parser/datacollectingparser.py → .../ctypesgen/parser/datacollectingparser.py b/.../ctypesgen/parser/datacollectingparser.py → .../ctypesgen/parser/datacollectingparser.py
diff --git a/python/grass/ctypes/ctypesgen/parser/lex.py → ...terface_generator/ctypesgen/parser/lex.py b/python/grass/ctypes/ctypesgen/parser/lex.py → ...terface_generator/ctypesgen/parser/lex.py
diff --git a/...n/grass/ctypes/ctypesgen/parser/lextab.py → ...face_generator/ctypesgen/parser/lextab.py b/...n/grass/ctypes/ctypesgen/parser/lextab.py → ...face_generator/ctypesgen/parser/lextab.py
diff --git a/...grass/ctypes/ctypesgen/parser/parsetab.py → ...ce_generator/ctypesgen/parser/parsetab.py b/...grass/ctypes/ctypesgen/parser/parsetab.py → ...ce_generator/ctypesgen/parser/parsetab.py
diff --git a/.../grass/ctypes/ctypesgen/parser/pplexer.py → ...ace_generator/ctypesgen/parser/pplexer.py b/.../grass/ctypes/ctypesgen/parser/pplexer.py → ...ace_generator/ctypesgen/parser/pplexer.py
diff --git a/...s/ctypes/ctypesgen/parser/preprocessor.py → ...enerator/ctypesgen/parser/preprocessor.py b/...s/ctypes/ctypesgen/parser/preprocessor.py → ...enerator/ctypesgen/parser/preprocessor.py
diff --git a/python/grass/ctypes/ctypesgen/parser/yacc.py → ...erface_generator/ctypesgen/parser/yacc.py b/python/grass/ctypes/ctypesgen/parser/yacc.py → ...erface_generator/ctypesgen/parser/yacc.py
diff --git a/...ctypes/ctypesgen/printer_json/__init__.py → ...erator/ctypesgen/printer_json/__init__.py b/...ctypes/ctypesgen/printer_json/__init__.py → ...erator/ctypesgen/printer_json/__init__.py
diff --git a/.../ctypes/ctypesgen/printer_json/printer.py → ...nerator/ctypesgen/printer_json/printer.py b/.../ctypes/ctypesgen/printer_json/printer.py → ...nerator/ctypesgen/printer_json/printer.py
diff --git a/...ass/ctypes/ctypesgen/printer_json/test.py → ..._generator/ctypesgen/printer_json/test.py b/...ass/ctypes/ctypesgen/printer_json/test.py → ..._generator/ctypesgen/printer_json/test.py
diff --git a/...ypes/ctypesgen/printer_python/__init__.py → ...ator/ctypesgen/printer_python/__init__.py b/...ypes/ctypesgen/printer_python/__init__.py → ...ator/ctypesgen/printer_python/__init__.py
diff --git a/...ctypesgen/printer_python/defaultheader.py → ...ctypesgen/printer_python/defaultheader.py b/...ctypesgen/printer_python/defaultheader.py → ...ctypesgen/printer_python/defaultheader.py
diff --git a/.../ctypesgen/printer_python/preamble/2_5.py → .../ctypesgen/printer_python/preamble/2_5.py b/.../ctypesgen/printer_python/preamble/2_5.py → .../ctypesgen/printer_python/preamble/2_5.py
diff --git a/.../ctypesgen/printer_python/preamble/2_7.py → .../ctypesgen/printer_python/preamble/2_7.py b/.../ctypesgen/printer_python/preamble/2_7.py → .../ctypesgen/printer_python/preamble/2_7.py
diff --git a/.../ctypesgen/printer_python/preamble/3_2.py → .../ctypesgen/printer_python/preamble/3_2.py b/.../ctypesgen/printer_python/preamble/3_2.py → .../ctypesgen/printer_python/preamble/3_2.py
diff --git a/...esgen/printer_python/preamble/__init__.py → ...esgen/printer_python/preamble/__init__.py b/...esgen/printer_python/preamble/__init__.py → ...esgen/printer_python/preamble/__init__.py
diff --git a/...types/ctypesgen/printer_python/printer.py → ...rator/ctypesgen/printer_python/printer.py b/...types/ctypesgen/printer_python/printer.py → ...rator/ctypesgen/printer_python/printer.py
diff --git a/...s/ctypes/ctypesgen/printer_python/test.py → ...enerator/ctypesgen/printer_python/test.py b/...s/ctypes/ctypesgen/printer_python/test.py → ...enerator/ctypesgen/printer_python/test.py
diff --git a/...ss/ctypes/ctypesgen/processor/__init__.py → ...generator/ctypesgen/processor/__init__.py b/...ss/ctypes/ctypesgen/processor/__init__.py → ...generator/ctypesgen/processor/__init__.py
diff --git a/...types/ctypesgen/processor/dependencies.py → ...rator/ctypesgen/processor/dependencies.py b/...types/ctypesgen/processor/dependencies.py → ...rator/ctypesgen/processor/dependencies.py
diff --git a/.../ctypes/ctypesgen/processor/operations.py → ...nerator/ctypesgen/processor/operations.py b/.../ctypes/ctypesgen/processor/operations.py → ...nerator/ctypesgen/processor/operations.py
diff --git a/...ss/ctypes/ctypesgen/processor/pipeline.py → ...generator/ctypesgen/processor/pipeline.py b/...ss/ctypes/ctypesgen/processor/pipeline.py → ...generator/ctypesgen/processor/pipeline.py
diff --git a/...on/grass/ctypes/ctypesgen/test/.gitignore → ...rface_generator/ctypesgen/test/.gitignore b/...on/grass/ctypes/ctypesgen/test/.gitignore → ...rface_generator/ctypesgen/test/.gitignore
diff --git a/...ss/ctypes/ctypesgen/test/ctypesgentest.py → ...generator/ctypesgen/test/ctypesgentest.py b/...ss/ctypes/ctypesgen/test/ctypesgentest.py → ...generator/ctypesgen/test/ctypesgentest.py
diff --git a/.../grass/ctypes/ctypesgen/test/testsuite.py → ...ace_generator/ctypesgen/test/testsuite.py b/.../grass/ctypes/ctypesgen/test/testsuite.py → ...ace_generator/ctypesgen/test/testsuite.py
diff --git a/python/grass/ctypes/ctypesgen/version.py → ..._interface_generator/ctypesgen/version.py b/python/grass/ctypes/ctypesgen/version.py → ..._interface_generator/ctypesgen/version.py
diff --git a/python/grass/ctypes/__init__.py → ...s_interface_generator/libgrass__init__.py b/python/grass/ctypes/__init__.py → ...s_interface_generator/libgrass__init__.py
diff --git a/python/grass/ctypes/run.py → python/libgrass_interface_generator/run.py b/python/grass/ctypes/run.py → python/libgrass_interface_generator/run.py