| OLD | NEW |
| 1 # Copyright 2015 The Native Client Authors. All rights reserved. | 1 # Copyright 2015 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 ConfigureStep() { | 5 ConfigureStep() { |
| 6 if [ "${NACL_LIBC}" = "newlib" ]; then | 6 if [ "${NACL_LIBC}" = "newlib" ]; then |
| 7 # newlib requires different library order to deal with static libraries | 7 # newlib requires different library order to deal with static libraries |
| 8 NACLPORTS_LIBS+=" -lXext -lX11 -lxcb -lXau" | 8 NACLPORTS_LIBS+=" -lXext -lX11 -lxcb -lXau" |
| 9 fi | 9 fi |
| 10 | 10 |
| 11 EnableGlibcCompat | 11 EnableGlibcCompat |
| 12 EnableCliMain |
| 12 | 13 |
| 13 EXTRA_CONFIGURE_ARGS+=" --disable-shm --enable-explicit-deps --disable-cups \ | 14 EXTRA_CONFIGURE_ARGS+=" --disable-shm --enable-explicit-deps --disable-cups \ |
| 14 --enable-gtk-doc-html=no" | 15 --enable-gtk-doc-html=no" |
| 15 | 16 |
| 16 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main -pthread" | |
| 17 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}" | |
| 18 export enable_gtk_doc=no | 17 export enable_gtk_doc=no |
| 19 | 18 |
| 20 DefaultConfigureStep | 19 DefaultConfigureStep |
| 21 } | 20 } |
| 22 | 21 |
| 23 PublishStep() { | 22 PublishStep() { |
| 24 MakeDir ${PUBLISH_DIR} | 23 MakeDir ${PUBLISH_DIR} |
| 25 local FONT_ROOT_DIR="${PUBLISH_DIR}/${NACL_ARCH}/root" | 24 local FONT_ROOT_DIR="${PUBLISH_DIR}/${NACL_ARCH}/root" |
| 26 local FONTCONFIG_DIR="${START_DIR}/../fontconfig" | 25 local FONTCONFIG_DIR="${START_DIR}/../fontconfig" |
| 27 local FONT_CACHE="${NACL_PACKAGES_PUBLISH}/xfonts/${TOOLCHAIN}/${NACL_ARCH}" | 26 local FONT_CACHE="${NACL_PACKAGES_PUBLISH}/xfonts/${TOOLCHAIN}/${NACL_ARCH}" |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 LogExecute cp ${INSTALL_DIR}/naclports-dummydir/bin/gtk-demo${NACL_EXEEXT} \ | 103 LogExecute cp ${INSTALL_DIR}/naclports-dummydir/bin/gtk-demo${NACL_EXEEXT} \ |
| 105 ${exe} | 104 ${exe} |
| 106 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ | 105 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ |
| 107 ${exe} -s . -L ${INSTALL_DIR}/naclports-dummydir/lib \ | 106 ${exe} -s . -L ${INSTALL_DIR}/naclports-dummydir/lib \ |
| 108 -o gtk-demo.nmf | 107 -o gtk-demo.nmf |
| 109 LogExecute python ${TOOLS_DIR}/create_term.py -n gtk-demo gtk-demo.nmf | 108 LogExecute python ${TOOLS_DIR}/create_term.py -n gtk-demo gtk-demo.nmf |
| 110 InstallNaClTerm ${APP_DIR} | 109 InstallNaClTerm ${APP_DIR} |
| 111 LogExecute cp -f ${START_DIR}/*.js ${APP_DIR} | 110 LogExecute cp -f ${START_DIR}/*.js ${APP_DIR} |
| 112 LogExecute rm -rf ${FONT_ROOT_DIR} | 111 LogExecute rm -rf ${FONT_ROOT_DIR} |
| 113 } | 112 } |
| OLD | NEW |