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

Side by Side Diff: ports/mongoose/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/make/nacl.patch ('k') | ports/nacl-spawn/cli_main.c » ('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) 2013 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2013 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 6
7 EnableCliMain
8
7 BuildStep() { 9 BuildStep() {
8 export EXTRA_CFLAGS="${NACLPORTS_CPPFLAGS} ${NACLPORTS_CFLAGS}" 10 export EXTRA_CFLAGS="${NACLPORTS_CPPFLAGS} ${NACLPORTS_CFLAGS}"
9 export LDFLAGS="${NACLPORTS_LDFLAGS} ${NACL_CLI_MAIN_LIB}" 11 export LDFLAGS="${NACLPORTS_LDFLAGS} ${NACLPORTS_LIBS}"
10 if [ "$NACL_LIBC" = "glibc" ]; then 12 if [ "$NACL_LIBC" = "glibc" ]; then
11 LDFLAGS+=" -ldl" 13 LDFLAGS+=" -ldl"
12 fi 14 fi
13 CC=${NACLCC} LogExecute make clean 15 CC=${NACLCC} LogExecute make clean
14 CC=${NACLCC} LogExecute make nacl 16 CC=${NACLCC} LogExecute make nacl
15 } 17 }
16 18
17 19
18 InstallStep() { 20 InstallStep() {
19 MakeDir ${PUBLISH_DIR} 21 MakeDir ${PUBLISH_DIR}
20 local ASSEMBLY_DIR="${PUBLISH_DIR}/mongoose" 22 local ASSEMBLY_DIR="${PUBLISH_DIR}/mongoose"
21 MakeDir ${ASSEMBLY_DIR} 23 MakeDir ${ASSEMBLY_DIR}
22 LogExecute cp mongoose \ 24 LogExecute cp mongoose \
23 ${ASSEMBLY_DIR}/mongoose_${NACL_ARCH}${NACL_EXEEXT} 25 ${ASSEMBLY_DIR}/mongoose_${NACL_ARCH}${NACL_EXEEXT}
24 LogExecute cp ${START_DIR}/index.html ${ASSEMBLY_DIR} 26 LogExecute cp ${START_DIR}/index.html ${ASSEMBLY_DIR}
25 pushd ${ASSEMBLY_DIR} 27 pushd ${ASSEMBLY_DIR}
26 python ${NACL_SDK_ROOT}/tools/create_nmf.py \ 28 python ${NACL_SDK_ROOT}/tools/create_nmf.py \
27 mongoose_*${NACL_EXEEXT} \ 29 mongoose_*${NACL_EXEEXT} \
28 -s . \ 30 -s . \
29 -o mongoose.nmf 31 -o mongoose.nmf
30 popd 32 popd
31 33
32 InstallNaClTerm ${ASSEMBLY_DIR} 34 InstallNaClTerm ${ASSEMBLY_DIR}
33 LogExecute cp ${START_DIR}/background.js ${ASSEMBLY_DIR} 35 LogExecute cp ${START_DIR}/background.js ${ASSEMBLY_DIR}
34 LogExecute cp ${START_DIR}/mongoose.js ${ASSEMBLY_DIR} 36 LogExecute cp ${START_DIR}/mongoose.js ${ASSEMBLY_DIR}
35 LogExecute cp ${START_DIR}/manifest.json ${ASSEMBLY_DIR} 37 LogExecute cp ${START_DIR}/manifest.json ${ASSEMBLY_DIR}
36 } 38 }
OLDNEW
« no previous file with comments | « ports/make/nacl.patch ('k') | ports/nacl-spawn/cli_main.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698