From c36705b0b0f648684c8b8869527e248b711040a9 Mon Sep 17 00:00:00 2001 From: "Matthew \"strager\" Glazar" Date: Thu, 12 Oct 2023 23:57:18 -0400 Subject: [PATCH] feat(debian): install Emacs plugin The Debian package does not install the Emacs LISP files. Install the .el files so that Emacs works out of the box without manual setup. --- dist/debian/debian/quick-lint-js.install | 1 + dist/debian/debian/rules | 1 + dist/debian/debian/rules-bionic | 1 + docs/CHANGELOG.md | 2 ++ website/public/install/emacs/debian/index.ejs.html | 3 +-- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dist/debian/debian/quick-lint-js.install b/dist/debian/debian/quick-lint-js.install index 757632d3a7..3a1c680978 100644 --- a/dist/debian/debian/quick-lint-js.install +++ b/dist/debian/debian/quick-lint-js.install @@ -1,5 +1,6 @@ usr/bin usr usr/share/bash-completion usr/share +usr/share/emacs/site-lisp usr/share/emacs usr/share/fish usr/share usr/share/icons usr/share usr/share/man usr/share diff --git a/dist/debian/debian/rules b/dist/debian/debian/rules index d499a2eee1..b893b9f80c 100755 --- a/dist/debian/debian/rules +++ b/dist/debian/debian/rules @@ -15,6 +15,7 @@ override_dh_auto_configure: dh_auto_configure -- \ -DQUICK_LINT_JS_HAVE_FCHAR8_T_FLAG=YES \ -DQUICK_LINT_JS_HAVE_WORKING_FCHAR8_T=NO \ + -DQUICK_LINT_JS_INSTALL_EMACS_DIR=share/emacs/site-lisp/quick-lint-js \ -DQUICK_LINT_JS_INSTALL_VIM_DIR=share/vim/addons \ -DQUICK_LINT_JS_INSTALL_VIM_NEOVIM_TAGS=ON \ -DQUICK_LINT_JS_USE_BUNDLED_GOOGLE_BENCHMARK=NO \ diff --git a/dist/debian/debian/rules-bionic b/dist/debian/debian/rules-bionic index 38e3f88e6d..32004d01cb 100644 --- a/dist/debian/debian/rules-bionic +++ b/dist/debian/debian/rules-bionic @@ -15,6 +15,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -flto-partition=none override_dh_auto_configure: # quick-lint-js does not build with GCC 7. Request GCC 8 by default. CC="$${CC-gcc-8}" CXX="$${CXX-g++-8}" dh_auto_configure -- \ + -DQUICK_LINT_JS_INSTALL_EMACS_DIR=share/emacs/site-lisp/quick-lint-js \ -DQUICK_LINT_JS_INSTALL_VIM_DIR=share/vim/addons \ -DQUICK_LINT_JS_INSTALL_VIM_NEOVIM_TAGS=ON \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=YES diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 812094c0ff..0cf5634722 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -21,6 +21,8 @@ Semantic Versioning. setters cannot be generators"). (Implemented by [koopiehoop][].) * `async get` and `async set` in classes now report [E0714][] ("'async' keyword is not allowed on getters or setters"). (Implemented by [koopiehoop][].) +* Emacs: The Debian/Ubuntu package now installs the Emacs plugin. Manual + installation of the .el files is no longer required. * TypeScript support (still experimental): * Class method overload signatures are now parsed. * [E0398][] is now reported when using both `abstract` and `static` on a diff --git a/website/public/install/emacs/debian/index.ejs.html b/website/public/install/emacs/debian/index.ejs.html index cc3765d4db..e807ed47b5 100644 --- a/website/public/install/emacs/debian/index.ejs.html +++ b/website/public/install/emacs/debian/index.ejs.html @@ -25,8 +25,7 @@

1. Install prerequisites

2. Install quick-lint-js

<%- await include("../../common-debian.ejs.html", {vim: false}) %> <%- - await include("../common-manual.ejs.html", {os: "posix", step: 3}) %> <%- - await include("../common-configure.ejs.html", {step: 4}) %> + await include("../common-configure.ejs.html", {step: 3}) %>