Commit b2155248 authored by gsell's avatar gsell
Browse files

emacs/build

- adapted to new build system
- reviewed
parent 179e2839
#!/bin/bash
declare -r OS=$(uname -s)
if [[ "${OS}" == "Darwin" ]]; then
open "${EMACS_DIR}/Emacs.app" --args "$@"
else
"${EMACS_DIR}/bin/emacs" "$@"
fi
#!/bin/bash
declare -r OS=$(uname -s)
if [[ "${OS}" == "Darwin" ]]; then
"${EMACS_DIR}/Emacs.app/Contents/MacOS/bin/emacsclient" -c "$@"
else
"${EMACS_DIR}/bin/emacsclient" -c "$@" &
fi
#!/bin/bash #!/usr/bin/env modbuild
source "$(dirname $0)/../../../lib/libpmodules.bash"
module use 'Libraries' module use 'Libraries'
...@@ -14,10 +12,6 @@ Darwin ) ...@@ -14,10 +12,6 @@ Darwin )
CXX='' CXX=''
COMPILER='' COMPILER=''
COMPILER_VERSION='' COMPILER_VERSION=''
pmodules.post_install() {
mkdir -p "${PREFIX}"
cp -rv "${MODULE_BUILDDIR}"/nextstep/Emacs.app "${PREFIX}"
}
;; ;;
Linux ) Linux )
# with 24.5 configure complains about missing libjpeg even it # with 24.5 configure complains about missing libjpeg even it
...@@ -28,7 +22,7 @@ Linux ) ...@@ -28,7 +22,7 @@ Linux )
;; ;;
esac esac
pmodules.configure() { pbuild::configure() {
"${MODULE_SRCDIR}"/configure \ "${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \ --prefix="${PREFIX}" \
${configure_args} \ ${configure_args} \
...@@ -36,40 +30,17 @@ pmodules.configure() { ...@@ -36,40 +30,17 @@ pmodules.configure() {
install -m 0755 -d "${PREFIX}" install -m 0755 -d "${PREFIX}"
} }
pmodules.post_install() { pbuild::post_install() {
if [[ -d "${MODULE_BUILDDIR}/nextstep/Emacs.app" ]]; then
cp -a "${MODULE_BUILDDIR}/nextstep/Emacs.app" "${PREFIX}"
fi
mkdir -p "${PREFIX}/bin" mkdir -p "${PREFIX}/bin"
cat > "${PREFIX}/bin/Emacs" <<\EOF install -m 0755 "${BUILD_BLOCK_DIR}/Emacs" "${PREFIX}/bin"
#!/bin/bash install -m 0755 "${BUILD_BLOCK_DIR}/Emacsclient" "${PREFIX}/bin"
}
declare -r OS=$(uname -s)
if [[ "${OS}" == "Darwin" ]]; then
open "${EMACS_DIR}/Emacs.app" --args "$@"
else
"${EMACS_DIR}/bin/emacs" "$@"
fi
EOF
cat > "${PREFIX}/bin/Emacsclient" <<\EOF
#!/bin/bash
declare -r OS=$(uname -s)
if [[ "${OS}" == "Darwin" ]]; then
"${EMACS_DIR}/Emacs.app/Contents/MacOS/bin/emacsclient" -c "$@"
else
"${EMACS_DIR}/bin/emacsclient" -c "$@" &
fi
EOF
chmod 0755 "${PREFIX}/bin/Emacs" pbuild::post_install_Darwin() {
chmod 0755 "${PREFIX}/bin/Emacsclient" cp -a "${MODULE_BUILDDIR}/nextstep/Emacs.app" "${PREFIX}"
} }
pmodules.add_to_group 'Tools' pbuild::add_to_group 'Tools'
pmodules.set_build_dependencies ${build_dependencies} pbuild::set_build_dependencies ${build_dependencies}
pmodules.make_all pbuild::make_all
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment