Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Unified Diff: ports/emacs/build.sh

Issue 1285953002: Switch devenv to use pkg packages (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@toolchain_install
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ports/emacs/build.sh
diff --git a/ports/emacs/build.sh b/ports/emacs/build.sh
index d842e74f759ba4cf5244e524a49da50b405e074b..33e3116d9af0dd0eeb94a709f5f5cad1a7e80ce6 100644
--- a/ports/emacs/build.sh
+++ b/ports/emacs/build.sh
@@ -46,25 +46,26 @@ PatchStep() {
LogExecute cp ${START_DIR}/emacs_pepper.c ${SRC_DIR}/src/emacs_pepper.c
}
-# Today the install step copies emacs_x86_63.nexe to the publish dir, but we
-# need nacl_temacs.nexe instead. Change to copy that here.
+InstallStep() {
+ # Today the install step copies emacs_x86_63.nexe to the publish dir, but we
bradn 2015/08/19 20:28:50 64
Sam Clegg 2015/08/19 21:31:11 Done.
+ # need nacl_temacs.nexe instead. Change to copy that here.
+ DefaultInstallStep
+ LogExecute cp ${BUILD_DIR}/src/nacl_temacs${NACL_EXEEXT} \
+ ${DESTDIR}${PREFIX}/bin/emacs${NACL_EXEEXT}
+}
PublishStep() {
MakeDir ${PUBLISH_DIR}
local ASSEMBLY_DIR="${PUBLISH_DIR}/emacs"
- DESTDIR=${ASSEMBLY_DIR}/emacstar
- DefaultInstallStep
-
- #Copy all the elisp files and other files emacs needs to here.
+ # Copy all installed files into tarball
+ MakeDir ${ASSEMBLY_DIR}/emacstar/usr
ChangeDir ${ASSEMBLY_DIR}/emacstar
- echo "****** pwd is " $(pwd)
- echo cp ${BUILD_DIR}/src/nacl_temacs${NACL_EXEEXT} \
+ LogExecute cp -ar ${DESTDIR}${PREFIX}/* ./usr
+ LogExecute cp usr/bin/emacs${NACL_EXEEXT} \
../emacs_${NACL_ARCH}${NACL_EXEEXT}
- cp ${BUILD_DIR}/src/nacl_temacs${NACL_EXEEXT} \
- ../emacs_${NACL_ARCH}${NACL_EXEEXT}
- rm -rf bin
- rm -rf share/man
+ rm -rf usr/bin
+ rm -rf usr/share/man
find . -iname "*.nexe" -delete
mkdir -p ${ASSEMBLY_DIR}/emacstar/home/user/.emacs.d
cp ${START_DIR}/init.el ${ASSEMBLY_DIR}/emacstar/home/user/.emacs.d

Powered by Google App Engine
This is Rietveld 408576698