projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
native_client_sdk
/
src
/
gonacl_appengine
/
src
/
lua
/
build.sh
diff --git
a/src/native_client_sdk/src/gonacl_appengine/src/lua/build.sh
b/src/native_client_sdk/src/gonacl_appengine/src/lua/build.sh
index
15a8e02
..
c1afeb0
100755
(executable)
--- a/
src/native_client_sdk/src/gonacl_appengine/src/lua/build.sh
+++ b/
src/native_client_sdk/src/gonacl_appengine/src/lua/build.sh
@@
-5,14
+5,13
@@
set -o nounset
set -o errexit
set -o nounset
set -o errexit
-set -o xtrace
SCRIPT_DIR="$(cd $(dirname $0) && pwd)"
cd ${SCRIPT_DIR}
OUT_DIR=out
SCRIPT_DIR="$(cd $(dirname $0) && pwd)"
cd ${SCRIPT_DIR}
OUT_DIR=out
-NACLPORTS_URL=http
://naclports.googlecode.com/svn/trunk/src
-NACLPORTS_REV=
1290
+NACLPORTS_URL=http
s://chromium.googlesource.com/external/naclports.git
+NACLPORTS_REV=
e53078c33d99b0b3cbadbbbbb92cccf7a48d5dc1
NACLPORTS_DIR=${OUT_DIR}/naclports
if [ -z "${NACL_SDK_ROOT:-}" ]; then
NACLPORTS_DIR=${OUT_DIR}/naclports
if [ -z "${NACL_SDK_ROOT:-}" ]; then
@@
-37,24
+36,11
@@
LogExecute() {
$*
}
$*
}
-Clone() {
- local url=$1
- local dir=$2
- local sha=$3
- if [ ! -d $dir ]; then
- LogExecute git clone $url $dir
- else
- pushd $dir
- LogExecute git fetch origin
- popd
- fi
-
- pushd $dir
- LogExecute git checkout $sha
- popd
-}
-
Banner Cloning naclports
Banner Cloning naclports
+if [ -d ${NACLPORTS_DIR} -a ! -d ${NACLPORTS_DIR}/src/.git ]; then
+ rm -rf ${NACLPORTS_DIR}
+fi
+
if [ ! -d ${NACLPORTS_DIR} ]; then
mkdir -p ${NACLPORTS_DIR}
pushd ${NACLPORTS_DIR}
if [ ! -d ${NACLPORTS_DIR} ]; then
mkdir -p ${NACLPORTS_DIR}
pushd ${NACLPORTS_DIR}