Attachment #213031 for bug #245328

Lines 2-8 Link Here

(-)lang/nim/Makefile (-8 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= nim	4	PORTNAME= nim
5	PORTVERSION= 1.0.6	5	PORTVERSION= 1.2.0
6	CATEGORIES= lang	6	CATEGORIES= lang
7	MASTER_SITES= https://nim-lang.org/download/	7	MASTER_SITES= https://nim-lang.org/download/
8		8
Lines 12-37 Link Here
12	LICENSE= MIT	12	LICENSE= MIT
13	LICENSE_FILE= ${WRKSRC}/copying.txt	13	LICENSE_FILE= ${WRKSRC}/copying.txt
14		14
15	BROKEN_aarch64= fails to compile: crt1.c: undefined reference to main
16	BROKEN_armv6= fails to compile: crt1.c: undefined reference to main
17	BROKEN_armv7= fails to compile: crt1.c: undefined reference to main
18	BROKEN_mips64= fails to build: build.sh: clang: not found	15	BROKEN_mips64= fails to build: build.sh: clang: not found
19	BROKEN_sparc64= fails to build: build.sh: clang: not found	16	BROKEN_sparc64= fails to build: build.sh: clang: not found
20		17
21	TOOLS_DESC= Build and install nimgrep and nimsuggest	18	USES= compiler tar:xz
22		19
		20	TOOLS_DESC= Build and install nim tools
		21
23	OPTIONS_DEFINE= DOCS TOOLS	22	OPTIONS_DEFINE= DOCS TOOLS
		23	OPTIONS_DEFAULT= DOCS TOOLS
		24
24	OPTIONS_SUB= yes	25	OPTIONS_SUB= yes
25		26
26	MAKE_JOBS_UNSAFE= yes	27	MAKE_JOBS_UNSAFE= yes
27	USES= compiler tar:xz
28		28
29	.include <bsd.port.pre.mk>	29	.include <bsd.port.pre.mk>
30		30
31	TLIST= nimgrep nimsuggest	31	TLIST= nimfind nimgrep nimpretty nimsuggest testament
32		32
33	.if ${ARCH} == "powerpc64"	33	.if ${ARCH} == "powerpc64"
34	. if defined(PPC_ABI) && ${PPC_ABI} == ELFv1	34	. if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
35	EXTRA_PATCHES= ${PATCHDIR}/elfv1-patch-build.sh	35	EXTRA_PATCHES= ${PATCHDIR}/elfv1-patch-build.sh
36	. endif	36	. endif
37	.endif	37	.endif

Lines 1-3 Link Here

(-)lang/nim/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1580488025	1	TIMESTAMP = 1585934270
2	SHA256 (nim-1.0.6.tar.xz) = 134e5751cf62fa189f76616a698ce0df4b4a0c1419ec0b582924087e585f66b3	2	SHA256 (nim-1.2.0.tar.xz) = 4e94583a373965821805e665e0a05f52fb610916676edb09148941415637c575
3	SIZE (nim-1.0.6.tar.xz) = 5153708	3	SIZE (nim-1.2.0.tar.xz) = 5869428




--- config/nim.cfg.orig	2020-04-03 17:22:53 UTC
+++ config/nim.cfg
@@ -8,7 +8,7 @@
 # Environment variables can be accessed like so:

 
 # additional options always passed to the compiler:
 --parallel_build: "0" # 0 to auto-detect number of processors
@@ -118,12 +118,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
-    # at least NetBSD has problems with thread local storage:
-    tlsEmulation:on
   @end
   @if haiku:
     gcc.options.linker = "-Wl,--as-needed -lnetwork"
     gcc.cpp.options.linker = "-Wl,--as-needed -lnetwork"
@@ -132,7 +126,7 @@ path="$lib/pure"
 @end
 
 @if nintendoswitch:
-  cc = "switch_gcc"
+  cc = "switch_clang"
   switch_gcc.options.linker = "-g -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE"
   switch_gcc.cpp.options.linker = "-g -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE"
   switch_gcc.options.always = "-g -Wall -O2 -ffunction-sections -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -D__SWITCH__"




--- install.sh.orig	2020-04-03 17:25:49 UTC
+++ install.sh
@@ -15,48 +15,14 @@ if [ $# -eq 1 ] ; then
     "--help"|"-h"|"help"|"h")

-      libdir=/usr/lib/nim
-      docdir=/usr/share/nim/doc
-      datadir=/usr/share/nim/data
-      nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
-      ;;
-    "/usr/local/bin")
-      bindir=/usr/local/bin

