complete removal of web folder, fixes nim-lang#9304 (nim-lang#9310)

* complete removal of web folder, fixes nim-lang#9304 * remove `buildJS`
tweenietomatoes · Oct 12, 2018 · c492a7f · c492a7f
1 parent 7f18d7c
commit c492a7f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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 → tools/nimblepkglist.nim b/web/nimblepkglist.nim → tools/nimblepkglist.nim
diff --git 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)