Rename buildDir to binDir.
This commit is contained in:
parent
a7d53f43b3
commit
11f710819c
2 changed files with 9 additions and 9 deletions
|
|
@ -212,7 +212,7 @@ their own packages to it! Take a look at
|
|||
* ``srcDir`` - Specifies the directory which contains the .nim source files.
|
||||
**Default**: The directory in which the .nimble file resides; i.e. root dir of
|
||||
the package.
|
||||
* ``buildDir`` - Specifies the directory where ``nimble build`` will output
|
||||
* ``binDir`` - Specifies the directory where ``nimble build`` will output
|
||||
binaries.
|
||||
**Default**: The directory in which the .nimble file resides; i.e.
|
||||
root dir of the package.
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ type
|
|||
installExt*: seq[string]
|
||||
requires*: seq[PkgTuple]
|
||||
bin*: seq[string]
|
||||
buildDir*: string
|
||||
binDir*: string
|
||||
srcDir*: string
|
||||
backend*: string
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ proc initPackageInfo(): PackageInfo =
|
|||
result.requires = @[]
|
||||
result.bin = @[]
|
||||
result.srcDir = ""
|
||||
result.buildDir = ""
|
||||
result.binDir = ""
|
||||
result.backend = "c"
|
||||
|
||||
proc validatePackageInfo(pkgInfo: PackageInfo, path: string) =
|
||||
|
|
@ -143,7 +143,7 @@ proc readPackageInfo*(path: string): PackageInfo =
|
|||
of "description": result.description = ev.value
|
||||
of "license": result.license = ev.value
|
||||
of "srcdir": result.srcDir = ev.value
|
||||
of "builddir": result.buildDir = ev.value
|
||||
of "bindir": result.binDir = ev.value
|
||||
of "skipdirs":
|
||||
result.skipDirs.add(ev.value.multiSplit)
|
||||
of "skipfiles":
|
||||
|
|
@ -332,8 +332,8 @@ proc getRealDir*(pkgInfo: PackageInfo): string =
|
|||
proc getOutputOption*(pkgInfo: TPackageInfo, bin: string): string =
|
||||
## Returns an output option for the nim compiler if a build directory
|
||||
## has been set.
|
||||
if pkgInfo.buildDir != "":
|
||||
result = " -o:\"" & pkgInfo.mypath.splitFile.dir / pkgInfo.buildDir / bin & "\""
|
||||
if pkgInfo.binDir != "":
|
||||
result = " -o:\"" & pkgInfo.mypath.splitFile.dir / pkgInfo.binDir / bin & "\""
|
||||
else:
|
||||
result = " -o:\"" & pkgInfo.mypath.splitFile.dir / bin & "\""
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue