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

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

Issue 1555913002: Build gtest from source rather than using SDK-provided version (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Created 4 years, 11 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/corelibs/build.sh ('k') | ports/devenv/pkg_info » ('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) 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 EnableCliMain 5 EnableCliMain
6 NACLPORTS_CPPFLAGS+=" -Wall -Werror -Dpipe=nacl_spawn_pipe" 6 NACLPORTS_CPPFLAGS+=" -Wall -Werror -Dpipe=nacl_spawn_pipe"
7 NACLPORTS_CPPFLAGS+=" -isystem ${GTEST_SRC}/include"
7 8
8 EXECUTABLES="tests/devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \ 9 EXECUTABLES="tests/devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \
9 jseval/jseval_${NACL_ARCH}${NACL_EXEEXT}" 10 jseval/jseval_${NACL_ARCH}${NACL_EXEEXT}"
10 11
11 STORAGE_URL=https://naclports.storage.googleapis.com/builds 12 STORAGE_URL=https://naclports.storage.googleapis.com/builds
12 SDK_VERSION=pepper_48 13 SDK_VERSION=pepper_48
13 BUILT_REVISION=trunk-703-gdb4edd8 14 BUILT_REVISION=trunk-703-gdb4edd8
14 DEFAULT_SOURCE=${STORAGE_URL}/${SDK_VERSION}/${BUILT_REVISION}/publish 15 DEFAULT_SOURCE=${STORAGE_URL}/${SDK_VERSION}/${BUILT_REVISION}/publish
15 LOCAL_SOURCE=http://localhost:5103 16 LOCAL_SOURCE=http://localhost:5103
16 17
17 BuildStep() { 18 BuildStep() {
18 SetupCrossEnvironment 19 SetupCrossEnvironment
19 20
20 # Build jseval module. 21 # Build jseval module.
21 MakeDir ${BUILD_DIR}/jseval 22 MakeDir ${BUILD_DIR}/jseval
22 LogExecute ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} \ 23 LogExecute ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} \
23 ${START_DIR}/jseval.c \ 24 ${START_DIR}/jseval.c \
24 -o ${BUILD_DIR}/jseval/jseval_${NACL_ARCH}${NACL_EXEEXT} \ 25 -o ${BUILD_DIR}/jseval/jseval_${NACL_ARCH}${NACL_EXEEXT} \
25 ${LIBS} 26 ${LIBS}
26 27
27 # Build test module. 28 # Build test module.
28 MakeDir ${BUILD_DIR}/tests 29 MakeDir tests
29 LogExecute ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} \ 30 LogExecute ${CXX} ${CPPFLAGS} ${CXXFLAGS} -o tests/devenv_small_test.o \
30 ${START_DIR}/tests/devenv_small_test.cc \ 31 -c ${START_DIR}/tests/devenv_small_test.cc
31 -o ${BUILD_DIR}/tests/devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \ 32 LogExecute ${CXX} ${CPPFLAGS} ${CXXFLAGS} -o tests/gtest-all.o \
32 -lgtest ${LIBS} 33 -c ${GTEST_SRC}/src/gtest-all.cc -I${GTEST_SRC}
34 LogExecute ${CXX} ${LDFLAGS} tests/devenv_small_test.o tests/gtest-all.o \
35 -o tests/devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} ${LIBS}
33 } 36 }
34 37
35 InstallStep() { 38 InstallStep() {
36 return 39 return
37 } 40 }
38 41
39 # 42 #
40 # $1: Name name of the repo 43 # $1: Name name of the repo
41 # $2: Name of directory in which to create the conf file. 44 # $2: Name of directory in which to create the conf file.
42 # $3: The http address of repo. 45 # $3: The http address of repo.
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 # Zip the full app for upload. 157 # Zip the full app for upload.
155 ChangeDir ${PUBLISH_DIR} 158 ChangeDir ${PUBLISH_DIR}
156 CreateWebStoreZip devenv_app_upload.zip devenv_app_upload 159 CreateWebStoreZip devenv_app_upload.zip devenv_app_upload
157 160
158 # Copy the files for DevEnvWidget. 161 # Copy the files for DevEnvWidget.
159 local WIDGET_DIR=${PUBLISH_DIR}/devenvwidget 162 local WIDGET_DIR=${PUBLISH_DIR}/devenvwidget
160 MakeDir ${WIDGET_DIR} 163 MakeDir ${WIDGET_DIR}
161 LogExecute cp -r ${START_DIR}/devenvwidget/* ${WIDGET_DIR} 164 LogExecute cp -r ${START_DIR}/devenvwidget/* ${WIDGET_DIR}
162 165
163 # Install tests. 166 # Install tests.
164 MakeDir ${PUBLISH_DIR}/tests 167 MakeDir tests
165 LogExecute cp -r ${BUILD_DIR}/tests/* ${PUBLISH_DIR}/tests 168 ChangeDir tests
166 cd ${PUBLISH_DIR}/tests 169 LogExecute cp -r ${BUILD_DIR}/tests/*${NACL_EXEEXT} .
167 if [[ ${NACL_ARCH} == pnacl ]]; then
168 LogExecute ${PNACLFINALIZE} devenv_small_test_${NACL_ARCH}${NACL_EXEEXT}
169 fi
170 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \
171 devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \
172 -s . \
173 -o devenv_small_test.nmf
174 LogExecute mv devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \ 170 LogExecute mv devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \
175 devenv_small_test_${NACL_ARCH} 171 devenv_small_test_${NACL_ARCH}
176 172
177 Remove devenv_small_test.zip 173 Remove devenv_small_test.zip
178 LogExecute zip -r devenv_small_test.zip * 174 LogExecute zip -r devenv_small_test.zip *
179 } 175 }
180 176
181 PostInstallTestStep() { 177 PostInstallTestStep() {
182 local arches= 178 local arches=
183 if [[ ${OS_NAME} == Darwin && ${NACL_ARCH} == x86_64 ]]; then 179 if [[ ${OS_NAME} == Darwin && ${NACL_ARCH} == x86_64 ]]; then
(...skipping 12 matching lines...) Expand all
196 fi 192 fi
197 # Run large and io2014 tests only on the buildbots (against pinned revs). 193 # Run large and io2014 tests only on the buildbots (against pinned revs).
198 if [[ -n ${BUILDBOT_BUILDERNAME:-} ]]; then 194 if [[ -n ${BUILDBOT_BUILDERNAME:-} ]]; then
199 LogExecute python ${START_DIR}/../devenv/devenv_large_test.py \ 195 LogExecute python ${START_DIR}/../devenv/devenv_large_test.py \
200 -x -v -a ${arch} 196 -x -v -a ${arch}
201 #LogExecute python ${START_DIR}/../devenv/io2014_test.py \ 197 #LogExecute python ${START_DIR}/../devenv/io2014_test.py \
202 #-x -v -a ${arch} 198 #-x -v -a ${arch}
203 fi 199 fi
204 done 200 done
205 } 201 }
OLDNEW
« no previous file with comments | « ports/corelibs/build.sh ('k') | ports/devenv/pkg_info » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698