Merge remote-tracking branch 'origin/develop' into update-neovim

Brewfile

@@ -6,5 +6,6 @@ brew 'cmake'
 brew 'pkg-config'
 brew 'gettext'
 brew 'ninja'
+brew 'coreutils'
 
 brew 'python3'

NvimView/NvimServer/NvimServer.entitlements

@@ -2,15 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
-	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
 	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
 	<true/>
 	<key>com.apple.security.cs.disable-executable-page-protection</key>
 	<true/>
-	<key>com.apple.security.cs.disable-library-validation</key>
-	<true/>
 </dict>
 </plist>

NvimView/NvimView.xcodeproj/project.pbxproj

@@ -1146,6 +1146,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 341;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1208,7 +1209,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
+				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 341;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -1259,20 +1260,16 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Developer ID Application: Tae Won Ha (H96Q2NKTQH)";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = H96Q2NKTQH;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 341;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = NvimView/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.NvimView;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -1330,10 +1327,6 @@
 				CLANG_ENABLE_MODULES = NO;
 				CLANG_LINK_OBJC_RUNTIME = NO;
 				CLANG_MODULES_AUTOLINK = NO;
-				CODE_SIGN_ENTITLEMENTS = NvimServer/NvimServer.entitlements;
-				CODE_SIGN_IDENTITY = "Developer ID Application: Tae Won Ha (H96Q2NKTQH)";
-				DEVELOPMENT_TEAM = H96Q2NKTQH;
-				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "INCLUDE_GENERATED_DECLARATIONS=1";
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/neovim/src",
@@ -1346,7 +1339,6 @@
 					"$(PROJECT_DIR)/neovim/build/lib",
 					"$(PROJECT_DIR)/neovim/.deps/usr/lib",
 				);
