jyapayne/nimterop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

--gc:arc fixes and testing

Browse source
This commit is contained in:
Ganesh Viswanathan 2020-06-18 14:33:32 -05:00
commit f207911d38
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nimterop/conan.nim
View file

@ -1,4 +1,4 @@
import json, marshal, os, strformat, strutils, tables import json, os, strformat, strutils, tables
type type
ConanPackage* = ref object ConanPackage* = ref object
@ -272,7 +272,10 @@ proc loadConanInfo*(outdir: string): ConanPackage =
file = outdir / conanInfo file = outdir / conanInfo
if fileExists(file): if fileExists(file):
result = to[ConanPackage](readFile(file)) try:
result = to(readFile(file).parseJson(), ConanPackage)
except:
discard
proc saveConanInfo*(pkg: ConanPackage, outdir: string) = proc saveConanInfo*(pkg: ConanPackage, outdir: string) =
## Save downloaded package info to `outdir/conaninfo.json` ## Save downloaded package info to `outdir/conaninfo.json`
@ -280,7 +283,7 @@ proc saveConanInfo*(pkg: ConanPackage, outdir: string) =
let let
file = outdir / conanInfo file = outdir / conanInfo
writeFile(file, $$pkg) writeFile(file, $(%pkg))
proc parseConanManifest(pkg: ConanPackage, outdir: string) = proc parseConanManifest(pkg: ConanPackage, outdir: string) =
# Get all library info from downloaded conan package # Get all library info from downloaded conan package

9
nimterop/jbb.nim
View file

@ -1,4 +1,4 @@
import marshal, os, strutils import json, os, strutils
type type
JBBPackage* = ref object JBBPackage* = ref object
@ -143,7 +143,10 @@ proc loadJBBInfo*(outdir: string): JBBPackage =
file = outdir / jbbInfo file = outdir / jbbInfo
if fileExists(file): if fileExists(file):
result = to[JBBPackage](readFile(file)) try:
result = to(readFile(file).parseJson(), JBBPackage)
except:
discard
proc saveJBBInfo*(pkg: JBBPackage, outdir: string) = proc saveJBBInfo*(pkg: JBBPackage, outdir: string) =
## Save downloaded package info to `outdir/jbbinfo.json` ## Save downloaded package info to `outdir/jbbinfo.json`
@ -151,7 +154,7 @@ proc saveJBBInfo*(pkg: JBBPackage, outdir: string) =
let let
file = outdir / jbbInfo file = outdir / jbbInfo
writeFile(file, $$pkg) writeFile(file, $(%pkg))
proc dlJBBRequires*(pkg: JBBPackage, outdir: string) proc dlJBBRequires*(pkg: JBBPackage, outdir: string)
proc downloadJBB*(pkg: JBBPackage, outdir: string, main = true) = proc downloadJBB*(pkg: JBBPackage, outdir: string, main = true) =

3
tests/getheader.nims
View file

@ -21,6 +21,9 @@ var
lexp = "liblzma version = " lexp = "liblzma version = "
zexp = "zlib version = " zexp = "zlib version = "
when (NimMajor, NimMinor, NimPatch) >= (1, 2, 0):
cmd &= " --gc:arc"
testCall(cmd & lrcmd, "No build files found", 1) testCall(cmd & lrcmd, "No build files found", 1)
testCall(cmd & " -d:libssh2Conan" & sshcmd, "Need version for Conan uri", 1) testCall(cmd & " -d:libssh2Conan" & sshcmd, "Need version for Conan uri", 1)
testCall(cmd & " -d:libssh2JBB" & sshcmd, "Need version for BinaryBuilder.org uri", 1) testCall(cmd & " -d:libssh2JBB" & sshcmd, "Need version for BinaryBuilder.org uri", 1)