| OLD | NEW |
| 1 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2011 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 BUILD_DIR=${SRC_DIR} | 5 BUILD_DIR=${SRC_DIR} |
| 6 EXECUTABLES="src/lua${NACL_EXEEXT} src/luac${NACL_EXEEXT}" | 6 EXECUTABLES="src/lua${NACL_EXEEXT} src/luac${NACL_EXEEXT}" |
| 7 | 7 |
| 8 EnableCliMain | 8 EnableCliMain |
| 9 | 9 |
| 10 if [ ${TOOLCHAIN} == glibc ]; then | 10 if [ ${TOOLCHAIN} == glibc ]; then |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 LogExecute make PLAT=${PLAT} clean | 41 LogExecute make PLAT=${PLAT} clean |
| 42 set -x | 42 set -x |
| 43 make MYLDFLAGS="${NACLPORTS_LDFLAGS}" MYCFLAGS="${NACLPORTS_CPPFLAGS}" \ | 43 make MYLDFLAGS="${NACLPORTS_LDFLAGS}" MYCFLAGS="${NACLPORTS_CPPFLAGS}" \ |
| 44 AR="${NACLAR} rcu" RANLIB="${NACLRANLIB}" CC="${NACLCC} -std=gnu99" \ | 44 AR="${NACLAR} rcu" RANLIB="${NACLRANLIB}" CC="${NACLCC} -std=gnu99" \ |
| 45 MYLIBS="${NACLPORTS_LIBS}" \ | 45 MYLIBS="${NACLPORTS_LIBS}" \ |
| 46 PLAT=${PLAT} EXEEXT=${NACL_EXEEXT} -j${OS_JOBS} | 46 PLAT=${PLAT} EXEEXT=${NACL_EXEEXT} -j${OS_JOBS} |
| 47 set +x | 47 set +x |
| 48 } | 48 } |
| 49 | 49 |
| 50 TestStep() { | 50 TestStep() { |
| 51 if [[ ${NACL_ARCH} == pnacl ]]; then | |
| 52 ChangeDir src | |
| 53 # Just do the x86-64 version for now. | |
| 54 TranslateAndWriteLauncherScript lua.pexe x86-64 lua.x86-64.nexe lua | |
| 55 TranslateAndWriteLauncherScript luac.pexe x86-64 luac.x86-64.nexe luac | |
| 56 ChangeDir .. | |
| 57 fi | |
| 58 | |
| 59 # First, run the 'make test' target. This currently just runs | 51 # First, run the 'make test' target. This currently just runs |
| 60 # lua -v. | 52 # lua -v. |
| 61 LogExecute make PLAT=${PLAT} test | 53 LogExecute make PLAT=${PLAT} test |
| 62 | 54 |
| 63 if [[ ${TOOLCHAIN} == emscripten ]]; then | 55 if [[ ${TOOLCHAIN} == emscripten ]]; then |
| 64 # TODO(sbc): fix lua tests running under node.js | 56 # TODO(sbc): fix lua tests running under node.js |
| 65 return | 57 return |
| 66 fi | 58 fi |
| 67 | 59 |
| 68 # Second, run the lua unittests. See: http://www.lua.org/tests/ | 60 # Second, run the lua unittests. See: http://www.lua.org/tests/ |
| (...skipping 24 matching lines...) Expand all Loading... |
| 93 LogExecute cp ${START_DIR}/icon_48.png ${PUBLISH_DIR} | 85 LogExecute cp ${START_DIR}/icon_48.png ${PUBLISH_DIR} |
| 94 LogExecute cp ${START_DIR}/icon_128.png ${PUBLISH_DIR} | 86 LogExecute cp ${START_DIR}/icon_128.png ${PUBLISH_DIR} |
| 95 LogExecute rm -rf ${PUBLISH_DIR}/lua-5.3.0-tests | 87 LogExecute rm -rf ${PUBLISH_DIR}/lua-5.3.0-tests |
| 96 LogExecute cp -r ${BUILD_DIR}/lua-5.3.0-tests ${PUBLISH_DIR} | 88 LogExecute cp -r ${BUILD_DIR}/lua-5.3.0-tests ${PUBLISH_DIR} |
| 97 ChangeDir ${PUBLISH_DIR} | 89 ChangeDir ${PUBLISH_DIR} |
| 98 rm -f manifest.txt lua.zip | 90 rm -f manifest.txt lua.zip |
| 99 ${NACL_SDK_ROOT}/tools/genhttpfs.py . -r > ../manifest.txt | 91 ${NACL_SDK_ROOT}/tools/genhttpfs.py . -r > ../manifest.txt |
| 100 mv ../manifest.txt . | 92 mv ../manifest.txt . |
| 101 CreateWebStoreZip lua.zip . | 93 CreateWebStoreZip lua.zip . |
| 102 } | 94 } |
| OLD | NEW |