-      libdir=/usr/local/lib/nim
-      docdir=/usr/local/share/nim/doc
-      datadir=/usr/local/share/nim/data
-      nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
-      ;;
-    "/opt")
-      bindir="/opt/nim/bin"

-      libdir="/opt/nim/lib"
-      docdir="/opt/nim/doc"
-      datadir="/opt/nim/data"
-      nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
-      mkdir -p /opt/nim
-      mkdir -p $bindir
-      mkdir -p $configdir

-      datadir="$1/nim/data"
+      bindir="$1/bin"
+      configdir="$1/etc/nim"
+      libdir="$1//lib"
+      docdir="$1/share/doc/nim"
+      datadir="$1/share/nim"
       nimbleDir="$1/nim"
       mkdir -p $1/nim
       mkdir -p $bindir
@@ -973,13 +939,6 @@ chmod 644 $nimbleDir/compiler.nimble
 else
   echo "Nim installation script"
   echo "Usage: [sudo] sh install.sh DIR"




--- koch.nim.orig	2019-07-22 09:56:30 UTC
+++ koch.nim
@@ -43,15 +43,11 @@ Usage:
   koch [options] command [options for command]
 Options:
   --help, -h               shows this help and quits
-  --latest                 bundle the installers with a bleeding edge Nimble
-  --stable                 bundle the installers with a stable Nimble (default)
 Possible Commands:
   boot [options]           bootstraps with given command line options
   distrohelper [bindir]    helper for distro packagers
-  tools                    builds Nim related tools
-  toolsNoNimble            builds Nim related tools (except nimble)
+  tools                    builds Nim related tools (except nimble)
                            doesn't require network connectivity
-  nimble                   builds the Nimble tool
 Boot options:
   -d:release               produce a release version of the compiler
   -d:useLinenoise          use the linenoise library for interactive mode
@@ -127,41 +123,6 @@ proc bundleC2nim(args: string) =
   nimCompile("dist/c2nim/c2nim",
              options = "--noNimblePath --path:. " & args)
 
-proc bundleNimbleExe(latest: bool, args: string) =
-  if not dirExists("dist/nimble/.git"):
-    exec("git clone https://github.com/nim-lang/nimble.git dist/nimble")
-  if not latest:
-    withDir("dist/nimble"):
-      exec("git fetch")
-      exec("git checkout " & NimbleStableCommit)
-  # installer.ini expects it under $nim/bin
-  nimCompile("dist/nimble/src/nimble.nim",
-             options = "-d:release --nilseqs:on " & args)
-
-proc buildNimble(latest: bool, args: string) =
-  # if koch is used for a tar.xz, build the dist/nimble we shipped
-  # with the tarball:
-  var installDir = "dist/nimble"
-  if not latest and dirExists(installDir) and not dirExists("dist/nimble/.git"):
-    discard "don't do the git dance"
-  else:
-    if not dirExists("dist/nimble/.git"):
-      if dirExists(installDir):
-        var id = 0
-        while dirExists("dist/nimble" & $id):
-          inc id
-        installDir = "dist/nimble" & $id
-      exec("git clone https://github.com/nim-lang/nimble.git " & installDir)
-    withDir(installDir):
-      if latest:
-        exec("git checkout -f master")
-        exec("git pull")
-      else:
-        exec("git fetch")
-        exec("git checkout " & NimbleStableCommit)
-  nimCompile(installDir / "src/nimble.nim",
-             options = "--noNimblePath --nilseqs:on -d:release " & args)
-
 proc bundleNimsuggest(args: string) =
   nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim",
                  options = "-d:release -d:danger " & args)
@@ -182,7 +143,6 @@ 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)
   bundleNimsuggest(args)
   bundleWinTools(args)
   nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" %
@@ -219,7 +179,6 @@ proc buildTools(args: string = "") =
                  options = "-d:release " & args)
 
 proc nsis(latest: bool; args: string) =
-  bundleNimbleExe(latest, args)
   bundleNimsuggest(args)
   bundleWinTools(args)
   # make sure we have generated the niminst executables:
@@ -466,8 +425,6 @@ proc runCI(cmd: string) =
   # boot without -d:nimHasLibFFI to make sure this still works
   kochExecFold("Boot in release mode", "boot -d:release -d:danger")
 
-  ## build nimble early on to enable remainder to depend on it if needed
-  kochExecFold("Build Nimble", "nimble")
 
   when false:
     execFold("nimble install -y libffi", "nimble install -y libffi")
@@ -588,8 +545,6 @@ when isMainModule:
     case op.kind
     of cmdLongOption, cmdShortOption:
       case normalize(op.key)
-      of "latest": latest = true
-      of "stable": latest = false
       else: showHelp()
     of cmdArgument:
       case normalize(op.key)
