Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
62cb89d2
Commit
62cb89d2
authored
Mar 08, 2016
by
Fabio Bas
Browse files
Fix mysql plugin deploy on windows
parent
0b8f52e0
Changes
2
Show whitespace changes
Inline
Side-by-side
appveyor.yml
View file @
62cb89d2
...
...
@@ -11,12 +11,18 @@ environment:
target_arch
:
x86_64
qt_ver
:
5.5\msvc2013_64
bintray_path
:
Win64
MYSQL_DRIVER_URL
:
https://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-6.1.6-winx64.zip
MYSQL_DRIVER_ARCHIVE
:
mysql-connector-c-6.1.6-winx64.zip
MYSQL_DRIVER_NAME
:
mysql-connector-c-6.1.6-winx64
-
vc_arch
:
amd64_x86
# cross-compile from amd64 to x86
choco_arch
:
--x86
nuget_arch
:
Win32
target_arch
:
x86
qt_ver
:
5.5\msvc2013
bintray_path
:
Win32
MYSQL_DRIVER_URL
:
https://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-6.1.6-win32.zip
MYSQL_DRIVER_ARCHIVE
:
mysql-connector-c-6.1.6-win32.zip
MYSQL_DRIVER_NAME
:
mysql-connector-c-6.1.6-win32
install
:
-
systeminfo
# upgrade cmake in order to have c++11 support
...
...
@@ -41,6 +47,9 @@ install:
} else {
nuget install zlib -OutputDirectory c:\zlib
}
# install mysql connector
-
curl -kLO %MYSQL_DRIVER_URL%
-
7z x %MYSQL_DRIVER_ARCHIVE% -oc:\ >nul
build_script
:
-
mkdir build
-
cd build
...
...
@@ -59,12 +68,15 @@ build_script:
$protolib = c:\cygwin\bin\cygpath -m $protolib
$protoc = c:\cygwin\bin\find /cygdrive/c/protoc/ -name "protoc.exe"
$protoc = c:\cygwin\bin\cygpath -m $protoc
$mysqldll = c:\cygwin\bin\find /cygdrive/c/$env:MYSQL_DRIVER_NAME -name "libmysql.dll"
$mysqldll = c:\cygwin\bin\cygpath -m $mysqldll
Write-Output "ZLIBINC = $zlibinc"
Write-Output "ZLIBLIB = $zliblib"
Write-Output "PROTOINC = $protoinc"
Write-Output "PROTOLIB = $protolib"
Write-Output "PROTOC = $protoc"
cmake .. "-GNMake Makefiles" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_PREFIX_PATH=c:/Qt/$env:qt_ver" "-DWITH_SERVER=1" "-DZLIB_INCLUDE_DIR=$zlibinc" "-DZLIB_LIBRARY=$zliblib" "-DPROTOBUF_INCLUDE_DIR=$protoinc" "-DPROTOBUF_LIBRARIES=$protolib" "-DPROTOBUF_LIBRARIES=$protolib" "-DPROTOBUF_LIBRARY=$protolib" "-DPROTOBUF_PROTOC_EXECUTABLE=$protoc"
Write-Output "MYSQLDLL = $mysqldll"
cmake .. "-GNMake Makefiles" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_PREFIX_PATH=c:/Qt/$env:qt_ver" "-DWITH_SERVER=1" "-DZLIB_INCLUDE_DIR=$zlibinc" "-DZLIB_LIBRARY=$zliblib" "-DPROTOBUF_INCLUDE_DIR=$protoinc" "-DPROTOBUF_LIBRARIES=$protolib" "-DPROTOBUF_LIBRARIES=$protolib" "-DPROTOBUF_LIBRARY=$protolib" "-DPROTOBUF_PROTOC_EXECUTABLE=$protoc" "-DMYSQLCLIENT_LIBRARIES=$mysqldll"
-
nmake package
-
c:\cygwin\bin\ls -l
-
ps
:
|
...
...
servatrice/CMakeLists.txt
View file @
62cb89d2
...
...
@@ -201,7 +201,7 @@ if(WIN32)
# qt5: platforms, sqldrivers
install
(
DIRECTORY
"
${
QT_PLUGINS_DIR
}
/"
DESTINATION
${
plugin_dest_dir
}
COMPONENT Runtime
FILES_MATCHING REGEX
"(codecs/.*|platforms/.*|sqldrivers/
lib
qsqlmysql)
\\
.dll"
FILES_MATCHING REGEX
"(codecs/.*|platforms/.*|sqldrivers/qsqlmysql)
\\
.dll"
REGEX
".*d
\\
.dll"
EXCLUDE
)
install
(
CODE
"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment