bk commit - MyODBC 3.51 (1.523)
am 10.10.2005 05:06:22 von pharveyBelow 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.523
ChangeSet
1.523 05/10/09 20:06:21 pharvey@pluto.codebydesign.com +8 -0
- updates to readme files
test/Makefile.ini
1.5 05/10/09 20:06:20 pharvey@pluto.codebydesign.com +1 -1
- updates to readme files
scripts/myodbc3.spec.sh
1.17 05/10/09 20:06:20 pharvey@pluto.codebydesign.com +1 -2
- updates to readme files
scripts/makerpm.sh
1.11 05/10/09 20:06:20 pharvey@pluto.codebydesign.com +0 -1
- updates to readme files
scripts/Makefile.am
1.11 05/10/09 20:06:19 pharvey@pluto.codebydesign.com +7 -3
- updates to readme files
myodbcinst/myodbcinst.c
1.41 05/10/09 20:06:19 pharvey@pluto.codebydesign.com +4 -4
- updates to readme files
README.win
1.4 05/10/09 20:06:19 pharvey@pluto.codebydesign.com +17 -121
- updates to readme files
README.unix
1.3 05/10/09 20:06:19 pharvey@pluto.codebydesign.com +21 -6
- updates to readme files
README.dist
1.6 05/10/09 20:06:19 pharvey@pluto.codebydesign.com +16 -25
- updates to readme files
# 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: pluto.codebydesign.com
# Root: /home/pharvey/SandBox/myodbc-3.51
--- 1.10/scripts/makerpm.sh 2005-10-09 18:17:55 -07:00
+++ 1.11/scripts/makerpm.sh 2005-10-09 20:06:20 -07:00
@@ -15,7 +15,6 @@
--enable-shared=yes \
--enable-static=yes \
--without-debug \
- --without-docs \
--without-samples
make dist;
}
--- 1.5/README.dist 2005-02-11 19:00:37 -08:00
+++ 1.6/README.dist 2005-10-09 20:06:19 -07:00
@@ -6,6 +6,7 @@
Linux
+=====
Source
(tar-ball)
@@ -36,38 +37,28 @@
Binary
(tar-ball)
-- make tar-ball
+- make bin-tar (or 'make tar-ball')
- change name of tar-ball (inside and out) for example;
- MyODBC-3.51.11-suse-linux-i686.tar.gz to...
- MyODBC-3.51.11-1-pc-linux-i686.tar.gz
+ mysql-connector-odbc-3.51.11-suse-linux-i686.tar.gz to...
+ mysql-connector-odbc-3.51.11-1-pc-linux-i686.tar.gz
XP
+==
Source
(zip)
-- create tar-ball
-- unpack tar-ball
-$ zip -r zip-file.zip dir-name
-
-Binary
-(Wise Installer)
-
-- cd util
-- qmake
-- nmake
-- cd ..\setup
-- qmake
-- nmake
-- cd ..\myodbcinst
-- qmake
-- nmake
-- cd ..\imyodbc
-- qmake
-- nmake
-- cd ..\win32
-- nmake
-- open wise project in wise folder
+???
+
+Binary
+(zip)
+
+???
+
+Binary
+(msi)
+
+???
--- 1.2/README.unix 2004-12-30 13:02:08 -08:00
+++ 1.3/README.unix 2005-10-09 20:06:19 -07:00
@@ -6,8 +6,8 @@
INTRODUCTION
------------------------------------------------------------ ---
-In this document I provide a general explaination of how to
-build the MyODBC driver on UNIX platforms. I will be as brief
+In this document we provide a general explaination of how to
+build the MyODBC driver on UNIX platforms. We will be as brief
as possible.
NOTE: This information is fairly generic. You may find other
@@ -41,7 +41,7 @@
compatability and portability issues.
Recently; Linux distributions have been including unixODBC as a
-standard option and Apple OSX now has ODBC by default.
+standard option and Apple OSX now has an ODBC by default.
We recommend, and use, unixODBC on all UNIX-like platforms
except OSX where we use the default ODBC.
@@ -55,7 +55,7 @@
We try to build using the native compiler tool set for the
target platform. This is SunStudio for Solaris and aCC for
HP-UX for example. But a common compiler across all platforms
-is the GNU tool set.
+is the GNU tool-chain.
Source Code
-----------
@@ -74,10 +74,11 @@
http://www.trolltech.com
-
BUILD
------------------------------------------------------------ ---
+GNU AutoTools
+-------------
cd to the MyODBC source directory and do the following.
@@ -89,6 +90,18 @@
$ make
+Qt
+--
+
+If you want to build with Qt project files (instead of the gnu
+auto-tools) then;
+
+1. review the *pro and *qmake files in the root dir
+2. $ qmake; make
+
+NOTE: You will find the executables in the bin sub-dir and the
+ libraries in the lib sub-dir of MyODBC.
+
INSTALL
------------------------------------------------------------ ---
@@ -103,7 +116,9 @@
probably want to register the driver with the ODBC on your system.
See your ODBC documentation for more on how to do this. For
-unixODBC one could use the odbcinst command line tool.
+unixODBC one could run ODBCConfig from GUI as root or use the
+odbcinst command line tool. You may also want to look at the
+myodbc3i command-line tool for this.
+----------------------------------------------------------- --+
--- 1.3/README.win 2004-12-18 10:58:50 -08:00
+++ 1.4/README.win 2005-10-09 20:06:19 -07:00
@@ -6,8 +6,8 @@
INTRODUCTION
------------------------------------------------------------ ---
-In this document I explain how to build the MyODBC driver on
-Windows platforms. I will be as brief as possible.
+In this document we explain how to build the MyODBC driver on
+Windows platforms. We will be as brief as possible.
WHAT YOU NEED
------------------------------------------------------------ ---
@@ -35,17 +35,12 @@
Qt Class Library
----------------
-There are two different Graphical User Interfaces for
-configuring MyODBC - CTL3D based and Qt based. If you plan to
-build MyODBC with an older compiler such as VC v6 then you can
-use either one. If you plan to use a newer compiler you may find
-that CTL3D is not supported. In this case you want to build
-the Qt based GUI.
-
-
-NOTE: The CTL3D based code will be phased out at some point
- in the future.
+The old GUI was based upon CTL3D and was Windows specific. The
+old GUI has been phased out of MyODBC. In its place you will find
+a Qt based GUI which works on all platforms.
+see;
+ http://www.trolltech.com
MySQL
-----
@@ -54,125 +49,26 @@
using a static client lib and other development files.
-CTL3D BASED BUILD AND INSTALL
------------------------------------------------------------ ----
-
-Build util Library
-------------------
-
-It is common to build MyODBC from the DOS prompt. Open a DOS
-prompt and cd into the source code directory.
-
-Start by building the utility library. cd to the util
-sub-directory and do the following;
-
-> nmake -f Makefile.win
-
-This will create the util library in the util directory.
-
-Build Driver Library
---------------------
-
-cd into the win32 directory and edit Makefile.ini to match your
-environment. In particular you want to set PORTABLE_GUI = 0 and
-MYSQL_PATH to the directory where the MySQL development files
-are installed.
-
-Do the following to build;
-
-> nmake -f Makefile
-
-This will create the driver in the Release sub directory. In
-this case the GUI code is in the driver itself and you are
-ready to install it.
-
-Build myodbcinst Tool
----------------------
-
-cd into myodbcinst directory and do the following;
-
-> nmake -f Makefile.win
-
-This will create a myodbcinst executable in the current directory.
-
-Install
--------
-
-Copy the driver library (the dll) to the Windows\System32
-directory and then use the myodbcinst command-line tool to register
-the driver. Simply execute it without arguments and see the help
-screen listed.
-
-
-
-Qt BASED BUILD AND INSTALL
+BUILD
------------------------------------------------------------ ---
-Build Qt Library And Tools
---------------------------
-
-If you want to build the Qt based GUI then you should download
-and install Qt. You can get a GPL version at;
-
-http://www.trolltech.com
-
-Build util Library
-------------------
-
-It is common to build MyODBC from the DOS prompt. Open a DOS
-prompt and cd into the source code directory.
-
-Start by building the utility library. cd to the util
-sub-directory and do the following;
-
-> qmake
-> nmake -f Makefile
-
-This will create the util library in the util directory.
-
-Build Driver Library
---------------------
-
-cd into the win32 directory and edit Makefile.ini to match your
-environment. In particular you want to set PORTABLE_GUI = 1 and
-MYSQL_PATH to the directory where the MySQL development files
-are installed.
+Build MyODBC using the Qt qmake command-line tool by doing the
+following from the MyODBC source root directory;
-Do the following to build;
+1. review the *pro and *qmake files in the root dir
+2. > qmake
+3. > make
-> nmake -f Makefile
+NOTE: You will find the executables in the bin sub-dir and the
+ libraries in the lib sub-dir of MyODBC.
-This will create the driver in the Release sub directory. In
-this case the driver does not contain the GUI code. We build this
-as a separate, setup, library.
-
-Build Setup Library
--------------------
-
-cd into the setup directory and do the following;
-
-> qmake
-> nmake -f Makefile
-
-Build myodbcinst Tool
----------------------
-
-cd into myodbcinst directory and do the following;
-
-> qmake
-> nmake -f Makefile
-
-This will create a myodbcinst executable in the current directory.
-
-Install
+INSTALL
-------
Copy the driver and setup libraries (the dlls) to the
-Windows\System32 directory and then use the myodbcinst command-line
+Windows\System32 directory and then use the myodbc3i command-line
tool to register the driver. Simply execute it without arguments
and see the help screen listed.
-
-
+----------------------------------------------------------- --+
--- 1.40/myodbcinst/myodbcinst.c 2005-10-05 14:42:43 -07:00
+++ 1.41/myodbcinst/myodbcinst.c 2005-10-09 20:06:19 -07:00
@@ -136,11 +136,11 @@
XP
- $ myodbcinst -a -d -t"MySQL ODBC 3.51 Driver;DRIVER=myodbc3.dll;SETUP=myodbc3S.dll"
+ $ myodbc3i -a -d -t"MySQL ODBC 3.51 Driver;DRIVER=myodbc3.dll;SETUP=myodbc3S.dll"
OR for old GUI...
- $ myodbcinst -a -d -t"MySQL ODBC 3.51 Driver;DRIVER=myodbc3.dll;SETUP=myodbc3.dll"
+ $ myodbc3i -a -d -t"MySQL ODBC 3.51 Driver;DRIVER=myodbc3.dll;SETUP=myodbc3.dll"
OSX
@@ -149,11 +149,11 @@
(contrary to the ODBC spec.). They appear to like
leading caps.
- $ myodbcinst -a -d -t"MySQL ODBC 3.51 Driver;Driver=/usr/lib/libmyodbc3.so;Setup=/usr/lib/libmyodb c3S.dylib"
+ $ myodbc3i -a -d -t"MySQL ODBC 3.51 Driver;Driver=/usr/lib/libmyodbc3.so;Setup=/usr/lib/libmyodb c3S.dylib"
UNIX/Linux
- $ myodbcinst -a -d -t"MySQL ODBC 3.51 Driver;DRIVER=/usr/lib/libmyodbc3.so;SETUP=/usr/lib/libmyodb c3S.so"
+ $ myodbc3i -a -d -t"MySQL ODBC 3.51 Driver;DRIVER=/usr/lib/libmyodbc3.so;SETUP=/usr/lib/libmyodb c3S.so"
*/
--- 1.16/scripts/myodbc3.spec.sh 2005-10-09 18:17:55 -07:00
+++ 1.17/scripts/myodbc3.spec.sh 2005-10-09 20:06:20 -07:00
@@ -46,8 +46,7 @@
--with-mysql-libs=%{MYSQL_LIBS} \
--with-mysql-includes=%{MYSQL_INCLUDES} \
%{ODBC_DM_PATH} \
- --without-debug \
- --without-docs
+ --without-debug
make
%clean
--- 1.10/scripts/Makefile.am 2005-01-28 11:33:51 -08:00
+++ 1.11/scripts/Makefile.am 2005-10-09 20:06:19 -07:00
@@ -30,7 +30,8 @@
CLEANFILES = make_binary_distribution \
make_win_src_distribution \
- myodbc3.spec myodbc-@VERSION@.spec
+ myodbc3.spec \
+ mysql-connector-odbc-@VERSION@.spec
.sh:
rm -f $@ $@-t
@@ -45,9 +46,12 @@
chmod +x $@-t
mv $@-t $@
-all: make_binary_distribution make_win_src_distribution myodbc-@VERSION@.spec makerpm
+all: make_binary_distribution \
+ make_win_src_distribution \
+ mysql-connector-odbc-@VERSION@.spec \
+ makerpm
-myodbc-@VERSION@.spec: myodbc3.spec
+mysql-connector-odbc-@VERSION@.spec: myodbc3.spec
rm -f $@
cp myodbc3.spec $@
--- 1.4/test/Makefile.ini 2003-09-25 23:48:16 -07:00
+++ 1.5/test/Makefile.ini 2005-10-09 20:06:20 -07:00
@@ -1,6 +1,6 @@
############################################################ ##############
# MAKEFILE INIT FOR MYODBC 3.51 TEST_LIBRARY #
-# (C) MySQL AB 1995-2003 #
+# (C) MySQL AB 1995-2005 #
############################################################ ##############
#
--
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