Skip to content

Fix fujinet-lib version finding #148

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 fujinet-lib version finding #148

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
10 changes: 5 additions & 5 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 Down Expand Up @@ -177,8 +177,8 @@ def fixupLibraryFilename(self, filename):
def setPlatformVersion(self, rxm):
if len(rxm.groups()) >= 1:
self.MV.FUJINET_LIB_PLATFORM = rxm.group(1)
if len(rxm.groups()) >= 2:
self.MV.FUJINET_LIB_VERSION = rxm.group(2)
if len(rxm.groups()) >= 3:
self.MV.FUJINET_LIB_VERSION = rxm.group(3)
return

def getVersion(self):
Expand Down Expand Up @@ -283,13 +283,13 @@ def gitClone(self, url):
cmd = ["git", "clone", url]
if branch:
cmd.extend(["-b", branch])
subprocess.run(cmd, cwd=FUJINET_CACHE_DIR, check=True)
subprocess.run(cmd, cwd=FUJINET_CACHE_DIR, check=True, stdout=sys.stderr)

possibleOutput = ["build", *[f"r2r/{p}" for p in self.possiblePlatforms]]
self.findLibraryDir(repoDir, possibleOutput)
if not self.MV.FUJINET_LIB_FILE:
cmd = ["make", ]
subprocess.run(cmd, cwd=repoDir, check=True)
subprocess.run(cmd, cwd=repoDir, check=True, stdout=sys.stderr)
self.findLibraryDir(repoDir, possibleOutput)

return
Expand Down