parent
38cd55e71a
commit
2ec470d287
14 changed files with 21 additions and 30 deletions
|
|
@ -3,8 +3,7 @@
|
||||||
|
|
||||||
import system except TResult
|
import system except TResult
|
||||||
|
|
||||||
import httpclient, parseopt, os, osproc, pegs, tables, parseutils,
|
import os, tables, strtabs, json, algorithm, sets, uri, sugar, sequtils
|
||||||
strtabs, json, algorithm, sets, uri, sugar, sequtils
|
|
||||||
|
|
||||||
import strutils except toLower
|
import strutils except toLower
|
||||||
from unicode import toLower
|
from unicode import toLower
|
||||||
|
|
|
||||||
|
|
@ -12,11 +12,8 @@
|
||||||
# - Bright for HighPriority.
|
# - Bright for HighPriority.
|
||||||
# - Normal for MediumPriority.
|
# - Normal for MediumPriority.
|
||||||
|
|
||||||
import logging, terminal, sets, strutils, os
|
import terminal, sets, strutils
|
||||||
import ./common
|
import version
|
||||||
|
|
||||||
when defined(windows):
|
|
||||||
import winlean
|
|
||||||
|
|
||||||
type
|
type
|
||||||
CLI* = ref object
|
CLI* = ref object
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ when not defined(nimscript):
|
||||||
import sets
|
import sets
|
||||||
|
|
||||||
import version
|
import version
|
||||||
export version.NimbleError # TODO: Surely there is a better way?
|
|
||||||
|
|
||||||
type
|
type
|
||||||
BuildFailed* = object of NimbleError
|
BuildFailed* = object of NimbleError
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
# BSD License. Look at license.txt for more info.
|
# BSD License. Look at license.txt for more info.
|
||||||
import parsecfg, streams, strutils, os, tables, Uri
|
import parsecfg, streams, strutils, os, tables, Uri
|
||||||
|
|
||||||
import tools, version, common, cli
|
import version, cli
|
||||||
|
|
||||||
type
|
type
|
||||||
Config* = object
|
Config* = object
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
# Copyright (C) Dominik Picheta. All rights reserved.
|
# Copyright (C) Dominik Picheta. All rights reserved.
|
||||||
# BSD License. Look at license.txt for more info.
|
# BSD License. Look at license.txt for more info.
|
||||||
|
|
||||||
import os, tables, strutils, sets
|
import os, strutils, sets
|
||||||
|
|
||||||
import packageparser, common, packageinfo, options, nimscriptwrapper, cli
|
import packageparser, common, packageinfo, options, nimscriptwrapper, cli,
|
||||||
|
version
|
||||||
|
|
||||||
proc execHook*(options: Options, before: bool): bool =
|
proc execHook*(options: Options, before: bool): bool =
|
||||||
## Returns whether to continue.
|
## Returns whether to continue.
|
||||||
|
|
|
||||||
|
|
@ -5,18 +5,15 @@
|
||||||
## scripting language.
|
## scripting language.
|
||||||
|
|
||||||
import
|
import
|
||||||
compiler/ast, compiler/modules, compiler/passes, compiler/passaux,
|
compiler/ast, compiler/modules, compiler/passes, compiler/condsyms,
|
||||||
compiler/condsyms, compiler/sem, compiler/semdata,
|
compiler/sem, compiler/llstream, compiler/vm, compiler/vmdef, compiler/idents,
|
||||||
compiler/llstream, compiler/vm, compiler/vmdef, compiler/commands,
|
|
||||||
compiler/msgs, compiler/magicsys, compiler/idents,
|
|
||||||
compiler/nimconf, compiler/nversion
|
compiler/nimconf, compiler/nversion
|
||||||
|
|
||||||
from compiler/scriptconfig import setupVM
|
|
||||||
from compiler/astalgo import strTableGet
|
from compiler/astalgo import strTableGet
|
||||||
import compiler/options as compiler_options
|
import compiler/options as compiler_options
|
||||||
|
|
||||||
import common, version, options, packageinfo, cli, tools
|
import common, version, options, cli, tools
|
||||||
import os, strutils, strtabs, tables, times, osproc, sets, pegs
|
import os, strutils, tables, times, osproc, sets, pegs
|
||||||
|
|
||||||
when not declared(resetAllModulesHard):
|
when not declared(resetAllModulesHard):
|
||||||
import compiler/modulegraphs
|
import compiler/modulegraphs
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,8 @@
|
||||||
## Implements the new configuration system for Nimble. Uses Nim as a
|
## Implements the new configuration system for Nimble. Uses Nim as a
|
||||||
## scripting language.
|
## scripting language.
|
||||||
|
|
||||||
import common, version, options, packageinfo, cli, tools
|
import version, options, cli, tools
|
||||||
import hashes, json, os, streams, strutils, strtabs,
|
import hashes, json, os, strutils, tables, times, osproc
|
||||||
tables, times, osproc, sets, pegs
|
|
||||||
|
|
||||||
type
|
type
|
||||||
Flags = TableRef[string, seq[string]]
|
Flags = TableRef[string, seq[string]]
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
import json, strutils, os, parseopt, strtabs, uri, tables, terminal
|
import json, strutils, os, parseopt, strtabs, uri, tables, terminal
|
||||||
from httpclient import Proxy, newProxy
|
from httpclient import Proxy, newProxy
|
||||||
|
|
||||||
import config, version, tools, common, cli
|
import config, version, common, cli
|
||||||
|
|
||||||
type
|
type
|
||||||
Options* = object
|
Options* = object
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,7 @@
|
||||||
|
|
||||||
# Stdlib imports
|
# Stdlib imports
|
||||||
import system except TResult
|
import system except TResult
|
||||||
import hashes, parsecfg, json, streams, strutils, parseutils, os, sets, tables
|
import hashes, json, strutils, os, sets, tables, httpclient
|
||||||
import httpclient
|
|
||||||
|
|
||||||
# Local imports
|
# Local imports
|
||||||
import version, tools, common, options, cli, config
|
import version, tools, common, options, cli, config
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
import os, strutils, sets, json
|
import os, strutils, sets, json
|
||||||
|
|
||||||
# Local imports
|
# Local imports
|
||||||
import cli, common, options, tools
|
import version, cli, options, tools
|
||||||
|
|
||||||
when defined(windows):
|
when defined(windows):
|
||||||
# This is just for Win XP support.
|
# This is just for Win XP support.
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Copyright (C) Dominik Picheta. All rights reserved.
|
# Copyright (C) Dominik Picheta. All rights reserved.
|
||||||
# BSD License. Look at license.txt for more info.
|
# BSD License. Look at license.txt for more info.
|
||||||
import parsecfg, json, sets, streams, strutils, parseutils, os, tables, sugar
|
import parsecfg, sets, streams, strutils, os, tables, sugar
|
||||||
from sequtils import apply, map
|
from sequtils import apply, map
|
||||||
|
|
||||||
import version, tools, common, nimscriptwrapper, options, packageinfo, cli
|
import version, tools, common, nimscriptwrapper, options, packageinfo, cli
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
||||||
## nim-lang/packages automatically.
|
## nim-lang/packages automatically.
|
||||||
|
|
||||||
import system except TResult
|
import system except TResult
|
||||||
import httpclient, base64, strutils, rdstdin, json, os, browsers, times, uri
|
import httpclient, strutils, json, os, browsers, times, uri
|
||||||
import tools, common, cli, config, options
|
import version, tools, common, cli, config, options
|
||||||
|
|
||||||
type
|
type
|
||||||
Auth = object
|
Auth = object
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# Various miscellaneous utility functions reside here.
|
# Various miscellaneous utility functions reside here.
|
||||||
import osproc, pegs, strutils, os, uri, sets, json, parseutils
|
import osproc, pegs, strutils, os, uri, sets, json, parseutils
|
||||||
import version, common, cli
|
import version, cli
|
||||||
|
|
||||||
proc extractBin(cmd: string): string =
|
proc extractBin(cmd: string): string =
|
||||||
if cmd[0] == '"':
|
if cmd[0] == '"':
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Copyright (C) Dominik Picheta. All rights reserved.
|
# Copyright (C) Dominik Picheta. All rights reserved.
|
||||||
# BSD License. Look at license.txt for more info.
|
# BSD License. Look at license.txt for more info.
|
||||||
import osproc, streams, unittest, strutils, os, sequtils, sugar
|
import osproc, unittest, strutils, os, sequtils, sugar
|
||||||
|
|
||||||
# TODO: Each test should start off with a clean slate. Currently installed
|
# TODO: Each test should start off with a clean slate. Currently installed
|
||||||
# packages are shared between each test which causes a multitude of issues
|
# packages are shared between each test which causes a multitude of issues
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue