diff --git a/readme.md b/readme.md index 7b81d0790466..c333611e2fa9 100644 --- a/readme.md +++ b/readme.md @@ -131,7 +131,6 @@ you should familiarize yourself with the following repository structure: * ``tests/`` - contains categorized tests for the compiler and standard library. * ``tools/`` - the tools including ``niminst`` and ``nimweb`` (mostly invoked via ``koch``). -* ``web/`` - [the Nim website][nim-site]. * ``koch.nim`` - tool used to bootstrap Nim, generate C sources, build the website, and generate the documentation. diff --git a/tools/kochdocs.nim b/tools/kochdocs.nim index 1eceadba4121..c3b52dddf517 100644 --- a/tools/kochdocs.nim +++ b/tools/kochdocs.nim @@ -323,7 +323,7 @@ proc buildPdfDoc*(nimArgs, destPath: string) = removeFile(changeFileExt(d, "tex")) proc buildJS() = - exec(findNim() & " js -d:release --out:$1 web/nimblepkglist.nim" % + exec(findNim() & " js -d:release --out:$1 tools/nimblepkglist.nim" % [webUploadOutput / "nimblepkglist.js"]) exec(findNim() & " js " & (docHackDir / "dochack.nim")) diff --git a/web/nimblepkglist.nim b/tools/nimblepkglist.nim similarity index 100% rename from web/nimblepkglist.nim rename to tools/nimblepkglist.nim diff --git a/tools/nimweb.nim b/tools/nimweb.nim index 61cae51702fd..b7fee220a42f 100644 --- a/tools/nimweb.nim +++ b/tools/nimweb.nim @@ -445,10 +445,6 @@ proc buildNewsRss(c: var TConfigData, destPath: string) = generateRss(destFilename, parseNewsTitles(srcFilename)) -proc buildJS(c: TConfigData) = - exec(findNim(c) & " js -d:release --out:$1 web/nimblepkglist.nim" % - [c.webUploadOutput / "nimblepkglist.js"]) - proc readSponsors(sponsorsFile: string): seq[Sponsor] = result = @[] var fileStream = newFileStream(sponsorsFile, fmRead) @@ -528,7 +524,6 @@ proc onlyDocs(c: var TConfigData) = proc main(c: var TConfigData) = buildWebsite(c) - buildJS(c) let docup = c.webUploadOutput / NimVersion createDir(docup) buildAddDoc(c, docup)