Attachment #228925 for bug #259341

View | Details | Raw Unified | Return to bug 259341
Collapse All | Expand All




# Created by: Neal Nelson <ports@nicandneal.net>

PORTNAME=	nim
PORTVERSION=	1.6.0
CATEGORIES=	lang
MASTER_SITES=	https://nim-lang.org/download/


BROKEN_sparc64=		fails to build: build.sh: clang: not found

LIB_DEPENDS=	libpcre.so:devel/pcre

TEST_DEPENDS=	node>=0:www/node

USES=		compiler:c11 cpe tar:xz

CPE_VENDOR=	nim-lang

TOOLS_DESC=	Build and install nim tools, not including nimble nor nimfind

TOOLS_DESC=	Build and install nim tools, including nimble

OPTIONS_DEFINE=	DOCS TOOLS
OPTIONS_DEFAULT=	DOCS TOOLS


.include <bsd.port.pre.mk>

TLIST=	nimgrep nimpretty nimsuggest testament

.if ${CHOSEN_COMPILER_TYPE} == "gcc"
EXTRA_PATCHES=	${PATCHDIR}/elfv1-patch-build.sh

		-d:release --nimcache=${WRKSRC}/nimcache

do-install:
	# Revert hack to build docs
	@${REINPLACE_CMD} -e '/%%NIMCACHE%%/d' \
		${WRKSRC}/config/nim.cfg
	# Install nim compiler
	${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${STAGEDIR}${PREFIX}/bin
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nim

Lines 1-3 Link Here

(-)b/lang/nim/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1621903432	1	TIMESTAMP = 1634741355
2	SHA256 (nim-1.4.8.tar.xz) = b798c577411d7d95b8631261dbb3676e9d1afd9e36740d044966a0555b41441a	2	SHA256 (nim-1.6.0.tar.xz) = 52065d48d72a72702ec1afe5f7a9831e11673531e279cdff9caec01a07eec63d
3	SIZE (nim-1.4.8.tar.xz) = 4786360	3	SIZE (nim-1.6.0.tar.xz) = 5272976




--- config/nim.cfg.orig	2021-10-20 15:37:06 UTC
+++ config/nim.cfg
@@ -107,10 +107,7 @@ nimblepath="$home/.nimble/pkgs/"
 @end
 
 @if unix:
 
+nimcache="%%NIMCACHE%%"
+
 # additional options always passed to the compiler:
 --parallel_build: "0" # 0 to auto-detect number of processors
 
@@ -118,12 +120,6 @@ path="$lib/pure"
     clang.options.linker = "-ldl"
     clang.cpp.options.linker = "-ldl"
     tcc.options.linker = "-ldl"
-  @end
-  @if bsd:
-    # BSD got posix_spawn only recently, so we deactivate it for osproc:
-    define:useFork
-  @elif haiku:
+  @if haiku:
   @end
   @if haiku:
     gcc.options.linker = "-Wl,--as-needed -lnetwork"
     gcc.cpp.options.linker = "-Wl,--as-needed -lnetwork"
     clang.options.linker = "-Wl,--as-needed -lnetwork"
@@ -160,11 +157,6 @@ nimblepath="$home/.nimble/pkgs/"
 @end
 
 gcc.maxerrorsimpl = "-fmax-errors=3"
-
-@if bsd:
-  # at least NetBSD has problems with thread local storage:
-  tlsEmulation:on
-@end
 
 @if macosx or freebsd or openbsd:
   cc = clang




--- koch.nim.orig	2021-10-19 00:39:28 UTC
+++ koch.nim
@@ -139,18 +139,18 @@ proc csource(args: string) =
            "--main:compiler/nim.nim compiler/installer.ini $1") %
        [args, VersionAsString, compileNimInst])
 
-proc bundleC2nim(args: string) =
-  cloneDependency(distDir, "https://github.com/nim-lang/c2nim.git")
-  nimCompile("dist/c2nim/c2nim",
-             options = "--noNimblePath --path:. " & args)
+#proc bundleC2nim(args: string) =
+#  cloneDependency(distDir, "https://github.com/nim-lang/c2nim.git")
+#  nimCompile("dist/c2nim/c2nim",
+#             options = "--noNimblePath --path:. " & args)
 
-proc bundleNimbleExe(latest: bool, args: string) =
-  let commit = if latest: "HEAD" else: NimbleStableCommit
-  cloneDependency(distDir, "https://github.com/nim-lang/nimble.git",
-                  commit = commit, allowBundled = true)
-  # installer.ini expects it under $nim/bin
-  nimCompile("dist/nimble/src/nimble.nim",
-             options = "-d:release --noNimblePath " & args)
+#proc bundleNimbleExe(latest: bool, args: string) =
+#  let commit = if latest: "HEAD" else: NimbleStableCommit
+#  cloneDependency(distDir, "https://github.com/nim-lang/nimble.git",
+#                  commit = commit, allowBundled = true)
+#  # installer.ini expects it under $nim/bin
+#  nimCompile("dist/nimble/src/nimble.nim",
+#             options = "-d:release --noNimblePath " & args)
 
 proc bundleNimsuggest(args: string) =
   nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim",
@@ -182,7 +182,7 @@ proc bundleWinTools(args: string) =
                options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui " & args)
 
 proc zip(latest: bool; args: string) =
-  bundleNimbleExe(latest, args)
+  #bundleNimbleExe(latest, args)
   bundleNimsuggest(args)
   bundleNimpretty(args)
   bundleWinTools(args)
@@ -191,15 +191,15 @@ proc zip(latest: bool; args: string) =
   exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim zip compiler/installer.ini" %
        ["tools/niminst/niminst".exe, VersionAsString])
 
-proc ensureCleanGit() =
-  let (outp, status) = osproc.execCmdEx("git diff")
-  if outp.len != 0:
-    quit "Not a clean git repository; 'git diff' not empty!"
-  if status != 0:
-    quit "Not a clean git repository; 'git diff' returned non-zero!"
+#proc ensureCleanGit() =
+#  let (outp, status) = osproc.execCmdEx("git diff")
+#  if outp.len != 0:
+#    quit "Not a clean git repository; 'git diff' not empty!"
+#  if status != 0:
+#    quit "Not a clean git repository; 'git diff' returned non-zero!"
 
 proc xz(latest: bool; args: string) =
-  ensureCleanGit()
+  #ensureCleanGit()
   nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" %
        [VersionAsString, compileNimInst])
   exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim xz compiler/installer.ini" %
