mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge GitHub PR #1817

pull/1821/head
Nate Bargmann 2025-07-27 17:10:45 -05:00
rodzic 96d5abab47 464076f193
commit 53b7cef537
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: FB2C5130D55A8819
3 zmienionych plików z 6 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
.github/workflows/c-cpp.yml vendored
Wyświetl plik

@ -94,4 +94,4 @@ jobs:
run: make distcheck V=0 --no-print-directory AM_DISTCHECK_CONFIGURE_FLAGS="${{ matrix.configure_args }} --without-perl-binding" run: make distcheck V=0 --no-print-directory AM_DISTCHECK_CONFIGURE_FLAGS="${{ matrix.configure_args }} --without-perl-binding"
- name: make distcheck on macOS - name: make distcheck on macOS
if: runner.os == 'macOS' if: runner.os == 'macOS'
run: make distcheck V=0 --no-print-directory AM_DISTCHECK_CONFIGURE_FLAGS="${{ matrix.configure_args }} --without-perl-binding --without-lua-binding PYTHON=/opt/homebrew/bin/python3" run: make distcheck V=0 --no-print-directory AM_DISTCHECK_CONFIGURE_FLAGS="${{ matrix.configure_args }} --without-perl-binding --without-lua-binding --without-tcl-binding PYTHON=/opt/homebrew/bin/python3"

8
bindings/Makefile.am
Wyświetl plik

@ -177,7 +177,7 @@ hamlibtcl_wrap.c: $(SWGDEP)
-I$(top_srcdir)/bindings \ -I$(top_srcdir)/bindings \
-o $@ $$(test -f hamlib.swg || echo '$(srcdir)/')hamlib.swg -o $@ $$(test -f hamlib.swg || echo '$(srcdir)/')hamlib.swg
do_subst = sed -e 's,[@]tcldir[@],$(tcldir),g' do_subst = sed -e 's,[@]tcldir[@],$(tcldir),g' -e 's,[@]builddir[@],$(builddir),g'
tcltest.tcl: tcltest.tcl.in Makefile tcltest.tcl: tcltest.tcl.in Makefile
$(AM_V_GEN)$(do_subst) < $(srcdir)/tcltest.tcl.in > tcltest.tcl $(AM_V_GEN)$(do_subst) < $(srcdir)/tcltest.tcl.in > tcltest.tcl
@ -186,8 +186,7 @@ all-tcl: pkgIndex.tcl $(tcl_ltlib) tcltest.tcl
check-tcl: all-tcl check-tcl: all-tcl
$(AM_V_at)cp $(builddir)/pkgIndex.tcl $(builddir)/.libs $(AM_V_at)cp $(builddir)/pkgIndex.tcl $(builddir)/.libs
$(AM_V_at)TCLLIBPATH=$(builddir)/.libs tclsh $(builddir)/tcltest.tcl \ $(AM_V_at)TCLLIBPATH=$(builddir)/.libs tclsh $(builddir)/tcltest.tcl
|| echo "Tcl test failed" 1>&2
$(AM_V_at)rm -f $(builddir)/.libs/pkgIndex.tcl $(AM_V_at)rm -f $(builddir)/.libs/pkgIndex.tcl
install-tcl: install-tcl:
@ -220,8 +219,7 @@ Hamliblua_la_LTLIBRARIES = $(luaexec_ltlib)
all-lua: $(luaexec_ltlib) all-lua: $(luaexec_ltlib)
check-lua: all-lua check-lua: all-lua
$(AM_V_at)LUA_CPATH="$(abs_builddir)/.libs/?.so" $(LUA) $(srcdir)/luatest.lua \ $(AM_V_at)LUA_CPATH="$(abs_builddir)/.libs/?.so" $(LUA) $(srcdir)/luatest.lua
|| echo "Lua test failed" 1>&2
Hamlib.lua: hamliblua_wrap.c Hamlib.lua: hamliblua_wrap.c

3
bindings/tcltest.tcl.in
Wyświetl plik

@ -6,7 +6,8 @@ exec tclsh "$0" "$@"
lappend ::auto_path @tcldir@ lappend ::auto_path @tcldir@
## Brute force loading ## Brute force loading
#load "@tcldir@/hamlibtcl.so" Hamlib # load "@tcldir@/hamlibtcl.so" Hamlib ; # from the installation directory
load "@builddir@/.libs/hamlibtcl.so" Hamlib ; # from the build directory
## Preferred package loading ## Preferred package loading
package require hamlib package require hamlib