-				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				OTHER_LDFLAGS = (
 					"-liconv",
 					"-lpthread",

README.md

@@ -13,32 +13,36 @@ VimR — Neovim Refined
 
 ## About
 
-Project VimR is a (YA) Neovim GUI for macOS. The goal is to build an editor that uses Neovim inside with many of the convenience GUI features similar to those present in modern editors. We mainly use Swift, but also use Objective-C when its C-nature helps.
+Project VimR is a (YA) Neovim GUI for macOS.
+The goal is to build an editor that uses Neovim inside with many of the convenience
+GUI features similar to those present in modern editors. We mainly use Swift,
+but also use Objective-C when its C-nature helps.
 
 There are other Neovim GUIs for macOS, e.g. [NyaoVim](https://github.com/rhysd/NyaoVim), [neovim-dot-app](https://github.com/rogual/neovim-dot-app), [Oni](https://www.onivim.io), etc., so why?
 
-- play around (obviously) with [Neovim](https://github.com/qvacua/neovim),
+- Play around (obviously) with [Neovim](https://github.com/qvacua/neovim),
-- play around with Swift (and especially with [RxSwift](https://github.com/ReactiveX/RxSwift)) and
+- play around with Swift (and especially with [RxSwift](https://github.com/ReactiveX/RxSwift)), and
 - (most importantly) have fun!
 
-## (Reusable) Components
-
-* [RxMessagePort](https://github.com/qvacua/vimr/blob/develop/RxPack/RxMessagePort.swift): RxSwift wrapper for local and remote `CFMessagePort`.
-* [RxMsgpackRpc](https://github.com/qvacua/vimr/blob/develop/RxPack/RxMsgpackRpc.swift): implementation of MsgpackRpc using RxSwift.
-* [RxNeovimApi](https://github.com/qvacua/vimr/blob/develop/RxPack/RxNeovimApi.swift): RxSwift wrapper of Neovim API.
-* [NvimView](https://github.com/qvacua/vimr/tree/develop/NvimView): Cocoa Framework which bundles everything, e.g. Neovim's `runtime`-files, needed to embed Neovim in a Cocoa App. See the [wiki](https://github.com/qvacua/vimr/wiki/NvimView-Framework).
-
----
-
-If you want to support VimR financially, you can use [Bountysource](https://www.bountysource.com/teams/vimr). Big thanks to [all](https://www.bountysource.com/teams/vimr/backers) who did support: We list our spendings in the [wiki](https://github.com/qvacua/vimr/wiki/How-we-use-the-donations).
-
 ## Download
 
 Pre-built binaries can be found under [Releases](https://github.com/qvacua/vimr/releases).
 
+## Reusable Components
+
+* [RxMessagePort](https://github.com/qvacua/vimr/blob/develop/RxPack/RxMessagePort.swift): RxSwift wrapper for local and remote `CFMessagePort`.
+* [RxMsgpackRpc](https://github.com/qvacua/vimr/blob/develop/RxPack/RxMsgpackRpc.swift): implementation of MsgpackRpc using RxSwift.
+* [RxNeovimApi](https://github.com/qvacua/vimr/blob/develop/RxPack/RxNeovimApi.swift): RxSwift wrapper of Neovim API.
+* [NvimView](https://github.com/qvacua/vimr/tree/develop/NvimView): Cocoa Framework which bundles everything, e.g. Neovim's `runtime`-files, needed to embed Neovim in a Cocoa App.
+
+---
+
+If you want to support VimR financially, you can use [Bountysource](https://www.bountysource.com/teams/vimr).
+Big thanks to [all](https://www.bountysource.com/teams/vimr/backers) who did support:
+We list our spendings in the [wiki](https://github.com/qvacua/vimr/wiki/How-we-use-the-donations).
+
 ## Some Features
 
-* Basic input including Emojis and Hangul (+Hanja): We don't know whether other input systems work...
 * Markdown preview
 * Generic HTML preview (retains the scroll position when reloading)
 * Fuzzy file finder a la Xcode's "Open Quickly..."
@@ -48,25 +52,22 @@ Pre-built binaries can be found under [Releases](https://github.com/qvacua/vimr/
 * (Simple) File browser
 * Flexible workspace model a la JetBrain's IDEs
 
-We will gradually create feature [issues](https://github.com/qvacua/vimr/issues) with more details. 
-
 ## How to Build
 
 First after cloning the VimR source tree you need to initialize git submodules
 
 ```bash
 git lfs install
-git submodule init
+git submodule update --init
-git submodule update
 ```
 
-You have to use Xcode 10.2. First install `homebrew`, then in the project root:
+First install `homebrew`, then in the project root:
 
 ```bash
 xcode-select --install # install the Xcode command line tools, if you haven't already
 brew bundle
 
-./bin/build_vimr.sh # VimR.app will be placed in build/Build/Products/Release/
+code_sign=false use_carthage_cache=false ./bin/build_vimr.sh # VimR.app will be placed in build/Build/Products/Release/
 ```
 
 If the build fails for some reason, do the following and build again:
@@ -76,8 +77,8 @@ cd NvimView/neovim
 git reset --hard @
 git clean -fd
 make distclean
-cd ..
+cd ../..
-./bin/build_vimr.sh
+code_sign=false use_carthage_cache=false ./bin/build_vimr.sh
 ```
 
 ## Project Setup

RxPack/RxPack.xcodeproj/project.pbxproj

@@ -402,6 +402,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -464,6 +465,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;

VimR/VimR.xcodeproj/project.pbxproj

@@ -1331,8 +1331,8 @@
 			projectRoot = "";
 			targets = (
 				4BEBA5041CFF374B00673FDF /* VimR */,
-				4BEBA5131CFF374B00673FDF /* VimRTests */,
 				4B2636A7223A487B00021586 /* VimR.dev */,
+				4BEBA5131CFF374B00673FDF /* VimRTests */,
 			);
 		};
 /* End PBXProject section */
@@ -1838,7 +1838,6 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = H96Q2NKTQH;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/../Carthage/Build/Mac",
@@ -1868,7 +1867,6 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = H96Q2NKTQH;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/../Carthage/Build/Mac",
@@ -1925,7 +1923,6 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 341;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1983,11 +1980,9 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
-				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 341;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -2040,11 +2035,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "Developer ID Application: Tae Won Ha (H96Q2NKTQH)";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = H96Q2NKTQH;
-				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/../Carthage/Build/Mac",
@@ -2055,7 +2047,6 @@
 				);
 				INFOPLIST_FILE = VimR/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				OTHER_LDFLAGS = (
 					"$(PROJECT_DIR)/../third-party/libxz/lib/liblzma.a",
 					"$(PROJECT_DIR)/../third-party/libpcre/lib/libpcre.a",

bin/build.sh

@@ -43,6 +43,8 @@ if [[ "${is_snapshot}" == true ]] && [[ "${branch}" == "master" ]] ; then
     exit 1
 fi
 
+git lfs install
+
 echo "### Installing some python packages"
 
 pip3 install requests

bin/build_vimr.sh

@@ -54,8 +54,17 @@ rm -rf ${build_path}
 if [[ ${code_sign} == true ]] ; then
     identity="Developer ID Application: Tae Won Ha (H96Q2NKTQH)"
     entitlements_path=$(realpath NvimView/NvimServer/NvimServer.entitlements)
-    xcodebuild -configuration Release -scheme VimR -workspace VimR.xcworkspace -derivedDataPath ${build_path} clean build
+
+    xcodebuild \
+        CODE_SIGN_IDENTITY="${identity}" \
+        OTHER_CODE_SIGN_FLAGS="--timestamp --options=runtime" \
+        CODE_SIGN_INJECT_BASE_ENTITLEMENTS=NO \
+        -configuration Release -derivedDataPath ./build -workspace VimR.xcworkspace -scheme VimR clean build
+
     pushd ${build_path}/Build/Products/Release > /dev/null
+        codesign --force -s "${identity}" --timestamp --options=runtime --entitlements="${entitlements_path}" \
+            VimR.app/Contents/Frameworks/NvimView.framework/Versions/A/NvimServer
+        codesign --force -s "${identity}" --timestamp --options=runtime VimR.app/Contents/Frameworks/NvimView.framework/Versions/A
         codesign --force -s "${identity}" --deep --timestamp --options=runtime VimR.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app
         codesign --force -s "${identity}" --deep --timestamp --options=runtime VimR.app/Contents/Frameworks/Sparkle.framework/Versions/A
     popd > /dev/null