@@ -231,7 +231,7 @@ proc buildTools(args: string = "") =
 
 
 proc nsis(latest: bool; args: string) =
-  bundleNimbleExe(latest, args)
+  #bundleNimbleExe(latest, args)
   bundleNimsuggest(args)
   bundleWinTools(args)
   # make sure we have generated the niminst executables:
@@ -503,27 +503,27 @@ proc icTest(args: string) =
     exec(cmd)
     inc i
 
-proc buildDrNim(args: string) =
-  if not dirExists("dist/nimz3"):
-    exec("git clone https://github.com/zevv/nimz3.git dist/nimz3")
-  when defined(windows):
-    if not dirExists("dist/dlls"):
-      exec("git clone -q https://github.com/nim-lang/dlls.git dist/dlls")
-    copyExe("dist/dlls/libz3.dll", "bin/libz3.dll")
-    execFold("build drnim", "nim c -o:$1 $2 drnim/drnim" % ["bin/drnim".exe, args])
-  else:
-    if not dirExists("dist/z3"):
-      exec("git clone -q https://github.com/Z3Prover/z3.git dist/z3")
-      withDir("dist/z3"):
-        exec("git fetch")
-        exec("git checkout " & Z3StableCommit)
-        createDir("build")
-        withDir("build"):
-          exec("""cmake -DZ3_BUILD_LIBZ3_SHARED=FALSE -G "Unix Makefiles" ../""")
-          exec("make -j4")
-    execFold("build drnim", "nim cpp --dynlibOverride=libz3 -o:$1 $2 drnim/drnim" % ["bin/drnim".exe, args])
-  # always run the tests for now:
-  exec("testament/testament".exe & " --nim:" & "drnim".exe & " pat drnim/tests")
+#proc buildDrNim(args: string) =
+#  if not dirExists("dist/nimz3"):
+#    exec("git clone https://github.com/zevv/nimz3.git dist/nimz3")
+#  when defined(windows):
+#    if not dirExists("dist/dlls"):
+#      exec("git clone -q https://github.com/nim-lang/dlls.git dist/dlls")
+#    copyExe("dist/dlls/libz3.dll", "bin/libz3.dll")
+#    execFold("build drnim", "nim c -o:$1 $2 drnim/drnim" % ["bin/drnim".exe, args])
+#  else:
+#    if not dirExists("dist/z3"):
+#      exec("git clone -q https://github.com/Z3Prover/z3.git dist/z3")
+#      withDir("dist/z3"):
+#        exec("git fetch")
+#        exec("git checkout " & Z3StableCommit)
+#        createDir("build")
+#        withDir("build"):
+#          exec("""cmake -DZ3_BUILD_LIBZ3_SHARED=FALSE -G "Unix Makefiles" ../""")
+#          exec("make -j4")
+#    execFold("build drnim", "nim cpp --dynlibOverride=libz3 -o:$1 $2 drnim/drnim" % ["bin/drnim".exe, args])
+#  # always run the tests for now:
+#  exec("testament/testament".exe & " --nim:" & "drnim".exe & " pat drnim/tests")
 
 
 proc hostInfo(): string =
@@ -535,9 +535,9 @@ proc installDeps(dep: string, commit = "") =
   # and tied to a nim release (mimicking git submodules)
   var commit = commit
   case dep
-  of "tinyc":
-    if commit.len == 0: commit = "916cc2f94818a8a382dd8d4b8420978816c1dfb3"
-    cloneDependency(distDir, "https://github.com/timotheecour/nim-tinyc-archive", commit)
+  #of "tinyc":
+  #  if commit.len == 0: commit = "916cc2f94818a8a382dd8d4b8420978816c1dfb3"
+  #  cloneDependency(distDir, "https://github.com/timotheecour/nim-tinyc-archive", commit)
   else: doAssert false, "unsupported: " & dep
   # xxx: also add linenoise, niminst etc, refs https://github.com/nim-lang/RFCs/issues/206
 
@@ -599,7 +599,7 @@ proc runCI(cmd: string) =
       execFold("build nimsuggest_testing", "nim c -o:bin/nimsuggest_testing -d:release nimsuggest/nimsuggest")
       execFold("Run nimsuggest tests", "nim r nimsuggest/tester")
 
-    execFold("Run atlas tests", "nim c -r -d:atlasTests tools/atlas/atlas.nim clone https://github.com/disruptek/balls")
+    #execFold("Run atlas tests", "nim c -r -d:atlasTests tools/atlas/atlas.nim clone https://github.com/disruptek/balls")
 
   when not defined(bsd):
     if not doUseCpp:
@@ -662,12 +662,12 @@ proc showHelp(success: bool) =
   quit(HelpText % [VersionAsString & spaces(44-len(VersionAsString)),
                    CompileDate, CompileTime], if success: QuitSuccess else: QuitFailure)
 
-proc branchDone() =
-  let thisBranch = execProcess("git symbolic-ref --short HEAD").strip()
-  if thisBranch != "devel" and thisBranch != "":
-    exec("git checkout devel")
-    exec("git branch -D " & thisBranch)
-    exec("git pull --rebase")
+#proc branchDone() =
+#  let thisBranch = execProcess("git symbolic-ref --short HEAD").strip()
+#  if thisBranch != "devel" and thisBranch != "":
+#    exec("git checkout devel")
+#    exec("git branch -D " & thisBranch)
+#    exec("git pull --rebase")
 
 when isMainModule:
   var op = initOptParser()
@@ -712,24 +712,24 @@ when isMainModule:
       of "temp": temp(op.cmdLineRest)
       of "xtemp": xtemp(op.cmdLineRest)
       of "wintools": bundleWinTools(op.cmdLineRest)
-      of "nimble": bundleNimbleExe(latest, op.cmdLineRest)
+      #of "nimble": bundleNimbleExe(latest, op.cmdLineRest)
       of "nimsuggest": bundleNimsuggest(op.cmdLineRest)
       # toolsNoNimble is kept for backward compatibility with build scripts
       of "toolsnonimble", "toolsnoexternal":
         buildTools(op.cmdLineRest)
       of "tools":
         buildTools(op.cmdLineRest)
-        bundleNimbleExe(latest, op.cmdLineRest)
-      of "pushcsource":
-        quit "use this instead: https://github.com/nim-lang/csources_v1/blob/master/push_c_code.nim"
+        #bundleNimbleExe(latest, op.cmdLineRest)
+      #of "pushcsource":
+      #  quit "use this instead: https://github.com/nim-lang/csources_v1/blob/master/push_c_code.nim"
       of "valgrind": valgrind(op.cmdLineRest)
-      of "c2nim": bundleC2nim(op.cmdLineRest)
-      of "drnim": buildDrNim(op.cmdLineRest)
+      #of "c2nim": bundleC2nim(op.cmdLineRest)
+      #of "drnim": buildDrNim(op.cmdLineRest)
       of "fusion":
         let suffix = if latest: HeadHash else: FusionStableHash
         exec("nimble install -y fusion@$#" % suffix)
       of "ic": icTest(op.cmdLineRest)
-      of "branchdone": branchDone()
+      #of "branchdone": branchDone()
       else: showHelp(success = false)
       break
     of cmdEnd:




bin/nim
%%TOOLS%%bin/nimble
%%TOOLS%%bin/nimfind
%%TOOLS%%bin/nimgrep
%%TOOLS%%bin/nimpretty
%%TOOLS%%bin/nimsuggest

lib/nim/arch/x86/amd64.S
lib/nim/arch/x86/i386.S
lib/nim/compiler/aliases.nim
lib/nim/compiler/asciitables.nim
lib/nim/compiler/ast.nim
lib/nim/compiler/astalgo.nim
lib/nim/compiler/astmsgs.nim
lib/nim/compiler/bitsets.nim
lib/nim/compiler/btrees.nim
lib/nim/compiler/canonicalizer.nim
lib/nim/compiler/ccgcalls.nim
lib/nim/compiler/ccgexprs.nim
lib/nim/compiler/ccgliterals.nim
lib/nim/compiler/ccgmerge_unused.nim
lib/nim/compiler/ccgreset.nim
lib/nim/compiler/ccgstmts.nim
lib/nim/compiler/ccgthreadvars.nim

lib/nim/compiler/closureiters.nim
lib/nim/compiler/cmdlinehelper.nim
lib/nim/compiler/commands.nim
lib/nim/compiler/concepts.nim
lib/nim/compiler/condsyms.nim
lib/nim/compiler/debuginfo.nim
lib/nim/compiler/debugutils.nim
lib/nim/compiler/depends.nim
lib/nim/compiler/dfa.nim
lib/nim/compiler/docgen.nim
lib/nim/compiler/docgen2.nim
lib/nim/compiler/enumtostr.nim
lib/nim/compiler/errorhandling.nim
lib/nim/compiler/evalffi.nim
lib/nim/compiler/evaltempl.nim
lib/nim/compiler/extccomp.nim

lib/nim/compiler/gorgeimpl.nim
lib/nim/compiler/guards.nim
lib/nim/compiler/hlo.nim
lib/nim/compiler/ic/bitabs.nim
lib/nim/compiler/ic/cbackend.nim
lib/nim/compiler/ic/dce.nim
lib/nim/compiler/ic/design.rst
lib/nim/compiler/ic/ic.nim
lib/nim/compiler/ic/integrity.nim
lib/nim/compiler/ic/navigator.nim
lib/nim/compiler/ic/packed_ast.nim
lib/nim/compiler/ic/replayer.nim
lib/nim/compiler/ic/rodfiles.nim
lib/nim/compiler/idents.nim
lib/nim/compiler/idgen.nim
lib/nim/compiler/importer.nim
lib/nim/compiler/incremental.nim
lib/nim/compiler/index.nim
lib/nim/compiler/injectdestructors.nim
lib/nim/compiler/installer.ini

lib/nim/compiler/modules.nim
lib/nim/compiler/msgs.nim
lib/nim/compiler/ndi.nim
lib/nim/compiler/nilcheck.nim
lib/nim/compiler/nim.cfg
lib/nim/compiler/nim.nim
lib/nim/compiler/nimblecmd.nim

lib/nim/compiler/renderer.nim
lib/nim/compiler/renderverbatim.nim
lib/nim/compiler/reorder.nim
lib/nim/compiler/rod.nim
lib/nim/compiler/rodimpl.nim
lib/nim/compiler/rodutils.nim
lib/nim/compiler/ropes.nim
lib/nim/compiler/saturate.nim

lib/nim/deprecated/pure/parseopt2.nim
lib/nim/deprecated/pure/securehash.nim
lib/nim/deprecated/pure/sharedstrings.nim
lib/nim/deps.txt
lib/nim/experimental/diff.nim
lib/nim/fusion/btreetables.nim
lib/nim/fusion/compat.nim
lib/nim/fusion/filepermissions.nim
lib/nim/fusion/htmlparser.nim
lib/nim/fusion/htmlparser/parsexml.nim
lib/nim/fusion/htmlparser/xmltree.nim
lib/nim/fusion/pools.nim
lib/nim/genode/alloc.nim
lib/nim/genode/env.nim
lib/nim/genode_cpp/syslocks.h

lib/nim/nimhcr.nim.cfg
lib/nim/nimrtl.nim
lib/nim/nimrtl.nim.cfg
lib/nim/packages/docutils/docutils.nimble.old
lib/nim/packages/docutils/docutils.nimble
lib/nim/packages/docutils/highlite.nim
lib/nim/packages/docutils/rst.nim
lib/nim/packages/docutils/rstast.nim

lib/nim/posix/posix_other_consts.nim
lib/nim/posix/posix_utils.nim
lib/nim/posix/termios.nim
lib/nim/prelude.nim
lib/nim/pure/algorithm.nim
lib/nim/pure/async.nim
lib/nim/pure/asyncdispatch.nim

lib/nim/pure/htmlparser.nim
lib/nim/pure/httpclient.nim
lib/nim/pure/httpcore.nim
lib/nim/pure/includes/decode_helpers.nim
lib/nim/pure/includes/osenv.nim
lib/nim/pure/includes/oserr.nim
lib/nim/pure/includes/osseps.nim

lib/nim/pure/parsexml.nim
lib/nim/pure/pathnorm.nim
lib/nim/pure/pegs.nim
lib/nim/pure/prelude.nim
lib/nim/pure/punycode.nim
lib/nim/pure/random.nim
lib/nim/pure/rationals.nim

lib/nim/std/editdistance.nim
lib/nim/std/effecttraits.nim
lib/nim/std/enumerate.nim
lib/nim/std/enumutils.nim
lib/nim/std/exitprocs.nim
lib/nim/std/genasts.nim
lib/nim/std/importutils.nim
lib/nim/std/isolation.nim
lib/nim/std/jsbigints.nim
lib/nim/std/jsfetch.nim
lib/nim/std/jsformdata.nim
lib/nim/std/jsheaders.nim
lib/nim/std/jsonutils.nim
lib/nim/std/logic.nim
lib/nim/std/monotimes.nim
lib/nim/std/packedsets.nim
lib/nim/std/private/asciitables.nim
lib/nim/std/private/bitops_utils.nim
lib/nim/std/private/dbutils.nim
lib/nim/std/private/decode_helpers.nim
lib/nim/std/private/digitsutils.nim
lib/nim/std/private/gitutils.nim
lib/nim/std/private/globs.nim
lib/nim/std/private/jsutils.nim
lib/nim/std/private/miscdollars.nim
lib/nim/std/private/since.nim
lib/nim/std/private/strimpl.nim
lib/nim/std/private/underscored_calls.nim
lib/nim/std/private/win_setenv.nim
lib/nim/std/setutils.nim
lib/nim/std/sha1.nim
lib/nim/std/socketstreams.nim
lib/nim/std/stackframes.nim
lib/nim/std/strbasics.nim
lib/nim/std/sums.nim
lib/nim/std/sysrand.nim
lib/nim/std/tasks.nim
lib/nim/std/tempfiles.nim
lib/nim/std/time_t.nim
lib/nim/std/varints.nim
lib/nim/std/vmutils.nim
lib/nim/std/with.nim
lib/nim/std/wordwrap.nim
lib/nim/std/wrapnils.nim

lib/nim/system/cellseqs_v2.nim
lib/nim/system/cellsets.nim
lib/nim/system/cgprocs.nim
lib/nim/system/channels_builtin.nim
lib/nim/system/chcks.nim
lib/nim/system/comparisons.nim
lib/nim/system/coro_detection.nim
lib/nim/system/countbits_impl.nim
lib/nim/system/cyclebreaker.nim
lib/nim/system/deepcopy.nim
lib/nim/system/dollars.nim
lib/nim/system/dragonbox.nim
lib/nim/system/dyncalls.nim
lib/nim/system/embedded.nim
lib/nim/system/exceptions.nim

lib/nim/system/platforms.nim
lib/nim/system/profiler.nim
lib/nim/system/repr.nim
lib/nim/system/repr_impl.nim
lib/nim/system/repr_v2.nim
lib/nim/system/reprjs.nim
lib/nim/system/schubfach.nim
lib/nim/system/seqs_v2.nim
lib/nim/system/seqs_v2_reimpl.nim
lib/nim/system/setops.nim

lib/nim/system_overview.rst
lib/nim/windows/registry.nim
lib/nim/windows/winlean.nim
lib/nim/wrappers/iup.nim
lib/nim/wrappers/linenoise/LICENSE.txt
lib/nim/wrappers/linenoise/README.markdown
lib/nim/wrappers/linenoise/linenoise.c

%%PORTDOCS%%%%DOCSDIR%%/hcr.rst
%%PORTDOCS%%%%DOCSDIR%%/html/algorithm.html
%%PORTDOCS%%%%DOCSDIR%%/html/apis.html
%%PORTDOCS%%%%DOCSDIR%%/html/asciitables.html
%%PORTDOCS%%%%DOCSDIR%%/html/assertions.html
%%PORTDOCS%%%%DOCSDIR%%/html/async.html
%%PORTDOCS%%%%DOCSDIR%%/html/asyncdispatch.html

%%PORTDOCS%%%%DOCSDIR%%/html/backends.html
%%PORTDOCS%%%%DOCSDIR%%/html/base64.html
%%PORTDOCS%%%%DOCSDIR%%/html/bitops.html
%%PORTDOCS%%%%DOCSDIR%%/html/bitops_utils.html
%%PORTDOCS%%%%DOCSDIR%%/html/browsers.html
%%PORTDOCS%%%%DOCSDIR%%/html/btreetables.html
%%PORTDOCS%%%%DOCSDIR%%/html/cgi.html
%%PORTDOCS%%%%DOCSDIR%%/html/chains.html
%%PORTDOCS%%%%DOCSDIR%%/html/channels_builtin.html
%%PORTDOCS%%%%DOCSDIR%%/html/colors.html
%%PORTDOCS%%%%DOCSDIR%%/html/compat.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/aliases.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/asciitables.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ast.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/astalgo.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/astmsgs.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/bitsets.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/btrees.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ccgmerge.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ccgutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/cgen.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/cgendata.html

%%PORTDOCS%%%%DOCSDIR%%/html/compiler/closureiters.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/cmdlinehelper.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/commands.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/concepts.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/condsyms.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/depends.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/dfa.html

%%PORTDOCS%%%%DOCSDIR%%/html/compiler/docgen2.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/dochack.js
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/enumtostr.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/errorhandling.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/evaltempl.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/extccomp.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/filter_tmpl.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/filters.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/gorgeimpl.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/guards.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ic/bitabs.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ic/cbackend.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ic/dce.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ic/ic.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ic/integrity.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ic/navigator.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ic/packed_ast.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ic/replayer.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ic/rodfiles.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/idents.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/idgen.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/importer.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/incremental.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/index.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/injectdestructors.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/int128.html

%%PORTDOCS%%%%DOCSDIR%%/html/compiler/modules.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/msgs.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ndi.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/nilcheck.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/nim.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/nimblecmd.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/nimconf.html

%%PORTDOCS%%%%DOCSDIR%%/html/compiler/renderer.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/renderverbatim.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/reorder.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/rod.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/rodutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/ropes.html
%%PORTDOCS%%%%DOCSDIR%%/html/compiler/saturate.html

%%PORTDOCS%%%%DOCSDIR%%/html/db_odbc.html
%%PORTDOCS%%%%DOCSDIR%%/html/db_postgres.html
%%PORTDOCS%%%%DOCSDIR%%/html/db_sqlite.html
%%PORTDOCS%%%%DOCSDIR%%/html/dbutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/decls.html
%%PORTDOCS%%%%DOCSDIR%%/html/decode_helpers.html
%%PORTDOCS%%%%DOCSDIR%%/html/deques.html
%%PORTDOCS%%%%DOCSDIR%%/html/destructors.html
%%PORTDOCS%%%%DOCSDIR%%/html/diff.html
%%PORTDOCS%%%%DOCSDIR%%/html/digitsutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/distros.html
%%PORTDOCS%%%%DOCSDIR%%/html/docgen.html
%%PORTDOCS%%%%DOCSDIR%%/html/docgen_sample.html

