all repos — min @ 2f25167cefa2e88f0df03898b83ece2ab2364ec6

A small but practical concatenative programming language.

Fixed compilation on Nim v0.20.2
h3rald h3rald@h3rald.com
Sun, 25 Aug 2019 18:55:55 +0200
commit

2f25167cefa2e88f0df03898b83ece2ab2364ec6

parent

1f1e7d63c3dd3801afd644a1e1635fabe91f5f2b

5 files changed, 7 insertions(+), 37 deletions(-)

jump to
M core/consts.nimcore/consts.nim

@@ -1,6 +1,6 @@

const pkgName* = "min" - pkgVersion* = "0.19.3" + pkgVersion* = "0.19.4" pkgAuthor* = "Fabio Cevasco" pkgDescription* = "A tiny concatenative programming language and shell."
M min.nimmin.nim

@@ -252,7 +252,6 @@ let prompt = v.getString()

line = ed.readLine(prompt) i.parser.bufpos = 0 i.parser.buf = $line - i.parser.bufLen = i.parser.buf.len discard i.parser.getToken() try: i.printResult i.interpret()
M min.nim.cfgmin.nim.cfg

@@ -1,26 +1,11 @@

---warning[LockLevel]:off +# https://blog.filippo.io/easy-windows-and-linux-cross-compilers-for-macos/ # https://gist.github.com/Drakulix/9881160 -amd64.windows.gcc.path = "/usr/local/mingw/bin" +amd64.windows.gcc.path = "/usr/local/bin" amd64.windows.gcc.exe = "x86_64-w64-mingw32-gcc" amd64.windows.gcc.linkerexe = "x86_64-w64-mingw32-gcc" -# https://gist.github.com/Drakulix/9881160 -i386.windows.gcc.path = "/usr/local/mingw/bin" -i386.windows.gcc.exe = "i686-w64-mingw32-gcc" -i386.windows.gcc.linkerexe = "i686-w64-mingw32-gcc" - # http://crossgcc.rts-software.org/doku.php?id=compiling_for_linux -i386.linux.gcc.path = "/usr/local/gcc-4.8.1-for-linux32/bin" -i386.linux.gcc.exe = "i586-pc-linux-gcc" -i386.linux.gcc.linkerexe = "i586-pc-linux-gcc" - -# http://crossgcc.rts-software.org/doku.php?id=compiling_for_linux -amd64.linux.gcc.path = "/usr/local/gcc-4.8.1-for-linux64/bin" -amd64.linux.gcc.exe = "x86_64-pc-linux-gcc" -amd64.linux.gcc.linkerexe = "x86_64-pc-linux-gcc" - -# http://www.jaredwolff.com/toolchains/ -arm.linux.gcc.path = "/usr/local/arm-none-linux-gnueabi/bin" -arm.linux.gcc.exe = "arm-none-linux-gnueabi-gcc" -arm.linux.gcc.linkerexe = "arm-none-linux-gnueabi-gcc" +amd64.linux.gcc.path = "/usr/local/bin" +amd64.linux.gcc.exe = "x86_64-linux-musl-gcc" +amd64.linux.gcc.linkerexe = "x86_64-linux-musl-gcc"
M min.nimblemin.nimble

@@ -41,14 +41,8 @@

task windows_x64_build, "Build min for Windows (x64)": shell compile, windows_x64, hs_file -task linux_x86_build, "Build min for Linux (x86)": - shell compile, linux_x86, hs_file - task linux_x64_build, "Build min for Linux (x64)": shell compile, linux_x64, hs_file - -task linux_arm_build, "Build min for Linux (ARM)": - shell compile, linux_arm, hs_file task macosx_x64_build, "Build min for Mac OS X (x64)": shell compile, macosx_x64, hs_file

@@ -61,14 +55,6 @@ shell "rm", hs & ".exe"

echo "\n\n\n LINUX - x64:\n\n" linux_x64_buildTask() shell zip, filename_for("linux", "x64"), hs - shell "rm", hs - echo "\n\n\n LINUX - x86:\n\n" - linux_x86_buildTask() - shell zip, filename_for("linux", "x86"), hs - shell "rm", hs - echo "\n\n\n LINUX - ARM:\n\n" - linux_arm_buildTask() - shell zip, filename_for("linux", "arm"), hs shell "rm", hs echo "\n\n\n MAC OS X - x64:\n\n" macosx_x64_buildTask()
M site/settings.jsonsite/settings.json

@@ -5,6 +5,6 @@ "templates": "templates",

"temp": "temp", "output": "output", "title": "min language", - "version": "0.19.3", + "version": "0.19.4", "rules": "rules.min" }