qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-11-24 03:25:03 +03:00
Code Issues Projects Releases Wiki Activity

Set VIMRUNTIME in NvimView (not in NvimServer)

Browse Source
This commit is contained in:
Tae Won Ha 2020-08-18 17:09:02 +02:00
parent da4c7d0eb6
commit 8628473d67
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
NvimView/Package.swift
View File

@ -1,5 +1,4 @@
// swift-tools-version:5.3
// The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription
@ -7,20 +6,14 @@ let package = Package(
name: "NvimView",
platforms: [.macOS(.v10_13)],
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(
name: "NvimView",
targets: ["NvimView"]),
.library(name: "NvimView", targets: ["NvimView"]),
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(name: "MessagePack", url: "https://github.com/a2/MessagePack.swift", .exact("4.0.0")),
.package(url: "https://github.com/ReactiveX/RxSwift", .exact("5.1.1")),
.package(name: "Socket", url: "https://github.com/IBM-Swift/BlueSocket", .exact("1.0.52")),
.package(name: "MessagePack", url: "https://github.com/a2/MessagePack.swift", .upToNextMinor(from: "4.0.0")),
.package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMinor(from: "5.1.1")),
.package(name: "Socket", url: "https://github.com/IBM-Swift/BlueSocket", .upToNextMinor(from: "1.0.52")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages this package depends on.
.target(
name: "NvimView",
dependencies: ["RxSwift", "MessagePack", "Socket"],
@ -28,9 +21,11 @@ let package = Package(
.copy("runtime"),
.copy("com.qvacua.NvimView.vim"),
.copy("NvimServer"),
]),
]
),
.testTarget(
name: "NvimViewTests",
dependencies: ["NvimView"]),
dependencies: ["NvimView"]
),
]
)

BIN
NvimView/Sources/NvimView/NvimServer
View File

Binary file not shown.

1
NvimView/Sources/NvimView/UiBridge.swift
View File

@ -288,6 +288,7 @@ class UiBridge {
private func launchNvimUsingLoginShellEnv() {
let listenAddress = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("vimr_\(self.uuid).sock")
var env = self.envDict
env["VIMRUNTIME"] = Bundle.module.url(forResource: "runtime", withExtension: nil)!.path
env["NVIM_LISTEN_ADDRESS"] = listenAddress.path
self.log.debug("Socket: \(listenAddress.path)")

4
VimR/VimR.xcodeproj/project.pbxproj
View File

@ -1558,8 +1558,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/httpswift/swifter";
requirement = {
kind = exactVersion;
version = 1.4.7;
kind = upToNextMinorVersion;
minimumVersion = 1.4.7;
};
};
4BD5655724E8040E00D52809 /* XCRemoteSwiftPackageReference "PureLayout" */ = {