Merge 84799e2f6c into 623ff17f61

.github/workflows/c-cpp.yml

@@ -12,6 +12,41 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        configure_args:
+          - >-
+            --enable-html-matrix=no
+            --enable-parallel=no
+            --enable-pytest=no
+            --enable-shared=yes
+            --enable-static=yes
+            --enable-usrp=no
+            --enable-winradio=no
+            --with-cxx-binding=no
+            --with-indi=no
+            --with-libusb=no
+            --with-lua-binding=no
+            --with-perl-binding=no
+            --with-python-binding=no
+            --with-readline=no
+            --with-tcl-binding=no
+            --with-xml-support=no
+          - >-
+            --enable-html-matrix=yes
+            --enable-parallel=yes
+            --enable-pytest=yes
+            --enable-shared=yes
+            --enable-static=yes
+            --enable-usrp=no
+            --enable-winradio=yes
+            --with-cxx-binding=yes
+            --with-indi=yes
+            --with-libusb=yes
+            --with-lua-binding=yes
+            --with-perl-binding=yes
+            --with-python-binding=yes
+            --with-readline=yes
+            --with-tcl-binding=yes
+            --with-xml-support=yes
 
     steps:
     - uses: actions/checkout@v4
@@ -19,7 +54,9 @@ jobs:
       if: runner.os == 'Linux'
       run: |
         sudo apt install libusb-1.0-0-dev
+        sudo apt install libgd-dev
         sudo apt install libgpiod-dev
+        sudo apt install libindi-dev libnova-dev
         sudo apt install grep
         sudo apt install python3-dev python3-pytest
         sudo apt install lua5.4 liblua5.4-dev libperl-dev tcl-dev
@@ -30,6 +67,8 @@ jobs:
         brew install automake
         brew install libtool
         brew install grep
+        brew install swig
+        brew install tcl-tk
     - name: bootstrap
       run: ./bootstrap
     - name: Suppress -Winitializer-overrides on macOS
@@ -41,14 +80,12 @@ jobs:
       run: grep README Makefile.am
     - name: configure
       if: runner.os != 'macOS'
-      run: ./configure --with-lua-binding --with-perl-binding --with-python-binding --with-tcl-binding
+      run: ./configure ${{ matrix.configure_args }} --enable-silent-rules
     - name: configure on macOS
       if: runner.os == 'macOS'
-      run: ./configure --without-python-binding
+      run: ./configure ${{ matrix.configure_args }} --enable-silent-rules --without-python-binding --without-lua-binding
     - name: make
-      run: make -j 4
-    - name: make check
-      run: make check
+      run: make -j 4 V=0 --no-print-directory
     - name: make distcheck
-      run: make distcheck
+      run: make distcheck V=0 --no-print-directory
 

Makefile.am

@@ -24,7 +24,10 @@ SUBDIRS = macros include lib security \
 	tests doc
 
 ## Static list of distributed directories.
-DIST_SUBDIRS = macros include lib src c++ bindings tests doc android scripts rotators/indi simulators\
+DIST_SUBDIRS = \
+	$(RIG_BACKEND_OPTIONAL_LIST) \
+	$(ROT_BACKEND_OPTIONAL_LIST) \
+	macros include lib src c++ bindings tests doc android scripts simulators\
 	security $(BACKEND_LIST) $(RIG_BACKEND_LIST) $(ROT_BACKEND_LIST) $(AMP_BACKEND_LIST)
 
 # Install any third party macros into our tree for distribution

configure.ac

@@ -66,8 +66,10 @@ dnl added to AC_CONFIG_FILES near the end of this file.  See README.developer
 dnl Beware of duplication should a backend directory include both rig and
 dnl rotor definitions, e.g. "dummy".  Optional backends will not be listed
 dnl here but will be added later, e.g. "winradio".
-RIG_BACKEND_LIST="rigs/adat rigs/alinco rigs/aor rigs/barrett rigs/codan rigs/dorji rigs/drake rigs/dummy rigs/elad rigs/flexradio rigs/icom rigs/icmarine rigs/jrc rigs/kachina rigs/kenwood rigs/kit rigs/lowe rigs/pcr rigs/prm80 rigs/racal rigs/rft rigs/rs rigs/skanti rigs/tapr rigs/tentec rigs/tuner rigs/uniden rigs/winradio rigs/wj rigs/yaesu rigs/gomspace rigs/mds rigs/anytone rigs/motorola rigs/commradio rigs/guohetec"
+RIG_BACKEND_LIST="rigs/adat rigs/alinco rigs/aor rigs/barrett rigs/codan rigs/dorji rigs/drake rigs/dummy rigs/elad rigs/flexradio rigs/icom rigs/icmarine rigs/jrc rigs/kachina rigs/kenwood rigs/kit rigs/lowe rigs/pcr rigs/prm80 rigs/racal rigs/rft rigs/rs rigs/skanti rigs/tapr rigs/tentec rigs/tuner rigs/uniden rigs/wj rigs/yaesu rigs/gomspace rigs/mds rigs/anytone rigs/motorola rigs/commradio rigs/guohetec"
+RIG_BACKEND_OPTIONAL_LIST=""
 ROT_BACKEND_LIST="rotators/amsat rotators/apex rotators/ars rotators/celestron rotators/cnctrk rotators/grbltrk rotators/easycomm rotators/ether6 rotators/flir rotators/fodtrack rotators/gs232a rotators/heathkit rotators/m2 rotators/meade rotators/rotorez rotators/sartek rotators/saebrtrack rotators/spid rotators/ts7400 rotators/prosistel rotators/ioptron rotators/satel rotators/skywatcher rotators/radant"
