aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix mysql plugin deploy on windows

Browse source
This commit is contained in:
Fabio Bas 2016-03-08 08:55:50 +01:00
parent 0b8f52e084
commit 62cb89d224
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
appveyor.yml
View file

@ -11,12 +11,18 @@ environment:
target_arch: x86_64 target_arch: x86_64
qt_ver: 5.5\msvc2013_64 qt_ver: 5.5\msvc2013_64
bintray_path: Win64 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 - vc_arch: amd64_x86 # cross-compile from amd64 to x86
choco_arch: --x86 choco_arch: --x86
nuget_arch: Win32 nuget_arch: Win32
target_arch: x86 target_arch: x86
qt_ver: 5.5\msvc2013 qt_ver: 5.5\msvc2013
bintray_path: Win32 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: install:
- systeminfo - systeminfo
# upgrade cmake in order to have c++11 support # upgrade cmake in order to have c++11 support
@ -41,6 +47,9 @@ install:
} else { } else {
nuget install zlib -OutputDirectory c:\zlib nuget install zlib -OutputDirectory c:\zlib
} }
# install mysql connector
- curl -kLO %MYSQL_DRIVER_URL%
- 7z x %MYSQL_DRIVER_ARCHIVE% -oc:\ >nul
build_script: build_script:
- mkdir build - mkdir build
- cd build - cd build
@ -59,12 +68,15 @@ build_script:
$protolib = c:\cygwin\bin\cygpath -m $protolib $protolib = c:\cygwin\bin\cygpath -m $protolib
$protoc = c:\cygwin\bin\find /cygdrive/c/protoc/ -name "protoc.exe" $protoc = c:\cygwin\bin\find /cygdrive/c/protoc/ -name "protoc.exe"
$protoc = c:\cygwin\bin\cygpath -m $protoc $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 "ZLIBINC = $zlibinc"
Write-Output "ZLIBLIB = $zliblib" Write-Output "ZLIBLIB = $zliblib"
Write-Output "PROTOINC = $protoinc" Write-Output "PROTOINC = $protoinc"
Write-Output "PROTOLIB = $protolib" Write-Output "PROTOLIB = $protolib"
Write-Output "PROTOC = $protoc" 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 - nmake package
- c:\cygwin\bin\ls -l - c:\cygwin\bin\ls -l
- ps: | - ps: |

2
servatrice/CMakeLists.txt
View file

@ -201,7 +201,7 @@ if(WIN32)
# qt5: platforms, sqldrivers # qt5: platforms, sqldrivers
install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
FILES_MATCHING REGEX "(codecs/.*|platforms/.*|sqldrivers/libqsqlmysql)\\.dll" FILES_MATCHING REGEX "(codecs/.*|platforms/.*|sqldrivers/qsqlmysql)\\.dll"
REGEX ".*d\\.dll" EXCLUDE) REGEX ".*d\\.dll" EXCLUDE)
install(CODE " install(CODE "