| OLD | NEW |
| 1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 export RUNPROGRAM="${NACL_SEL_LDR} -a -B ${NACL_IRT} -- \ | 5 export RUNPROGRAM="${NACL_SEL_LDR} -a -B ${NACL_IRT} -- \ |
| 6 ${NACL_SDK_LIB}/runnable-ld.so \ | 6 ${NACL_SDK_LIB}/runnable-ld.so \ |
| 7 --library-path ${NACL_SDK_LIBDIR}:${NACL_SDK_LIB}:${NACLPORTS_LIBDIR}" | 7 --library-path ${NACL_SDK_LIBDIR}:${NACL_SDK_LIB}:${NACLPORTS_LIBDIR}" |
| 8 export NACL_SEL_LDR | 8 export NACL_SEL_LDR |
| 9 export RUNPROGRAM_ARGS="-a -B ${NACL_IRT} -- ${NACL_SDK_LIB}/runnable-ld.so \ | 9 export RUNPROGRAM_ARGS="-a -B ${NACL_IRT} -- ${NACL_SDK_LIB}/runnable-ld.so \ |
| 10 --library-path ${NACL_SDK_LIBDIR}:${NACL_SDK_LIB}:${NACLPORTS_LIBDIR}" | 10 --library-path ${NACL_SDK_LIBDIR}:${NACL_SDK_LIB}:${NACLPORTS_LIBDIR}" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 DefaultPatchStep | 39 DefaultPatchStep |
| 40 | 40 |
| 41 ChangeDir ${SRC_DIR} | 41 ChangeDir ${SRC_DIR} |
| 42 rm -f lisp/emacs-lisp/bytecomp.elc | 42 rm -f lisp/emacs-lisp/bytecomp.elc |
| 43 rm -f lisp/files.elc | 43 rm -f lisp/files.elc |
| 44 rm -f lisp/international/quail.elc | 44 rm -f lisp/international/quail.elc |
| 45 rm -f lisp/startup.elc | 45 rm -f lisp/startup.elc |
| 46 LogExecute cp ${START_DIR}/emacs_pepper.c ${SRC_DIR}/src/emacs_pepper.c | 46 LogExecute cp ${START_DIR}/emacs_pepper.c ${SRC_DIR}/src/emacs_pepper.c |
| 47 } | 47 } |
| 48 | 48 |
| 49 # Today the install step copies emacs_x86_63.nexe to the publish dir, but we | 49 InstallStep() { |
| 50 # need nacl_temacs.nexe instead. Change to copy that here. | 50 # Today the install step copies emacs_x86_64.nexe to the publish dir, but we |
| 51 # need nacl_temacs.nexe instead. Change to copy that here. |
| 52 DefaultInstallStep |
| 53 LogExecute cp ${BUILD_DIR}/src/nacl_temacs${NACL_EXEEXT} \ |
| 54 ${DESTDIR}${PREFIX}/bin/emacs${NACL_EXEEXT} |
| 55 } |
| 51 | 56 |
| 52 PublishStep() { | 57 PublishStep() { |
| 53 MakeDir ${PUBLISH_DIR} | 58 MakeDir ${PUBLISH_DIR} |
| 54 local ASSEMBLY_DIR="${PUBLISH_DIR}/emacs" | 59 local ASSEMBLY_DIR="${PUBLISH_DIR}/emacs" |
| 55 | 60 |
| 56 DESTDIR=${ASSEMBLY_DIR}/emacstar | 61 # Copy all installed files into tarball |
| 57 DefaultInstallStep | 62 MakeDir ${ASSEMBLY_DIR}/emacstar/usr |
| 58 | |
| 59 #Copy all the elisp files and other files emacs needs to here. | |
| 60 ChangeDir ${ASSEMBLY_DIR}/emacstar | 63 ChangeDir ${ASSEMBLY_DIR}/emacstar |
| 61 echo "****** pwd is " $(pwd) | 64 LogExecute cp -ar ${DESTDIR}${PREFIX}/* ./usr |
| 62 echo cp ${BUILD_DIR}/src/nacl_temacs${NACL_EXEEXT} \ | 65 LogExecute cp usr/bin/emacs${NACL_EXEEXT} \ |
| 63 ../emacs_${NACL_ARCH}${NACL_EXEEXT} | 66 ../emacs_${NACL_ARCH}${NACL_EXEEXT} |
| 64 cp ${BUILD_DIR}/src/nacl_temacs${NACL_EXEEXT} \ | 67 rm -rf usr/bin |
| 65 ../emacs_${NACL_ARCH}${NACL_EXEEXT} | 68 rm -rf usr/share/man |
| 66 rm -rf bin | |
| 67 rm -rf share/man | |
| 68 find . -iname "*.nexe" -delete | 69 find . -iname "*.nexe" -delete |
| 69 mkdir -p ${ASSEMBLY_DIR}/emacstar/home/user/.emacs.d | 70 mkdir -p ${ASSEMBLY_DIR}/emacstar/home/user/.emacs.d |
| 70 cp ${START_DIR}/init.el ${ASSEMBLY_DIR}/emacstar/home/user/.emacs.d | 71 cp ${START_DIR}/init.el ${ASSEMBLY_DIR}/emacstar/home/user/.emacs.d |
| 71 tar cf ${ASSEMBLY_DIR}/emacs.tar . | 72 tar cf ${ASSEMBLY_DIR}/emacs.tar . |
| 72 rm -rf ${ASSEMBLY_DIR}/emacstar | 73 rm -rf ${ASSEMBLY_DIR}/emacstar |
| 73 shasum ${ASSEMBLY_DIR}/emacs.tar > ${ASSEMBLY_DIR}/emacs.tar.hash | 74 shasum ${ASSEMBLY_DIR}/emacs.tar > ${ASSEMBLY_DIR}/emacs.tar.hash |
| 74 cd ${ASSEMBLY_DIR} | 75 cd ${ASSEMBLY_DIR} |
| 75 # TODO(petewil) this is expecting an exe, but we give it a shell script | 76 # TODO(petewil) this is expecting an exe, but we give it a shell script |
| 76 # since we have emacs running "unpacked", so it fails. Give it | 77 # since we have emacs running "unpacked", so it fails. Give it |
| 77 # nacl_temacs.nexe instead. | 78 # nacl_temacs.nexe instead. |
| 78 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ | 79 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ |
| 79 emacs_*${NACL_EXEEXT} \ | 80 emacs_*${NACL_EXEEXT} \ |
| 80 -s . \ | 81 -s . \ |
| 81 -o emacs.nmf | 82 -o emacs.nmf |
| 82 LogExecute python ${TOOLS_DIR}/create_term.py emacs.nmf | 83 LogExecute python ${TOOLS_DIR}/create_term.py emacs.nmf |
| 83 | 84 |
| 84 InstallNaClTerm ${ASSEMBLY_DIR} | 85 InstallNaClTerm ${ASSEMBLY_DIR} |
| 85 GenerateManifest ${START_DIR}/manifest.json ${ASSEMBLY_DIR} "TITLE"="Emacs" | 86 GenerateManifest ${START_DIR}/manifest.json ${ASSEMBLY_DIR} "TITLE"="Emacs" |
| 86 LogExecute cp ${START_DIR}/background.js ${ASSEMBLY_DIR} | 87 LogExecute cp ${START_DIR}/background.js ${ASSEMBLY_DIR} |
| 87 LogExecute cp ${START_DIR}/icon_16.png ${ASSEMBLY_DIR} | 88 LogExecute cp ${START_DIR}/icon_16.png ${ASSEMBLY_DIR} |
| 88 LogExecute cp ${START_DIR}/icon_48.png ${ASSEMBLY_DIR} | 89 LogExecute cp ${START_DIR}/icon_48.png ${ASSEMBLY_DIR} |
| 89 LogExecute cp ${START_DIR}/icon_128.png ${ASSEMBLY_DIR} | 90 LogExecute cp ${START_DIR}/icon_128.png ${ASSEMBLY_DIR} |
| 90 LogExecute cp ${START_DIR}/emacs.js ${ASSEMBLY_DIR} | 91 LogExecute cp ${START_DIR}/emacs.js ${ASSEMBLY_DIR} |
| 91 ChangeDir ${PUBLISH_DIR} | 92 ChangeDir ${PUBLISH_DIR} |
| 92 CreateWebStoreZip emacs-${VERSION}.zip emacs | 93 CreateWebStoreZip emacs-${VERSION}.zip emacs |
| 93 } | 94 } |
| OLD | NEW |