diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8433f31..0dac095 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -27,9 +27,6 @@ jobs: - master - stable-4.13 - stable-4.12 - - stable-4.11 - - stable-4.10 - - stable-4.9 os: [ubuntu-latest] include: - gap-branch: master diff --git a/PackageInfo.g b/PackageInfo.g index fbcb26e..48f49e9 100644 --- a/PackageInfo.g +++ b/PackageInfo.g @@ -63,8 +63,8 @@ ArchiveURL := Concatenation("https://github.com/gap-packages/ZeroMQInterface "/ZeroMQInterface-", ~.Version), README_URL := Concatenation( ~.PackageWWWHome, "README.md" ), PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ), -SourceRepository := rec( - Type := "git", +SourceRepository := rec( + Type := "git", URL := "https://github.com/gap-packages/ZeroMQInterface" ), IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ), @@ -92,20 +92,21 @@ PackageDoc := rec( ), Dependencies := rec( - GAP := ">= 4.9", + GAP := ">= 4.12", NeededOtherPackages := [ [ "GAPDoc", ">= 1.6.1" ] ], SuggestedOtherPackages := [ ], ExternalConditions := [ ], ), AvailabilityTest := function() - if not "ZeroMQInterface" in SHOW_STAT() and - Filename(DirectoriesPackagePrograms("ZeroMQInterface"), "zeromqinterface.so") = fail then - #Info(InfoWarning, 1, "ZeroMQInterface: kernel ZeroMQInterface functions not available."); - return fail; - fi; - return true; - end, + if not IsKernelExtensionAvailable("zeromqinterface") then + LogPackageLoadingMessage(PACKAGE_WARNING, + ["the kernel module is not compiled, ", + "the package cannot be loaded."]); + return fail; + fi; + return true; +end, TestFile := "tst/testall.g", @@ -115,14 +116,14 @@ AutoDoc := rec( TitlePage := rec( Copyright := """©right; 2015-17 by Markus Pfeiffer, Reimer Behrends and others

-The &ZeroMQInterface; package is free software; -you can redistribute it and/or modify it under the terms of the -http://www.fsf.org/licenses/gpl.html -as published by the Free Software Foundation; either version 2 of the License, +The &ZeroMQInterface; package is free software; +you can redistribute it and/or modify it under the terms of the +http://www.fsf.org/licenses/gpl.html +as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.""", Acknowledgements := -"""We appreciate very much all past and future comments, suggestions and -contributions to this package and its documentation provided by &GAP; +"""We appreciate very much all past and future comments, suggestions and +contributions to this package and its documentation provided by &GAP; users and developers.""", ), ), @@ -130,5 +131,3 @@ users and developers.""", )); - - diff --git a/init.g b/init.g index d456769..3cc4163 100644 --- a/init.g +++ b/init.g @@ -8,14 +8,9 @@ ## to the COPYRIGHT.md and LICENSE files for details. ## -if (not IsBound(__GAPZEROMQ_C)) and ("ZeroMQInterface" in SHOW_STAT()) then - LoadStaticModule("zeromqinterface"); -fi; -if (not IsBound(__GAPZEROMQ_C)) and - (Filename(DirectoriesPackagePrograms("ZeroMQInterface"), "zeromqinterface.so") <> fail) then - LoadDynamicModule(Filename(DirectoriesPackagePrograms("ZeroMQInterface"), - "zeromqinterface.so")); +if not LoadKernelExtension("zeromqinterface") then + Error("failed to load the ZeroMQInterface package kernel extension"); fi; -ReadPackage("ZeroMQInterface", "gap/zmq.g"); +ReadPackage("ZeroMQInterface", "gap/zmq.g");