+ROT_BACKEND_OPTIONAL_LIST=""
 # Amplifiers are all in the amplifiers directory
 AMP_BACKEND_LIST="amplifiers/elecraft amplifiers/gemini amplifiers/expert"
 
@@ -434,11 +436,12 @@ AS_IF([test x"$cf_with_indi_support" != "xno"], [
 	    cf_with_indi_support=no
 	])
 
-	AS_IF([test x"$cf_with_indi_support" != "xno"], [
-	    ROT_BACKEND_LIST="$ROT_BACKEND_LIST rotators/indi"
-	])
     ])
 ])
+AS_IF([test x"$cf_with_indi_support" != "xno"],
+	[ROT_BACKEND_LIST="$ROT_BACKEND_LIST rotators/indi"],
+	[ROT_BACKEND_OPTIONAL_LIST="$ROT_BACKEND_OPTIONAL_LIST rotators/indi"]
+)
 
 dnl Check if libgd-dev is installed, so we can enable rigmatrix
 AC_MSG_CHECKING([whether to build HTML rig feature matrix])
@@ -778,19 +781,12 @@ AC_MSG_RESULT([$cf_with_parallel])
 DL_LIBS=""
 
 AS_IF([test x"${cf_with_winradio}" = "xyes"],
-      [RIGS_BACKEND_LIST="$RIGS_BACKEND_LIST rigs/winradio"
+      [RIG_BACKEND_LIST="$RIG_BACKEND_LIST rigs/winradio"
 dnl Check for libdl and set DL_LIBS if found--used for linradio WR-G313 backend.
        AC_CHECK_LIB([dl], [dlopen], [DL_LIBS="-ldl"],
 		    [AC_MSG_WARN([dlopen was not found in libdl--linradio backend will be disabled])])
-      ])
-
-# Still need -ldl if we have it
-AS_IF([test x"${cf_with_winradio}" = "xno"],
-      [RIGS_BACKEND_LIST="$RIGS_BACKEND_LIST"
-dnl Check for libdl and set DL_LIBS if found--used for linradio WR-G313 backend.
-       AC_CHECK_LIB([dl], [dlopen], [DL_LIBS="-ldl"],
-		    [AC_MSG_WARN([dlopen was not found in libdl--linradio backend will be disabled])])
-      ])
+      ],
+      [RIG_BACKEND_OPTIONAL_LIST="$RIG_BACKEND_OPTIONAL_LIST rigs/winradio"])
 
 dnl Set conditional compilation for G-313.
 AS_CASE(["$host_os"],
@@ -850,6 +846,7 @@ for be in ${RIG_BACKEND_LIST} ; do
 	RIG_BACKENDEPS="${RIG_BACKENDEPS} \$(top_builddir)/rigs/${RIGDIR}/libhamlib-${RIGDIR}.la"
 done
 
+AC_SUBST([RIG_BACKEND_OPTIONAL_LIST])
 AC_SUBST([RIG_BACKEND_LIST])
 AC_SUBST([RIG_BACKENDEPS])
 
@@ -865,6 +862,7 @@ for be in ${ROT_BACKEND_LIST} ; do
 	ROT_BACKENDEPS="${ROT_BACKENDEPS} \$(top_builddir)/rotators/${ROTDIR}/libhamlib-${ROTDIR}.la"
 done
 
+AC_SUBST([ROT_BACKEND_OPTIONAL_LIST])
 AC_SUBST([ROT_BACKEND_LIST])
 AC_SUBST([ROT_BACKENDEPS])
 

simulators/Makefile.am

@@ -10,11 +10,6 @@ bin_PROGRAMS =
 
 check_PROGRAMS = simelecraft simicgeneric simkenwood simyaesu simic9100 simic9700 simft991 simftdx1200 simftdx3000 simjupiter simpowersdr simid5100 simft736 simftdx5000 simtmd700 simrotorez simspid simft817 simts590 simft847 simic7300 simic7000 simic7100 simic7200 simatd578 simic905 simts450 simic7600 simic7610 simic705 simts950 simts990 simic7851 simftdx101 simxiegug90 simqrplabs simft818 simic275 simtrusdx simft1000 simtmd710 simts890 simxiegux108g simxiegux6100 simic910 simft450 simelecraftk4 simmicom simflex simft710 simic2730 simorion simpmr171 simic7700 simft990 simpstrotator simeasycomm simicr8600
 
-simelecraft_SOURCES = simelecraft.c 
-simkenwood_SOURCES = simkenwood.c 
-simyaesu_SOURCES = simyaesu.c 
-simid5100_SOURCES = simid5100.c
-
 # include generated include files ahead of any in sources
 #rigctl_CPPFLAGS = -I$(top_builddir)/tests -I$(top_builddir)/src -I$(srcdir) $(AM_CPPFLAGS)
 
@@ -46,5 +41,3 @@ EXTRA_DIST =
 
 $(top_builddir)/src/libhamlib.la:
 	$(MAKE) -C $(top_builddir)/src/ libhamlib.la
-
-CLEANFILES = simelelecraft simicgeneric simkenwood simyaesu

src/Makefile.am

@@ -49,6 +49,8 @@ hamlibdatetime.h: FORCE
 		test -f $(srcdir)/$(@F) || cp $(srcdir)/$(@F).in $(srcdir)/$(@F) ;\
 	fi
 
+snapshot_data.o rig.o: hamlibdatetime.h
+
 RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
 
 LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)