Skip to content

Commit

Permalink
Add hunspell (#4)
Browse files Browse the repository at this point in the history
* add hunspell to include files, set extensions if zip exists

* line ending

* keep share/hunspell

* share exclusion for packaging
  • Loading branch information
cannero authored Apr 20, 2024
1 parent e6fd414 commit aff5f25
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:

- name: Package Emacs
if: runner.os == 'Windows'
run: .\emacs-build.cmd --nativecomp --slim --with-rsvg --hunspell --add-additional-files --pack-all
run: .\emacs-build.cmd --nativecomp --slim --debug-dependencies --with-rsvg --hunspell --add-additional-files --pack-all
- name: Build and pack Emacs
if: runner.os != 'Windows'
run: |
Expand Down
8 changes: 6 additions & 2 deletions emacs-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ function action3_package_deps ()

function action3_add_additional_files ()
{
# Copy the files from the additional_files directory to the install directory
#
if [ ! -d "$emacs_build_root" ]; then
echo "$emacs_install_dir does not exist, action must be run after install step"
return -1
Expand Down Expand Up @@ -386,6 +388,7 @@ msvcrt
pthread
shell32
user32
hunspell-
"

exe_inclusions="
Expand All @@ -400,6 +403,7 @@ etags
ld
objdump
gzip
hunspell
"

dependency_slim_exclusions="
Expand All @@ -411,7 +415,7 @@ $build_type
etc
lib/((?!emacs)(?!gcc)(?![^/]*\.(a|o)$))
lib/.*\.exe
.*share/((?!licenses))
.*share/((?!licenses)(?!hunspell))
usr/lib/cmake
usr/lib/gettext
usr/lib/pkgconfig
Expand All @@ -424,7 +428,7 @@ var
"

packing_slim_exclusion="
.*share/((?!emacs)(?!icons)(?!info)(?!licenses))
.*share/((?!emacs)(?!icons)(?!info)(?!licenses)(?!hunspell))
.*share/emacs/.*/lisp/leim
"

Expand Down
2 changes: 2 additions & 0 deletions scripts/hunspell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ function action3_hunspell ()
local hunspell_zip_file="$emacs_build_zip_dir/hunspell-${architecture}.zip"
if test -f "$hunspell_zip_file"; then
echo File $hunspell_zip_file already exists.
emacs_extensions="$hunspell_zip_file $emacs_extensions" \
&& return 0
else
local packages="${mingw_prefix}-hunspell ${mingw_prefix}-hunspell-en"
ensure_packages "$packages" \
Expand Down

0 comments on commit aff5f25

Please sign in to comment.