Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
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

10
support/checkout-deps.sh
View File

@ -1,6 +1,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
trap "exit" INT trap "exit" INT
if [ ! -d "amxmodx" ]; then
git clone https://github.com/alliedmodders/amxmodx.git
fi
if [ "$1" != "--no-mysql" ]; then
ismac=0 ismac=0
iswin=0 iswin=0
@ -15,10 +20,6 @@ elif [ `uname` != "Linux" ] && [ -n "${COMSPEC:+1}" ]; then
decomp=unzip decomp=unzip
fi fi
if [ ! -d "amxmodx" ]; then
git clone https://github.com/alliedmodders/amxmodx.git
fi
if [ $ismac -eq 1 ]; then 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
@ -45,6 +46,7 @@ if [ ! -d "mysql-5.0" ]; then
mv $mysqlver mysql-5.0 mv $mysqlver mysql-5.0
rm mysql.$archive_ext rm mysql.$archive_ext
fi fi
fi
checkout () checkout ()
{ {