website updates; Source links now work

This commit is contained in:
Araq 2014-12-30 23:20:40 +01:00
commit 1b56334c46
3 changed files with 19 additions and 17 deletions

View file

@ -47,7 +47,7 @@ proc initConfigData(c: var TConfigData) =
c.logo = "" c.logo = ""
c.ticker = "" c.ticker = ""
c.vars = newStringTable(modeStyleInsensitive) c.vars = newStringTable(modeStyleInsensitive)
c.gitRepo = "https://github.com/Araq/Nimrod/tree" c.gitRepo = "https://github.com/Araq/Nim/tree"
c.gitCommit = "master" c.gitCommit = "master"
c.numProcessors = countProcessors() c.numProcessors = countProcessors()
# Attempts to obtain the git current commit. # Attempts to obtain the git current commit.
@ -262,24 +262,26 @@ proc buildDocSamples(c: var TConfigData, destPath: string) =
exec("nim doc2 $# -o:$# $#" % exec("nim doc2 $# -o:$# $#" %
[c.nimArgs, destPath / "docgen_sample2.html", src]) [c.nimArgs, destPath / "docgen_sample2.html", src])
proc pathPart(d: string): string = splitFile(d).dir.replace('\\', '/')
proc buildDoc(c: var TConfigData, destPath: string) = proc buildDoc(c: var TConfigData, destPath: string) =
# call nim for the documentation: # call nim for the documentation:
var var
commands = newSeq[string](len(c.doc) + len(c.srcdoc) + len(c.srcdoc2)) commands = newSeq[string](len(c.doc) + len(c.srcdoc) + len(c.srcdoc2))
i = 0 i = 0
for d in items(c.doc): for d in items(c.doc):
commands[i] = "nim rst2html $# --docSeeSrcUrl:$#/$# -o:$# --index:on $#" % commands[i] = "nim rst2html $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" %
[c.nimArgs, c.gitRepo, c.gitCommit, [c.nimArgs, c.gitRepo, c.gitCommit, d.pathPart,
destPath / changeFileExt(splitFile(d).name, "html"), d] destPath / changeFileExt(splitFile(d).name, "html"), d]
i.inc i.inc
for d in items(c.srcdoc): for d in items(c.srcdoc):
commands[i] = "nim doc $# --docSeeSrcUrl:$#/$# -o:$# --index:on $#" % commands[i] = "nim doc $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" %
[c.nimArgs, c.gitRepo, c.gitCommit, [c.nimArgs, c.gitRepo, c.gitCommit, d.pathPart,
destPath / changeFileExt(splitFile(d).name, "html"), d] destPath / changeFileExt(splitFile(d).name, "html"), d]
i.inc i.inc
for d in items(c.srcdoc2): for d in items(c.srcdoc2):
commands[i] = "nim doc2 $# --docSeeSrcUrl:$#/$# -o:$# --index:on $#" % commands[i] = "nim doc2 $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" %
[c.nimArgs, c.gitRepo, c.gitCommit, [c.nimArgs, c.gitRepo, c.gitCommit, d.pathPart,
destPath / changeFileExt(splitFile(d).name, "html"), d] destPath / changeFileExt(splitFile(d).name, "html"), d]
i.inc i.inc
@ -311,8 +313,8 @@ proc buildAddDoc(c: var TConfigData, destPath: string) =
# build additional documentation (without the index): # build additional documentation (without the index):
var commands = newSeq[string](c.webdoc.len) var commands = newSeq[string](c.webdoc.len)
for i, doc in pairs(c.webdoc): for i, doc in pairs(c.webdoc):
commands[i] = "nim doc $# --docSeeSrcUrl:$#/$# -o:$# $#" % commands[i] = "nim doc $# --docSeeSrcUrl:$#/$#/$# -o:$# $#" %
[c.nimArgs, c.gitRepo, c.gitCommit, [c.nimArgs, c.gitRepo, c.gitCommit, doc.pathPart,
destPath / changeFileExt(splitFile(doc).name, "html"), doc] destPath / changeFileExt(splitFile(doc).name, "html"), doc]
mexec(commands, c.numProcessors) mexec(commands, c.numProcessors)

View file

@ -9,12 +9,9 @@ and clang on Mac OS X.
Binaries Binaries
======== ========
Unfortunately for now we provide no binary builds. Unfortunately for now we only provide builds for Windows.
* 32 bit: `nim-0.10.2_x32.exe <download/nim-0.10.2_x32.exe>`_
.. * 64 bit: `nim-0.10.2_x64.exe <download/nim-0.10.2_x64.exe>`_
Unfortunately for now we only provide builds for Windows.
* 32 bit: `nim_0.10.2.exe <download/nim-0.10.2.exe>`_
* 64 bit: `nim_0.10.2_x64.exe <download/nim-0.10.2_x64.exe>`_
Installation based on generated C code Installation based on generated C code

View file

@ -29,7 +29,10 @@ for lightweight threading through the use of ``spawn``.
The unpopular "T" and "P" prefixes on types have been deprecated. Nim also The unpopular "T" and "P" prefixes on types have been deprecated. Nim also
became more expressive by weakening the distinction between statements and became more expressive by weakening the distinction between statements and
expressions. We also added a new and searchable forum, a new website, and our expressions. We also added a new and searchable forum, a new website, and our
documentation generator ``docgen`` has seen major improvements. documentation generator ``docgen`` has seen major improvements. Many thanks to
Nick Greenfield for the much more beautiful documentation!
What's left to be done What's left to be done
~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~
@ -120,7 +123,7 @@ Language Additions
- The builtin ``procCall`` can be used to get ``super``-like functionality - The builtin ``procCall`` can be used to get ``super``-like functionality
for multi methods. for multi methods.
- There is a new pragma ``{.experimental.}`` that enables experimental - There is a new pragma ``{.experimental.}`` that enables experimental
language features per module, or you can enable this features on a global language features per module, or you can enable these features on a global
level with the ``--experimental`` command line option. level with the ``--experimental`` command line option.