@@ -613,13 +568,9 @@ when isMainModule:
       of "temp": temp(op.cmdLineRest)
       of "xtemp": xtemp(op.cmdLineRest)
       of "wintools": bundleWinTools(op.cmdLineRest)
-      of "nimble": buildNimble(latest, op.cmdLineRest)
       of "nimsuggest": bundleNimsuggest(op.cmdLineRest)
-      of "toolsnonimble":
-        buildTools(op.cmdLineRest)
       of "tools":
         buildTools(op.cmdLineRest)
-        buildNimble(latest, op.cmdLineRest)
       of "pushcsource", "pushcsources": pushCsources()
       of "valgrind": valgrind(op.cmdLineRest)
       of "c2nim": bundleC2nim(op.cmdLineRest)




bin/nim
%%TOOLS%%bin/nimfind
%%TOOLS%%bin/nimgrep
%%TOOLS%%bin/nimpretty
%%TOOLS%%bin/nimsuggest
%%TOOLS%%bin/testament
%%ETCDIR%%/nim.cfg
%%ETCDIR%%/nimdoc.cfg
%%ETCDIR%%/nimdoc.tex.cfg
lib/arch/x86/amd64.S
lib/arch/x86/i386.S
lib/core/allocators.nim
lib/core/hotcodereloading.nim
lib/core/locks.nim
lib/core/macrocache.nim
lib/core/macros.nim
lib/core/rlocks.nim
lib/core/runtime_v2.nim
lib/core/seqs.nim
lib/core/strs.nim
lib/core/typeinfo.nim
lib/cycle.h
lib/deprecated/pure/LockFreeHash.nim

lib/impure/db_sqlite.nim
lib/impure/nre.nim
lib/impure/nre/private/util.nim
lib/impure/osinfo_posix.nim
lib/impure/osinfo_win.nim
lib/impure/rdstdin.nim
lib/impure/re.nim
lib/js/asyncjs.nim

lib/posix/posix_macos_amd64.nim
lib/posix/posix_nintendoswitch.nim
lib/posix/posix_nintendoswitch_consts.nim
lib/posix/posix_openbsd_amd64.nim
lib/posix/posix_other.nim
lib/posix/posix_other_consts.nim
lib/posix/posix_utils.nim

lib/pure/selectors.nim
lib/pure/smtp.nim
lib/pure/smtp.nim.cfg
lib/pure/ssl_certs.nim
lib/pure/stats.nim
lib/pure/streams.nim
lib/pure/strformat.nim

lib/pure/volatile.nim
lib/pure/xmlparser.nim
lib/pure/xmltree.nim
lib/std/compilesettings.nim
lib/std/decls.nim
lib/std/editdistance.nim
lib/std/logic.nim
lib/std/monotimes.nim
lib/std/private/underscored_calls.nim
lib/std/sha1.nim
lib/std/stackframes.nim
lib/std/sums.nim
lib/std/time_t.nim
lib/std/varints.nim
lib/std/with.nim
lib/std/wordwrap.nim
lib/std/wrapnils.nim
lib/stdlib.nimble
lib/system.nim
lib/system/alloc.nim
lib/system/ansi_c.nim
lib/system/arithm.nim
lib/system/arithmetics.nim
lib/system/assertions.nim
lib/system/assign.nim
lib/system/atomics.nim
lib/system/avltree.nim
lib/system/basic_types.nim
lib/system/cellsets.nim
lib/system/cgprocs.nim
lib/system/channels.nim
lib/system/chcks.nim
lib/system/comparisons.nim
lib/system/cyclebreaker.nim
lib/system/cyclicrefs_v2.nim
lib/system/deepcopy.nim
lib/system/dollars.nim
lib/system/dyncalls.nim
lib/system/embedded.nim
lib/system/exceptions.nim
lib/system/excpt.nim
lib/system/fatal.nim
lib/system/formatfloat.nim

lib/system/gc2.nim
lib/system/gc_common.nim
lib/system/gc_hooks.nim
lib/system/gc_interface.nim
lib/system/gc_ms.nim
lib/system/gc_regions.nim
lib/system/hti.nim
lib/system/inclrtl.nim
lib/system/indexerrors.nim
lib/system/integerops.nim
lib/system/io.nim
lib/system/iterators.nim
lib/system/iterators_1.nim
lib/system/jssys.nim
lib/system/memalloc.nim
lib/system/memory.nim
lib/system/memtracker.nim
lib/system/mm/boehm.nim
lib/system/mm/go.nim
lib/system/mm/malloc.nim
lib/system/mm/none.nim
lib/system/mmdisp.nim
lib/system/nimscript.nim
lib/system/osalloc.nim
lib/system/platforms.nim
lib/system/profiler.nim
lib/system/refs_v2.nim
lib/system/repr.nim
lib/system/repr_v2.nim
lib/system/reprjs.nim
lib/system/seqs_v2.nim
lib/system/setops.nim
lib/system/sets.nim
lib/system/strmantle.nim
lib/system/strs_v2.nim
lib/system/syslocks.nim
lib/system/sysspawn.nim
lib/system/sysstr.nim

