Skip to content

Commit d7f721e

Browse files
committed
Update neovim
1 parent ab3e252 commit d7f721e

File tree

6 files changed

+12
-104
lines changed

6 files changed

+12
-104
lines changed

Diff for: DEVELOP.md

+3-15
Original file line numberDiff line numberDiff line change
@@ -23,44 +23,32 @@ e.g. `NvimServer` binary.
2323
This can be done with the following:
2424

2525
```bash
26-
build_libnvim=true clean=true download_gettext=true ./bin/build_nvimserver_for_local_dev.sh
26+
build_libnvim=true clean=true ./bin/build_nvimserver_for_local_dev.sh
2727
```
2828

29-
Set `download_gettext` to true when you are building NvimServer locally for the first time.
3029
See the `build_nvimserver_for_local_dev` script for default values of the env vars.
3130
You can also use a watch script as follows (it uses `entr`):
3231

3332
```bash
3433
clean_initial_build=true ./bin/watch_nvimserver_and_build
3534
```
3635

37-
When `clean_initial_build` is `true`, the script will download `gettext`, clean, and build,
36+
When `clean_initial_build` is `true`, the script will clean and build,
3837
then continuously invoke the `build_nvimserver_for_local_dev` script.
3938

4039
## How to release
4140

4241
### NvimServer
4342

44-
#### Dependencies
45-
46-
* Tag with the name `nvimserver-deps-yyyy-mm-dd`. GitHub actions will build the `x86_64` version,
47-
create a release and upload it.
48-
* Build the `arm64` version locally (on an Apple Silicon machine since I could not find out
49-
how to cross-compile `libnvim`) and upload it.
50-
* Update `NvimServer/Resources/nvimserver-deps-for-download.txt` and push.
51-
52-
#### Executable
53-
5443
* Tag with the name `nvimserver-x.y.z-n`. GitHub actions will build the `x86_64` version,
5544
create a release and upload it.
5645
* Build the `arm64` version locally and upload it:
5746
```bash
5847
download_gettext=true clean=true build_libnvim=true ./NvimServer/bin/build_nvimserver.sh
5948
```
60-
* Update `NvimServer/Resources/nvimserver-for-download.txt`.
6149
* Build a universal binary by the following and upload the artefact:
6250
```bash
63-
./NvimServer/bin/build_release.sh
51+
tag=nvimserver-x.y.z-n ./NvimServer/bin/build_release.sh
6452
```
6553

6654
### VimR
+4-50
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
43
version = "1.3">
5-
<BuildAction
6-
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
4+
<BuildAction>
85
<BuildActionEntries>
96
<BuildActionEntry
10-
buildForTesting = "YES"
11-
buildForRunning = "YES"
12-
buildForProfiling = "YES"
13-
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
7+
buildForRunning = "YES">
158
<BuildableReference
169
BuildableIdentifier = "primary"
1710
BlueprintIdentifier = "4BEBA5041CFF374B00673FDF"
@@ -22,26 +15,11 @@
2215
</BuildActionEntry>
2316
</BuildActionEntries>
2417
</BuildAction>
25-
<TestAction
26-
buildConfiguration = "Debug"
27-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
32-
</TestAction>
3318
<LaunchAction
34-
buildConfiguration = "Debug"
35-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37-
launchStyle = "0"
3819
useCustomWorkingDirectory = "NO"
39-
ignoresPersistentStateOnLaunch = "NO"
40-
debugDocumentVersioning = "YES"
41-
debugServiceExtension = "internal"
20+
buildConfiguration = "Debug"
4221
allowLocationSimulation = "YES">
43-
<BuildableProductRunnable
44-
runnableDebuggingMode = "0">
22+
<BuildableProductRunnable>
4523
<BuildableReference
4624
BuildableIdentifier = "primary"
4725
BlueprintIdentifier = "4BEBA5041CFF374B00673FDF"
@@ -51,28 +29,4 @@
5129
</BuildableReference>
5230
</BuildableProductRunnable>
5331
</LaunchAction>
54-
<ProfileAction
55-
buildConfiguration = "Release"
56-
shouldUseLaunchSchemeArgsEnv = "YES"
57-
savedToolIdentifier = ""
58-
useCustomWorkingDirectory = "NO"
59-
debugDocumentVersioning = "YES">
60-
<BuildableProductRunnable
61-
runnableDebuggingMode = "0">
62-
<BuildableReference
63-
BuildableIdentifier = "primary"
64-
BlueprintIdentifier = "4BEBA5041CFF374B00673FDF"
65-
BuildableName = "VimR.app"
66-
BlueprintName = "VimR"
67-
ReferencedContainer = "container:VimR.xcodeproj">
68-
</BuildableReference>
69-
</BuildableProductRunnable>
70-
</ProfileAction>
71-
<AnalyzeAction
72-
buildConfiguration = "Debug">
73-
</AnalyzeAction>
74-
<ArchiveAction
75-
buildConfiguration = "Release"
76-
revealArchiveInOrganizer = "YES">
77-
</ArchiveAction>
7832
</Scheme>
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
43
version = "1.3">
5-
<BuildAction
6-
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
4+
<BuildAction>
85
<BuildActionEntries>
96
<BuildActionEntry
10-
buildForTesting = "YES"
11-
buildForRunning = "YES"
12-
buildForProfiling = "YES"
13-
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
7+
buildForTesting = "YES">
158
<BuildableReference
169
BuildableIdentifier = "primary"
1710
BlueprintIdentifier = "4BEBA5131CFF374B00673FDF"
@@ -23,13 +16,9 @@
2316
</BuildActionEntries>
2417
</BuildAction>
2518
<TestAction
26-
buildConfiguration = "Debug"
27-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "NO">
19+
buildConfiguration = "Debug">
3020
<Testables>
31-
<TestableReference
32-
skipped = "NO">
21+
<TestableReference>
3322
<BuildableReference
3423
BuildableIdentifier = "primary"
3524
BlueprintIdentifier = "4BEBA5131CFF374B00673FDF"
@@ -41,28 +30,7 @@
4130
</Testables>
4231
</TestAction>
4332
<LaunchAction
44-
buildConfiguration = "Debug"
45-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
46-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47-
launchStyle = "0"
4833
useCustomWorkingDirectory = "NO"
49-
ignoresPersistentStateOnLaunch = "NO"
50-
debugDocumentVersioning = "YES"
51-
debugServiceExtension = "internal"
5234
allowLocationSimulation = "YES">
5335
</LaunchAction>
54-
<ProfileAction
55-
buildConfiguration = "Release"
56-
shouldUseLaunchSchemeArgsEnv = "YES"
57-
savedToolIdentifier = ""
58-
useCustomWorkingDirectory = "NO"
59-
debugDocumentVersioning = "YES">
60-
</ProfileAction>
61-
<AnalyzeAction
62-
buildConfiguration = "Debug">
63-
</AnalyzeAction>
64-
<ArchiveAction
65-
buildConfiguration = "Release"
66-
revealArchiveInOrganizer = "YES">
67-
</ArchiveAction>
6836
</Scheme>

Diff for: bin/build_nvimserver_for_local_dev.sh

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
set -Eeuo pipefail
33

44
declare -x target; target="$(uname -m)"; readonly target
5-
declare -r -x download_gettext=${download_gettext:-false}
65
declare -r -x clean=${clean:-false}
76
declare -r -x build_libnvim=${build_libnvim:-true}
87
declare -r -x build_dir=${build_dir:-"./.build"}

Diff for: bin/watch_nvimserver_and_build.sh

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ set -Eeuo pipefail
44
readonly clean_initial_build=${clean_inital_build:-false}
55

66
clean_build() {
7-
local -r -x download_gettext=true
87
local -r -x clean=true
98
local -r -x build_libnvim=true
109
./bin/build_nvimserver_for_local_dev.sh

0 commit comments

Comments
 (0)