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

Fix rebase issues

Browse source
This commit is contained in:
Ganesh Viswanathan 2020-06-23 12:48:18 -05:00
commit e44ab30af9
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nimterop/build/conan.nim
View file

@ -387,8 +387,6 @@ proc downloadConan*(pkg: ConanPackage, outdir: string, main = true) =
cleanDir(outdir)
echo &"# Downloading {pkg.name} v{pkg.version} from Conan"
pkg.getConanBuilds()
doAssert pkg.recipes.len != 0, &"Failed to download {pkg.name} v{pkg.version} from Conan - check https://conan.io/center"

13
tests/getheader.nims
View file

@ -25,8 +25,8 @@ when (NimMajor, NimMinor, NimPatch) >= (1, 2, 0):
cmd &= " --gc:arc"
testCall(cmd & lrcmd, "No build files found", 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:libssh2Conan" & sshcmd, "Need version for Conan.io uri", 1)
testCall(cmd & " -d:libssh2JBB -d:libssh2SetVer=1.9.0" & sshcmd, "Version in both uri", 1)
when defined(posix):
# stdlib
@ -43,17 +43,15 @@ when defined(posix):
# conan static
testCall(cmd & " -d:libssh2Conan -d:libssh2SetVer=1.9.0 -d:libssh2Static" & sshcmd, zexp, 0)
<<<<<<< HEAD
else:
# conan static for Windows
testCall(cmd & " -d:zlibConan -d:zlibSetVer=1.2.11 -d:zlibStatic" & zrcmd, zexp, 0)
# JBB
testCall(cmd & " -d:libssh2JBB -d:libssh2SetVer=1.9.0" & sshcmd, zexp, 0)
testCall(cmd & " -d:libssh2JBB" & sshcmd, zexp, 0)
testCall(cmd & " -d:zlibJBB -d:zlibSetVer=1.2.11" & zrcmd, zexp, 0)
testCall(cmd & " -d:zlibJBB -d:zlibSetVer=1.2.11 -d:zlibStatic" & zrcmd, zexp, 0)
=======
>>>>>>> c35eb74... Add tests for conan, recurse implies preprocess
testCall(cmd & " -d:zlibJBB -d:zlibSetVer=1.2.11 -d:zlibStatic" & zrcmd, zexp, 0, delete = false)
testCall(cmd & " -d:lzmaJBB -d:lzmaSetVer=5.2.4" & lrcmd, lexp & "5.2.4", 0)
# git
testCall(cmd & " -d:envTest" & zrcmd, zexp, 0)
@ -74,3 +72,4 @@ testCall(cmd & " -d:zlibDL -d:zlibStatic -d:zlibSetVer=1.2.11" & zrcmd, zexp & "
# conan
testCall(cmd & " -d:libssh2Conan -d:libssh2SetVer=1.9.0" & sshcmd, zexp, 0)
testCall(cmd & " -d:lzmaConan -d:lzmaSetVer=5.2.4" & lrcmd, lexp & "5.2.4", 0)