nim/compiler/cmdlinehelper.nim
nim/compiler/commands.nim
nim/compiler/condsyms.nim
nim/compiler/configuration.nim
nim/compiler/debuginfo.nim
nim/compiler/depends.nim
nim/compiler/dfa.nim

nim/compiler/semtypinst.nim
nim/compiler/sighashes.nim
nim/compiler/sigmatch.nim
nim/compiler/sinkparameter_inference.nim
nim/compiler/sizealignoffsetimpl.nim
nim/compiler/sourcemap.nim
nim/compiler/spawn.nim
nim/compiler/suggest.nim
nim/compiler/syntaxes.nim

nim/compiler/writetracking.nim
nim/doc/advopt.txt
nim/doc/basicopt.txt
nim/doc/nimdoc.css
%%PORTDOCS%%%%DOCSDIR%%/html/overview.html
%%TOOLS%%bin/nimgrep
%%TOOLS%%bin/nimsuggest

Return to bug 245328

Lines 1-4 Link Here

(-)lang/nim/files/patch-config-nim.cfg (-14 / +5 lines)
1	--- config/nim.cfg.orig 2019-07-22 09:41:23 UTC	1	--- config/nim.cfg.orig 2020-04-03 17:22:53 UTC
2	+++ config/nim.cfg	2	+++ config/nim.cfg
3	@@ -8,7 +8,7 @@	3	@@ -8,7 +8,7 @@
4	# Environment variables can be accessed like so:	4	# Environment variables can be accessed like so:
Lines 9-33 Link Here
9		9
10	# additional options always passed to the compiler:	10	# additional options always passed to the compiler:
11	--parallel_build: "0" # 0 to auto-detect number of processors	11	--parallel_build: "0" # 0 to auto-detect number of processors
12	@@ -105,12 +105,6 @@ path="$lib/pure"	12	@@ -118,12 +118,6 @@ path="$lib/pure"
		13	clang.options.linker = "-ldl"
13	clang.cpp.options.linker = "-ldl"	14	clang.cpp.options.linker = "-ldl"
14	tcc.options.linker = "-ldl"	15	tcc.options.linker = "-ldl"
15	@end	16	- @end
16	- @if bsd:	17	- @if bsd:
17	- # BSD got posix_spawn only recently, so we deactivate it for osproc:	18	- # BSD got posix_spawn only recently, so we deactivate it for osproc:
18	- define:useFork	19	- define:useFork
19	- # at least NetBSD has problems with thread local storage:	20	- # at least NetBSD has problems with thread local storage:
20	- tlsEmulation:on	21	- tlsEmulation:on
21	- @end	22	@end
22	@if haiku:	23	@if haiku:
23	gcc.options.linker = "-Wl,--as-needed -lnetwork"	24	gcc.options.linker = "-Wl,--as-needed -lnetwork"
24	gcc.cpp.options.linker = "-Wl,--as-needed -lnetwork"
25	@@ -132,7 +126,7 @@ path="$lib/pure"
26	@end
27
28	@if nintendoswitch:
29	- cc = "switch_gcc"
30	+ cc = "switch_clang"
31	switch_gcc.options.linker = "-g -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE"
32	switch_gcc.cpp.options.linker = "-g -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE"
33	switch_gcc.options.always = "-g -Wall -O2 -ffunction-sections -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -D__SWITCH__"

Lines 1-4 Link Here

