UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use MySQL 5.5 for MySQL extension. (#786)

Browse Source
This commit is contained in:
Nicholas Hastings 2018-03-20 17:12:30 -04:00 committed by GitHub
parent 4fd68939d3
commit 4637cf9221
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AMBuildScript
View File

@ -183,7 +183,7 @@ class SMConfig(object):
self.mysql_root['x86'] = builder.options.mysql_path self.mysql_root['x86'] = builder.options.mysql_path
else: else:
for i in range(7): for i in range(7):
self.mysql_root['x86'] = ResolveEnvPath('MYSQL5', 'mysql-5.' + str(i)) self.mysql_root['x86'] = ResolveEnvPath('MYSQL55', 'mysql-5.' + str(i))
if self.mysql_root['x86']: if self.mysql_root['x86']:
break break
if not self.mysql_root['x86'] or not os.path.isdir(self.mysql_root['x86']): if not self.mysql_root['x86'] or not os.path.isdir(self.mysql_root['x86']):
@ -196,7 +196,7 @@ class SMConfig(object):
self.mysql_root['x64'] = builder.options.mysql64_path self.mysql_root['x64'] = builder.options.mysql64_path
else: else:
for i in range(7): for i in range(7):
self.mysql_root['x64'] = ResolveEnvPath('MYSQL5_64', 'mysql-5.' + str(i) + '-x86_64') self.mysql_root['x64'] = ResolveEnvPath('MYSQL55_64', 'mysql-5.' + str(i) + '-x86_64')
if self.mysql_root['x64']: if self.mysql_root['x64']:
break break
if not self.mysql_root['x64'] or not os.path.isdir(self.mysql_root['x64']): if not self.mysql_root['x64'] or not os.path.isdir(self.mysql_root['x64']):

8
tools/checkout-deps.sh
View File

@ -42,13 +42,13 @@ getmysql ()
} }
# 32-bit MySQL # 32-bit MySQL
mysqlfolder=mysql-5.0 mysqlfolder=mysql-5.5
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=https://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext mysqlurl=https://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-5.5.54-win32
mysqlurl=https://cdn.mysql.com/archives/mysql-5.0/$mysqlver.$archive_ext mysqlurl=https://cdn.mysql.com/archives/mysql-5.5/$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
@ -58,7 +58,7 @@ fi
getmysql getmysql
# 64-bit MySQL # 64-bit MySQL
mysqlfolder=mysql-5.0-x86_64 mysqlfolder=mysql-5.5-x86_64
if [ $ismac -eq 1 ]; then if [ $ismac -eq 1 ]; then
mysqlver=mysql-5.5.28-osx10.5-x86_64 mysqlver=mysql-5.5.28-osx10.5-x86_64
mysqlurl=https://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext mysqlurl=https://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext