mirror of
https://github.com/neovim/neovim.git
synced 2025-09-07 03:48:18 +00:00
Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
ede21f9518 | ||
![]() |
361d4be588 | ||
![]() |
bd4bb61f35 | ||
![]() |
8a6bb66e80 | ||
![]() |
4553fc5e6c | ||
![]() |
877d539904 | ||
![]() |
60c3c92db1 | ||
![]() |
d7cf93ce34 |
@@ -112,7 +112,7 @@ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY
|
|||||||
# version string, else they are combined with the result of `git describe`.
|
# version string, else they are combined with the result of `git describe`.
|
||||||
set(NVIM_VERSION_MAJOR 0)
|
set(NVIM_VERSION_MAJOR 0)
|
||||||
set(NVIM_VERSION_MINOR 3)
|
set(NVIM_VERSION_MINOR 3)
|
||||||
set(NVIM_VERSION_PATCH 5)
|
set(NVIM_VERSION_PATCH 7)
|
||||||
set(NVIM_VERSION_PRERELEASE "") # for package maintainers
|
set(NVIM_VERSION_PRERELEASE "") # for package maintainers
|
||||||
|
|
||||||
# API level
|
# API level
|
||||||
|
BIN
runtime/nvim.png
BIN
runtime/nvim.png
Binary file not shown.
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 5.7 KiB |
@@ -37,29 +37,24 @@ VERSION=$("$ROOT_DIR"/build/bin/nvim --version | head -n 1 | grep -o 'v.*')
|
|||||||
|
|
||||||
cd "$APP_BUILD_DIR"
|
cd "$APP_BUILD_DIR"
|
||||||
|
|
||||||
curl -Lo "$APP_BUILD_DIR"/appimage_functions.sh https://github.com/AppImage/AppImages/raw/master/functions.sh
|
# Only downloads linuxdeploy if the remote file is different from local
|
||||||
. ./appimage_functions.sh
|
if [ -e "$APP_BUILD_DIR"/linuxdeploy-x86_64.AppImage ]; then
|
||||||
|
curl -Lo "$APP_BUILD_DIR"/linuxdeploy-x86_64.AppImage \
|
||||||
|
-z "$APP_BUILD_DIR"/linuxdeploy-x86_64.AppImage \
|
||||||
|
https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
|
||||||
|
else
|
||||||
|
curl -Lo "$APP_BUILD_DIR"/linuxdeploy-x86_64.AppImage \
|
||||||
|
https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
|
||||||
|
fi
|
||||||
|
|
||||||
# Copy desktop and icon file to AppDir for AppRun to pick them up.
|
chmod +x "$APP_BUILD_DIR"/linuxdeploy-x86_64.AppImage
|
||||||
# get_apprun
|
|
||||||
# get_desktop
|
# metainfo is not packaged automatically by linuxdeploy
|
||||||
cp "$ROOT_DIR/runtime/nvim.desktop" "$APP_DIR/"
|
|
||||||
cp "$ROOT_DIR/runtime/nvim.png" "$APP_DIR/"
|
|
||||||
mkdir "$APP_DIR/usr/share/metainfo/"
|
mkdir "$APP_DIR/usr/share/metainfo/"
|
||||||
cp "$ROOT_DIR/runtime/nvim.appdata.xml" "$APP_DIR/usr/share/metainfo/"
|
cp "$ROOT_DIR/runtime/nvim.appdata.xml" "$APP_DIR/usr/share/metainfo/"
|
||||||
|
|
||||||
cd "$APP_DIR"
|
cd "$APP_DIR"
|
||||||
|
|
||||||
# copy dependencies
|
|
||||||
copy_deps
|
|
||||||
# Move the libraries to usr/bin
|
|
||||||
move_lib
|
|
||||||
|
|
||||||
# Delete stuff that should not go into the AppImage.
|
|
||||||
# Delete dangerous libraries; see
|
|
||||||
# https://github.com/AppImage/AppImages/blob/master/excludelist
|
|
||||||
delete_blacklisted
|
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
# AppDir complete. Now package it as an AppImage.
|
# AppDir complete. Now package it as an AppImage.
|
||||||
########################################################################
|
########################################################################
|
||||||
@@ -78,21 +73,24 @@ chmod 755 AppRun
|
|||||||
|
|
||||||
cd "$APP_BUILD_DIR" # Get out of AppImage directory.
|
cd "$APP_BUILD_DIR" # Get out of AppImage directory.
|
||||||
|
|
||||||
|
# Set the name of the file generated by appimage
|
||||||
|
export OUTPUT=nvim.appimage
|
||||||
|
|
||||||
|
# If it's a release generate the zsync file
|
||||||
|
if [ -n "$TAG" ]; then
|
||||||
|
export UPDATE_INFORMATION="gh-releases-zsync|neovim|neovim|$TAG|nvim.appimage.zsync"
|
||||||
|
fi
|
||||||
|
|
||||||
# Generate AppImage.
|
# Generate AppImage.
|
||||||
# - Expects: $ARCH, $APP, $VERSION env vars
|
# - Expects: $ARCH, $APP, $VERSION env vars
|
||||||
# - Expects: ./$APP.AppDir/ directory
|
# - Expects: ./$APP.AppDir/ directory
|
||||||
# - Produces: ../out/$APP-$VERSION.glibc$GLIBC_NEEDED-$ARCH.AppImage
|
# - Produces: ./nvim.appimage
|
||||||
if [ -n "$TAG" ]; then
|
./linuxdeploy-x86_64.AppImage --appdir $APP.AppDir -d $ROOT_DIR/runtime/nvim.desktop -i \
|
||||||
generate_type2_appimage -u "gh-releases-zsync|neovim|neovim|$TAG|nvim.appimage.zsync"
|
"$ROOT_DIR/runtime/nvim.png" --output appimage
|
||||||
else
|
|
||||||
generate_type2_appimage
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Moving the final executable to a different folder so it isn't in the
|
# Moving the final executable to a different folder so it isn't in the
|
||||||
# way for a subsequent build.
|
# way for a subsequent build.
|
||||||
|
|
||||||
mv "$ROOT_DIR"/out/*.AppImage* "$ROOT_DIR"/build/bin
|
mv "$ROOT_DIR"/build/nvim.appimage* "$ROOT_DIR"/build/bin
|
||||||
# Remove the (now empty) folder the AppImage was built in
|
|
||||||
rmdir "$ROOT_DIR"/out
|
|
||||||
|
|
||||||
echo 'genappimage.sh: finished'
|
echo 'genappimage.sh: finished'
|
||||||
|
@@ -15,10 +15,6 @@
|
|||||||
# - Tag the commit.
|
# - Tag the commit.
|
||||||
# Create the "version bump" commit:
|
# Create the "version bump" commit:
|
||||||
# - CMakeLists.txt: Set NVIM_VERSION_PRERELEASE to "-dev"
|
# - CMakeLists.txt: Set NVIM_VERSION_PRERELEASE to "-dev"
|
||||||
#
|
|
||||||
# Manual steps:
|
|
||||||
# - CMakeLists.txt: Bump NVIM_VERSION_* as appropriate.
|
|
||||||
# - git push --follow-tags
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
set -u
|
set -u
|
||||||
@@ -95,5 +91,9 @@ _do_bump_commit
|
|||||||
echo "
|
echo "
|
||||||
Next steps:
|
Next steps:
|
||||||
- Double-check NVIM_VERSION_* in CMakeLists.txt
|
- Double-check NVIM_VERSION_* in CMakeLists.txt
|
||||||
- git push --follow-tags
|
- Push the tag:
|
||||||
- update website: index.html"
|
git push --follow-tags
|
||||||
|
- Update the 'stable' tag:
|
||||||
|
git push --force upstream HEAD^:refs/tags/stable
|
||||||
|
git fetch --tags
|
||||||
|
- Update website: index.html"
|
||||||
|
@@ -1244,6 +1244,13 @@ openscript (
|
|||||||
EMSG(_(e_nesting));
|
EMSG(_(e_nesting));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Disallow sourcing a file in the sandbox, the commands would be executed
|
||||||
|
// later, possibly outside of the sandbox.
|
||||||
|
if (check_secure()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (ignore_script)
|
if (ignore_script)
|
||||||
/* Not reading from script, also don't open one. Warning message? */
|
/* Not reading from script, also don't open one. Warning message? */
|
||||||
return;
|
return;
|
||||||
|
Reference in New Issue
Block a user