diff options
| author | Araq <rumpf_a@web.de> | 2017-01-06 13:10:51 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2017-01-06 13:11:17 +0100 |
| commit | 4b73194bb0ebb9c7c1f36b98d4dad2ba543622ed (patch) | |
| tree | ce77fbe028282a2a33c32835287b2a111d73f8e2 | |
| parent | 4910a87c6f8ceded56750bd2dc4cd3fe4db55966 (diff) | |
| download | Nim-4b73194bb0ebb9c7c1f36b98d4dad2ba543622ed.tar.gz | |
koch and nims updates
| -rw-r--r-- | install_nimble.nims | 21 | ||||
| -rw-r--r-- | install_tools.nims | 16 | ||||
| -rw-r--r-- | koch.nim | 2 |
3 files changed, 3 insertions, 36 deletions
diff --git a/install_nimble.nims b/install_nimble.nims index 6e929f499..e1b665d58 100644 --- a/install_nimble.nims +++ b/install_nimble.nims @@ -1,25 +1,6 @@ -import ospaths - mode = ScriptMode.Verbose echo "This script is deprecated. Use 'koch nimble' instead." -var id = 0 -while dirExists("nimble" & $id): - inc id - -exec "git clone https://github.com/nim-lang/nimble.git nimble" & $id - -withDir "nimble" & $id & "/src": - exec "nim c nimble" - -mkDir "bin/nimblepkg" -for file in listFiles("nimble" & $id & "/src/nimblepkg/"): - cpFile file, "bin/nimblepkg/" & file.extractFilename - -try: - mvFile "nimble" & $id & "/src/nimble".toExe, "bin/nimble".toExe -except OSError: - cpFile "nimble" & $id & "/src/nimble".toExe, "bin/nimble".toExe - +exec "koch nimble" diff --git a/install_tools.nims b/install_tools.nims index f5f320f78..e7f0aee2c 100644 --- a/install_tools.nims +++ b/install_tools.nims @@ -1,20 +1,6 @@ -import ospaths - mode = ScriptMode.Verbose echo "This script is deprecated. Use 'koch tools' instead." -if not dirExists"dist/nimble": - echo "[Error] This script only works for the tarball." -else: - let nimbleExe = "./bin/nimble".toExe - selfExec "c --noNimblePath -p:compiler -o:" & nimbleExe & - " dist/nimble/src/nimble.nim" - - let nimsugExe = "./bin/nimsuggest".toExe - selfExec "c --noNimblePath -d:release -p:compiler -o:" & nimsugExe & - " dist/nimsuggest/nimsuggest.nim" - - let nimgrepExe = "./bin/nimgrep".toExe - selfExec "c -d:release -o:" & nimgrepExe & " tools/nimgrep.nim" +exec "koch tools" diff --git a/koch.nim b/koch.nim index c066c8305..f117f136c 100644 --- a/koch.nim +++ b/koch.nim @@ -139,7 +139,7 @@ proc testUnixInstall() = # check the docs build: execCleanPath("./koch web", destDir / "bin") # check nimble builds: - execCleanPath("./bin/nim e install_tools.nims") + execCleanPath("./koch tools") # check the tests work: execCleanPath("./koch tests", destDir / "bin") else: |