diff --git a/compiler/docgen.nim b/compiler/docgen.nim index 4c98034013..434e2a65b1 100644 --- a/compiler/docgen.nim +++ b/compiler/docgen.nim @@ -383,6 +383,8 @@ proc genItem(d: PDoc, n, nameNode: PNode, k: TSymKind) = var seeSrcRope: PRope = nil let docItemSeeSrc = getConfigVar("doc.item.seesrc") if docItemSeeSrc.len > 0 and options.docSeeSrcUrl.len > 0: + # XXX toFilename doesn't really work. We need to ensure that this keeps + # returning a relative path. let urlRope = ropeFormatNamedVars(options.docSeeSrcUrl, ["path", "line"], [n.info.toFilename.toRope, toRope($n.info.line)]) dispA(seeSrcRope, "$1", "", [ropeFormatNamedVars(docItemSeeSrc, diff --git a/config/nimdoc.cfg b/config/nimdoc.cfg index 9db52a84d5..975c7c06af 100644 --- a/config/nimdoc.cfg +++ b/config/nimdoc.cfg @@ -41,7 +41,6 @@ doc.item = """
$header
$desc -$seeSrc
""" diff --git a/tools/nimweb.nim b/tools/nimweb.nim index 00faecc01b..5233bac459 100644 --- a/tools/nimweb.nim +++ b/tools/nimweb.nim @@ -45,9 +45,10 @@ proc initConfigData(c: var TConfigData) = c.gitCommit = "master" c.numProcessors = countProcessors() # Attempts to obtain the git current commit. - let (output, code) = execCmdEx("git log -n 1 --format=%H") - if code == 0 and output.strip.len == 40: - c.gitCommit = output.strip + when false: + let (output, code) = execCmdEx("git log -n 1 --format=%H") + if code == 0 and output.strip.len == 40: + c.gitCommit = output.strip c.quotations = initTable[string, tuple[quote, author: string]]() include "website.tmpl" diff --git a/web/download.txt b/web/download.txt index 31777fad00..dc53cbeb4f 100644 --- a/web/download.txt +++ b/web/download.txt @@ -9,8 +9,10 @@ and clang on Mac OS X. Binaries ======== -Unfortunately for now we only provide 32 bit builds for -Windows: `nimrod_0.9.6.exe `_ +Unfortunately for now we only provide builds for Windows. + +* 32 bit: `nimrod_0.9.6.exe `_ +* 64 bit: `nimrod_0.9.6_x64.exe `_ Installation based on generated C code