%%PORTDOCS%%%%DOCSDIR%%/html/encodings.html
%%PORTDOCS%%%%DOCSDIR%%/html/endians.html
%%PORTDOCS%%%%DOCSDIR%%/html/enumerate.html
%%PORTDOCS%%%%DOCSDIR%%/html/enumutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/epoll.html
%%PORTDOCS%%%%DOCSDIR%%/html/estp.html
%%PORTDOCS%%%%DOCSDIR%%/html/exitprocs.html
%%PORTDOCS%%%%DOCSDIR%%/html/fenv.html
%%PORTDOCS%%%%DOCSDIR%%/html/filepermissions.html
%%PORTDOCS%%%%DOCSDIR%%/html/filters.html
%%PORTDOCS%%%%DOCSDIR%%/html/gc.html
%%PORTDOCS%%%%DOCSDIR%%/html/genasts.html
%%PORTDOCS%%%%DOCSDIR%%/html/gitutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/globs.html
%%PORTDOCS%%%%DOCSDIR%%/html/hashes.html
%%PORTDOCS%%%%DOCSDIR%%/html/hcr.html

%%PORTDOCS%%%%DOCSDIR%%/html/httpclient.html
%%PORTDOCS%%%%DOCSDIR%%/html/httpcore.html
%%PORTDOCS%%%%DOCSDIR%%/html/idetools.html
%%PORTDOCS%%%%DOCSDIR%%/html/importutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
%%PORTDOCS%%%%DOCSDIR%%/html/inotify.html
%%PORTDOCS%%%%DOCSDIR%%/html/intern.html

%%PORTDOCS%%%%DOCSDIR%%/html/io.html
%%PORTDOCS%%%%DOCSDIR%%/html/isolation.html
%%PORTDOCS%%%%DOCSDIR%%/html/iterators.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsbigints.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsconsole.html
%%PORTDOCS%%%%DOCSDIR%%/html/jscore.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsfetch.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsffi.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsformdata.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsheaders.html
%%PORTDOCS%%%%DOCSDIR%%/html/json.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsonutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsre.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/koch.html
%%PORTDOCS%%%%DOCSDIR%%/html/kqueue.html
%%PORTDOCS%%%%DOCSDIR%%/html/lenientops.html

%%PORTDOCS%%%%DOCSDIR%%/html/macros.html
%%PORTDOCS%%%%DOCSDIR%%/html/manual.html
%%PORTDOCS%%%%DOCSDIR%%/html/manual_experimental.html
%%PORTDOCS%%%%DOCSDIR%%/html/manual_experimental_strictnotnil.html
%%PORTDOCS%%%%DOCSDIR%%/html/marshal.html
%%PORTDOCS%%%%DOCSDIR%%/html/math.html
%%PORTDOCS%%%%DOCSDIR%%/html/md5.html

%%PORTDOCS%%%%DOCSDIR%%/html/oswalkdir.html
%%PORTDOCS%%%%DOCSDIR%%/html/overview.html
%%PORTDOCS%%%%DOCSDIR%%/html/packaging.html
%%PORTDOCS%%%%DOCSDIR%%/html/packedsets.html
%%PORTDOCS%%%%DOCSDIR%%/html/parsecfg.html
%%PORTDOCS%%%%DOCSDIR%%/html/parsecsv.html
%%PORTDOCS%%%%DOCSDIR%%/html/parsejson.html

%%PORTDOCS%%%%DOCSDIR%%/html/pathnorm.html
%%PORTDOCS%%%%DOCSDIR%%/html/pcre.html
%%PORTDOCS%%%%DOCSDIR%%/html/pegs.html
%%PORTDOCS%%%%DOCSDIR%%/html/pools.html
%%PORTDOCS%%%%DOCSDIR%%/html/posix.html
%%PORTDOCS%%%%DOCSDIR%%/html/posix_utils.html
%%PORTDOCS%%%%DOCSDIR%%/html/postgres.html

%%PORTDOCS%%%%DOCSDIR%%/html/ropes.html
%%PORTDOCS%%%%DOCSDIR%%/html/rst.html
%%PORTDOCS%%%%DOCSDIR%%/html/rstast.html
%%PORTDOCS%%%%DOCSDIR%%/html/rstcommon.html
%%PORTDOCS%%%%DOCSDIR%%/html/rstgen.html
%%PORTDOCS%%%%DOCSDIR%%/html/rtarrays.html
%%PORTDOCS%%%%DOCSDIR%%/html/segfaults.html
%%PORTDOCS%%%%DOCSDIR%%/html/selectors.html
%%PORTDOCS%%%%DOCSDIR%%/html/sequtils.html
%%PORTDOCS%%%%DOCSDIR%%/html/sets.html
%%PORTDOCS%%%%DOCSDIR%%/html/setutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/sexp.html
%%PORTDOCS%%%%DOCSDIR%%/html/sha1.html
%%PORTDOCS%%%%DOCSDIR%%/html/sharedlist.html
%%PORTDOCS%%%%DOCSDIR%%/html/sharedtables.html
%%PORTDOCS%%%%DOCSDIR%%/html/since.html
%%PORTDOCS%%%%DOCSDIR%%/html/smtp.html
%%PORTDOCS%%%%DOCSDIR%%/html/socketstreams.html
%%PORTDOCS%%%%DOCSDIR%%/html/sqlite3.html
%%PORTDOCS%%%%DOCSDIR%%/html/ssl_certs.html
%%PORTDOCS%%%%DOCSDIR%%/html/ssl_config.html
%%PORTDOCS%%%%DOCSDIR%%/html/stackframes.html
%%PORTDOCS%%%%DOCSDIR%%/html/stats.html
%%PORTDOCS%%%%DOCSDIR%%/html/strbasics.html
%%PORTDOCS%%%%DOCSDIR%%/html/streams.html
%%PORTDOCS%%%%DOCSDIR%%/html/streamwrapper.html
%%PORTDOCS%%%%DOCSDIR%%/html/strformat.html
%%PORTDOCS%%%%DOCSDIR%%/html/strimpl.html
%%PORTDOCS%%%%DOCSDIR%%/html/strmisc.html
%%PORTDOCS%%%%DOCSDIR%%/html/strscans.html
%%PORTDOCS%%%%DOCSDIR%%/html/strtabs.html
%%PORTDOCS%%%%DOCSDIR%%/html/strutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/sugar.html
%%PORTDOCS%%%%DOCSDIR%%/html/sums.html
%%PORTDOCS%%%%DOCSDIR%%/html/sysrand.html
%%PORTDOCS%%%%DOCSDIR%%/html/system.html
%%PORTDOCS%%%%DOCSDIR%%/html/tables.html
%%PORTDOCS%%%%DOCSDIR%%/html/tasks.html
%%PORTDOCS%%%%DOCSDIR%%/html/tempfiles.html
%%PORTDOCS%%%%DOCSDIR%%/html/terminal.html
%%PORTDOCS%%%%DOCSDIR%%/html/termios.html
%%PORTDOCS%%%%DOCSDIR%%/html/testament.html

