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

Side by Side Diff: ports/thttpd/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/thttpd/Makefile ('k') | ports/thttpd/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) 2012 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2012 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 ConfigureStep() { 9 ConfigureStep() {
8 ChangeDir ${SRC_DIR} 10 ChangeDir ${SRC_DIR}
9 FILES=" 11 FILES="
10 my_syslog.h 12 my_syslog.h
11 syslog.cpp 13 syslog.cpp
12 Makefile" 14 Makefile"
13 for FILE in $FILES; do 15 for FILE in $FILES; do
14 cp -f ${START_DIR}/${FILE} . 16 cp -f ${START_DIR}/${FILE} .
15 done 17 done
16 18
17 LogExecute make -j${OS_JOBS} clean 19 LogExecute make -j${OS_JOBS} clean
18 } 20 }
19 21
20 BuildStep() { 22 BuildStep() {
21 # export the nacl tools 23 # export the nacl tools
22 # The checked-in Makefile has more configuration for this example. 24 # The checked-in Makefile has more configuration for this example.
23 SetupCrossEnvironment 25 SetupCrossEnvironment
24 export NACLPORTS_CPPFLAGS 26 export NACLPORTS_CPPFLAGS
25 export NACLPORTS_CFLAGS 27 export NACLPORTS_CFLAGS
26 export NACLPORTS_LDFLAGS 28 export NACLPORTS_LDFLAGS
29 export NACLPORTS_LIBS
27 LogExecute make -j${OS_JOBS} thttpd 30 LogExecute make -j${OS_JOBS} thttpd
28 } 31 }
29 32
30 InstallStep() { 33 InstallStep() {
31 MakeDir ${PUBLISH_DIR} 34 MakeDir ${PUBLISH_DIR}
32 install ${START_DIR}/thttpd.html ${PUBLISH_DIR} 35 install ${START_DIR}/thttpd.html ${PUBLISH_DIR}
33 install ${START_DIR}/nacl.js ${PUBLISH_DIR} 36 install ${START_DIR}/nacl.js ${PUBLISH_DIR}
34 install ${START_DIR}/json2min.js ${PUBLISH_DIR} 37 install ${START_DIR}/json2min.js ${PUBLISH_DIR}
35 cp ${BUILD_DIR}/thttpd ${BUILD_DIR}/thttpd_${NACL_ARCH}${NACL_EXEEXT} 38 cp ${BUILD_DIR}/thttpd ${BUILD_DIR}/thttpd_${NACL_ARCH}${NACL_EXEEXT}
36 install ${BUILD_DIR}/thttpd_${NACL_ARCH}${NACL_EXEEXT} ${PUBLISH_DIR}/ 39 install ${BUILD_DIR}/thttpd_${NACL_ARCH}${NACL_EXEEXT} ${PUBLISH_DIR}/
37 ChangeDir ${PUBLISH_DIR} 40 ChangeDir ${PUBLISH_DIR}
38 41
39 CMD="$NACL_SDK_ROOT/tools/create_nmf.py \ 42 CMD="$NACL_SDK_ROOT/tools/create_nmf.py \
40 -o thttpd.nmf -s . \ 43 -o thttpd.nmf -s . \
41 thttpd_*${NACL_EXEEXT}" 44 thttpd_*${NACL_EXEEXT}"
42 45
43 LogExecute $CMD 46 LogExecute $CMD
44 } 47 }
OLDNEW
« no previous file with comments | « ports/thttpd/Makefile ('k') | ports/thttpd/nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698