(-)lang/nim/files/patch-install.sh (-6 / +6 lines)
1	--- install.sh.orig 2020-01-31 16:27:59 UTC	1	--- install.sh.orig 2020-04-03 17:25:49 UTC
2	+++ install.sh	2	+++ install.sh
3	@@ -15,48 +15,14 @@ if [ $# -eq 1 ] ; then	3	@@ -15,48 +15,14 @@ if [ $# -eq 1 ] ; then
4	"--help"\|"-h"\|"help"\|"h")	4	"--help"\|"-h"\|"help"\|"h")
Lines 19-25 Link Here
19	- libdir=/usr/lib/nim	19	- libdir=/usr/lib/nim
20	- docdir=/usr/share/nim/doc	20	- docdir=/usr/share/nim/doc
21	- datadir=/usr/share/nim/data	21	- datadir=/usr/share/nim/data
22	- nimbleDir="/opt/nimble/pkgs/compiler-1.0.6"	22	- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
23	- ;;	23	- ;;
24	- "/usr/local/bin")	24	- "/usr/local/bin")
25	- bindir=/usr/local/bin	25	- bindir=/usr/local/bin
Lines 27-33 Link Here
27	- libdir=/usr/local/lib/nim	27	- libdir=/usr/local/lib/nim
28	- docdir=/usr/local/share/nim/doc	28	- docdir=/usr/local/share/nim/doc
29	- datadir=/usr/local/share/nim/data	29	- datadir=/usr/local/share/nim/data
30	- nimbleDir="/opt/nimble/pkgs/compiler-1.0.6"	30	- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
31	- ;;	31	- ;;
32	- "/opt")	32	- "/opt")
33	- bindir="/opt/nim/bin"	33	- bindir="/opt/nim/bin"
Lines 35-41 Link Here
35	- libdir="/opt/nim/lib"	35	- libdir="/opt/nim/lib"
36	- docdir="/opt/nim/doc"	36	- docdir="/opt/nim/doc"
37	- datadir="/opt/nim/data"	37	- datadir="/opt/nim/data"
38	- nimbleDir="/opt/nimble/pkgs/compiler-1.0.6"	38	- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
39	- mkdir -p /opt/nim	39	- mkdir -p /opt/nim
40	- mkdir -p $bindir	40	- mkdir -p $bindir
41	- mkdir -p $configdir	41	- mkdir -p $configdir
Lines 48-60 Link Here
48	- datadir="$1/nim/data"	48	- datadir="$1/nim/data"
49	+ bindir="$1/bin"	49	+ bindir="$1/bin"
50	+ configdir="$1/etc/nim"	50	+ configdir="$1/etc/nim"
51	+ libdir="$1/lib"	51	+ libdir="$1//lib"
52	+ docdir="$1/share/doc/nim"	52	+ docdir="$1/share/doc/nim"
53	+ datadir="$1/share/nim"	53	+ datadir="$1/share/nim"
54	nimbleDir="$1/nim"	54	nimbleDir="$1/nim"
55	mkdir -p $1/nim	55	mkdir -p $1/nim
56	mkdir -p $bindir	56	mkdir -p $bindir
57	@@ -923,13 +889,6 @@ chmod 644 $nimbleDir/compiler.nimble	57	@@ -973,13 +939,6 @@ chmod 644 $nimbleDir/compiler.nimble
58	else	58	else
59	echo "Nim installation script"	59	echo "Nim installation script"
60	echo "Usage: [sudo] sh install.sh DIR"	60	echo "Usage: [sudo] sh install.sh DIR"

Lines 1-109 Link Here

