Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix default info path #64

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix default info path #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b97d26d
fix defautl info path
izahn Jul 12, 2022
8cac742
MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.21.0, and co…
Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .ci_support/migrations/gnutls37.yaml
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 22 additions & 8 deletions LICENSE.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 13 additions & 6 deletions build-locally.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,15 @@ EOF
touch $PREFIX/Emacs.app/Contents/MacOS/libexec/Emacs.pdmp
fi
fi

if [ "$(uname)" == "Linux" ]; then
mkdir -p $PREFIX/share/emacs/site-lisp
cat <<EOF > $PREFIX/share/emacs/site-lisp/site-start.el
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel a bit uneasy about this potentially overwriting an existing file. Would you mind adding a test for existence and/or use >> to append instead of overwriting in that case?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is supposed to be created by site administrators, it is not included with emacs.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but it's possible that it will be introduced in other parts of the packaging in the future, and adding another > seems like a trivial thing that wouldn't hurt much. But as I said, feel free to ignore. 👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

>> would do nothing. This is done at the build step. Whatever file is created in the build is what is shipped with the package. If this file is somehow included with other packages and we want to append it, that will have to be done in a post-install script. Although I'm unclear what other packages would ship files in $PREFIX/share/emacs.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, let's forget about this comment.

;; Fix info directory default
;; https://github.com/conda-forge/emacs-feedstock/issues/60

(setq configure-info-directory (string-replace "\0" "" configure-info-directory))
(setf (car Info-default-directory-list) configure-info-directory)

EOF
fi
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ source:
- 0006-macos-cross-compile-post-install-pdump-path.patch # [osx and build_platform != target_platform]

build:
number: 1
number: 2
skip: true # [win]
detect_binary_files_with_prefix: true

Expand Down