mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
This commit is contained in:
commit
3d6f77bdd6
|
@ -621,16 +621,26 @@ if test "${DOWNLOAD_STARTER}" == 1; then
|
|||
STARTER_REV=`curl -s https://api.github.com/repos/arangodb-helper/ArangoDBStarter/releases |grep tag_name |head -n 1 |${SED} -e "s;.*: ;;" -e 's;";;g' -e 's;,;;'`
|
||||
STARTER_URL=`curl -s https://api.github.com/repos/arangodb-helper/ArangoDBStarter/releases/tags/${STARTER_REV} |grep browser_download_url |grep "${OSNAME}" |${SED} -e "s;.*: ;;" -e 's;";;g' -e 's;,;;'`
|
||||
if test -n "${STARTER_URL}"; then
|
||||
curl -LO "${STARTER_URL}"
|
||||
FN=`echo ${STARTER_URL} |${SED} "s;.*/;;"`
|
||||
if test "${isCygwin}" == 1; then
|
||||
TN=arangodb.exe
|
||||
else
|
||||
TN=arangodb
|
||||
fi
|
||||
mkdir -p ${BUILD_DIR}
|
||||
mv ${FN} ${BUILD_DIR}/${TN}
|
||||
chmod a+x ${BUILD_DIR}/${TN}
|
||||
export BUILD_DIR
|
||||
export STARTER_URL
|
||||
export SED
|
||||
export FN
|
||||
(
|
||||
mkdir -p ${BUILD_DIR}
|
||||
cd ${BUILD_DIR}
|
||||
if test "${isCygwin}" == 1; then
|
||||
TN=arangodb.exe
|
||||
else
|
||||
TN=arangodb
|
||||
fi
|
||||
if test -f ${TN}; then
|
||||
rm -f ${TN}
|
||||
fi
|
||||
curl -LO "${STARTER_URL}"
|
||||
FN=`echo ${STARTER_URL} |${SED} "s;.*/;;"`
|
||||
mv ${FN} ${TN}
|
||||
chmod a+x ${TN}
|
||||
)
|
||||
fi
|
||||
CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DTHIRDPARTY_BIN=${BUILD_DIR}/${TN} "
|
||||
fi
|
||||
|
|
|
@ -233,10 +233,12 @@ endif()
|
|||
|
||||
if (THIRDPARTY_SBIN)
|
||||
install(FILES ${THIRDPARTY_SBIN}
|
||||
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
||||
DESTINATION "${CMAKE_INSTALL_SBINDIR}")
|
||||
endif()
|
||||
|
||||
if (THIRDPARTY_BIN)
|
||||
install(FILES ${THIRDPARTY_BIN}
|
||||
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
||||
DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
||||
endif()
|
||||
|
|
|
@ -20,6 +20,7 @@ done
|
|||
--buildDir build-${EP}bundle \
|
||||
--prefix "/opt/arangodb" \
|
||||
--targetDir /var/tmp/ \
|
||||
--downloadStarter \
|
||||
--clang \
|
||||
--staticOpenSSL \
|
||||
$@
|
||||
|
|
|
@ -25,6 +25,7 @@ done
|
|||
--buildDir build-${EP}deb \
|
||||
--targetDir /var/tmp/ \
|
||||
--jemalloc \
|
||||
--downloadStarter \
|
||||
--noopt \
|
||||
$@
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@ done
|
|||
--buildDir /cygdrive/c/b/${EP}/ \
|
||||
--package NSIS \
|
||||
--targetDir /var/tmp/ \
|
||||
--downloadStarter \
|
||||
$@
|
||||
|
||||
cd ${DIR}/..
|
||||
|
|
|
@ -20,6 +20,7 @@ done
|
|||
--buildDir build-${EP}rpm \
|
||||
--targetDir /var/tmp/ \
|
||||
--jemalloc \
|
||||
--downloadStarter \
|
||||
--noopt \
|
||||
$@
|
||||
|
||||
|
|
|
@ -29,6 +29,7 @@ cd ${DIR}/..
|
|||
--snap \
|
||||
--buildDir build-${EP}snap \
|
||||
--targetDir /var/tmp/ \
|
||||
--downloadStarter \
|
||||
--noopt \
|
||||
$@
|
||||
|
||||
|
|
Loading…
Reference in New Issue