(-)lang/nim/files/patch-koch.nim (-109 lines)
1	--- koch.nim.orig 2019-07-22 09:56:30 UTC
2	+++ koch.nim
3	@@ -43,15 +43,11 @@ Usage:
4	koch [options] command [options for command]
5	Options:
6	--help, -h shows this help and quits
7	- --latest bundle the installers with a bleeding edge Nimble
8	- --stable bundle the installers with a stable Nimble (default)
9	Possible Commands:
10	boot [options] bootstraps with given command line options
11	distrohelper [bindir] helper for distro packagers
12	- tools builds Nim related tools
13	- toolsNoNimble builds Nim related tools (except nimble)
14	+ tools builds Nim related tools (except nimble)
15	doesn't require network connectivity
16	- nimble builds the Nimble tool
17	Boot options:
18	-d:release produce a release version of the compiler
19	-d:useLinenoise use the linenoise library for interactive mode
20	@@ -127,41 +123,6 @@ proc bundleC2nim(args: string) =
21	nimCompile("dist/c2nim/c2nim",
22	options = "--noNimblePath --path:. " & args)
23
24	-proc bundleNimbleExe(latest: bool, args: string) =
25	- if not dirExists("dist/nimble/.git"):
26	- exec("git clone https://github.com/nim-lang/nimble.git dist/nimble")
27	- if not latest:
28	- withDir("dist/nimble"):
29	- exec("git fetch")
30	- exec("git checkout " & NimbleStableCommit)
31	- # installer.ini expects it under $nim/bin
32	- nimCompile("dist/nimble/src/nimble.nim",
33	- options = "-d:release --nilseqs:on " & args)
34	-
35	-proc buildNimble(latest: bool, args: string) =
36	- # if koch is used for a tar.xz, build the dist/nimble we shipped
37	- # with the tarball:
38	- var installDir = "dist/nimble"
39	- if not latest and dirExists(installDir) and not dirExists("dist/nimble/.git"):
40	- discard "don't do the git dance"
41	- else:
42	- if not dirExists("dist/nimble/.git"):
43	- if dirExists(installDir):
44	- var id = 0
45	- while dirExists("dist/nimble" & $id):
46	- inc id
47	- installDir = "dist/nimble" & $id
48	- exec("git clone https://github.com/nim-lang/nimble.git " & installDir)
49	- withDir(installDir):
50	- if latest:
51	- exec("git checkout -f master")
52	- exec("git pull")
53	- else:
54	- exec("git fetch")
55	- exec("git checkout " & NimbleStableCommit)
56	- nimCompile(installDir / "src/nimble.nim",
57	- options = "--noNimblePath --nilseqs:on -d:release " & args)
58	-
59	proc bundleNimsuggest(args: string) =
60	nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim",
61	options = "-d:release -d:danger " & args)
62	@@ -182,7 +143,6 @@ proc bundleWinTools(args: string) =
63	options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui " & args)
64
65	proc zip(latest: bool; args: string) =
66	- bundleNimbleExe(latest, args)
67	bundleNimsuggest(args)
68	bundleWinTools(args)
69	nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" %
70	@@ -219,7 +179,6 @@ proc buildTools(args: string = "") =
71	options = "-d:release " & args)
72
73	proc nsis(latest: bool; args: string) =
74	- bundleNimbleExe(latest, args)
75	bundleNimsuggest(args)
76	bundleWinTools(args)
77	# make sure we have generated the niminst executables:
78	@@ -466,8 +425,6 @@ proc runCI(cmd: string) =
79	# boot without -d:nimHasLibFFI to make sure this still works
80	kochExecFold("Boot in release mode", "boot -d:release -d:danger")
81
82	- ## build nimble early on to enable remainder to depend on it if needed
83	- kochExecFold("Build Nimble", "nimble")
84
85	when false:
86	execFold("nimble install -y libffi", "nimble install -y libffi")
87	@@ -588,8 +545,6 @@ when isMainModule:
88	case op.kind
89	of cmdLongOption, cmdShortOption:
90	case normalize(op.key)
91	- of "latest": latest = true
92	- of "stable": latest = false
93	else: showHelp()
94	of cmdArgument:
95	case normalize(op.key)
96	@@ -613,13 +568,9 @@ when isMainModule:
97	of "temp": temp(op.cmdLineRest)
98	of "xtemp": xtemp(op.cmdLineRest)
99	of "wintools": bundleWinTools(op.cmdLineRest)
100	- of "nimble": buildNimble(latest, op.cmdLineRest)
101	of "nimsuggest": bundleNimsuggest(op.cmdLineRest)
102	- of "toolsnonimble":
103	- buildTools(op.cmdLineRest)
104	of "tools":
105	buildTools(op.cmdLineRest)
106	- buildNimble(latest, op.cmdLineRest)
107	of "pushcsource", "pushcsources": pushCsources()
108	of "valgrind": valgrind(op.cmdLineRest)
109	of "c2nim": bundleC2nim(op.cmdLineRest)

Lines 1-18 Link Here

(-)lang/nim/pkg-plist (-13 / +39 lines)
1	bin/nim	1	bin/nim
2	etc/nim/nim.cfg	2	%%TOOLS%%bin/nimfind
3	etc/nim/nimdoc.cfg	3	%%TOOLS%%bin/nimgrep
4	etc/nim/nimdoc.tex.cfg	4	%%TOOLS%%bin/nimpretty
		5	%%TOOLS%%bin/nimsuggest
		6	%%TOOLS%%bin/testament
		7	%%ETCDIR%%/nim.cfg
		8	%%ETCDIR%%/nimdoc.cfg
		9	%%ETCDIR%%/nimdoc.tex.cfg
