Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Joey Yakimowich-Payne 2019-09-07 08:51:49 -06:00
commit 942ae8e803
5 changed files with 11 additions and 11 deletions

View file

@ -70,8 +70,6 @@ To see examples of nimgen in action check out the following wrappers:-
* git sparse checkout * git sparse checkout
* [nimtess2](https://github.com/genotrance/nimtess2) - libtess2 wrapper: [docs](http://nimgen.genotrance.com/nimtess2) * [nimtess2](https://github.com/genotrance/nimtess2) - libtess2 wrapper: [docs](http://nimgen.genotrance.com/nimtess2)
* git checkout * git checkout
* [libsvm](https://github.com/genotrance/libsvm) - libsvm wrapper: [docs](http://nimgen.genotrance.com/libsvm)
* git sparse checkout
* [duktape-nim](https://github.com/manguluka/duktape-nim) - Duktape wrapper * [duktape-nim](https://github.com/manguluka/duktape-nim) - Duktape wrapper
* static * static

View file

@ -9,8 +9,8 @@ matrix:
environment: environment:
matrix: matrix:
- NIM_VERSION: 0.18.0 - NIM_VERSION: 0.20.0
- NIM_VERSION: 0.19.2 - NIM_VERSION: 0.19.6
for: for:
- -

View file

@ -1,6 +1,6 @@
# Package # Package
version = "0.5.0" version = "0.5.1"
author = "genotrance" author = "genotrance"
description = "c2nim helper to simplify and automate the wrapping of C libraries" description = "c2nim helper to simplify and automate the wrapping of C libraries"
license = "MIT" license = "MIT"
@ -11,7 +11,7 @@ skipDirs = @["nimgen", "tests", "web"]
# Dependencies # Dependencies
requires "nim >= 0.17.0", "c2nim#3ec45c24585ebaed", "regex >= 0.10.0" requires "nim >= 0.19.0", "c2nim >= 0.9.14", "regex >= 0.10.0"
task test, "Test nimgen": task test, "Test nimgen":
exec "nim c -r tests/rununittests.nim" exec "nim c -r tests/rununittests.nim"

View file

@ -43,9 +43,10 @@ proc downloadUrl*(url: string) =
file = url.extractFilename() file = url.extractFilename()
ext = file.splitFile().ext.toLowerAscii() ext = file.splitFile().ext.toLowerAscii()
var cmd = "curl $# -o $#" var cmd = if defined(Windows):
if defined(Windows): "powershell [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget $# -OutFile $#"
cmd = "powershell wget $# -OutFile $#" else:
"curl -L $# -o $#"
if not (ext == ".zip" and fileExists(gOutput/file)): if not (ext == ".zip" and fileExists(gOutput/file)):
echo "Downloading " & file echo "Downloading " & file

View file

@ -2,10 +2,11 @@ import distros, ospaths, strutils
var var
pygonly = false pygonly = false
comps = @["libsvm", "nim7z", #"nimarchive", comps = @["nim7z", #"nimarchive",
"nimbass", "nimbigwig", "nimbass", "nimbigwig",
"nimclipboard", "nimfuzzy", "nimmonocypher", "nimclipboard", "nimfuzzy", "nimmonocypher",
"nimnuklear", "nimpcre", "nimrax", "nimssl", "nimssh2", #"nimnuklear",
"nimpcre", "nimrax", "nimssl", "nimssh2",
"nimtess2" "nimtess2"
] ]