%%PORTDOCS%%%%DOCSDIR%%/html/util.html
%%PORTDOCS%%%%DOCSDIR%%/html/var_t_return.html
%%PORTDOCS%%%%DOCSDIR%%/html/varints.html
%%PORTDOCS%%%%DOCSDIR%%/html/vmutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/volatile.html
%%PORTDOCS%%%%DOCSDIR%%/html/widestrs.html
%%PORTDOCS%%%%DOCSDIR%%/html/win_setenv.html
%%PORTDOCS%%%%DOCSDIR%%/html/winlean.html
%%PORTDOCS%%%%DOCSDIR%%/html/with.html
%%PORTDOCS%%%%DOCSDIR%%/html/wordwrap.html

%%PORTDOCS%%%%DOCSDIR%%/manual.rst
%%PORTDOCS%%%%DOCSDIR%%/manual/var_t_return.rst
%%PORTDOCS%%%%DOCSDIR%%/manual_experimental.rst
%%PORTDOCS%%%%DOCSDIR%%/manual_experimental_strictnotnil.rst
%%PORTDOCS%%%%DOCSDIR%%/mytest.cfg
%%PORTDOCS%%%%DOCSDIR%%/nep1.rst
%%PORTDOCS%%%%DOCSDIR%%/nimc.rst
%%PORTDOCS%%%%DOCSDIR%%/nimdoc.css
%%PORTDOCS%%%%DOCSDIR%%/nimfix.rst
%%PORTDOCS%%%%DOCSDIR%%/nimgrep.rst
%%PORTDOCS%%%%DOCSDIR%%/nimgrep_cmdline.txt
%%PORTDOCS%%%%DOCSDIR%%/niminst.rst
%%PORTDOCS%%%%DOCSDIR%%/nims.rst
%%PORTDOCS%%%%DOCSDIR%%/nimsuggest.rst
%%PORTDOCS%%%%DOCSDIR%%/overview.rst
%%PORTDOCS%%%%DOCSDIR%%/packaging.rst
%%PORTDOCS%%%%DOCSDIR%%/pegdocs.txt
%%PORTDOCS%%%%DOCSDIR%%/prelude.rst
%%PORTDOCS%%%%DOCSDIR%%/readme.txt
%%PORTDOCS%%%%DOCSDIR%%/regexprs.txt
%%PORTDOCS%%%%DOCSDIR%%/rstcommon.rst
%%PORTDOCS%%%%DOCSDIR%%/sets_fragment.txt
%%PORTDOCS%%%%DOCSDIR%%/spawn.txt
%%PORTDOCS%%%%DOCSDIR%%/subexes.txt

Return to bug 259341

Lines 1-7 Link Here

(-)b/lang/nim/Makefile (-8 / +4 lines)
1	# Created by: Neal Nelson <ports@nicandneal.net>	1	# Created by: Neal Nelson <ports@nicandneal.net>
2		2
3	PORTNAME= nim	3	PORTNAME= nim
4	PORTVERSION= 1.4.8	4	PORTVERSION= 1.6.0
5	CATEGORIES= lang	5	CATEGORIES= lang
6	MASTER_SITES= https://nim-lang.org/download/	6	MASTER_SITES= https://nim-lang.org/download/
7		7
Lines 14-28 LICENSE_FILE= ${WRKSRC}/copying.txt Link Here
14	BROKEN_sparc64= fails to build: build.sh: clang: not found	14	BROKEN_sparc64= fails to build: build.sh: clang: not found
15		15
16	LIB_DEPENDS= libpcre.so:devel/pcre	16	LIB_DEPENDS= libpcre.so:devel/pcre
		17
17	TEST_DEPENDS= node>=0:www/node	18	TEST_DEPENDS= node>=0:www/node
18		19
19	USES= compiler:c11 cpe tar:xz	20	USES= compiler:c11 cpe tar:xz
20		21
21	CPE_VENDOR= nim-lang	22	CPE_VENDOR= nim-lang
22		23
23	CONFLICTS_INSTALL= nimble	24	TOOLS_DESC= Build and install nim tools, not including nimble nor nimfind
24
25	TOOLS_DESC= Build and install nim tools, including nimble
26		25
27	OPTIONS_DEFINE= DOCS TOOLS	26	OPTIONS_DEFINE= DOCS TOOLS
28	OPTIONS_DEFAULT= DOCS TOOLS	27	OPTIONS_DEFAULT= DOCS TOOLS
Lines 36-42 MAKE_JOBS_UNSAFE= yes Link Here
36		35
37	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
38		37
39	TLIST= nimble nimfind nimgrep nimpretty nimsuggest testament	38	TLIST= nimgrep nimpretty nimsuggest testament
40		39
41	.if ${CHOSEN_COMPILER_TYPE} == "gcc"	40	.if ${CHOSEN_COMPILER_TYPE} == "gcc"
42	EXTRA_PATCHES= ${PATCHDIR}/elfv1-patch-build.sh	41	EXTRA_PATCHES= ${PATCHDIR}/elfv1-patch-build.sh
Lines 72-80 do-build-TOOLS-on: Link Here
72	-d:release --nimcache=${WRKSRC}/nimcache	71	-d:release --nimcache=${WRKSRC}/nimcache
73		72
74	do-install:	73	do-install:
75	# Revert hack to build docs
76	@${REINPLACE_CMD} -e '/%%NIMCACHE%%/d' \
77	${WRKSRC}/config/nim.cfg
78	# Install nim compiler	74	# Install nim compiler
79	${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${STAGEDIR}${PREFIX}/bin	75	${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${STAGEDIR}${PREFIX}/bin
80	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nim	76	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nim

Lines 1-24 Link Here

(-)b/lang/nim/files/patch-config-nim.cfg (-18 / +20 lines)
1	--- config/nim.cfg.orig 2020-10-25 07:25:40 UTC	1	--- config/nim.cfg.orig 2021-10-20 15:37:06 UTC
2	+++ config/nim.cfg	2	+++ config/nim.cfg
3	@@ -10,6 +10,8 @@	3	@@ -107,10 +107,7 @@ nimblepath="$home/.nimble/pkgs/"
		4	@end
4		5
5	cc = clang	6	@if unix:
6
7	+nimcache="%%NIMCACHE%%"
8	+
9	# additional options always passed to the compiler:
10	--parallel_build: "0" # 0 to auto-detect number of processors
11
12	@@ -118,12 +120,6 @@ path="$lib/pure"
13	clang.options.linker = "-ldl"
14	clang.cpp.options.linker = "-ldl"
15	tcc.options.linker = "-ldl"
16	- @end
17	- @if bsd:	7	- @if bsd:
18	- # BSD got posix_spawn only recently, so we deactivate it for osproc:	8	- # BSD got posix_spawn only recently, so we deactivate it for osproc:
19	- define:useFork	9	- define:useFork
20	- # at least NetBSD has problems with thread local storage:	10	- @elif haiku:
21	- tlsEmulation:on	11	+ @if haiku:
22	@end
23	@if haiku:
24	gcc.options.linker = "-Wl,--as-needed -lnetwork"	12	gcc.options.linker = "-Wl,--as-needed -lnetwork"
		13	gcc.cpp.options.linker = "-Wl,--as-needed -lnetwork"
		14	clang.options.linker = "-Wl,--as-needed -lnetwork"
		15	@@ -160,11 +157,6 @@ nimblepath="$home/.nimble/pkgs/"
		16	@end
		17
		18	gcc.maxerrorsimpl = "-fmax-errors=3"
		19	-
		20	-@if bsd:
		21	- # at least NetBSD has problems with thread local storage:
		22	- tlsEmulation:on
		23	-@end
		24
		25	@if macosx or freebsd or openbsd:
		26	cc = clang

Lines 1-11 Link Here

(-)b/lang/nim/files/patch-koch.nim (-7 / +191 lines)
1	--- koch.nim.orig 2020-11-03 05:15:11 UTC	1	--- koch.nim.orig 2021-10-19 00:39:28 UTC
2	+++ koch.nim	2	+++ koch.nim
3	@@ -687,7 +687,7 @@ when isMainModule:	3	@@ -139,18 +139,18 @@ proc csource(args: string) =
		4	"--main:compiler/nim.nim compiler/installer.ini $1") %
		5	[args, VersionAsString, compileNimInst])
		6
		7	-proc bundleC2nim(args: string) =
		8	- cloneDependency(distDir, "https://github.com/nim-lang/c2nim.git")
		9	- nimCompile("dist/c2nim/c2nim",
		10	- options = "--noNimblePath --path:. " & args)
		11	+#proc bundleC2nim(args: string) =
		12	+# cloneDependency(distDir, "https://github.com/nim-lang/c2nim.git")
		13	+# nimCompile("dist/c2nim/c2nim",
		14	+# options = "--noNimblePath --path:. " & args)
		15
		16	-proc bundleNimbleExe(latest: bool, args: string) =
		17	- let commit = if latest: "HEAD" else: NimbleStableCommit
		18	- cloneDependency(distDir, "https://github.com/nim-lang/nimble.git",
		19	- commit = commit, allowBundled = true)
		20	- # installer.ini expects it under $nim/bin
		21	- nimCompile("dist/nimble/src/nimble.nim",
		22	- options = "-d:release --noNimblePath " & args)
		23	+#proc bundleNimbleExe(latest: bool, args: string) =
		24	+# let commit = if latest: "HEAD" else: NimbleStableCommit
		25	+# cloneDependency(distDir, "https://github.com/nim-lang/nimble.git",
		26	+# commit = commit, allowBundled = true)
		27	+# # installer.ini expects it under $nim/bin
		28	+# nimCompile("dist/nimble/src/nimble.nim",
		29	+# options = "-d:release --noNimblePath " & args)
		30
		31	proc bundleNimsuggest(args: string) =
		32	nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim",
		33	@@ -182,7 +182,7 @@ proc bundleWinTools(args: string) =
		34	options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui " & args)
		35
		36	proc zip(latest: bool; args: string) =
		37	- bundleNimbleExe(latest, args)
		38	+ #bundleNimbleExe(latest, args)
		39	bundleNimsuggest(args)
		40	bundleNimpretty(args)
		41	bundleWinTools(args)
		42	@@ -191,15 +191,15 @@ proc zip(latest: bool; args: string) =
		43	exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim zip compiler/installer.ini" %
		44	["tools/niminst/niminst".exe, VersionAsString])
		45
		46	-proc ensureCleanGit() =
		47	- let (outp, status) = osproc.execCmdEx("git diff")
		48	- if outp.len != 0:
		49	- quit "Not a clean git repository; 'git diff' not empty!"
		50	- if status != 0:
		51	- quit "Not a clean git repository; 'git diff' returned non-zero!"
		52	+#proc ensureCleanGit() =
		53	+# let (outp, status) = osproc.execCmdEx("git diff")
		54	+# if outp.len != 0:
		55	+# quit "Not a clean git repository; 'git diff' not empty!"
		56	+# if status != 0:
		57	+# quit "Not a clean git repository; 'git diff' returned non-zero!"
		58
		59	proc xz(latest: bool; args: string) =
		60	- ensureCleanGit()
		61	+ #ensureCleanGit()
		62	nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" %
		63	[VersionAsString, compileNimInst])
		64	exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim xz compiler/installer.ini" %
		65	@@ -231,7 +231,7 @@ proc buildTools(args: string = "") =
		66
		67
