Skip to content

Fix version number finding regex, don't try to download zip if we alr… #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2025
Merged

Fix version number finding regex, don't try to download zip if we alr… #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ SRC_DIRS = src src/%PLATFORM%
# - empty which will use whatever is the latest
# - undefined, no fujinet-lib will be used
FUJINET_LIB =
$(info FUJUNET_LIB=$(FUJINET_LIB))

# Some platforms don’t use FUJINET_LIB; set this to allow builds to continue
# even if the library isn’t present.
Expand Down
5 changes: 3 additions & 2 deletions makefiles/fnlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def __init__(self, FUJINET_LIB, PLATFORM, COMBOS, skipIfMissing=False):
self.LIBRARY_REGEX = []
for platform in self.possiblePlatforms:
self.LIBRARY_REGEX.extend([
fr"fujinet[-.]({platform})(-{VERSION_NUM_RE})?[.]lib$",
fr"fujinet[-.]({platform})-({VERSION_NUM_RE})?[.]lib$",
fr"fujinet[.]lib[.]({platform})$",
fr"libfujinet[.]({platform})[.]a$",
])
Expand All @@ -114,7 +114,8 @@ def __init__(self, FUJINET_LIB, PLATFORM, COMBOS, skipIfMissing=False):
if not self.MV.FUJINET_LIB_DIR:
self.getDirectory()

if not self.MV.FUJINET_LIB_FILE:
if not self.MV.FUJINET_LIB_FILE \
and (not self.MV.FUJINET_LIB_ZIP or not os.path.exists(self.MV.FUJINET_LIB_ZIP)):
self.downloadZip()

if not self.MV.FUJINET_LIB_INCLUDE:
Expand Down