From 865ac56c20c6683b2a352aec6263dc9c817899c5 Mon Sep 17 00:00:00 2001
From: Ganesh Viswanathan <dev@genotrance.com>
Date: Sun, 10 May 2020 01:49:05 -0500
Subject: [PATCH] Fix lib version regex

---
 nimterop.nimble      |  6 ++----
 nimterop/build.nim   |  8 ++++----
 tests/getheader.nims | 10 +++++-----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/nimterop.nimble b/nimterop.nimble
index d60224f..21221a7 100644
--- a/nimterop.nimble
+++ b/nimterop.nimble
@@ -82,10 +82,8 @@ task test, "Test":
   # getHeader tests
   withDir("tests"):
     exec "nim e getheader.nims"
-    when not defined(Windows):
-      # Skip on Windows since very slow
-      if not existsEnv("APPVEYOR"):
-        exec "nim e wrappers.nims"
+    if not existsEnv("APPVEYOR"):
+      exec "nim e wrappers.nims"
 
   docsTask()
 
diff --git a/nimterop/build.nim b/nimterop/build.nim
index ece2e33..5978074 100644
--- a/nimterop/build.nim
+++ b/nimterop/build.nim
@@ -859,11 +859,11 @@ proc buildLibrary(lname, outdir, conFlags, cmakeFlags, makeFlags: string, buildT
 
 proc getDynlibExt(): string =
   when defined(Windows):
-    result = ".dll"
+    result = "[0-9.\\-]*\\.dll"
   elif defined(linux) or defined(FreeBSD):
-    result = ".so[0-9.]*"
+    result = "\\.so[0-9.]*"
   elif defined(macosx):
-    result = ".dylib[0-9.]*"
+    result = "\\.dylib[0-9.]*"
 
 var
   gDefines {.compileTime.} = initTable[string, string]()
@@ -1007,7 +1007,7 @@ macro getHeader*(header: static[string], giturl: static[string] = "", dlurl: sta
     preBuild = newIdentNode(name & "PreBuild")
 
     # Regex for library search
-    lre = "(lib)?$1[_-]?(static)?[0-9.\\-]*\\"
+    lre = "(lib)?$1[_-]?(static)?"
 
     # If -d:xxx set with setDefines()
     stdVal = gDefines.hasKey(stdStr)
diff --git a/tests/getheader.nims b/tests/getheader.nims
index be22967..5d3b427 100644
--- a/tests/getheader.nims
+++ b/tests/getheader.nims
@@ -35,11 +35,6 @@ when defined(posix):
   testCall(cmd & " -d:lzmaGit -d:lzmaSetVer=v5.2.0" & lrcmd, lexp & "5.2.0", 0)
   testCall(cmd & " -d:lzmaGit -d:lzmaStatic -d:lzmaSetVer=v5.2.0" & lrcmd, lexp & "5.2.0", 0, delete = false)
 
-  # dl - remove from Windows to save some time
-  testCall(cmd & " -d:lzmaDL" & lrcmd, "Need version", 1)
-  testCall(cmd & " -d:lzmaDL -d:lzmaSetVer=5.2.4" & lrcmd, lexp & "5.2.4", 0)
-  testCall(cmd & " -d:lzmaDL -d:lzmaStatic -d:lzmaSetVer=5.2.4" & lrcmd, lexp & "5.2.4", 0, delete = false)
-
 # git
 testCall(cmd & " -d:envTest" & zrcmd, zexp, 0)
 testCall(cmd & " -d:envTestStatic" & zrcmd, zexp, 0, delete = false)
@@ -48,6 +43,11 @@ testCall(cmd & " -d:envTestStatic" & zrcmd, zexp, 0, delete = false)
 testCall(cmd & " -d:zlibGit -d:zlibSetVer=v1.2.10" & zrcmd, zexp & "1.2.10", 0)
 testCall(cmd & " -d:zlibGit -d:zlibStatic -d:zlibSetVer=v1.2.10" & zrcmd, zexp & "1.2.10", 0, delete = false)
 
+# dl
+testCall(cmd & " -d:lzmaDL" & lrcmd, "Need version", 1)
+testCall(cmd & " -d:lzmaDL -d:lzmaSetVer=5.2.4" & lrcmd, lexp & "5.2.4", 0)
+testCall(cmd & " -d:lzmaDL -d:lzmaStatic -d:lzmaSetVer=5.2.4" & lrcmd, lexp & "5.2.4", 0, delete = false)
+
 # dl
 testCall(cmd & " -d:zlibDL -d:zlibSetVer=1.2.11" & zrcmd, zexp & "1.2.11", 0)
 testCall(cmd & " -d:zlibDL -d:zlibStatic -d:zlibSetVer=1.2.11" & zrcmd, zexp & "1.2.11", 0, delete = false)