CyberTaIlor/nimbus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use binary's basename instead of full path

Browse Source
This commit is contained in:
Anna “CyberTailor” 2022-07-02 07:36:15 +05:00
parent 73ab2411cb
commit 8b58e3265f
Signed by: CyberTaIlor
GPG Key ID: E7B76EDC50864BB1
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nimbus.nimble
View File

@ -3,7 +3,7 @@
# Package
version = "0.2.0"
version = "0.2.1"
author = "Anna"
description = "A Nim build system."
license = "BSD"

2
src/nimbs/common.nim
View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause
const
nimbusVersion* = "0.2.0"
nimbusVersion* = "0.2.1"
defaultBinDir* = "/usr/local/bin"
defaultNimbleDir* = "/opt/nimble"

2
src/nimbs/installerscript.nim
View File

@ -54,6 +54,6 @@ let destDir = getEnv("DESTDIR")
f.write('\n')
f.writeMkDir(options.getBinDir())
for bin in pkgInfo.bin:
let binWithExt = bin.addFileExt(ExeExt)
let binWithExt = bin.lastPathPart.addFileExt(ExeExt)
f.writeCpFile(binWithExt, options.getBinDir() / binWithExt)
f.makeExecutable(options.getBinDir() / binWithExt)

2
src/nimbus.nim
View File

@ -149,7 +149,7 @@ proc setup(options: Options) =
ninja.newline()
for bin in pkgInfo.bin:
let output = bin.addFileExt(ExeExt)
let output = bin.lastPathPart.addFileExt(ExeExt)
let input = pkgInfo.getSourceDir(options) / bin.addFileExt("nim")
ninja.application(input, output, depPaths)
ninja.newline()

2
tests/installerscript/binary/binary.nimble
View File

@ -3,5 +3,5 @@
version = "1.0"
bin = @["main"]
bin = @["tools/main"]
skipFiles = @["README.md"]

0
tests/installerscript/binary/main.nim → tests/installerscript/binary/tools/main.nim
View File

6
tests/installerscript/test_binary.nim
View File

@ -7,18 +7,20 @@ discard """
output: '''
exec(chmod & " +x " & destDir & "/usr/local/bin/main")
#!/usr/bin/env nim e
cpFile("main", destDir & "/usr/local/bin/main")
cpFile("tests/installerscript/binary/binary.nimble", destDir & "/opt/nimble/pkgs2/binary-1.0/binary.nimble")
cpFile("tests/installerscript/binary/main.nim", destDir & "/opt/nimble/pkgs2/binary-1.0/main.nim")
cpFile("tests/installerscript/binary/tools/main.nim", destDir & "/opt/nimble/pkgs2/binary-1.0/tools/main.nim")
echo "-- Installing " & destDir & "/opt/nimble/pkgs2/binary-1.0/binary.nimble"
echo "-- Installing " & destDir & "/opt/nimble/pkgs2/binary-1.0/main.nim"
echo "-- Installing " & destDir & "/opt/nimble/pkgs2/binary-1.0/tools/main.nim"
echo "-- Installing " & destDir & "/usr/local/bin/main"
if chmod.len != 0:
let chmod = findExe("chmod")
let destDir = getEnv("DESTDIR")
mkDir(destDir & "/opt/nimble/pkgs2/binary-1.0")
mkDir(destDir & "/opt/nimble/pkgs2/binary-1.0/tools")
mkDir(destDir & "/usr/local/bin")
'''
"""