| OLD | NEW | 
|    1 #!/bin/bash |    1 #!/bin/bash | 
|    2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |    2 # Copyright (c) 2012 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 # |    6 # | 
|    7 # nacl-mounts.sh |    7 # nacl-mounts.sh | 
|    8 # |    8 # | 
|    9 # usage:  ./nacl-mounts.sh |    9 # usage:  ./nacl-mounts.sh | 
|   10 # |   10 # | 
| (...skipping 13 matching lines...) Expand all  Loading... | 
|   24   if [ $OS_SUBDIR = "windows" ]; then |   24   if [ $OS_SUBDIR = "windows" ]; then | 
|   25     echo "Not running sel_ldr tests on Windows." |   25     echo "Not running sel_ldr tests on Windows." | 
|   26     return |   26     return | 
|   27   fi |   27   fi | 
|   28  |   28  | 
|   29   if [ ! -e ${NACL_IRT} ]; then |   29   if [ ! -e ${NACL_IRT} ]; then | 
|   30     echo "WARNING: Missing IRT binary. Not running sel_ldr-based tests." |   30     echo "WARNING: Missing IRT binary. Not running sel_ldr-based tests." | 
|   31     return |   31     return | 
|   32   fi |   32   fi | 
|   33  |   33  | 
|   34   if [ ${NACL_PACKAGES_BITSIZE} = "pnacl" ]; then |   34   if [ ${NACL_ARCH} = "pnacl" ]; then | 
|   35     echo "FIXME: Not running sel_ldr-based tests with PNaCl." |   35     echo "FIXME: Not running sel_ldr-based tests with PNaCl." | 
|   36     return |   36     return | 
|   37   fi |   37   fi | 
|   38  |   38  | 
|   39   export CC=${NACLCC} |   39   export CC=${NACLCC} | 
|   40   export CXX=${NACLCXX} |   40   export CXX=${NACLCXX} | 
|   41   export CFLAGS=-I${NACL_SDK_USR_INCLUDE} |   41   export CFLAGS=-I${NACL_SDK_USR_INCLUDE} | 
|   42  |   42  | 
|   43   LDFLAGS=-L${NACL_SDK_USR_LIB} |   43   LDFLAGS=-L${NACL_SDK_USR_LIB} | 
|   44   if [ $NACL_GLIBC != "1" ] ; then |   44   if [ $NACL_GLIBC != "1" ] ; then | 
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  132  |  132  | 
|  133 CustomInstallStep() { |  133 CustomInstallStep() { | 
|  134   Banner "Installing ${PACKAGE_NAME}" |  134   Banner "Installing ${PACKAGE_NAME}" | 
|  135   export PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}" |  135   export PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}" | 
|  136   cp ${PACKAGE_DIR}/libnacl-mounts.a ${NACL_SDK_USR_LIB} |  136   cp ${PACKAGE_DIR}/libnacl-mounts.a ${NACL_SDK_USR_LIB} | 
|  137   mkdir -p ${NACL_SDK_USR_LIB}/nacl-mounts/util |  137   mkdir -p ${NACL_SDK_USR_LIB}/nacl-mounts/util | 
|  138   cp ${START_DIR}/console/console.js ${NACL_SDK_USR_LIB}/nacl-mounts |  138   cp ${START_DIR}/console/console.js ${NACL_SDK_USR_LIB}/nacl-mounts | 
|  139   cp ${START_DIR}/http2/genfs.py ${NACL_SDK_USR_LIB}/nacl-mounts/util |  139   cp ${START_DIR}/http2/genfs.py ${NACL_SDK_USR_LIB}/nacl-mounts/util | 
|  140  |  140  | 
|  141   # GLibC toolchain has termio.h so don't copy stub header. |  141   # GLibC toolchain has termio.h so don't copy stub header. | 
|  142   if [[ $NACL_GLIBC == 0 ]]; then |  142   if [[ $NACL_GLIBC = 0 ]]; then | 
|  143     cp ${START_DIR}/console/termio.h ${NACL_SDK_USR_INCLUDE} |  143     cp ${START_DIR}/console/termio.h ${NACL_SDK_USR_INCLUDE} | 
|  144   fi |  144   fi | 
|  145  |  145  | 
|  146   mkdir -p ${NACL_SDK_USR_INCLUDE}/nacl-mounts |  146   mkdir -p ${NACL_SDK_USR_INCLUDE}/nacl-mounts | 
|  147   for DIR in console base util memory net http2 AppEngine pepper buffer; do |  147   for DIR in console base util memory net http2 AppEngine pepper buffer; do | 
|  148     mkdir -p ${NACL_SDK_USR_INCLUDE}/nacl-mounts/${DIR} |  148     mkdir -p ${NACL_SDK_USR_INCLUDE}/nacl-mounts/${DIR} | 
|  149     cp ${START_DIR}/${DIR}/*.h ${NACL_SDK_USR_INCLUDE}/nacl-mounts/${DIR} |  149     cp ${START_DIR}/${DIR}/*.h ${NACL_SDK_USR_INCLUDE}/nacl-mounts/${DIR} | 
|  150   done |  150   done | 
|  151   mkdir -p ${NACL_SDK_USR_INCLUDE}/nacl-mounts/ppapi/cpp/private |  151   mkdir -p ${NACL_SDK_USR_INCLUDE}/nacl-mounts/ppapi/cpp/private | 
|  152   mkdir -p ${NACL_SDK_USR_INCLUDE}/nacl-mounts/ppapi/c/private |  152   mkdir -p ${NACL_SDK_USR_INCLUDE}/nacl-mounts/ppapi/c/private | 
|  153   cp -R ${START_DIR}/ppapi/cpp/private/*.h \ |  153   cp -R ${START_DIR}/ppapi/cpp/private/*.h \ | 
|  154     ${NACL_SDK_USR_INCLUDE}/nacl-mounts/ppapi/cpp/private/ |  154     ${NACL_SDK_USR_INCLUDE}/nacl-mounts/ppapi/cpp/private/ | 
|  155   cp -R ${START_DIR}/ppapi/c/private/*.h \ |  155   cp -R ${START_DIR}/ppapi/c/private/*.h \ | 
|  156     ${NACL_SDK_USR_INCLUDE}/nacl-mounts/ppapi/c/private/ |  156     ${NACL_SDK_USR_INCLUDE}/nacl-mounts/ppapi/c/private/ | 
|  157 } |  157 } | 
|  158  |  158  | 
|  159 CustomPackageInstall() { |  159 CustomPackageInstall() { | 
|  160 #  RunTests |  160 #  RunTests | 
|  161   DefaultPreInstallStep |  161   DefaultPreInstallStep | 
|  162   CustomBuildStep |  162   CustomBuildStep | 
|  163   CustomInstallStep |  163   CustomInstallStep | 
|  164   DefaultCleanUpStep |  164   DefaultCleanUpStep | 
|  165   DefaultTouchStep |  165   DefaultTouchStep | 
|  166   RunSelLdrTests |  166   RunSelLdrTests | 
|  167 } |  167 } | 
|  168  |  168  | 
|  169 CustomPackageInstall |  169 CustomPackageInstall | 
|  170 exit 0 |  170 exit 0 | 
| OLD | NEW |