Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1050)

Side by Side Diff: ports/lua/build.sh

Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ports/libxpm/build.sh ('k') | ports/m4/nacl.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" 8 EnableCliMain
9 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}"
10 9
11 if [ "${NACL_LIBC}" = "glibc" ]; then 10 if [ "${NACL_LIBC}" = "glibc" ]; then
12 PLAT=nacl-glibc 11 PLAT=nacl-glibc
13 else 12 else
14 PLAT=nacl-newlib 13 PLAT=nacl-newlib
15 fi 14 fi
16 15
17 TEST_FILE=lua-5.3.0-tests.tar.gz 16 TEST_FILE=lua-5.3.0-tests.tar.gz
18 TEST_URL=http://www.lua.org/tests/${TEST_FILE} 17 TEST_URL=http://www.lua.org/tests/${TEST_FILE}
19 TEST_SHA1=8fd633ab67edf5e824c2afc62f318de245fce268 18 TEST_SHA1=8fd633ab67edf5e824c2afc62f318de245fce268
(...skipping 14 matching lines...) Expand all
34 LogExecute tar zxf ${NACL_PACKAGES_CACHE}/${TEST_FILE} 33 LogExecute tar zxf ${NACL_PACKAGES_CACHE}/${TEST_FILE}
35 ChangeDir lua-5.3.0-tests 34 ChangeDir lua-5.3.0-tests
36 LogExecute patch -p1 < ${START_DIR}/lua_tests.patch 35 LogExecute patch -p1 < ${START_DIR}/lua_tests.patch
37 } 36 }
38 37
39 BuildStep() { 38 BuildStep() {
40 LogExecute make PLAT=${PLAT} clean 39 LogExecute make PLAT=${PLAT} clean
41 set -x 40 set -x
42 make MYLDFLAGS="${NACLPORTS_LDFLAGS}" MYCFLAGS="${NACLPORTS_CPPFLAGS}" \ 41 make MYLDFLAGS="${NACLPORTS_LDFLAGS}" MYCFLAGS="${NACLPORTS_CPPFLAGS}" \
43 AR="${NACLAR} rcu" RANLIB="${NACLRANLIB}" CC="${NACLCC} -std=gnu99" \ 42 AR="${NACLAR} rcu" RANLIB="${NACLRANLIB}" CC="${NACLCC} -std=gnu99" \
43 MYLIBS="${NACLPORTS_LIBS}" \
44 PLAT=${PLAT} EXEEXT=${NACL_EXEEXT} -j${OS_JOBS} 44 PLAT=${PLAT} EXEEXT=${NACL_EXEEXT} -j${OS_JOBS}
45 set +x 45 set +x
46 } 46 }
47 47
48 TestStep() { 48 TestStep() {
49 if [ "${NACL_ARCH}" = pnacl ]; then 49 if [ "${NACL_ARCH}" = pnacl ]; then
50 ChangeDir src 50 ChangeDir src
51 # Just do the x86-64 version for now. 51 # Just do the x86-64 version for now.
52 TranslateAndWriteLauncherScript lua.pexe x86-64 lua.x86-64.nexe lua 52 TranslateAndWriteLauncherScript lua.pexe x86-64 lua.x86-64.nexe lua
53 TranslateAndWriteLauncherScript luac.pexe x86-64 luac.x86-64.nexe luac 53 TranslateAndWriteLauncherScript luac.pexe x86-64 luac.x86-64.nexe luac
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 LogExecute cp ${START_DIR}/icon_48.png ${PUBLISH_DIR} 97 LogExecute cp ${START_DIR}/icon_48.png ${PUBLISH_DIR}
98 LogExecute cp ${START_DIR}/icon_128.png ${PUBLISH_DIR} 98 LogExecute cp ${START_DIR}/icon_128.png ${PUBLISH_DIR}
99 LogExecute rm -rf ${PUBLISH_DIR}/lua-5.3.0-tests 99 LogExecute rm -rf ${PUBLISH_DIR}/lua-5.3.0-tests
100 LogExecute cp -r ${BUILD_DIR}/lua-5.3.0-tests ${PUBLISH_DIR} 100 LogExecute cp -r ${BUILD_DIR}/lua-5.3.0-tests ${PUBLISH_DIR}
101 ChangeDir ${PUBLISH_DIR} 101 ChangeDir ${PUBLISH_DIR}
102 rm -f manifest.txt lua.zip 102 rm -f manifest.txt lua.zip
103 ${NACL_SDK_ROOT}/tools/genhttpfs.py . -r > ../manifest.txt 103 ${NACL_SDK_ROOT}/tools/genhttpfs.py . -r > ../manifest.txt
104 mv ../manifest.txt . 104 mv ../manifest.txt .
105 CreateWebStoreZip lua.zip . 105 CreateWebStoreZip lua.zip .
106 } 106 }
OLDNEW
« no previous file with comments | « ports/libxpm/build.sh ('k') | ports/m4/nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698