68	proc nsis(latest: bool; args: string) =
69	- bundleNimbleExe(latest, args)
70	+ #bundleNimbleExe(latest, args)
71	bundleNimsuggest(args)
72	bundleWinTools(args)
73	# make sure we have generated the niminst executables:
74	@@ -503,27 +503,27 @@ proc icTest(args: string) =
75	exec(cmd)
76	inc i
77
78	-proc buildDrNim(args: string) =
79	- if not dirExists("dist/nimz3"):
80	- exec("git clone https://github.com/zevv/nimz3.git dist/nimz3")
81	- when defined(windows):
82	- if not dirExists("dist/dlls"):
83	- exec("git clone -q https://github.com/nim-lang/dlls.git dist/dlls")
84	- copyExe("dist/dlls/libz3.dll", "bin/libz3.dll")
85	- execFold("build drnim", "nim c -o:$1 $2 drnim/drnim" % ["bin/drnim".exe, args])
86	- else:
87	- if not dirExists("dist/z3"):
88	- exec("git clone -q https://github.com/Z3Prover/z3.git dist/z3")
89	- withDir("dist/z3"):
90	- exec("git fetch")
91	- exec("git checkout " & Z3StableCommit)
92	- createDir("build")
93	- withDir("build"):
94	- exec("""cmake -DZ3_BUILD_LIBZ3_SHARED=FALSE -G "Unix Makefiles" ../""")
95	- exec("make -j4")
96	- execFold("build drnim", "nim cpp --dynlibOverride=libz3 -o:$1 $2 drnim/drnim" % ["bin/drnim".exe, args])
97	- # always run the tests for now:
98	- exec("testament/testament".exe & " --nim:" & "drnim".exe & " pat drnim/tests")
99	+#proc buildDrNim(args: string) =
100	+# if not dirExists("dist/nimz3"):
101	+# exec("git clone https://github.com/zevv/nimz3.git dist/nimz3")
102	+# when defined(windows):
103	+# if not dirExists("dist/dlls"):
104	+# exec("git clone -q https://github.com/nim-lang/dlls.git dist/dlls")
105	+# copyExe("dist/dlls/libz3.dll", "bin/libz3.dll")
106	+# execFold("build drnim", "nim c -o:$1 $2 drnim/drnim" % ["bin/drnim".exe, args])
107	+# else:
108	+# if not dirExists("dist/z3"):
109	+# exec("git clone -q https://github.com/Z3Prover/z3.git dist/z3")
110	+# withDir("dist/z3"):
111	+# exec("git fetch")
112	+# exec("git checkout " & Z3StableCommit)
113	+# createDir("build")
114	+# withDir("build"):
115	+# exec("""cmake -DZ3_BUILD_LIBZ3_SHARED=FALSE -G "Unix Makefiles" ../""")
116	+# exec("make -j4")
117	+# execFold("build drnim", "nim cpp --dynlibOverride=libz3 -o:$1 $2 drnim/drnim" % ["bin/drnim".exe, args])
118	+# # always run the tests for now:
119	+# exec("testament/testament".exe & " --nim:" & "drnim".exe & " pat drnim/tests")
120
121
122	proc hostInfo(): string =
123	@@ -535,9 +535,9 @@ proc installDeps(dep: string, commit = "") =
124	# and tied to a nim release (mimicking git submodules)
125	var commit = commit
126	case dep
127	- of "tinyc":
128	- if commit.len == 0: commit = "916cc2f94818a8a382dd8d4b8420978816c1dfb3"
129	- cloneDependency(distDir, "https://github.com/timotheecour/nim-tinyc-archive", commit)
130	+ #of "tinyc":
131	+ # if commit.len == 0: commit = "916cc2f94818a8a382dd8d4b8420978816c1dfb3"
132	+ # cloneDependency(distDir, "https://github.com/timotheecour/nim-tinyc-archive", commit)
133	else: doAssert false, "unsupported: " & dep
134	# xxx: also add linenoise, niminst etc, refs https://github.com/nim-lang/RFCs/issues/206
135
136	@@ -599,7 +599,7 @@ proc runCI(cmd: string) =
137	execFold("build nimsuggest_testing", "nim c -o:bin/nimsuggest_testing -d:release nimsuggest/nimsuggest")
138	execFold("Run nimsuggest tests", "nim r nimsuggest/tester")
139
140	- execFold("Run atlas tests", "nim c -r -d:atlasTests tools/atlas/atlas.nim clone https://github.com/disruptek/balls")
141	+ #execFold("Run atlas tests", "nim c -r -d:atlasTests tools/atlas/atlas.nim clone https://github.com/disruptek/balls")
142
143	when not defined(bsd):
144	if not doUseCpp:
145	@@ -662,12 +662,12 @@ proc showHelp(success: bool) =
146	quit(HelpText % [VersionAsString & spaces(44-len(VersionAsString)),
147	CompileDate, CompileTime], if success: QuitSuccess else: QuitFailure)
148
149	-proc branchDone() =
150	- let thisBranch = execProcess("git symbolic-ref --short HEAD").strip()
151	- if thisBranch != "devel" and thisBranch != "":
152	- exec("git checkout devel")
153	- exec("git branch -D " & thisBranch)
154	- exec("git pull --rebase")
155	+#proc branchDone() =
156	+# let thisBranch = execProcess("git symbolic-ref --short HEAD").strip()
157	+# if thisBranch != "devel" and thisBranch != "":
158	+# exec("git checkout devel")
159	+# exec("git branch -D " & thisBranch)
160	+# exec("git pull --rebase")
161
162	when isMainModule:
163	var op = initOptParser()
164	@@ -712,24 +712,24 @@ when isMainModule:
165	of "temp": temp(op.cmdLineRest)
166	of "xtemp": xtemp(op.cmdLineRest)
167	of "wintools": bundleWinTools(op.cmdLineRest)
168	- of "nimble": bundleNimbleExe(latest, op.cmdLineRest)
169	+ #of "nimble": bundleNimbleExe(latest, op.cmdLineRest)
170	of "nimsuggest": bundleNimsuggest(op.cmdLineRest)
171	# toolsNoNimble is kept for backward compatibility with build scripts
172	of "toolsnonimble", "toolsnoexternal":
173	buildTools(op.cmdLineRest)
4	of "tools":	174	of "tools":
5	buildTools(op.cmdLineRest)	175	buildTools(op.cmdLineRest)
6	bundleNimbleExe(latest, op.cmdLineRest)	176	- bundleNimbleExe(latest, op.cmdLineRest)
7	- bundleFusion(latest)	177	- of "pushcsource":
8	+ # bundleFusion(latest)	178	- quit "use this instead: https://github.com/nim-lang/csources_v1/blob/master/push_c_code.nim"
9	of "pushcsource", "pushcsources": pushCsources()	179	+ #bundleNimbleExe(latest, op.cmdLineRest)
		180	+ #of "pushcsource":
		181	+ # quit "use this instead: https://github.com/nim-lang/csources_v1/blob/master/push_c_code.nim"
10	of "valgrind": valgrind(op.cmdLineRest)	182	of "valgrind": valgrind(op.cmdLineRest)
11	of "c2nim": bundleC2nim(op.cmdLineRest)	183	- of "c2nim": bundleC2nim(op.cmdLineRest)
		184	- of "drnim": buildDrNim(op.cmdLineRest)
		185	+ #of "c2nim": bundleC2nim(op.cmdLineRest)
		186	+ #of "drnim": buildDrNim(op.cmdLineRest)
		187	of "fusion":
		188	let suffix = if latest: HeadHash else: FusionStableHash
		189	exec("nimble install -y fusion@$#" % suffix)
		190	of "ic": icTest(op.cmdLineRest)
		191	- of "branchdone": branchDone()
		192	+ #of "branchdone": branchDone()
		193	else: showHelp(success = false)
		194	break
		195	of cmdEnd: