bk commit - MyODBC 3.51 (1.512)

bk commit - MyODBC 3.51 (1.512)

am 21.09.2005 09:04:58 von pharvey

Below is the list of changes that have just been commited into a local
MyODBC 3.51 repository of 'pharvey'. When 'pharvey' does a push, they will
be propogaged to the main repository and within 2 hours after the push
into the public repository.

For more information on how to access the public repository see:
http://www.mysql.com/products/myodbc/faq_2.html#Development_ source

You can also browse the changes from public repository:
Complete repository: http://mysql.bkbits.net:8080/myodbc3/
This changeset : http://mysql.bkbits.net:8080/myodbc3/cset@1.512

ChangeSet
1.512 05/09/21 00:04:55 pharvey@sun.codebydesign.com +7 -0
- more tweaks to pro files and qmake build process

root.vpj
1.6 05/09/21 00:04:52 pharvey@sun.codebydesign.com +5 -1
- more tweaks to pro files and qmake build process

odbc.qmake
1.2 05/09/21 00:04:52 pharvey@sun.codebydesign.com +2 -2
- more tweaks to pro files and qmake build process

mysql.qmake
1.5 05/09/21 00:04:52 pharvey@sun.codebydesign.com +2 -2
- more tweaks to pro files and qmake build process

defines.qmake
1.5 05/09/21 00:04:52 pharvey@sun.codebydesign.com +2 -4
- more tweaks to pro files and qmake build process

config.qmake
1.4 05/09/21 00:04:52 pharvey@sun.codebydesign.com +2 -3
- more tweaks to pro files and qmake build process

CreateMakefiles.sh
1.2 05/09/21 00:04:52 pharvey@sun.codebydesign.com +24 -31
- more tweaks to pro files and qmake build process

Build.sh
1.2 05/09/21 00:04:52 pharvey@sun.codebydesign.com +15 -45
- more tweaks to pro files and qmake build process

# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: pharvey
# Host: sun.codebydesign.com
# Root: /home/pharvey/SandBox/64/myodbc-3.51

--- 1.3/config.qmake 2005-09-20 12:58:38 -07:00
+++ 1.4/config.qmake 2005-09-21 00:04:52 -07:00
@@ -24,8 +24,7 @@
CONFIG -= debug

unix {
- INCLUDEPATH += /usr/local/include
- LIBS += -L/usr/local/lib
+ INCLUDEPATH += $(LIBTOOL_DIR)/include
+ LIBS += -L$(LIBTOOL_DIR)/lib
}
-


--- 1.4/defines.qmake 2005-09-10 14:43:16 -07:00
+++ 1.5/defines.qmake 2005-09-21 00:04:52 -07:00
@@ -10,13 +10,11 @@
#
# #########################################################

-# DEFINES += HAVE_SQLGETPRIVATEPROFILESTRING HAVE_ODBCINST_H
-DEFINES += PORTABLE_GUI
-DEFINES += SETUP_VERSION=\"3.51.12\"
+# DEFINES += PORTABLE_GUI
+# DEFINES += SETUP_VERSION=\"3.51.12\"

win32 {
DEFINES -= UNICODE
-# DEFINES += WIN32
}

unix {

--- 1.4/mysql.qmake 2005-09-02 10:45:50 -07:00
+++ 1.5/mysql.qmake 2005-09-21 00:04:52 -07:00
@@ -29,8 +29,8 @@
# UNIX
# #########################################################
unix {
- INCLUDEPATH += /usr/include/mysql
- LIBS += -L/usr/lib/mysql -lmysqlclient
+ INCLUDEPATH += $(MYSQL_DIR)/include/mysql
+ LIBS += -L$(MYSQL_DIR)/lib/mysql -lmysqlclient
}



--- 1.5/root.vpj 2005-09-20 12:58:38 -07:00
+++ 1.6/root.vpj 2005-09-21 00:04:52 -07:00
@@ -54,7 +54,10 @@
Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.a sm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*. py;*.pl"/>
Name="Header Files"
- Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if"/>
+ Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
+
+
+
Name="Resource Files"
Filters="*.ico;*.cur;*.dlg"/>
@@ -77,6 +80,7 @@



+




--- 1.1/Build.sh 2005-09-20 14:28:50 -07:00
+++ 1.2/Build.sh 2005-09-21 00:04:52 -07:00
@@ -1,51 +1,21 @@
-ECHO OFF
-REM #########################################################
-REM
-REM \brief Make the sources.
-REM
-REM This exists as a temp solution to a problem with qmake
-REM generated Makefile.
-REM
-REM Normally running 'qmake' and 'make' from the source root
-REM would work fine but until the qmake pro file for the
-REM driver is working we can use this to automate the build.
-REM
-REM This should not be required in platforms other than
-REM MS Windows.
-REM
-REM \note WARNING: This will do a;
-REM
-REM "del /Q /F \Windows\System32\MYODBC*.*"
-REM
-REM \note If you do not have a 'make' then copy nmake to make.
-REM
-REM #########################################################
+# #########################################################
+#
+# \brief Make the sources.
+#
+#
+# #########################################################

-ECHO ****
-ECHO * Removing libraries and executables to force relink...
-ECHO ****
-rmdir /Q /S lib
-rmdir /Q /S bin
-del /Q /F \Windows\System32\*myodbc*.*
+echo "+-----------------------"
+echo "| Force relink..."
+echo "+-----------------------"
+rm -rf lib
+rm -rf bin

-REM Invoke qmake - without relying upon its mechanism to dive into sub dirs.
-CALL CreateMakefiles.bat
+./CreateMakefiles.sh

-ECHO ****
-ECHO * Making the libraries and executables...
-ECHO ****
-ECHO Make...
+echo "+-----------------------"
+echo "| Making the libraries and executables..."
+echo "+-----------------------"
make
-
-ECHO ****
-ECHO * Replacing the registered files with our newly built files...
-ECHO ****
-copy lib\myodbc3S.dll \Windows\System32
-copy lib\myodbc3S.lib \Windows\System32
-copy lib\myodbc3.dll \Windows\System32
-copy lib\myodbc3.lib \Windows\System32
-copy bin\myodbc3i.exe \Windows\System32
-copy bin\myodbc3m.exe \Windows\System32
-copy bin\myodbc3c.exe \Windows\System32



--- 1.1/CreateMakefiles.sh 2005-09-20 14:28:50 -07:00
+++ 1.2/CreateMakefiles.sh 2005-09-21 00:04:52 -07:00
@@ -1,61 +1,54 @@
-ECHO OFF
-REM #########################################################
-REM
-REM \brief Create Makefiles from qmake project files.
-REM
-REM Actually; you only want to use this to 'regenerate'
-REM the Makefiles. So do a qmake from the root source for
-REM the first time and then after that you probably want
-REM to use this for regenerating them due to changes in
-REM a qmake project file.
-REM
-REM It would appear that under certian circumtsances existing
-REM make files will not get regenerated after a qmake project
-REM file has changed.
-REM
-REM \note Its probably a good idea to run this twice as I think the
-REM the problem only occurs the first time an attempt is made
-REM to auto recreate the makefile.
-REM
-REM #########################################################
-
-ECHO ****
-ECHO * Recreating Makefiles...
-ECHO ****
+# #########################################################
+#
+# \brief Create Makefiles from qmake project files.
+#
+#
+# #########################################################
+
+echo "+-----------------------"
+echo "| Recreating Makefiles..."
+echo "+-----------------------"
qmake

-ECHO dltest...
+echo "dltest..."
cd dltest
+rm -f Makefile
qmake
cd ..

-ECHO util...
+echo "myodbcutil..."
cd util
+rm -f Makefile
qmake
cd ..

-ECHO setup...
+echo "myodbc3S..."
cd setup
+rm -f Makefile
qmake
cd ..

-ECHO myodbcinst...
+echo "myodbc3i..."
cd myodbcinst
+rm -f Makefile
qmake
cd ..

-ECHO imyodbc...
+echo "myodbc3m..."
cd imyodbc
+rm -f Makefile
qmake
cd ..

-ECHO MYODBCConfig...
+echo "myodbc3c..."
cd MYODBCConfig
+rm -f Makefile
qmake
cd ..

-ECHO driver...
+echo "myodbc3..."
cd driver
+rm -f Makefile
qmake
cd ..


--- 1.1/odbc.qmake 2005-09-20 15:19:43 -07:00
+++ 1.2/odbc.qmake 2005-09-21 00:04:52 -07:00
@@ -27,8 +27,8 @@
# UNIX
# #########################################################
unix {
- INCLUDEPATH += $UNIXODBC_DIR/include
- LIBS += -L$UNIXODBC_DIR/lib -lodbc -lodbcinst
+ INCLUDEPATH += $(UNIXODBC_DIR)/include
+ LIBS += -L$(UNIXODBC_DIR)/lib -lodbc -lodbcinst
}

# #########################################################

--
MySQL ODBC Mailing List
For list archives: http://lists.mysql.com/myodbc
To unsubscribe: http://lists.mysql.com/myodbc?unsub=gcdmo-myodbc@m.gmane.org