aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rw-r--r--README.md2
-rwxr-xr-xconfigure2
-rw-r--r--doc/internals/AST.rst2
-rw-r--r--pyGHDL/lsp/README2
-rwxr-xr-xscripts/pnodes.py (renamed from pyGHDL/xtools/pnodes.py)0
-rwxr-xr-xscripts/pnodespy.py (renamed from pyGHDL/xtools/pnodespy.py)0
-rw-r--r--src/edif/Makefile12
-rw-r--r--src/psl/Makefile11
-rw-r--r--src/vhdl/Makefile35
10 files changed, 44 insertions, 24 deletions
diff --git a/Makefile.in b/Makefile.in
index 1ef92ac8d..c089789d5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -457,7 +457,7 @@ uninstall.libghdl:
libghdl-py.tgz:
[ -d pythonb ] || $(MKDIR) pythonb
- $(CP) -r $(srcdir)/python/libghdl $(srcdir)/python/setup.py pythonb
+ $(CP) -r $(srcdir)/pyGHDL/libghdl $(srcdir)/setup.py pythonb
tar -zcvf $@ -C pythonb .
################ ghwdump #################################################
diff --git a/README.md b/README.md
index becdbf3bf..ae032c91d 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ That's all!
- `libghdl` is a shared library that includes a subset of the regular features plus some features to be used by extension tools (i.e. `libghdl-py`). This is built along with the regular GHDL and it supports both non-synthesisable and synthesisable code. Nonetheless, this is not for users, but for tools built on top of the core. When configured along with `--enable-synth`, this shared library includes **[experimental]** synthesis features too.
-- [libghdl-py](python/libghdl) is a Python interface to `libghdl`. Currently, it is only used by `ghdl-ls`; however, it can be useful for advanced users which are willing to build Python utilities based on GHDL.
+- [pyGHDL](pyGHDL) is a Python interface to `libghdl`. Currently, it is only used by `ghdl-ls`; however, it can be useful for advanced users which are willing to build Python utilities based on GHDL.
- **[experimental]** [ghdl-yosys-plugin](https://github.com/ghdl/ghdl-yosys-plugin) is the integration of GHDL as a frontend plugin module for [Yosys Open SYnthesis Suite](http://www.clifford.at/yosys/), which uses the `libghdl` library (built with `--enable-synth`).
diff --git a/configure b/configure
index 83d9b2628..75599d776 100755
--- a/configure
+++ b/configure
@@ -190,7 +190,7 @@ fi
# Check the version of libghdl is correct.
if [ "$enable_libghdl" = true ]; then
- libghdl_version="$srcdir/python/libghdl/version.py"
+ libghdl_version="$srcdir/pyGHDL/libghdl/version.py"
# Extract content between single quotes in version.py, to avoid false positives due to LF/CRLF mismatch.
if [ "$ghdl_version" != "`sed 's/.*"\(.*\)".*/\1/g' $libghdl_version`" ]; then
echo "Sorry, the version of $libghdl_version is not correct"
diff --git a/doc/internals/AST.rst b/doc/internals/AST.rst
index 488fa6d71..ad52f0286 100644
--- a/doc/internals/AST.rst
+++ b/doc/internals/AST.rst
@@ -75,7 +75,7 @@ either a node reference, a boolean flag or a enumerated type (like
node or to a list.
The accessors for the node are generated automatically by the python
-script :file:`src/xtools/pnodes.py`.
+script :file:`src/scripts/pnodes.py`.
Why a meta-model ?
******************
diff --git a/pyGHDL/lsp/README b/pyGHDL/lsp/README
index c82ccc4d4..f9595f15f 100644
--- a/pyGHDL/lsp/README
+++ b/pyGHDL/lsp/README
@@ -9,7 +9,7 @@ develop tools around the parser and analyzer.
To install:
1) First install ghdl (add --enable-python during configuration).
This is needed so that the libraries are available
-2) In ghdl/python, install pyghdl. There is a setup.py script, so you can do:
+2) In ghdl, install pyGHDL. There is a setup.py script, so you can do:
$ pip install .
To install for development: pip install -e .
Add --user to install in your home directory.
diff --git a/pyGHDL/xtools/pnodes.py b/scripts/pnodes.py
index 793c1c712..793c1c712 100755
--- a/pyGHDL/xtools/pnodes.py
+++ b/scripts/pnodes.py
diff --git a/pyGHDL/xtools/pnodespy.py b/scripts/pnodespy.py
index 0e0f5ba9e..0e0f5ba9e 100755
--- a/pyGHDL/xtools/pnodespy.py
+++ b/scripts/pnodespy.py
diff --git a/src/edif/Makefile b/src/edif/Makefile
index 3a3cb4a8b..e7e449483 100644
--- a/src/edif/Makefile
+++ b/src/edif/Makefile
@@ -6,8 +6,16 @@ ortho_srcdir=../ortho
GEN_SRCS=edif-nodes.adb edif-nodes_meta.ads edif-nodes_meta.adb
CC=gcc
-PNODES=../../python/xtools/pnodes.py
-PNODES_ARGS=--field-file=edif-nodes.adb.in --kind-file=edif-nodes.ads --node-file=edif-nodes.ads --template-file=edif-nodes.adb.in --meta-basename=edif-nodes_meta --kind-type=Nkind --kind-range-prefix=Nkinds_ --kind-prefix=N_ --node-type=Node
+PNODES=../../scripts/pnodes.py
+PNODES_ARGS=--field-file=edif-nodes.adb.in \
+ --kind-file=edif-nodes.ads \
+ --node-file=edif-nodes.ads \
+ --template-file=edif-nodes.adb.in \
+ --meta-basename=edif-nodes_meta \
+ --kind-type=Nkind \
+ --kind-range-prefix=Nkinds_ \
+ --kind-prefix=N_ \
+ --node-type=Node
all: dump_edif
diff --git a/src/psl/Makefile b/src/psl/Makefile
index fdcfccaf7..9d7627263 100644
--- a/src/psl/Makefile
+++ b/src/psl/Makefile
@@ -20,11 +20,18 @@
# be committed and distribued with the sources, so that users don't need to
# regenerate them (and don't need to have python installed).
-PNODES=../../python/xtools/pnodes.py
+PNODES=../../scripts/pnodes.py
DEPS=psl-nodes.ads psl-nodes.adb.in $(PNODES)
-PNODES_FLAGS=--field-file=psl-nodes.adb.in --kind-file=psl-nodes.ads --node-file=psl-nodes.ads --template-file=psl-nodes.adb.in --meta-basename=psl-nodes_meta --kind-type=Nkind --kind-prefix=N_ --node-type=Node
+PNODES_FLAGS=--field-file=psl-nodes.adb.in \
+ --kind-file=psl-nodes.ads \
+ --node-file=psl-nodes.ads \
+ --template-file=psl-nodes.adb.in \
+ --meta-basename=psl-nodes_meta \
+ --kind-type=Nkind \
+ --kind-prefix=N_ \
+ --node-type=Node
GEN_FILES=psl-nodes.adb psl-nodes_meta.ads psl-nodes_meta.adb
diff --git a/src/vhdl/Makefile b/src/vhdl/Makefile
index 754f063dd..08277b4d5 100644
--- a/src/vhdl/Makefile
+++ b/src/vhdl/Makefile
@@ -20,18 +20,23 @@
# be committed and distribued with the sources, so that users don't need to
# regenerate them (and don't need to have python installed).
-PNODES=../../python/xtools/pnodes.py
-PNODESPY=../../python/xtools/pnodespy.py
+PNODES=../../scripts/pnodes.py
+PNODESPY=../../scripts/pnodespy.py
DEPS=vhdl-nodes.ads vhdl-nodes.adb.in $(PNODES)
-GEN_FILES=vhdl-nodes.adb vhdl-nodes_meta.ads vhdl-nodes_meta.adb \
- vhdl-elocations.adb vhdl-elocations_meta.ads vhdl-elocations_meta.adb \
- ../../python/libghdl/thin/vhdl/nodes.py \
- ../../python/libghdl/thin/vhdl/nodes_meta.py \
- ../../python/libghdl/thin/vhdl/tokens.py \
- ../../python/libghdl/thin/vhdl/elocations.py \
- ../../python/libghdl/thin/errorout.py ../../python/libghdl/thin/std_names.py
+GEN_FILES=vhdl-nodes.adb \
+ vhdl-nodes_meta.ads \
+ vhdl-nodes_meta.adb \
+ vhdl-elocations.adb \
+ vhdl-elocations_meta.ads \
+ vhdl-elocations_meta.adb \
+ ../../pyGHDL/libghdl/vhdl/nodes.py \
+ ../../pyGHDL/libghdl/vhdl/nodes_meta.py \
+ ../../pyGHDL/libghdl/vhdl/tokens.py \
+ ../../pyGHDL/libghdl/vhdl/elocations.py \
+ ../../pyGHDL/libghdl/errorout.py \
+ ../../pyGHDL/libghdl/std_names.py
NODES_FLAGS=--node-file=vhdl-nodes.ads --field-file=vhdl-nodes.adb.in \
--template-file=vhdl-nodes.adb.in --kind-file=vhdl-nodes.ads \
@@ -73,32 +78,32 @@ vhdl-elocations_meta.adb: vhdl-elocations_meta.adb.in vhdl-elocations.ads $(DEPS
$(PNODES) $(ELOCATIONS_FLAGS) meta_body > $@
chmod -w $@
-../../python/libghdl/thin/vhdl/nodes.py: $(DEPS) $(PNODESPY)
+../../pyGHDL/libghdl/vhdl/nodes.py: $(DEPS) $(PNODESPY)
$(RM) $@
$(PNODESPY) $(NODES_FLAGS) libghdl-nodes > $@
chmod -w $@
-../../python/libghdl/thin/vhdl/nodes_meta.py: $(DEPS) $(PNODESPY)
+../../pyGHDL/libghdl/vhdl/nodes_meta.py: $(DEPS) $(PNODESPY)
$(RM) $@
$(PNODESPY) $(NODES_FLAGS) libghdl-meta > $@
chmod -w $@
-../../python/libghdl/thin/std_names.py: $(PNODESPY) ../std_names.ads
+../../pyGHDL/libghdl/std_names.py: $(PNODESPY) ../std_names.ads
$(RM) $@
$(PNODESPY) $(NODES_FLAGS) libghdl-names > $@
chmod -w $@
-../../python/libghdl/thin/vhdl/tokens.py: $(PNODESPY) vhdl-tokens.ads
+../../pyGHDL/libghdl/vhdl/tokens.py: $(PNODESPY) vhdl-tokens.ads
$(RM) $@
$(PNODESPY) $(NODES_FLAGS) libghdl-tokens > $@
chmod -w $@
-../../python/libghdl/thin/vhdl/elocations.py: $(PNODESPY) vhdl-elocations.ads
+../../pyGHDL/libghdl/vhdl/elocations.py: $(PNODESPY) vhdl-elocations.ads
$(RM) $@
$(PNODESPY) $(ELOCATIONS_FLAGS) libghdl-elocs > $@
chmod -w $@
-../../python/libghdl/thin/errorout.py: $(PNODESPY) ../errorout.ads
+../../pyGHDL/libghdl/errorout.py: $(PNODESPY) ../errorout.ads
$(RM) $@
$(PNODESPY) $(ELOCATIONS_FLAGS) libghdl-errorout > $@
chmod -w $@