5	lib/arch/x86/amd64.S	10	lib/arch/x86/amd64.S
6	lib/arch/x86/i386.S	11	lib/arch/x86/i386.S
7	lib/core/allocators.nim
8	lib/core/hotcodereloading.nim	12	lib/core/hotcodereloading.nim
9	lib/core/locks.nim	13	lib/core/locks.nim
10	lib/core/macrocache.nim	14	lib/core/macrocache.nim
11	lib/core/macros.nim	15	lib/core/macros.nim
12	lib/core/rlocks.nim	16	lib/core/rlocks.nim
13	lib/core/runtime_v2.nim
14	lib/core/seqs.nim
15	lib/core/strs.nim
16	lib/core/typeinfo.nim	17	lib/core/typeinfo.nim
17	lib/cycle.h	18	lib/cycle.h
18	lib/deprecated/pure/LockFreeHash.nim	19	lib/deprecated/pure/LockFreeHash.nim
Lines 32-39 Link Here
32	lib/impure/db_sqlite.nim	33	lib/impure/db_sqlite.nim
33	lib/impure/nre.nim	34	lib/impure/nre.nim
34	lib/impure/nre/private/util.nim	35	lib/impure/nre/private/util.nim
35	lib/impure/osinfo_posix.nim
36	lib/impure/osinfo_win.nim
37	lib/impure/rdstdin.nim	36	lib/impure/rdstdin.nim
38	lib/impure/re.nim	37	lib/impure/re.nim
39	lib/js/asyncjs.nim	38	lib/js/asyncjs.nim
Lines 62-67 Link Here
62	lib/posix/posix_macos_amd64.nim	61	lib/posix/posix_macos_amd64.nim
63	lib/posix/posix_nintendoswitch.nim	62	lib/posix/posix_nintendoswitch.nim
64	lib/posix/posix_nintendoswitch_consts.nim	63	lib/posix/posix_nintendoswitch_consts.nim
		64	lib/posix/posix_openbsd_amd64.nim
65	lib/posix/posix_other.nim	65	lib/posix/posix_other.nim
66	lib/posix/posix_other_consts.nim	66	lib/posix/posix_other_consts.nim
67	lib/posix/posix_utils.nim	67	lib/posix/posix_utils.nim
Lines 166-171 Link Here
166	lib/pure/selectors.nim	166	lib/pure/selectors.nim
167	lib/pure/smtp.nim	167	lib/pure/smtp.nim
168	lib/pure/smtp.nim.cfg	168	lib/pure/smtp.nim.cfg
		169	lib/pure/ssl_certs.nim
169	lib/pure/stats.nim	170	lib/pure/stats.nim
170	lib/pure/streams.nim	171	lib/pure/streams.nim
171	lib/pure/strformat.nim	172	lib/pure/strformat.nim
Lines 186-215 Link Here
186	lib/pure/volatile.nim	187	lib/pure/volatile.nim
187	lib/pure/xmlparser.nim	188	lib/pure/xmlparser.nim
188	lib/pure/xmltree.nim	189	lib/pure/xmltree.nim
		190	lib/std/compilesettings.nim
		191	lib/std/decls.nim
189	lib/std/editdistance.nim	192	lib/std/editdistance.nim
		193	lib/std/logic.nim
190	lib/std/monotimes.nim	194	lib/std/monotimes.nim
		195	lib/std/private/underscored_calls.nim
191	lib/std/sha1.nim	196	lib/std/sha1.nim
		197	lib/std/stackframes.nim
192	lib/std/sums.nim	198	lib/std/sums.nim
193	lib/std/time_t.nim	199	lib/std/time_t.nim
194	lib/std/varints.nim	200	lib/std/varints.nim
		201	lib/std/with.nim
195	lib/std/wordwrap.nim	202	lib/std/wordwrap.nim
		203	lib/std/wrapnils.nim
196	lib/stdlib.nimble	204	lib/stdlib.nimble
197	lib/system.nim	205	lib/system.nim
198	lib/system/alloc.nim	206	lib/system/alloc.nim
199	lib/system/ansi_c.nim	207	lib/system/ansi_c.nim
200	lib/system/arithm.nim	208	lib/system/arithm.nim
		209	lib/system/arithmetics.nim
201	lib/system/assertions.nim	210	lib/system/assertions.nim
202	lib/system/assign.nim	211	lib/system/assign.nim
203	lib/system/atomics.nim	212	lib/system/atomics.nim
204	lib/system/avltree.nim	213	lib/system/avltree.nim
		214	lib/system/basic_types.nim
205	lib/system/cellsets.nim	215	lib/system/cellsets.nim
206	lib/system/cgprocs.nim	216	lib/system/cgprocs.nim
207	lib/system/channels.nim	217	lib/system/channels.nim
208	lib/system/chcks.nim	218	lib/system/chcks.nim
		219	lib/system/comparisons.nim
		220	lib/system/cyclebreaker.nim
		221	lib/system/cyclicrefs_v2.nim
209	lib/system/deepcopy.nim	222	lib/system/deepcopy.nim
210	lib/system/dollars.nim	223	lib/system/dollars.nim
211	lib/system/dyncalls.nim	224	lib/system/dyncalls.nim
212	lib/system/embedded.nim	225	lib/system/embedded.nim
		226	lib/system/exceptions.nim
