Add --no-mysql to checkout-deps.sh

This commit is contained in:
xPaw 2014-07-27 12:31:19 +03:00
parent fae6c52082
commit f2b1d26da3
2 changed files with 40 additions and 38 deletions

View File

@ -4,7 +4,7 @@ compiler:
before_script: before_script:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -y g++-multilib libc6-dev-i386 lib32stdc++6 lib32z1-dev - sudo apt-get install -y g++-multilib libc6-dev-i386 lib32stdc++6 lib32z1-dev
- CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh && cd $CHECKOUT_DIR - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh --no-mysql && cd $CHECKOUT_DIR
script: script:
- mkdir build && cd build - mkdir build && cd build
- python ../configure.py --enable-optimize --no-mysql - python ../configure.py --enable-optimize --no-mysql

View File

@ -1,38 +1,39 @@
#!/usr/bin/env bash #!/usr/bin/env bash
trap "exit" INT trap "exit" INT
ismac=0
iswin=0
archive_ext=tar.gz
decomp="tar zxf"
if [ `uname` = "Darwin" ]; then
ismac=1
elif [ `uname` != "Linux" ] && [ -n "${COMSPEC:+1}" ]; then
iswin=1
archive_ext=zip
decomp=unzip
fi
if [ ! -d "amxmodx" ]; then if [ ! -d "amxmodx" ]; then
git clone https://github.com/alliedmodders/amxmodx.git git clone https://github.com/alliedmodders/amxmodx.git
fi fi
if [ $ismac -eq 1 ]; then if [ "$1" != "--no-mysql" ]; then
ismac=0
iswin=0
archive_ext=tar.gz
decomp="tar zxf"
if [ `uname` = "Darwin" ]; then
ismac=1
elif [ `uname` != "Linux" ] && [ -n "${COMSPEC:+1}" ]; then
iswin=1
archive_ext=zip
decomp=unzip
fi
if [ $ismac -eq 1 ]; then
mysqlver=mysql-5.5.28-osx10.5-x86 mysqlver=mysql-5.5.28-osx10.5-x86
mysqlurl=http://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext mysqlurl=http://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext
elif [ $iswin -eq 1 ]; then elif [ $iswin -eq 1 ]; then
mysqlver=mysql-noinstall-5.0.24a-win32 mysqlver=mysql-noinstall-5.0.24a-win32
mysqlurl=http://cdn.mysql.com/archives/mysql-5.0/$mysqlver.$archive_ext mysqlurl=http://cdn.mysql.com/archives/mysql-5.0/$mysqlver.$archive_ext
# The folder in the zip archive does not contain the substring "-noinstall", so strip it # The folder in the zip archive does not contain the substring "-noinstall", so strip it
mysqlver=${mysqlver/-noinstall} mysqlver=${mysqlver/-noinstall}
else else
mysqlver=mysql-5.6.15-linux-glibc2.5-i686 mysqlver=mysql-5.6.15-linux-glibc2.5-i686
mysqlurl=http://cdn.mysql.com/archives/mysql-5.6/$mysqlver.$archive_ext mysqlurl=http://cdn.mysql.com/archives/mysql-5.6/$mysqlver.$archive_ext
fi fi
if [ ! -d "mysql-5.0" ]; then if [ ! -d "mysql-5.0" ]; then
if [ `command -v wget` ]; then if [ `command -v wget` ]; then
wget $mysqlurl -O mysql.$archive_ext wget $mysqlurl -O mysql.$archive_ext
elif [ `command -v curl` ]; then elif [ `command -v curl` ]; then
@ -44,6 +45,7 @@ if [ ! -d "mysql-5.0" ]; then
$decomp mysql.$archive_ext $decomp mysql.$archive_ext
mv $mysqlver mysql-5.0 mv $mysqlver mysql-5.0
rm mysql.$archive_ext rm mysql.$archive_ext
fi
fi fi
checkout () checkout ()