ports/toybox/build.sh - Issue 907563002: Simplify cli_main

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 907563002: Simplify cli_main (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master

Patch Set: Created 5 years, 10 months 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/texlive/build.sh ('k') | ports/xkbcomp/build.sh » ('j') | no next file with comments »

OLD	NEW
1 # Copyright (c) 2014 The Native Client Authors. All rights reserved.	1 # Copyright (c) 2014 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 EXECUTABLES="toybox"	5 EXECUTABLES="toybox"

6	6

7 # Toybox wants to build in its current directory.	7 # Toybox wants to build in its current directory.

8 BUILD_DIR=${SRC_DIR}	8 BUILD_DIR=${SRC_DIR}

9	9

10 NACLPORTS_CPPFLAGS+=" -DBYTE_ORDER=LITTLE_ENDIAN"	10 NACLPORTS_CPPFLAGS+=" -DBYTE_ORDER=LITTLE_ENDIAN"

11 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main"	11 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main"

12 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB} -lnacl_spawn "	12 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}"

13 NACLPORTS_LDFLAGS+=" -lppapi_simple -lnacl_io -lppapi -lppapi_cpp"	13 NACLPORTS_LDFLAGS+=" -lppapi_simple -lnacl_io -lppapi -lppapi_cpp"

14	14

15 export HOSTCC=cc	15 export HOSTCC=cc

16	16

17 if [ "${NACL_LIBC}" = "newlib" ]; then	17 if [ "${NACL_LIBC}" = "newlib" ]; then

18 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"	18 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"

19 NACLPORTS_LDFLAGS+=" -lglibc-compat"	19 NACLPORTS_LDFLAGS+=" -lglibc-compat"

20 fi	20 fi

21	21

22 ConfigureStep() {	22 ConfigureStep() {

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 LogExecute python ${TOOLS_DIR}/create_term.py toybox.nmf	56 LogExecute python ${TOOLS_DIR}/create_term.py toybox.nmf

57	57

58 InstallNaClTerm ${ASSEMBLY_DIR}	58 InstallNaClTerm ${ASSEMBLY_DIR}

59 LogExecute cp ${START_DIR}/manifest.json ${ASSEMBLY_DIR}	59 LogExecute cp ${START_DIR}/manifest.json ${ASSEMBLY_DIR}

60 LogExecute cp ${START_DIR}/icon_16.png ${ASSEMBLY_DIR}	60 LogExecute cp ${START_DIR}/icon_16.png ${ASSEMBLY_DIR}

61 LogExecute cp ${START_DIR}/icon_48.png ${ASSEMBLY_DIR}	61 LogExecute cp ${START_DIR}/icon_48.png ${ASSEMBLY_DIR}

62 LogExecute cp ${START_DIR}/icon_128.png ${ASSEMBLY_DIR}	62 LogExecute cp ${START_DIR}/icon_128.png ${ASSEMBLY_DIR}

63 ChangeDir ${PUBLISH_DIR}	63 ChangeDir ${PUBLISH_DIR}

64 CreateWebStoreZip toybox-${VERSION}.zip toybox	64 CreateWebStoreZip toybox-${VERSION}.zip toybox

65 }	65 }

OLD	NEW