diff --git a/README.md b/README.md index e3a9ce20..5e05bc36 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,33 @@ -nvox -==== +VimR — Vim Refined +================== -NeoVim for OS X +![App Icon](https://raw.github.com/qvacua/vimr/master/resources/vimr-app-icon.png) -## About + -There are other working NeoVim GUIs for OS X, e.g. [NyaoVim](https://github.com/rhysd/NyaoVim), [neovim-dot-app](https://github.com/rogual/neovim-dot-app), etc., why another? Well, nvox is a *toy* project, meaning e.g. no tests whatsoever, for me to: +[![Bountysource](https://www.bountysource.com/badge/team?team_id=933&style=raised)](https://www.bountysource.com/teams/vimr?utm_source=VimR%20%E2%80%94%20Vim%20Refined&utm_medium=shield&utm_campaign=raised) -- play around (obviously) with [NeoVim](https://github.com/neovim), -- play around with the `XPC`-architecture and to find out whether this is a viable choice for an OSX-NeoVim-GUI-app, -- play around with Swift (and especially with [RxSwift](https://github.com/ReactiveX/RxSwift)) and -- (most importantly) have fun! +UPDATE +------ -It could very well be that nothing useful comes out of it. +We recently, June 2016, started to migrate the MacVim backend (VimR-MacVim) to a NeoVim backend. We experimented with NeoVim a bit ([nvox](https://github.com/qvacua/nvox)) and now we are confident enough to think that VimR can be backed by NeoVim. It will take some time though till the transition is complete. Bear with us! + +If you want to build VimR-MacVim, use the [macvim/master](https://github.com/qvacua/vimr/tree/macvim/master) branch. + +Since VimR-MacVim is not developed anymore, we also closed all issues involving VimR-MacVim. + +About +----- + +Project VimR is an attempt to refine the Vim experience. The goal is to build an editor that uses Vim inside with many of the convenience GUI features similar to those present in modern editors for Mac. + + +Download +-------- + +Pre-built binaries can be found [here](https://github.com/qvacua/vimr/releases). + +From time to time I'll upload a bleeding edge build and you can download it [here](http://taewon.de/snapshots/?C=M;O=D). ## How to Build @@ -41,10 +56,10 @@ Run the `nvox`-target in Xcode. nvox.app +-- SwiftNeoVim.framework    +-- NeoVimView -    +-- NeoVimXpc.xpc +    +-- runtime files for NeoVim +    +-- NeoVimServer       +-- libnvim       +-- other libs for NeoVim -       +-- runtime files for NeoVim ``` ### Libraries for NeoVim @@ -52,3 +67,27 @@ nvox.app * The library `libiconv` is linked by the linker flag `-liconv`. The version bundled with OSX will be linked. * The library `libintl` should be installed by `homebrew` and is statically linked by explicitly using the linker flag `/usr/local/opt/gettext/lib/libintl.a`. * Other libraries used by NeoVim, which are automatically built by building `libnvim`, are linked by adding them to the Xcode project. + +## License + +The MIT License (MIT) + +Copyright (c) 2016 Tae Won Ha + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/resources/vimr-app-icon.png b/resources/vimr-app-icon.png new file mode 100644 index 00000000..e2d0e80c Binary files /dev/null and b/resources/vimr-app-icon.png differ