Move common/ directory into decoders/.

This simplifies cross-platform handling of the Python/decoder paths
and module installation/dist a bit and also fixes bug #804.

diff --git a/Makefile.am b/Makefile.am
index 1a1074e25938e0c5941fca9ddb64c4b32874a09f..a8df8f6e280a454d48cee9b23532eec39045fad9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,12 +23,11 @@ AM_LIBTOOLFLAGS = --silent
 GNUMAKEFLAGS = --no-print-directory
 
 DECODERS_DIR = $(pkgdatadir)/decoders
-COMMON_DIR = $(pkgdatadir)/common
 # Do not hard-code the decoders location on Windows.
 if WIN32
 AM_CPPFLAGS =
 else
-AM_CPPFLAGS = -DDECODERS_DIR='"$(DECODERS_DIR)"' -DCOMMON_DIR='"$(COMMON_DIR)"'
+AM_CPPFLAGS = -DDECODERS_DIR='"$(DECODERS_DIR)"'
 endif
 
 # The tests CFLAGS are a superset of the libsigrokdecode CFLAGS.
@@ -89,20 +88,14 @@ ChangeLog:
 dist-hook: ChangeLog
        $(MKDIR_P) $(distdir)/tools
        cp ${top_srcdir}/tools/install-decoders $(distdir)/tools
-       $(MKDIR_P) $(distdir)/common
-       cp -a ${top_srcdir}/common $(distdir)
        $(MKDIR_P) $(distdir)/decoders
        ${top_srcdir}/tools/install-decoders -i ${top_srcdir}/decoders \
                -o $(distdir)/decoders
 
-install-common:
-       $(MKDIR_P) $(DESTDIR)$(COMMON_DIR)
-       cp -a ${top_srcdir}/common $(DESTDIR)$(pkgdatadir)
-
 install-decoders:
        $(MKDIR_P) $(DESTDIR)$(DECODERS_DIR)
        $(PYTHON3) ${top_srcdir}/tools/install-decoders \
                -i ${top_srcdir}/decoders -o $(DESTDIR)$(DECODERS_DIR)
 
-install-data-hook: install-common install-decoders
+install-data-hook: install-decoders
 

diff --git a/srd.c b/srd.c
index c74d2ded7d5c65d845e2f84858a41f932c1fd158..2947ca8dd14bcda6073b41c4ee7e0c0a2d86f297 100644 (file)
--- a/srd.c
+++ b/srd.c
@@ -169,12 +169,6 @@ SRD_API int srd_init(const char *path)
                }
        }
 #ifdef DECODERS_DIR
-       /* Common modules for use by any decoder. */
-       if ((ret = srd_decoder_searchpath_add(COMMON_DIR)) != SRD_OK) {
-               Py_Finalize();
-               return ret;
-       }
-
        /* Hardcoded decoders install location, if defined. */
        if ((ret = srd_decoder_searchpath_add(DECODERS_DIR)) != SRD_OK) {
                Py_Finalize();

diff --git a/tools/install-decoders b/tools/install-decoders
index 465c70e45f5125515068d29ab5794ba057b844be..8445da561df4beb55f6056f445f4ad2773dec546 100755 (executable)
--- a/tools/install-decoders
+++ b/tools/install-decoders
@@ -24,7 +24,7 @@ from shutil import copy
 from getopt import getopt
 
 
-def install(srcdir, dstdir):
+def install(srcdir, dstdir, s):
     worklist = []
     for pd in os.listdir(srcdir):
         pd_dir = srcdir + '/' + pd
@@ -39,9 +39,10 @@ def install(srcdir, dstdir):
                 install_list.extend(config_get_extra_install(pd_file))
             elif f[-3:] == '.py':
                 install_list.append(f)
-        worklist.append((pd, pd_dir, install_list))
+        if install_list:
+            worklist.append((pd, pd_dir, install_list))
 
-    print("Installing %d protocol decoders:" % len(worklist))
+    print("Installing %d %s:" % (len(worklist), s))
     col = 0
     for pd, pd_dir, install_list in worklist:
         msg = pd + ' '
@@ -107,6 +108,7 @@ except Exception as e:
 if len(args) != 0 or dst is None:
     usage()
 
-install(src, dst)
+install(src, dst, 'protocol decoders')
+install(src + '/common', dst + '/common', 'common modules')