213	lib/system/excpt.nim	227	lib/system/excpt.nim
214	lib/system/fatal.nim	228	lib/system/fatal.nim
215	lib/system/formatfloat.nim	229	lib/system/formatfloat.nim
Lines 217-241 Link Here
217	lib/system/gc2.nim	231	lib/system/gc2.nim
218	lib/system/gc_common.nim	232	lib/system/gc_common.nim
219	lib/system/gc_hooks.nim	233	lib/system/gc_hooks.nim
		234	lib/system/gc_interface.nim
220	lib/system/gc_ms.nim	235	lib/system/gc_ms.nim
221	lib/system/gc_regions.nim	236	lib/system/gc_regions.nim
222	lib/system/hti.nim	237	lib/system/hti.nim
223	lib/system/inclrtl.nim	238	lib/system/inclrtl.nim
224	lib/system/indexerrors.nim	239	lib/system/indexerrors.nim
		240	lib/system/integerops.nim
225	lib/system/io.nim	241	lib/system/io.nim
226	lib/system/iterators.nim	242	lib/system/iterators.nim
		243	lib/system/iterators_1.nim
227	lib/system/jssys.nim	244	lib/system/jssys.nim
		245	lib/system/memalloc.nim
228	lib/system/memory.nim	246	lib/system/memory.nim
229	lib/system/memtracker.nim	247	lib/system/memtracker.nim
		248	lib/system/mm/boehm.nim
		249	lib/system/mm/go.nim
		250	lib/system/mm/malloc.nim
		251	lib/system/mm/none.nim
230	lib/system/mmdisp.nim	252	lib/system/mmdisp.nim
231	lib/system/nimscript.nim	253	lib/system/nimscript.nim
232	lib/system/osalloc.nim	254	lib/system/osalloc.nim
233	lib/system/platforms.nim	255	lib/system/platforms.nim
234	lib/system/profiler.nim	256	lib/system/profiler.nim
		257	lib/system/refs_v2.nim
235	lib/system/repr.nim	258	lib/system/repr.nim
		259	lib/system/repr_v2.nim
236	lib/system/reprjs.nim	260	lib/system/reprjs.nim
		261	lib/system/seqs_v2.nim
		262	lib/system/setops.nim
237	lib/system/sets.nim	263	lib/system/sets.nim
238	lib/system/strmantle.nim	264	lib/system/strmantle.nim
		265	lib/system/strs_v2.nim
239	lib/system/syslocks.nim	266	lib/system/syslocks.nim
240	lib/system/sysspawn.nim	267	lib/system/sysspawn.nim
241	lib/system/sysstr.nim	268	lib/system/sysstr.nim
Lines 283-289 Link Here
283	nim/compiler/cmdlinehelper.nim	310	nim/compiler/cmdlinehelper.nim
284	nim/compiler/commands.nim	311	nim/compiler/commands.nim
285	nim/compiler/condsyms.nim	312	nim/compiler/condsyms.nim
286	nim/compiler/configuration.nim
287	nim/compiler/debuginfo.nim	313	nim/compiler/debuginfo.nim
288	nim/compiler/depends.nim	314	nim/compiler/depends.nim
289	nim/compiler/dfa.nim	315	nim/compiler/dfa.nim
Lines 383-389 Link Here
383	nim/compiler/semtypinst.nim	409	nim/compiler/semtypinst.nim
384	nim/compiler/sighashes.nim	410	nim/compiler/sighashes.nim
385	nim/compiler/sigmatch.nim	411	nim/compiler/sigmatch.nim
		412	nim/compiler/sinkparameter_inference.nim
386	nim/compiler/sizealignoffsetimpl.nim	413	nim/compiler/sizealignoffsetimpl.nim
		414	nim/compiler/sourcemap.nim
387	nim/compiler/spawn.nim	415	nim/compiler/spawn.nim
388	nim/compiler/suggest.nim	416	nim/compiler/suggest.nim
389	nim/compiler/syntaxes.nim	417	nim/compiler/syntaxes.nim
Lines 405-411 Link Here
405	nim/compiler/writetracking.nim	433	nim/compiler/writetracking.nim
406	nim/doc/advopt.txt	434	nim/doc/advopt.txt
407	nim/doc/basicopt.txt	435	nim/doc/basicopt.txt
408	%%PORTDOCS%%@dir %%DOCSDIR%%	436	nim/doc/nimdoc.css
409	%%PORTDOCS%%%%DOCSDIR%%/html/overview.html	437	%%PORTDOCS%%%%DOCSDIR%%/html/overview.html
410	%%TOOLS%%bin/nimgrep
411	%%TOOLS%%bin/nimsuggest