| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # Copyright (c) 2014 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2014 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/pixman-1" | 6 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/pixman-1" |
| 7 NACLPORTS_CPPFLAGS+=" -DFASYNC=O_NONBLOCK -DFNDELAY=O_NONBLOCK" | 7 NACLPORTS_CPPFLAGS+=" -DFASYNC=O_NONBLOCK -DFNDELAY=O_NONBLOCK" |
| 8 | 8 |
| 9 EXECUTABLES=hw/kdrive/sdl/Xsdl${NACL_EXEEXT} | 9 EXECUTABLES=hw/kdrive/sdl/Xsdl${NACL_EXEEXT} |
| 10 | 10 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 ${ASSEMBLY_DIR}/Xsdl_${NACL_ARCH}${NACL_EXEEXT} | 76 ${ASSEMBLY_DIR}/Xsdl_${NACL_ARCH}${NACL_EXEEXT} |
| 77 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ | 77 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ |
| 78 ${ASSEMBLY_DIR}/Xsdl_*${NACL_EXEEXT} \ | 78 ${ASSEMBLY_DIR}/Xsdl_*${NACL_EXEEXT} \ |
| 79 -s . \ | 79 -s . \ |
| 80 -o Xsdl.nmf | 80 -o Xsdl.nmf |
| 81 | 81 |
| 82 # Bash is already platform specific split, copy the whole thing. | 82 # Bash is already platform specific split, copy the whole thing. |
| 83 local BASH_DIR=${NACL_PACKAGES_PUBLISH}/bash/${TOOLCHAIN}/bash_multiarch | 83 local BASH_DIR=${NACL_PACKAGES_PUBLISH}/bash/${TOOLCHAIN}/bash_multiarch |
| 84 LogExecute cp -fR ${BASH_DIR}/* ${ASSEMBLY_DIR} | 84 LogExecute cp -fR ${BASH_DIR}/* ${ASSEMBLY_DIR} |
| 85 | 85 |
| 86 local XKBCOMP_DIR=${NACL_PACKAGES_PUBLISH}/xkbcomp/${TOOLCHAIN}/${NACL_ARCH} | 86 LogExecute cp ${NACLPORTS_BIN}/xkbcomp${NACL_EXEEXT} \ |
| 87 LogExecute cp ${XKBCOMP_DIR}/xkbcomp \ | |
| 88 ${ASSEMBLY_DIR}/xkbcomp_${NACL_ARCH}${NACL_EXEEXT} | 87 ${ASSEMBLY_DIR}/xkbcomp_${NACL_ARCH}${NACL_EXEEXT} |
| 89 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ | 88 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ |
| 90 ${ASSEMBLY_DIR}/xkbcomp_*${NACL_EXEEXT} \ | 89 ${ASSEMBLY_DIR}/xkbcomp_*${NACL_EXEEXT} \ |
| 91 -s . \ | 90 -s . \ |
| 92 -o xkbcomp.nmf | 91 -o xkbcomp.nmf |
| 93 | 92 |
| 94 # Install the HTML/JS for the terminal. | 93 # Install the HTML/JS for the terminal. |
| 95 LogExecute python ${TOOLS_DIR}/create_term.py -i whitelist.js Xsdl.nmf | 94 LogExecute python ${TOOLS_DIR}/create_term.py -i whitelist.js Xsdl.nmf |
| 96 InstallNaClTerm ${ASSEMBLY_DIR} | 95 InstallNaClTerm ${ASSEMBLY_DIR} |
| 97 | 96 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 109 LogExecute tar cvf ${ASSEMBLY_DIR}/xorg-xkb.tar share/X11/xkb | 108 LogExecute tar cvf ${ASSEMBLY_DIR}/xorg-xkb.tar share/X11/xkb |
| 110 LogExecute shasum ${ASSEMBLY_DIR}/xorg-xkb.tar > \ | 109 LogExecute shasum ${ASSEMBLY_DIR}/xorg-xkb.tar > \ |
| 111 ${ASSEMBLY_DIR}/xorg-xkb.tar.hash | 110 ${ASSEMBLY_DIR}/xorg-xkb.tar.hash |
| 112 local XFONTS_DIR=${NACL_PACKAGES_PUBLISH}/xfonts/${TOOLCHAIN} | 111 local XFONTS_DIR=${NACL_PACKAGES_PUBLISH}/xfonts/${TOOLCHAIN} |
| 113 LogExecute cp ${XFONTS_DIR}/xorg-fonts.tar ${ASSEMBLY_DIR}/ | 112 LogExecute cp ${XFONTS_DIR}/xorg-fonts.tar ${ASSEMBLY_DIR}/ |
| 114 LogExecute cp ${XFONTS_DIR}/xorg-fonts.tar.hash ${ASSEMBLY_DIR}/ | 113 LogExecute cp ${XFONTS_DIR}/xorg-fonts.tar.hash ${ASSEMBLY_DIR}/ |
| 115 | 114 |
| 116 ChangeDir ${PUBLISH_DIR} | 115 ChangeDir ${PUBLISH_DIR} |
| 117 LogExecute zip -r xorg-server.zip xorg-server | 116 LogExecute zip -r xorg-server.zip xorg-server |
| 118 } | 117 } |
| OLD | NEW |