Move all artifacts to nimcache

This commit is contained in:
Ganesh Viswanathan 2019-10-10 07:56:47 -05:00
commit 6db698ea7a
14 changed files with 80 additions and 54 deletions

View file

@ -1,16 +1,17 @@
import strutils
proc testCall(cmd, output: string, exitCode: int, delete = true) =
if delete:
rmDir("build/liblzma")
rmDir("build/zlib")
echo cmd
var
ccmd =
when defined(windows):
"cmd /c " & cmd
else:
cmd
if not delete:
ccmd = ccmd.replace(" -f ", " ")
var
(outp, exitC) = gorgeEx(ccmd)
echo outp
doAssert exitC == exitCode, $exitC
@ -41,7 +42,6 @@ when defined(posix):
# git tag
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)
testCall("cd build/liblzma && git branch", "v5.2.0", 0, delete = false)
# git
testCall(cmd & " -d:envTest" & zrcmd, zexp, 0)
@ -50,7 +50,6 @@ testCall(cmd & " -d:envTestStatic" & zrcmd, zexp, 0, delete = false)
# git tag
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)
testCall("cd build/zlib && git branch", "v1.2.10", 0, delete = false)
# dl
testCall(cmd & " -d:lzmaDL" & lrcmd, "Need version", 1)

View file

@ -3,7 +3,7 @@ import os, strutils
import nimterop/[build, cimport]
const
baseDir = currentSourcePath.parentDir()/"build"/"liblzma"
baseDir = getProjectCacheDir("nimterop" / "tests" / "liblzma")
static:
cDebug()

View file

@ -3,7 +3,7 @@ import os
import nimterop/[cimport, build, paths]
const
baseDir = nimteropBuildDir()/"pcre"
baseDir = getProjectCacheDir("nimterop" / "tests" / "pcre")
pcreH = baseDir/"pcre.h.in"
static:
@ -32,4 +32,4 @@ cPlugin:
cImport(pcreH, dynlib="dynpcre")
echo version()
echo version()

View file

@ -1,7 +1,7 @@
import os, nimterop/[cimport, build, paths]
const
baseDir = nimteropBuildDir()/"soloud"
baseDir = getProjectCacheDir("nimterop" / "tests" / "soloud")
incl = baseDir/"include"
src = baseDir/"src"

View file

@ -3,7 +3,7 @@ import os, strutils
import nimterop/[build, cimport]
const
baseDir = currentSourcePath.parentDir()/"build"/"zlib"
baseDir = getProjectCacheDir("nimterop" / "tests" / "zlib")
static:
cDebug()