Changeset 792

Timestamp:

Oct 11, 2010, 10:14:03 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

plugins: Enabled the MySQL Qt plugin.

Location:

trunk

Files:

• README.OS2 (modified) (3 diffs)
• configure.cmd (modified) (6 diffs)
• src/plugins/sqldrivers/mysql/mysql.pro (modified) (2 diffs)

trunk/README.OS2

@@ -72 +72 @@
     available at:
 
-      http://rpm.netlabs.org/experimental/00/i386/i386/openssl-devel-1.0.0a-1.i386.rpm
-      http://rpm.netlabs.org/experimental/00/i386/i386/openssl-1.0.0a-1.i386.rpm
-
-      or
-
       http://bauxite.sakura.ne.jp/tmp/os2/openssl-1.0.0a-os2knix-20100706-runtime.zip
       http://bauxite.sakura.ne.jp/tmp/os2/openssl-1.0.0a-os2knix-20100706-dev.zip
 
+  - MySQL 5.1 or later for the MySQL Qt plugin. The MySQL libraries are
+    available at:
+
+      http://download.smedley.info/mysql-5.1.51-os2-20101001.zip
+
+    Note that you will also need the above OpenSSL libraries and pthread.lib to
+    be able to use this MySQL build.
 
 
@@ -159 +161 @@
     variables to tell the Qt configure script its location:
 
-      set CUPS_INCLUDEPATH=X:\<path_to_CUPS>\include
-      set CUPS_LIBS=-LX:\<path_to_CUPS>\lib -llibcups.a -L<path_to_pthread> -lpthread.lib
+      set CUPS_INCLUDEPATH=<path_to_CUPS>\include
+      set CUPS_LIBS=-L<path_to_CUPS>\lib -llibcups.a -L<path_to_pthread> -lpthread.lib
 
   - Unzip the OpenSSL libraries to some directory and set the following
     environment variables to tell the Qt configure script its location:
 
-      set OPENSSL_INCLUDEPATH=X:\<path_to_OpenSSL>\include
+      set OPENSSL_INCLUDEPATH=<path_to_OpenSSL>\include
       set OPENSSL_LIBS=
 
@@ -172 +174 @@
     runtime:
 
-      set BEGINLIBPATH=X:\<path_to_OpenSSL>\dll;%BEGINLIBPATH%
+      set BEGINLIBPATH=<path_to_OpenSSL>\dll;%BEGINLIBPATH%
+
+  - Unzip the MySQL archive to some directory and set the following environment
+    variables to tell the Qt configure script the library location:
+
+      set MYSQL_INCLUDEPATH=<path_to_MySQL>\include'
+      set MYSQL_LIBS=-L<path_to_MySQL>\lib -lmysqlclient_r -L<path_to_OpenSSL>\lib -llibssl -llibcrypto -L<path_to_pthread> -lpthread
 
 

trunk/configure.cmd

@@ -228 +228 @@
     G.CFG_QCONFIG = "full"
     G.CFG_DEBUG = "auto"
-    G.CFG_MYSQL_CONFIG = ""
     G.CFG_DEBUG_RELEASE = "no"
     G.CFG_SHARED = "yes"
@@ -358 +357 @@
     G.QMAKE_EXEPACK_POST_FLAGS = ""
 
-    /* flags for SQL drivers */
-    G.QT_CFLAGS_PSQL = ""
-    G.QT_LFLAGS_PSQL = ""
-    G.QT_CFLAGS_MYSQL = ""
-    G.QT_LFLAGS_MYSQL = ""
-    G.QT_LFLAGS_MYSQL_R = ""
-    G.QT_CFLAGS_SQLITE = ""
-    G.QT_LFLAGS_SQLITE = ""
-
     /* check SQL drivers, mouse drivers and decorations available in
      * this package */
@@ -916 +906 @@
         call Done 2
 
+    call SayLog
+
     /*--------------------------------------------------------------------------
      tests that need qmake
@@ -927 +919 @@
         drv = word(G.CFG_SQL_AVAILABLE, i)
         select
+            when (drv == "mysql") then do
+                if (G.CFG_SQL_mysql \== "no") then do
+                    /* detect MySQL libraries */
+                    G.MYSQL_INCLUDEPATH = GetEnv('MYSQL_INCLUDEPATH')
+                    G.MYSQL_LIBS = GetEnv('MYSQL_LIBS')
+                    if (G.MYSQL_INCLUDEPATH \== '' & G.MYSQL_LIBS \== '')  then do
+                        call SayVerbose 'MySQL include path : 'G.MYSQL_INCLUDEPATH
+                        call SayVerbose 'MySQL libraries    : 'G.MYSQL_LIBS
+                        call SayVerbose
+                        /* qt sources for some reason include mysql headers directly, so
+                         * add a prefix here to fix that */
+                        G.MYSQL_INCLUDEPATH = G.MYSQL_INCLUDEPATH'/mysql'
+                        if (G.CFG_SQL_mysql == "auto") then
+                            G.CFG_SQL_mysql = "plugin"
+                    end
+                    else do
+                        call SayVerbose,
+'Warning: MySQL libraries are not specified, MySQL plugin is disabled.'G.EOL||,
+'Use MYSQL_INCLUDEPATH and MYSQL_LIBS environment variables to specify'G.EOL||,
+'the location of the libraries.'G.EOL||G.EOL
+                        G.CFG_SQL_mysql = 'no'
+                    end
+                end
+            end
             when (drv == "sqlite") then do
                 if (G.CFG_SQL_sqlite \== "no") then do
                     if (G.CFG_SQLITE == "system") then do
                         /* @todo external sqlite3 library isn't yet supported */
-                        call SayLog,
+                        call SayVerbose,
 "Warning: Linking against the external sqlite3 library isn't yet supported,"G.EOL||,
 "the sqlite SQL driver is disabled"G.EOL||G.EOL
@@ -942 +958 @@
                         end
                         else do
+                            call SayVerbose,
 "Warning: 3rdparty sources for the sqlite3 library are not found,"G.EOL||,
 "the sqlite SQL driver is disabled"G.EOL||G.EOL
@@ -1721 +1738 @@
 'QMAKE_LIBDIR_QT = $$QT_BUILD_TREE\lib'G.EOL||G.EOL
 
-    if (G.QT_CFLAGS_PSQL \== "") then
-        call lineout qmake_cache_new, 'QT_CFLAGS_PSQL  = 'G.QT_CFLAGS_PSQL
-    if (G.QT_LFLAGS_PSQL \== "") then
-        call lineout qmake_cache_new, 'QT_LFLAGS_PSQL  = 'G.QT_LFLAGS_PSQL
-    if (G.QT_CFLAGS_MYSQL \== "") then
-        call lineout qmake_cache_new, 'QT_CFLAGS_MYSQL = 'G.QT_CFLAGS_MYSQL
-    if (G.QT_LFLAGS_MYSQL \== "") then
-        call lineout qmake_cache_new, 'QT_LFLAGS_MYSQL = 'G.QT_LFLAGS_MYSQL
-    if (G.QT_CFLAGS_SQLITE \== "") then
-        call lineout qmake_cache_new, 'QT_CFLAGS_SQLITE = 'G.QT_CFLAGS_SQLITE
-    if (G.QT_LFLAGS_SQLITE \== "") then
-        call lineout qmake_cache_new, 'QT_LFLAGS_SQLITE = 'G.QT_LFLAGS_SQLITE
+    if (G.MYSQL_INCLUDEPATH \== "") then
+        call lineout qmake_cache_new, 'MYSQL_INCLUDEPATH = 'G.MYSQL_INCLUDEPATH
+    if (G.MYSQL_LIBS \== "") then
+        call lineout qmake_cache_new, 'MYSQL_LIBS = 'G.MYSQL_LIBS
 
     if (G.QT_EDITION \== "QT_EDITION_OPENSOURCE") then

trunk/src/plugins/sqldrivers/mysql/mysql.pro

@@ -1 +1 @@
 TARGET   = qsqlmysql
+os2:TARGET_SHORT = qmysql
 
 HEADERS         = ../../../sql/drivers/mysql/qsql_mysql.h
@@ -21 +22 @@
 }
 
+os2 {
+    INCLUDEPATH *= $$MYSQL_INCLUDEPATH
+    LIBS        *= $$MYSQL_LIBS    
+}
+
 include(../qsqldriverbase.pri)