Added:
trunk/BUILD.osx
trunk/BUILD.unix
trunk/BUILD.win
trunk/Build.bat
trunk/Build.sh
trunk/COPYING
trunk/ChangeLog
trunk/CreateBinaryMsi.bat
trunk/CreateBinaryZip.bat
trunk/CreateMakefiles.bat
trunk/CreateMakefiles.sh
trunk/CreateSourceZip.bat
trunk/CreateVisualStudioProjects.bat
trunk/acconfig.h
trunk/acinclude.m4
trunk/common.pri
trunk/config.pri
trunk/configure.in
trunk/connector-odbc3.vpj
trunk/connector-odbc3.vpw
trunk/defines.pri
trunk/depcomp
Removed:
BUILD.osx
BUILD.unix
BUILD.win
Build.bat
Build.sh
COPYING
ChangeLog
CreateBinaryMsi.bat
CreateBinaryZip.bat
CreateMakefiles.bat
CreateMakefiles.sh
CreateSourceZip.bat
CreateVisualStudioProjects.bat
acconfig.h
acinclude.m4
common.pri
config.pri
configure.in
connector-odbc3.vpj
connector-odbc3.vpw
defines.pri
depcomp
Log:
- more reorg
Deleted: BUILD.osx
===================================================================
--- BUILD.osx 2006-09-08 03:49:09 UTC (rev 71)
+++ BUILD.osx 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,645 +0,0 @@
-+-------------------------------------------------------------+
-| Connector/ODBC |
-| Apple OSX |
-+-------------------------------------------------------------+
-
-INTRODUCTION
----------------------------------------------------------------
-
-These are my notes from my experiences building a binary MyODBC
-distribution on/for OSX. This was done during the last week in
-July 2004 with MyODBC v3.51.9.
-
-NOTE 3.51.12: Notes like this indicate modifications made to
- this document derived from building MyODBC
- 3.51.12 distribution. This was done Jul.05.
-
-NOTE 3.51.10: Notes like this indicate modifications made to
- this document derived from building MyODBC
- 3.51.10 distribution. This was done Nov.04.
-
-WHAT YOU NEED
----------------------------------------------------------------
-
-OSX
----
-
-I did my work on a modest iBook running a fresh install of OSX
-10.3 (Panther) with a complete online update.
-
-NOTE 3.51.10: Now using a G5 single 1.8 Ghz.
-NOTE 3.51.12: Now using 10.4 (Tiger).
-
-Well; actually I had to reinstall everything after ending up
-with multiple ODBC systems on my OSX. Apple has not done a good
-job of taking charge of the core ODBC stuff so the driver
-vendors and others are all trying to lead it in various self
-serving directions and this sometimes results in redundent driver
-managers and drivers with all kinds of degradation of the user
-experience.
-
-In the UNIX world libraries can be complicated by the fact that
-there are different ways to handle share libraries. OSX adds more
-complexity to this by also having 'Bundles' and 'Frameworks'.
-
-Oh joy. I did not get too deep into Frameworks but Bundles are
-important here.
-
-On OSX there is a functional difference between a share
-library built to simply share code in memory and a share
-library built to be explicitly loaded by an application (or
-another library) to provide plugin capabilities. A simple
-share library is called MH_DYLIB, uses the "dylib" file
-extension and may not be loaded explicitly by other code.
-A plugin library is called MH_BUNDLE, uses an undefined
-file extension (usually "bundle" or "so") and is created
-specifically to be used as a plugin. The implication for
-MyODBC is that we want to, by default, build the driver
-and the setup library as bundles so that the driver manager
-may load them explicitly. We also want to provide a means
-to build the driver as a MH_DYLIB or static library in the
-case where an app needs to link directly to the driver.
-
-
-Xcode
------
-
-I installed Xcode v1.1. This is the version which came with my
-OSX distribution. Its gcc with some GUI stuff.
-
-NOTE 3.51.10: Now using xcode v1.5.
-NOTE 3.51.12: Now using xcode v2.0.
-
-ODBC
-----
-
-My goal was to get things to work with the default ODBC
-environment. This is a version of iODBC built by
-Apple - unfortunately this has many problems. I think it is
-preferrable to live with the problems and bug Apple to update
-ODBC in future releases than to install a new Driver Manager (as
-some are doing).
-
-MySQL
------
-
-I used the latest general release - MySQL v4.0.20. I tried to
-use the binary distribution but failed to get MyODBC to build
-against it properly. Seems it was fine for building a regular
-share library but I was left with 4 or 5 unresolved references
-when I tried to build a bundle. So I switched to using the
-source tar-ball off of the web.
-
-NOTE 3.51.10: Built with MySQL 4.1.7. The binary distro would
- probably work fine except it has a hard-coded
- relative path for zlib in mysql_config so I use
- the source.
-
-NOTE 3.51.11: Built with MySQL 4.1.9.
-
-NOTE 3.51.12: Built with MySQL 4.1.13.
-
-MyODBC
-------
-
-In the past I have built myodbc on OSX using the latest source
-distribution but in this case I wanted to build directly from
-source in the source repository.
-
-
-BUILDING
----------------------------------------------------------------
-
-Qt
---
-
-MyODBC includes Windows specific GUI bits and Qt GUI bits. The
-Windows specific can be found in the driver itself while on
-other platforms a seperate setup library is created using Qt.
-This means we should install Qt when working on OSX.
-
-I will not repeat all of the Qt install documentation (see
-www.trolltech.com) but here are a couple of tips.
-
-1. Make sure you have your Qt environment variables set. I
- put the following in ~/.bashrc;
-
- export QTDIR=~/SandBox/qt-mac-free-3.3.2
- PATH=$QTDIR/bin:$PATH
- export PATH
-
- Since bash is not my default shell I enter bash as soon
- as I open a terminal window using;
-
- $ bash
-
-2. We want a static Qt lib so that we do not have to
- distribute any extra libraries so when you configure
- Qt I suggest doing the following;
-
- $ ./configure -static
-
-NOTE 3.51.10: Qt must be built as static lib in order for the
- AC_PATH_QT_WITHOUT_X macro to find it.
-
- For this version I have decided to build qt as;
- $ ./configure -static -thread
-NOTE 3.51.12: Now using qt 3.3.3 commercial.
-
-Qt will take a long time to build. This tired old iBook
-spent most of a day spinnings its bits.
-
-MySQL
------
-
-NOTE: If you want to use the sources from bk then you need to
- execute the following in the mysql dir to create a
- 'configure' script;
-
- $ cp ../myodbc-3.51/Makefile.cvs .
- $ make -f Makefile.cvs macosx
-
- This will replace a few files for libtool so do not check
- any changes into bk when done. The macosx arg is needed because
- OSX does not have libtoolize (by default).
-
-NOTE 3.51.12: Makefile.cvs has been renamed to Makefile.bk.
-
-I did not want to build or install the server parts - I just
-wanted the client stuff. I also wanted to link myodbc against
-a static mysql client lib so I did the following;
-
-$ ./configure --without-server --disable-shared
-$ make
-$ sudo make install
-
-To provide the multi-threaded version of the mysql client I
-did the following;
-
-$ make clean
-$ ./configure --without-server --disable-shared --enable-thread-safe-client
--without-innodb
-$ make
-$ sudo make install
-
-This resulted in MySQL client stuff being installed in
-/usr/local. In particular;
-
-libs -> /usr/local/lib/mysql
-includes -> /usr/local/include/mysql
-
-NOTE 3.51.10: configure option "--prefix=/usr" was added causing
- the files to be installed in /usr and not /usr/local.
-
-MyODBC 3.51.10
---------------
-
-This version of MyODBC build has greatly improved support for
-OSX but you will still have a problem with a missing config.h
-file for iODBC. The work around for this remains the same -
-see MyODBC 3.51.9.
-
-The build now understands the difference between a
-regular share library and a bundle (plugin) and will build
-the driver and the setup library as bundles by default.
-
-Do the following to build/install MyODBC;
-
-$ make -f Makefile.cvs macosx
-$ ./configure --prefix=/usr --with-iODBC=/usr --with-iODBC-includes=/usr/include
--with-ldflags=-lltdl --without-samples --disable-gui --disable-test
-$ make
-$ make install
-
-NOTE 3.51.12: Makefile.cvs has been renamed to Makefile.bk.
-NOTE 3.51.12: The following should be added to configure line as they are disabled by
default now;
- --enable-bundles --enable-myodbcinst --enable-imyodbc
-
-This will result in the following files;
-
-/usr/bin/myodbcinst - driver installer
-/usr/bin/imyodbc - interactive SQL
-/usr/lib/libmyodbc3.so - driver (bundle)
-
-We disabled the gui because there is, at this time, a
-problem with libtool which causes the setup library
-to be built with a few unresolved references. So we
-use qmake to build the gui bits as follows;
-
-$ qmake root.pro -o Makefile.qt
-$ make -f Makefile.qt
-$ make install
-
-This will result in the following files;
-
-/usr/lib/libmyodbc3S.dylib - setup library (bundle)
-srcdir/MYODBCConfig/MYODBCConfig.app - setup application
-
-The qmake must be done after the gnu build because the gui
-source uses the config include file generated by the gnu
-build.
-
-If the files build fine but fail to install you can cd to
-the setup dir and do the following;
-
-$ touch setup.pro
-$ sudo make install
-
-
-MyODBC 3.51.9
---------------
-
-I cloned the latest sources for myodbc from the source code
-repository in the usual way. I had already removed some
-libtool files from the source tree in previous work so as
-to ensure that the libtool on the build system gets used
-when building from source repository. The theory here is that
-if you have GNU auto-tools then you should have libtool.
-Unfortunately; OSX does not include libtoolize part of
-libtool so I had to manually link in the systems libtool
-files. So I started with the following;
-
-$ ln -s /usr/share/libtool/config.guess config.guess
-$ ln -s /usr/share/libtool/config.sub config.sub
-$ ln -s /usr/share/libtool/ltmain.sh ltmain.sh
-
-I then did the following to allow the gnu auto-tools a
-chance to create configure script and whatever other magic
-it performs.
-
-$ make -f Makefile.cvs
-
-NOTE: The above link steps are now in Makfefile.cvs
- so do "$ make -f Makefile.cvs macosx".
-
-Unfortunately myodbc could not find all of the mysql client
-stuff so I had to help it along with a configure option.
-So I did the following to start the build;
-
-$ ./configure --with-mysql-path=/usr/local
-$ make
-
-This build process will fail because it lacks a config.h
-needed by an odbc include file. I had the source for iodbc
-(www.iodbc.org) laying around so I did a quick configure
-in there (no build or install) and then copied the config.h
-to /usr/include. This is a hack but is probably safe for
-my work here.
-
-Starting myodbc make again will result in a link error. Seems
-like adding a link option to the Makefile in the driver,
-driver_r, and setup dirs solves this problem. Unfortunately I
-could not figure out the best way to add this properly to the
-gnu auto build stuff nor am I certian this link option is the
-best solution. But switching the link lines in those two
-make files as follows seems to solve the link error;
-
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -Wl,-single_module -o $@
-
-NOTE: Putting the "-Wl,-single_module" link option in other
- places on the link line may not work.
-
-Now doing a make again will result in a complete build so
-do the usual to install it.
-
-$ sudo make install
-
-This drops some libmyodbc*dylib share libs into
-/usr/local/lib. You can do the following to see that the lib
-type is the normal share library;
-
-$ file /usr/local/lib/libmyodbc3-3.51.09.dylib
-
-This will show "Mach-O dynamically linked shared library ppc".
-
-This library will work under the following circumstances;
-
-1. if you link your app (ie imyodbc) directly to the driver
-2. using odbctest (not sure why this works and other stuff
- fails)
-
-But it will fail to load under the following circumstances;
-
-1. if you link your app (ie imyodbc) against the driver
-manager (which is the most common thing to do).
-2. if you test with a standard GUI application such as
-FileMaker v7.
-
-So lets get rid of the files we just installed into
-/usr/local/lib since they are not linked for use with the
-driver manager. The following should do the job but you
-probably want to make sure you do not delete more files
-than wanted.
-
-$ sudo rm /usr/local/lib/libmyodbc*
-
-Now lets link a bundle and place it in a better place (myodbcinst
-wants the drivers to be in /usr/lib).
-
-$ cd driver/.libs
-$ gcc -bundle -flat_namespace -o libmyodbc3-3.51.09.dylib *.o
- -L/usr/local/lib/mysql -lmysqlclient -lz -liodbcinst
-$ sudo cp -R *lib /usr/lib
-$ sudo cp *la /usr/lib
-
-Do the same for the multi-threaded version;
-
-$ cd driver_r/.libs
-$ gcc -bundle -flat_namespace -o libmyodbc_r3-3.51.09.dylib *.o
- -L/usr/local/lib/mysql -lmysqlclient -lz -liodbcinst
-$ sudo cp -R *lib /usr/lib
-$ sudo cp *la /usr/lib
-
-Now check the file type on this library;
-
-$ file /usr/lib/libmyodbc3-3.51.09.dylib
-
-You should see "Mach-O bundle ppc". This should make the
-driver manager happy.
-
-NOTE: I assume anyone wanting to link their app directly
- to myodbc will have the skills to build an
- appropriate myodbc share lib type from myodbc sources
- so I simply replace the normal share library with the
- bundle - with no intention of including the normal
- share lib in a final myodbc binary distibution for
- OSX.
-
-setup
------
-
-Now make the setup library.
-
-$ cd setup
-$ qmake
-$ make
-
-This will produce libmyodbc3S.dylib (a standard share lib)
-and related symbolic links .tmp dir. You want these in
-/usr/lib so do the following;
-
-NOTE 3.51.10: MYODBCConfig is now built and installed
- automatically when you build/install the
- driver. This will only happen if a viable
- Qt environment is found. Also; the setup
- library is a proper bundle with a "so" file
- extension now.
-
-$ cd .tmp
-$ sudo cp -R lib* /usr/lib
-
-NOTE: Ignore dl warnings - but these should get sorted
- out at some point in the future.
-
-
-myodbcinst
-----------
-
-Ensure that you have the ODBC config files we are going
-to use. They are;
-
-~/Library/ODBC/odbcinst.ini
-~/Library/ODBC/odbc.ini
-
-If they are missing simply create empty ones. In
-anycase ensure that you have read/write privs. on
-them.
-
-NOTE: Just running "/Applications/Utilities/ODBC
- Administrator" for the first time should create
- the need config files.
-
-Now make myodbcinst and use it to register the driver. The
-location of the driver is hard-coded to /usr/lib so either
-get the driver in /usr/lib or edit myodbcinst.
-
-$ cd myodbcinst
-$ make -f Makefile.osx
-$ sudo myodbcinst -i
-$ sudo myodbcinst -s
-
-NOTE 3.51.10: myodbcinst is now built and installed
- automatically when you build/install the
- driver.
-
-This will register the driver in;
-~/Library/ODBC/odbcinst.ini
-and ensure that a sample DSN (myodbc) exists in;
-~/Library/ODBC/odbc.ini
-
-The DSN details may need to be edited to match your
-environment. There are several ways to do this;
-
-1. use a text editor to edit ~/Library/ODBC/odbc.ini
-2. use gui ODBC Administrator (does not show all
- driver options)
-3. use "myodbcinst -e" to get a gui dialog (not good
- on OSX)
-4. use MYODBCConfig to get gui dialog (recommended
- - and used during install)
-
-imyodbc
--------
-
-Now make imyodbc by doing the following;
-
-$ cd imyodbc
-$ make -f Makefile.osx
-
-NOTE 3.51.10: imyodbc is now built and installed
- automatically when you build/install the
- driver.
-
-MYODBCConfig
-------------
-
-Now make MYODBCConfig by doing the following;
-
-$ qmake
-$ make
-
-NOTE 3.51.10: You may have already built this if you have
- use the qmake project in the root souorce dir.
-
-This will result in MYODBCConfig.app in the current
-dir. Execute this GUI app from an xterm with;
-
-$ open MYODBCConfig.app
-
-TESTING
----------------------------------------------------------------
-
-myodbcinst
-----------
-
-This is a new addition to the myodbc source. This has been
-created to aid the driver installer. It can register/deregister
-the driver and even add a sample data source name. Most
-importantly it does this using the standard installer ODBC API
-so it *should* work regardless of the plaform and the ODBC
-system vendor.
-
-dltest
-------
-
-This new addition to myodbc source is a tool which can be used
-to ensure that the driver can be explicitly loaded using
-libtool. It can also check for symbols (ie functions).
-
-This program is not part of the normal build process for myodbc
-but can be easily built manually by going to the directory and
-running make with the appropriate makefile. For example;
-
-$ make -f Makefile.osx
-
-NOTE: This is a good test for normal share library and seems to
- to be useful for the bundle type share library but I am not
- sure that the default driver manager actually uses
- libtool. This probably works well on OSX with the help of
- dlcompat.
-
-odbctest
---------
-
-This is a standard feature of ODBC on OSX. It can be used to test
-connecting to the server and submitting SQL to the server.
-
-NOTE: odbctest can be used to test myodbc driver but the test
- may be somewhat misleading as odbctest seems to work fine
- with a normal lib type - but even a simple C test
- program will show that the driver manager fails to load
- such a library. So odbctest does some magic here. I
- even downloaded the sources for it and built it without
- being able to recreate this minor miracle.
-
-imyodbc
--------
-
-This new addition to myodbc source is a tool like the mysql
-command-line tool but is based soley upon ODBC calls. Use this to
-test connecting to the server and submitting SQL to the server.
-
-This can be linked directly to the driver or to the driver manager
-providing more testing options.
-
-This program is not part of the normal build process for myodbc
-but can be easily built manually by going to the directory and
-running make with the appropriate makefile. For example;
-
-$ make -f Makefile.osx
-
-By default; this will link against the driver manager. Do the
-following to link directly against the driver (you may need the
-driver built as a standard library for this);
-
-$ make -f Makefile.osx todriver
-
-
-INSTALLER
----------------------------------------------------------------
-
-Copy the osx/MyODBC dir to some place like you home dir.
-
-Go into the MyODBC/resources dir and update the html files as
-needed - which means the version number at least.
-
-Got into each dir in the MyODBC/root dir nd check for any
-BillOfMaterials.txt files. Where found; copy appropriate
-files to the dir and then remove the BillOfMaterials.txt file.
-You also want to remove and hidden dirs and files and the
-SCCS dirs wherever they are found in MyODBC.
-
-Now open the mac-install.pmsp like this;
-
-$ open mac-install.pmsp
-
-Edit the "Files" and "Resources" tabs to reflect your
-environment.
-
-Then do File -> Create Package. Create the file as;
-
-MyODBC-ver-OSX.pkg
-
-Note that the a pkg file is actually a dir - which is not
-suitables for distribution. Put this dir into a new dir and
-include any addiotional readme as needed in there as well.
-Then use "/Applications/Utilities/Disk Utility.app" to create
-a disk image (dmg file).
-
-MORE TESTING
----------------------------------------------------------------
-
-Well start testing install by trying on current machine. Delete
-the working files - which would be something like;
-
-$ sudo rm /usr/lib/libmyodbc*
-$ sudo rm /usr/bin/*myodbc*
-$ sudo rm -r /Applications/Utilities/MYODBCConfig.app
-$ sudo rm -r ~/Library/ODBC
-$ sudo rm -r /Library/Receipts/MyODBC*
-
-NOTE: The above is, in practice, an uninstall.
-
-Now open the dmg and the pkg in the usual fashion.
-
-Complications
--------------
-
-- its is very possible that non-standard and even multiple
-ODBC systems can be installed on OSX which complicates
-things in a variety of ways - perhaps most notably in that the
-ODBC config files may exist in different places and with diff
-editing rules. For example; FileMaker v7 comes with DataDirect
-ODBC drivers AND a Driver Manager of some sort.
-
-- standard installer API calls do not create config dirs/files,
-they are however created by ODBC Admin gui and can then be
-updated using ODBC installer API
-
-- the default ODBC installer on OSX does not try to call
-the drivers ConfigDSN()
-
-RECOMMENDATIONS
----------------------------------------------------------------
-
-1. Need GNU auto-tools expert to work with OSX platform
- specialist (someone who really knows gcc/ld/libtool well would
- also do) to;
- - ensure that the driver is linked correctly. ie no
- manual editing of make files after configure.
- - address link warnings
-
-2. Need GNU auto-tools expert to overcome following problems;
- - need for iodbc config.h
- - using libtoolize where it exists and otherwise linking
- libtool files into source dir
-
-3. Need graphics/web/UI person to jazz up installer and GUI
- bits.
-
-4. Need to lean on Apple to make FileMaker use default ODBC
- system and to make some other enhancements fixs in ODBC;
- - make calls to ConfigDSN() if driver has it
- - make installer API create ODBC config files (ini files)
- not just the ODBC Admin GUI.
- - and many other non-conformance issues and bugs (see
- source code - search for OSX conditions)
-
-5. Possibly create a custom installer which can install, uninstall
- and configure myodbc. This can be good for a number of reasons;
- - myodbcinst, used in PackageMaker install, does not have a
- window handle to give ConfigDSN() so no GUI can be provided
- to allow user to tweek their first DSN during install. They
- muust find and run the ODBC Admin tool after the install.
- - PackageMaker does not seem to allow for an uninstall?
- - the installer can be more intelligent and look nicer
-
-Finally; OSX Users demand the best User experience from their
-products but with ODBC - things fall short of great. A
-lot can be done to improve this and make it easier for OSX Users,
-many of which are web developers or otherwise use mysql.
-
-
-+-------------------------------------------------------------+
-| Peter Harvey <pharvey@stripped |
-+-------------------------------------------------------------+
-
Deleted: BUILD.unix
===================================================================
--- BUILD.unix 2006-09-08 03:49:09 UTC (rev 71)
+++ BUILD.unix 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,127 +0,0 @@
-+-------------------------------------------------------------+
-| Connector/ODBC |
-| UNIX Platforms |
-+-------------------------------------------------------------+
-
-INTRODUCTION
----------------------------------------------------------------
-
-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
- README files with more detailed information for
- building for specific flavours of UNIX.
-
-WHAT YOU NEED
----------------------------------------------------------------
-
-UNIX
-----
-
-UNIX or some UNIX-like operating system such as;
-
-- Solaris
-- Linux
-- HP-UX
-- AIX
-- OSX
-
-ODBC
-----
-
-You need an ODBC SDK and you probably want an ODBC Driver
-Manager.
-
-ODBC has not, traditionally, been a standard part of any UNIX
-or UNIX-like platform. This caused a number of vendors to
-provide ODBC solutions which can be added to UNIX. In theory
-this should not be a problem but in practice this can cause
-compatability and portability issues.
-
-Recently; Linux distributions have been including unixODBC as a
-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.
-
-see;
- http://www.unixodbc.org
-
-Compiler Tools
---------------
-
-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-chain.
-
-Source Code
------------
-
-The source code is the main thing. You can get it from the bk
-source repository if you want the 'bleeding edge' code but most
-people will simply download the zip or tar-ball of the source.
-
-Qt Class Library
-----------------
-
-The graphical bits of MyODBC are optional. If you plan to build
-them you will need the Qt class library.
-
-see;
- http://www.trolltech.com
-
-
-BUILD
----------------------------------------------------------------
-
-GNU AutoTools
--------------
-
-cd to the MyODBC source directory and do the following.
-
-Execute 'configure --help' to see a list of configure options then
-execute configure again with the desired options.
-
-Then do;
-
-$ 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
----------------------------------------------------------------
-
-You probably want to be root user to do install as extra
-privileges will likely be required. Now do the following to
-install the MyODBC libraries and tools.
-
-# make install
-
-At this point all of the MyODBC files should be in place but you
-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 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.
-
-
-+-------------------------------------------------------------+
-| Peter Harvey <pharvey@stripped |
-+-------------------------------------------------------------+
-
Deleted: BUILD.win
===================================================================
--- BUILD.win 2006-09-08 03:49:09 UTC (rev 71)
+++ BUILD.win 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,97 +0,0 @@
-+-------------------------------------------------------------+
-| MySQL Connector/ODBC |
-| Build on MS Windows |
-+-------------------------------------------------------------+
-
-INTRODUCTION
----------------------------------------------------------------
-
-In this document we explain how to build MySQL Connector/ODBC on
-Windows platforms. We will be as brief as possible.
-
-WHAT YOU NEED
----------------------------------------------------------------
-
-Windows
-
- ODBC has been a standard part of Windows since 3.1 but we do
- not build for very old versions of Windows. Consider building
- on and for Windows XP or newer. Windows 2000 should be fine also.
-
-Compiler Tools
-
- We regularly build using either MS Visual C/C++ v6 or MS
- Visual C/C++ v7 (.NET). Other compilers may work as well.
-
-Source Code
-
- The source code is the main thing. You can get it from the
- source repository if you want the 'bleeding edge' code but most
- people will simply download the zip of the source.
-
- NOTE: The source was kept in a public bk repository but is now
- in a svn repository.
-
-Qt Class Library
-
- The old GUI was based upon CTL3D and was Windows specific. The
- old GUI has been phased out - in its place you will find
- a Qt based GUI which works on all platforms.
-
- You must use a recent (latest) version of Qt v3 - not Qt v4. For
- example; Qt v3.3.5. We have done some work to make this work with
- Qt v4 but it is incomplete.
-
- It is possible to build the driver only - no GUI bits - but this
- build process is currently geared to building everything.
-
- see;
- http://www.trolltech.com
-
-MySQL
-
- We usually build with the latest stable release of MySQL -
- using a static client lib and other development files.
-
-
-BUILD
----------------------------------------------------------------
-
-Build Connector/ODBC using the Qt qmake command-line tool by doing
-the following from the source root directory (in a command prompt
-window);
-
-1. review the *pro and *pri files in the root dir
-2. execute Build.bat from the source root dir
-
-Upon completion; you will find the executables in the bin sub-dir
-and the libraries in the lib sub-dir.
-
-NOTE: At some point in the future we may create a configure.bat which
- will automagically create qmake pri files.
-
-NOTE: You will need the env vars for your tool-chain to be set
- before you try to build. Microsoft provides a batch file
- for Visual Studio folks.
-
-INSTALL
----------------------------------------------------------------
-
-Execute the Install.bat script to copy the files to your system
-directory and to register the driver.
-
-Those wishing to install over an existing installation
-should consider executing the Uninstall.bat script first. This
-will avoid incrementing the internal usage counter beyond what
-is needed.
-
-NOTE: The Uninstall script does not, currently, honour the
- usage count - it will remove the files regardless of the
- value of the usage counter.
-
-See the INSTALL file for more details.
-
-+-------------------------------------------------------------+
-| Peter Harvey <pharvey@stripped |
-+-------------------------------------------------------------+
-
Deleted: Build.bat
===================================================================
--- Build.bat 2006-09-08 03:49:09 UTC (rev 71)
+++ Build.bat 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,52 +0,0 @@
-@ECHO OFF
-REM ########################################################
-REM
-REM \brief Build myodbc.
-REM
-REM This exists for those working with the Windows source
-REM distribution.
-REM
-REM \sa README.win
-REM
-REM #########################################################
-
-ECHO "+-----------------------------------------------------+"
-ECHO "| BUILD |"
-ECHO "+-----------------------------------------------------+"
-REM ****
-REM * Removing libraries and executables to force relink...
-REM * We do not want to del all in lib as some may be
-REM * additional libs for distro building.
-REM ****
-IF EXIST lib (
- rem rmdir /Q /S lib
- del /Q lib\myodbc*
-)
-IF EXIST bin (
- rmdir /Q /S bin
-)
-
-REM Invoke qmake - without relying upon its mechanism to dive into sub dirs.
-CALL CreateMakefiles.bat
-
-REM ****
-REM * Making the libraries and executables...
-REM ****
-ECHO Make...
-nmake
-
-goto doSuccess
-
-:doSuccess
-ECHO "+-----------------------------------------------------+"
-ECHO "| BUILD DONE |"
-ECHO "+-----------------------------------------------------+"
-ECHO "| |"
-ECHO "| Hopefully things went well and you have results in |"
-ECHO "| lib and bin sub-dirs. Consider running Install.bat |"
-ECHO "| next. |"
-ECHO "| |"
-ECHO "+-----------------------------------------------------+"
-EXIT /B 0
-
-
Deleted: Build.sh
===================================================================
--- Build.sh 2006-09-08 03:49:09 UTC (rev 71)
+++ Build.sh 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,21 +0,0 @@
-# #########################################################
-#
-# \brief Make the sources.
-#
-#
-# #########################################################
-
-echo "+-----------------------"
-echo "| Force relink..."
-echo "+-----------------------"
-rm -rf lib
-rm -rf bin
-
-./CreateMakefiles.sh
-
-echo "+-----------------------"
-echo "| Making the libraries and executables..."
-echo "+-----------------------"
-make
-
-
Deleted: COPYING
===================================================================
--- COPYING 2006-09-08 03:49:09 UTC (rev 71)
+++ COPYING 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,358 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-**************************
-
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-Preamble
-========
-
-The licenses for most software are designed to take away your freedom
-to share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not price.
-Our General Public Licenses are designed to make sure that you have
-the freedom to distribute copies of free software (and charge for this
-service if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone
-to deny you these rights or to ask you to surrender the rights. These
-restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis
-or for a fee, you must give the recipients all the rights that you
-have. You must make sure that they, too, receive or can get the source
-code. And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-Finally, any free program is threatened constantly by software patents.
-We wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program
-proprietary. To prevent this, we have made it clear that any patent
-must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
-
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains a
- notice placed by the copyright holder saying it may be distributed
- under the terms of this General Public License. The "Program",
- below, refers to any such program or work, and a "work based on
- the Program" means either the Program or any derivative work under
- copyright law: that is to say, a work containing the Program or a
- portion of it, either verbatim or with modifications and/or
- translated into another language. (Hereinafter, translation is
- included without limitation in the term "modification".) Each
- licensee is addressed as "you".
-
- Activities other than copying, distribution and modification are
- not covered by this License; they are outside its scope. The act
- of running the Program is not restricted, and the output from the
- Program is covered only if its contents constitute a work based on
- the Program (independent of having been made by running the
- Program). Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
- source code as you receive it, in any medium, provided that you
- conspicuously and appropriately publish on each copy an appropriate
- copyright notice and disclaimer of warranty; keep intact all the
- notices that refer to this License and to the absence of any
- warranty; and give any other recipients of the Program a copy of
- this License along with the Program.
-
- You may charge a fee for the physical act of transferring a copy,
- and you may at your option offer warranty protection in exchange
- for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
- of it, thus forming a work based on the Program, and copy and
- distribute such modifications or work under the terms of Section 1
- above, provided that you also meet all of these conditions:
-
- a. You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b. You must cause any work that you distribute or publish, that
- in whole or in part contains or is derived from the Program
- or any part thereof, to be licensed as a whole at no charge
- to all third parties under the terms of this License.
-
- c. If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display
- an announcement including an appropriate copyright notice and
- a notice that there is no warranty (or else, saying that you
- provide a warranty) and that users may redistribute the
- program under these conditions, and telling the user how to
- view a copy of this License. (Exception: if the Program
- itself is interactive but does not normally print such an
- announcement, your work based on the Program is not required
- to print an announcement.)
-
- These requirements apply to the modified work as a whole. If
- identifiable sections of that work are not derived from the
- Program, and can be reasonably considered independent and separate
- works in themselves, then this License, and its terms, do not
- apply to those sections when you distribute them as separate
- works. But when you distribute the same sections as part of a
- whole which is a work based on the Program, the distribution of
- the whole must be on the terms of this License, whose permissions
- for other licensees extend to the entire whole, and thus to each
- and every part regardless of who wrote it.
-
- Thus, it is not the intent of this section to claim rights or
- contest your rights to work written entirely by you; rather, the
- intent is to exercise the right to control the distribution of
- derivative or collective works based on the Program.
-
- In addition, mere aggregation of another work not based on the
- Program with the Program (or with a work based on the Program) on
- a volume of a storage or distribution medium does not bring the
- other work under the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
- under Section 2) in object code or executable form under the terms
- of Sections 1 and 2 above provided that you also do one of the
- following:
-
- a. Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of
- Sections 1 and 2 above on a medium customarily used for
- software interchange; or,
-
- b. Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a
- medium customarily used for software interchange; or,
-
- c. Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with
- such an offer, in accord with Subsection b above.)
-
- The source code for a work means the preferred form of the work for
- making modifications to it. For an executable work, complete
- source code means all the source code for all modules it contains,
- plus any associated interface definition files, plus the scripts
- used to control compilation and installation of the executable.
- However, as a special exception, the source code distributed need
- not include anything that is normally distributed (in either
- source or binary form) with the major components (compiler,
- kernel, and so on) of the operating system on which the executable
- runs, unless that component itself accompanies the executable.
-
- If distribution of executable or object code is made by offering
- access to copy from a designated place, then offering equivalent
- access to copy the source code from the same place counts as
- distribution of the source code, even though third parties are not
- compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
- except as expressly provided under this License. Any attempt
- otherwise to copy, modify, sublicense or distribute the Program is
- void, and will automatically terminate your rights under this
- License. However, parties who have received copies, or rights,
- from you under this License will not have their licenses
- terminated so long as such parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
- signed it. However, nothing else grants you permission to modify
- or distribute the Program or its derivative works. These actions
- are prohibited by law if you do not accept this License.
- Therefore, by modifying or distributing the Program (or any work
- based on the Program), you indicate your acceptance of this
- License to do so, and all its terms and conditions for copying,
- distributing or modifying the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
- Program), the recipient automatically receives a license from the
- original licensor to copy, distribute or modify the Program
- subject to these terms and conditions. You may not impose any
- further restrictions on the recipients' exercise of the rights
- granted herein. You are not responsible for enforcing compliance
- by third parties to this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
- infringement or for any other reason (not limited to patent
- issues), conditions are imposed on you (whether by court order,
- agreement or otherwise) that contradict the conditions of this
- License, they do not excuse you from the conditions of this
- License. If you cannot distribute so as to satisfy simultaneously
- your obligations under this License and any other pertinent
- obligations, then as a consequence you may not distribute the
- Program at all. For example, if a patent license would not permit
- royalty-free redistribution of the Program by all those who
- receive copies directly or indirectly through you, then the only
- way you could satisfy both it and this License would be to refrain
- entirely from distribution of the Program.
-
- If any portion of this section is held invalid or unenforceable
- under any particular circumstance, the balance of the section is
- intended to apply and the section as a whole is intended to apply
- in other circumstances.
-
- It is not the purpose of this section to induce you to infringe any
- patents or other property right claims or to contest validity of
- any such claims; this section has the sole purpose of protecting
- the integrity of the free software distribution system, which is
- implemented by public license practices. Many people have made
- generous contributions to the wide range of software distributed
- through that system in reliance on consistent application of that
- system; it is up to the author/donor to decide if he or she is
- willing to distribute software through any other system and a
- licensee cannot impose that choice.
-
- This section is intended to make thoroughly clear what is believed
- to be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
- certain countries either by patents or by copyrighted interfaces,
- the original copyright holder who places the Program under this
- License may add an explicit geographical distribution limitation
- excluding those countries, so that distribution is permitted only
- in or among countries not thus excluded. In such case, this
- License incorporates the limitation as if written in the body of
- this License.
-
- 9. The Free Software Foundation may publish revised and/or new
- versions of the General Public License from time to time. Such
- new versions will be similar in spirit to the present version, but
- may differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
- Program specifies a version number of this License which applies
- to it and "any later version", you have the option of following
- the terms and conditions either of that version or of any later
- version published by the Free Software Foundation. If the Program
- does not specify a version number of this License, you may choose
- any version ever published by the Free Software Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
- programs whose distribution conditions are different, write to the
- author to ask for permission. For software which is copyrighted
- by the Free Software Foundation, write to the Free Software
- Foundation; we sometimes make exceptions for this. Our decision
- will be guided by the two goals of preserving the free status of
- all derivatives of our free software and of promoting the sharing
- and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
- WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
- LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
- HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
- WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE
- QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
- PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
- SERVICING, REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
- WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
- MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
- LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
- INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
- INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
- DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
- OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
- OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-=============================================
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
-To do so, attach the following notices to the program. It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
- Copyright (C) YYYY NAME OF AUTHOR
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19YY NAME OF AUTHOR
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License. Of course, the
-commands you use may be called something other than `show w' and `show
-c'; they could even be mouse-clicks or menu items--whatever suits your
-program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- SIGNATURE OF TY COON, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library,
-you may consider it more useful to permit linking proprietary
-applications with the library. If this is what you want to do, use the
-GNU Library General Public License instead of this License.
-
Deleted: ChangeLog
===================================================================
--- ChangeLog 2006-09-08 03:49:09 UTC (rev 71)
+++ ChangeLog 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,565 +0,0 @@
- ***************************************
- * MySQL ODBC 3.51 Driver *
- * CHANGELOG *
- ***************************************
-
----------------------------------------------
-25-AUG-2006 (3.51.14): pharvey@stripped
----------------------------------------------
--- Added support of HENV handlers in SQLEndTran(), updated tran
- test case
--- Added auto-reconnect option since default auto-reconnecting
- was disabled in mysqlclient library.
-
----------------------------------------------
-22-FEB-2006 (3.51.13): pharvey@stripped
----------------------------------------------
--- result of SQLGetInfo(SQL_MAX_DRIVER_CONNECTIONS) parameter is
- treated as SQLSMALLINT
--- fixed problem with memory allocation in Windows for BLOB and long
- queries that need re-allocation of net->buf
--- updated fix for GlobalAlloc-ated memory
--- fixed bug #20547 - SQL_LEN_DATA_AT_EXEC not working
--- fixed problem with query log
--- added support for SQLMoreResults
--- SQL_ATTR_CONNECTION_DEAD now calls mysql_ping everytime
--- lost connection once again detected (prob. need to make
- CHECK_IF_ALIVE a connection/dsn option to make even better)
--- added MYODBCBrowser to distro
--- now handles statements embraced by {} (removes the braces)
--- fixed the windows-specifie problem with GUI and SQL_DRIVER_PROMPT
--- fixed issue with numeric/decimal rounding
--- improved post-build/smoke tests
--- release made with MySQL 4.1.18
--- added ODBC Browser
--- fixed issue with SQLDriverConnect
--- fixed memory leak in SQLDriverConnect()
-
----------------------------------------------
-25-Aug-2005 (3.51.12): pharvey@stripped
----------------------------------------------
-
--- improved README etc doc
--- greatly improved windows source distro
--- reviewed configure script - made it smarter and a bit more reliable
--- renamed package from 'MyODBC' to 'mysql-connector-odbc'
--- added -w option to myodbc3i (to disable gui popups)
--- a redone help screen in myodbc3i
--- ODBCINI env var now used (if exists) for SQLConnect
--- fixed problem with positioned update
--- source: moved source towards Qt4
--- source: started move of win32 dir into root
--- source: improvements with qmake-based build
--- source: code cleanup (mostly having to do with old gui)
--- source: started to add diagnostics/other gui improvements
--- fixed issue with SQLForeignKeys() when more than 18 fkeys
--- fixed issue with SQLForeignKeys() and quotes
--- fixed issue with SQLGetTypeInfo() and date/time/timestamp
--- fixed issue with SQLBulkOperations()
--- fixed issue when SOCKET other than 'MySQL'
--- fixed issue with SQL_C_BIT
--- added CLIENT_MULTI_RESULTS flag for SP in mysql v5
--- added more flexability for debug
--- added support for FIELD_TYPE_NEWDECIMAL for mysql v5
--- moved to WiX based installer
--- renamed some files to be more WiX friendly
--- adjusted code/build for OSX 10.4
--- smarter implied insert (minimized cols used)
--- source: added VS project files to source
--- remove useless warning message from command line tools
--- tweeks to make connection pooling easier
--- escape column names
--- improvements for working with time/timestamp
--- fixed unbalanced "#if" affecting WIN32 build
--- fixed incorrect call to int2str() affecting WIN32 build
--- fixed typo for non-qt build affecting WIN32 build
--- binaries made using MySQL 4.1.13
--- binaries made using unixODBC 2.2.11 (where applicable)
-
----------------------------------------------
-11-Feb-2005 (3.51.11-2): pharvey@stripped
----------------------------------------------
-
--- resources for last thread now freed
--- rolled back a fix for CR (force v3) as it messed up MS
- Access (wants v2)
--- Tweeked binary rpm spec. No longer tries to create a sample
- DSN upon install.
--- Tweeked myodbcinst. Was exiting with error when should have
- been success.
-
----------------------------------------------
-28-Jan-2005 (3.51.11): pharvey@stripped
----------------------------------------------
-
--- Corrected SQLDriverConnect now *always* prompting when
- SQL_DRIVER_PROMPT
--- Corrected a number of problems with connecting via SQLDriverConnect
- This helps; MS Access and ADO/VB.
--- Enhanced SQLGetTypeInfo - mostly for blob types.
--- Allows alternate keywords for DSN for read - silently converts upon write.
-
----------------------------------------------
-15-Dec-2004 : pharvey@stripped
----------------------------------------------
-This is the 'bug fix' release of Connector/ODBC '3.51.10a'. Here is
-the list of changes in the 3.51.10a:
-
--- SQLDriverConnect heavily reworked to more fully support prompting
--- Port now saves in new GUI
--- 6369,
--- Improvements for working with Crystal Reports
-
----------------------------------------------
-25-Oct-2004 : pharvey@stripped
----------------------------------------------
-This is the 'bug fix' release of Connector/ODBC '3.51.10'. Here is
-the list of changes in the 3.51.10:
-
--- Use MyODBC with 4.1 client library
--- Introduction of a Qt based setup library
--- Bug fix: #3456
--- Updated documentation
-
----------------------------------------------
-10-Oct-2003 : monty@stripped, venu@stripped
----------------------------------------------
-This is the 'bug fix' release of Connector/ODBC '3.51.07'. Here is
-the list of changes in the 3.51.07:
-
--- Use MyODBC with 4.0 client library
--- Fix configure to take options from mysql_config.
- Now one only have to supply --with-mysql-path instead of
- --with-mysql-libs and --with-mysql-includes
- This also fixes linking problems with libraries like ssl
--- Fix compiler warnings
--- Compile thread safe library as default
--- Disable sigpipe if not compiling threadsafe
--- Test are now run with users 'odbc', password ''
--- Big code cleanup to make the code (more) conformant to MYSQL coding
- conventions
--- Fixed a crash when SQLSetPos is called with SQL_ADD to insert
- a record with empty value i.e. when pcbValue is SQL_COLUMN_IGNORE
--- Fixed SQLFetch to return and update SQL_ATTR_ROWS_FETCHED_PTR and
- SQL_ATTR_ROW_STATUS_PTR statement attribute pointers appropriately
--- Fixed SQLFetch to take care SQL_ROWSET_SIZE correctly.
--- Added internal MyODBC test library under 'test' directory
--- Added bin-tar to Makefile.am to generate the binary distro directly
--- Added make_win_src_distribution.sh to scripts/ to generate Windows
- source archieve.
--- Source code structure change to take care of Windows files and its
- Makefiles separately into 'win32' directory.
--- Fix for .NET crash when creating the MFC database project (BR #913)
--- Added search pattern for all catalog APIs for all input parameters
- (Catalog, Table and Column names) (back port feature from 3.52).
--- Added the support of SQLProcedures when talking with MySQL 5.0
- (back port feature from 3.52).
--- Fixed SQL_ATTR_CURRENT_CATALOG to take correct length pointer.
--- Portability fixups while using the platform dependant compilers
-
----------------------------------------------
-27-Feb-2003 : monty@stripped, venu@stripped
----------------------------------------------
-This is the 'stable' release of Connector/ODBC '3.51.06'.
-
-The development is started in 3.52 tree which mainly
-aims to support the following features:
-
- - Binary protocol compatible with MySQL 4.1 to improve
- the performance.
- - Missed features from 3.51 (descriptors)
- - Array parameter handling
- - Unicode API
-
-Here is the list of changes in the 3.51.06:
-
--- Fix for the ADO when handling long text field with 0
- length data.
-
--- Fixed a ADO/Visual Basic when using with MySQL server
- >= 4.0.8 when there is a syntax error due to the
- error message buffer over flow.
-
--- Fixed a bug when the dynamic cursor is used for cursor
- based updates/deletes and when
- - there are no key fields present in the table &
- - the schema of the table is changed.
-
--- Fixed to refresh the initialized SQLSTATEs in the
- driver when the ODBC version is changed and when the
- multiple instances of driver is loaded into to the
- memory.
-
--- Fixed a minor bug when the bulk inserts are performed
- from SQLBulkOperations or SQLSetPos with SQL_ADD and
- when the wrong pcbValue is passed.
-
-Recommended upgrade to all earlier versions of MyODBC
-on all platforms.
-
----------------------------------------------
-19-Dec-2002 : monty@stripped, venu@stripped
----------------------------------------------
-This is the gamma release of MyODBC 3.51.05. This
-should be the final release in the development series
-before making the stable announcement unless if
-there is any criticil bugs from this version.
-
-So, please test this, and let us know the status back
-to proceed onto stable release.
-
-Here is the list of changes:
-
--- Fix for the thread-safe library core dumps when the
- driver is built with the debug options.
-
--- Fix for OpenOffice to return valid list of catalog
- names SQLTables along with a valid catalog name.
-
--- Fixed SQLTablePrivileges and SQLColumnPrivileges to
- return each privilege type in a individual rows.
-
--- Fixed the time connersion format error from SQL_TIME_STRUCT
-
- (Thanks to Ocke Janssen<ocke.janssen@stripped> for the
- above 3 bugs from OpenOffice team).
-
--- Fixed SQLSpecialColumns coredump on HP-UX (threaded
- library)
-
--- Fixed SQLGetTypeInfo to return individual rows for
- auto_increment status for all numeric types.
- (Request from Gerry Sweeney <gerry@stripped>)
-
--- Fixed to return an error when the conversion is from
- SQL_C_NUMERIC as the driver is not cabale to handle
- SQL_NUMERIC_STRUCT conversion due to lack of descriptors
- support.
- (Request from Michael Thomas <mithomas@stripped>
- from Microsoft ODBC team)
-
--- Added missed ROWS_FETCH_PTR status to SQLFetch and
- SQLExtendedFetch as that of SQLFetchScroll along
- with PARAMA_PROCESSED_PTR.
-
--- Fixed to not to set the default attributes for the
- new DSN when the attributes are set through the config
- APIs (Windows specific).
-
--- Added to return the DRIVER name when there is no DSN
- is specified (Linux only).
-
--- Support for the new autoconf tools along with few
- new configurations options.
-
--- Lot of cleanups to configure script to work on all
- unix platforms along with gcc 3.x compatibility.
-
--- Added distribution uitlity scripts under scripts
- sub-directory.
-
- * Binary distribution support for all platforms
- * Snapshot source distribution
-
--- Minor fix-ups to work with native compilers.
-
--- Lot of code cleanup.
-
-Recommended upgrade to earlier versions on all
-platforms.
-
----------------------------------------------
-30-Sep-2002 : monty@stripped, venu@stripped
----------------------------------------------
-Release of 3.51.04 with the following bug fixes or
-improvements:
-
--- Support for handling large tables without
- caching the entire result set. Now one can force
- the driver to use non-cache result sets (mysql_use_
- result instead of mysql_store_result). Note that
- this can be used only with forward-only cursors.
-
--- Added --enable-thread-safe and --disable-thread-safe
- options to configure, so that driver links directly
- with thread-safe or non thread-safe client libraries
- instead of using the explicit symbolic links.
-
--- Fixed SQLTables to not to return any data related
- to SYSTEM TABLES due to the conflict of database
- names. This should allow 'WinSQL' to show the
- correct user tables without any duplicates.
-
--- Fixed few core dumps from HP-UX and AIX
-
--- Cleanups to thread-safe code (debug calls)
-
--- Added the driver to check for pre-connection
- attributes (AUTOCOMMIT, TXN_ISOLATION) values after
- the connection instead of returning error when they
- are set before the connection.
-
--- Poratbility changes for MySQL 4.0.3 and 4.1.
-
--- Fix to SQLForeignKeys when the CREATE TABLE had a
- COMMENT syntax.
-
--- Two new options 'Force use of forward-only cursors'
- and 'Don't cache results' to help large scale
- customers.
-
--- Fix to rs.update when server side cursor is used.
-
--- Changes for error handling w.r.t. MySQL 4.3.
-
--- Multi-step generated error fixups.
-
--- Lot of code cleanup
-
--- Improvements to driver logging calls (myodbc.log
- and myodbc.sql)
-
--- Few misc portability changes to build the driver
- on various UNIX platforms, and
-
--- Lot of code cleanup to have better performance:
-
-Recommended upgrade to earlier versions on all
-platforms.
-
----------------------------------------------
-29-May-2002 : monty@stripped, venu@stripped
----------------------------------------------
-Release of 3.51.03 with the following bug fixes or
-improvements:
-
--- New DSN configuration dialog window.
-
--- Support of SQLForeignKeys for InnoDB table type
-
--- Fix for multi-step generated errors (when server side
- cursor is used) (Bug from vrincon_dtt@stripped and
- AdoAnywhere [mike@stripped])
-
--- Fix for time conversion using SQL_C_TIME when hour has 3
- digits (Bug from Michael Thomas [mithomas@stripped])
-
--- Fix for ADO/DAO empty string issue (Bug from Tom
- DeGerlia [tom@stripped])
-
--- Fix for BLOB data reading from ADO/DAO (Bug from
- Justin Goodwin [justin.andre.goodwin@stripped])
-
--- Support of new Query Log option, which allows the
- driver to log all SQL queries that it is processing
- to c:/myodbc.sql file (or /tmp/myodbc.sql)
-
--- Added code to have one time initialization when the
- ODBC version specified is SQL_OV_ODBC2, so that the
- subsequent driver calls will not perform any checks
- on ODBC version.
-
--- Fix to return an error when the float fields are used
- in positioned options( Info from Jim Dickenson
- [dickenson@stripped])
-
--- Fix for errors generated during the export of tables with
- VARCHAR/TEXT from Access/MS DTS to MySQL using MyODBC. Now
- driver should be capable of handling all types of
- conversions.
-
--- Fix to handle SQL_C_BINARY properly (Info from
- Spilka [spilka@stripped])
-
--- Added MY_SQL_PRIMARY_KEY(1212) option to SQLColAttribute
- to make rs.resync to work from ADO (Info from
- Dan Perik [dan_perik-work@stripped])
-
--- Updated SQLSTATE to return correct truncated data during
- the warning cases (Info from akbar ali [akbar_ali@stripped])
-
--- Fixed type casting issues in SQLGetInfo to make Open Office
- to work-Memory overwrite (Bug from Ocke Janssen
- [Ocke.Janssen@stripped])
-
--- Fix to SQLFetch when it is called after SQLFetchScroll
- with SQL_FETCH_FIRST (Bug from Simone Tregnago
- [simone@stripped]).
-
--- Minor fix in mapping SQL_ATTR_CONNECTION_TIMEOUT option to
- mysql_options with MYSQL_OPT_CONNECT_TIMEOUT.
-
--- Changes made to error handling to eliminate some misc
- conditions.
-
--- Improvements to driver logging calls.
-
--- Few misc compatibility changes, and
-
--- Lot of code cleanup to have better performance.
-
-Recommended upgrade from earlier versions.
-
----------------------------------------------
-05-Mar-2002 : monty@stripped, venu@stripped
----------------------------------------------
-Release of 3.51.02 with the following bug fixes or
-improvements:
-
--- Fix to SQLDriverConnect to return correct output
- string. This is the main fix for 'Reserved error
- (-7778)' from all Windows ODBC applications.
-
--- Fix to hang from unixODBC when there is a exception.
- Modified SQLError to clear the error buffers on the
- first call when the ODBC version is SQL_OV_ODBC3, so
- that the subsequent calls will return SQL_NO_DATA.
-
--- Fix to SQL_UPDATE and SQL_ADD from SQLSetPos. Also
- changed to have different way of using the NULL
- values from WHERE clause.
-
--- Fix to SQLSetPos and SQLBulkOperations, when the
- application passes SQL_NTS as pcbValue.
-
--- Fix to SQLColumns to return the correct Nullability.
-
--- Added the support of SQLTablePrivileges and
- SQLColumnPrivileges.
-
--- Fix to SQL_ATTR_CONNECTION_DEAD. This should fix the
- issues from SQLExpress for XBase++ and .NET connection
- closed issues.
-
--- Fix to SQLGetTypeInfo to return correct values for
- SQL_DATE/SQL_TYPE_DATE, SQL_TIME/SQL_TYPE_TIME and
- SQL_TIMESTAMP/SQL_TYPE_TIMESTAMP.
-
--- Fix to tab ordering ordering from DSN configuration
- dialog.
-
--- Added default values for the new DSN creation.
-
--- Fix to export of tables from ACCESS 97 or MS DTS(
- Data Transformation Services) when one of the field
- types are TEXT or VARCHAR.
-
--- Added few more questions to MyODBC FAQ and also added
- simple ODBC.NET samples.
-
-If anybody is using the older versions of MyODBC 3.51,
-then recommended to upgrade to this version for all
-platforms.
-
----------------------------------------------
-30-Jan-2002 : monty@stripped, venu@stripped
----------------------------------------------
-Release of 3.51.01 with the support of following
-APIs and/or features:
-
--- SQLAllocHandle
-
--- SQLFreeHandle
-
--- SQLSetEnvAttr, using this, the driver can be configured
- its functionality based on the ODBC version
-
--- SQLGetEnvAttr
-
--- SQLSetConnectAttr
-
--- SQLGetConnectAttr
-
--- SQLSetStmtAttr
-
--- SQLGetStmtAttr
-
--- SQLFetchScroll
-
--- SQLBulkOperations with SQL_ADD (Bulk Inserts)
-
--- SQLGetDiagRec
-
--- SQLGetDiagField
-
--- SQLCloseCursor
-
--- SQLEndTran
-
--- SQLGetInfo, re-written completely
-
--- SQLGetFunctions, re-written completely
-
--- Complete changes to error handling. Also driver returns
- the SQLSTATE values based on the ODBC version.
-
--- Enhanced cursor handling
-
--- Changed SQLGetTypeInfo to return column headers as
- per 3.5 spec
-
--- Changed all catalog APIs to return column headers
- as per 3.5 spec
-
--- Support of dynamic cursor type
-
--- New feature called 'Test Data Source' in the DSN setup
- dialog, so that the DSN settings can be tested while
- configuring.
-
--- Added 'HELP' button to DSN setup dialog, which links
- to online MyODBC manual.
-
--- Added SOCKET option to SQLConnect API i.e. in odbc.ini
-
--- Support of deprecated API 'SQLParamOptions'
- so that one can supply batch parameter processing
- with 2.x applications
-
--- Added server name and version to the statement
- error prefix i.e. the error prefix looks something
- like [MySQL][ODBC 3.51 Driver][mysqld-3.23.46-max]
-
--- Added SOCKET option to SQLConnect API i.e. in odbc.ini
-
--- Fix to SQL_FETCH_RELATIVE from SQLExtendedFetch or
- SQLFetchScroll, to handle the following cases:
-
- - BeforeStart AND FetchOffset <= 0
- - CurrRowsetStart = 1 AND FetchOffset < 0
- - CurrRowsetStart > 1 AND
- CurrRowsetStart + FetchOffset < 1 AND
- |FetchOffset| > RowsetSize
- - CurrRowsetStart > 1 AND
- CurrRowsetStart + FetchOffset < 1 AND
- |FetchOffset| <= RowsetSize
-
--- Fix to SQL_FETCH_RELATIVE from SQLExtendedFetch or
- SQLFetchScroll, to handle the case when
-
- FetchOffset < 0 AND
- |FetchOffset| > LastResultRow AND
- |FetchOffset| > RowsetSize
-
--- Fix to memory leaks on UNIX when linked with
- iodbc or unixODBC.
-
--- FILEDSN support
-
-Apart from the above,
-
--- MyODBC 3.51 allows backward compatibility, i.e. all
- 2.50 applications will work without any problems.
-
--- MySQL ODBC 3.51 Programmer's Reference Manual and
- frequently Asked Questions(FAQs) are live from
-
- http://www.mysql.com/products/myodbc/index.html
-
-
-
-
-
-
-
-
Deleted: CreateBinaryMsi.bat
===================================================================
--- CreateBinaryMsi.bat 2006-09-08 03:49:09 UTC (rev 71)
+++ CreateBinaryMsi.bat 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,85 +0,0 @@
-@ECHO OFF
-REM #########################################################
-REM
-REM \brief Create binary distribution (with installer).
-REM
-REM Creates binary distributions with installer. It will
-REM create a GPL and a Commercial version.
-REM 1) MSI
-REM 2) setup.exe (zipped)
-REM
-REM \sa CreateBinaryZip.bat
-REM CreateSourceZip.bat
-REM
-REM #########################################################
-
-IF "%1"=="" GOTO doSyntax
-IF "%2"=="" GOTO doSyntax
-
-REM Building...
-call Build.bat
-
-REM Copying files to wix stage area...
-IF NOT EXIST ..\wix-installer\bin\mysql-connector-odbc-%1-win32 (
- mkdir ..\wix-installer\bin\mysql-connector-odbc-%1-win32
-)
-IF NOT EXIST ..\wix-installer\bin\mysql-connector-odbc-%1-win32\Windows (
- mkdir ..\wix-installer\bin\mysql-connector-odbc-%1-win32\Windows
-)
-IF NOT EXIST ..\wix-installer\bin\mysql-connector-odbc-%1-win32\Windows\System32 (
- mkdir ..\wix-installer\bin\mysql-connector-odbc-%1-win32\Windows\System32
-)
-copy bin\* ..\wix-installer\bin\mysql-connector-odbc-%1-win32\Windows\System32
-copy lib\* ..\wix-installer\bin\mysql-connector-odbc-%1-win32\Windows\System32
-copy doc\*.hlp ..\wix-installer\bin\mysql-connector-odbc-%1-win32\Windows\System32
-copy LICENSE.* ..\wix-installer\bin\mysql-connector-odbc-%1-win32\Windows\System32
-
-REM Creating Commercial msi...
-cd ..\wix-installer
-copy bin\mysql-connector-odbc-%1-win32\Windows\System32\LICENSE.commercial
bin\mysql-connector-odbc-%1-win32\Windows\System32\myodbc3-license.rtf
-copy bin\mysql-connector-odbc-%1-win32\Windows\System32\LICENSE.commercial
resources\commercial_license.rtf
-call OdbcMakeSetup.bat %1 %2 commercial
-
-REM Creating GPL msi...
-move /Y bin\dist\mysql-connector-odbc-%1-win32.msi
bin\dist\mysql-connector-odbc-commercial-%1-win32.msi
-move /Y bin\dist\mysql-connector-odbc-%1-win32.msi
bin\dist\mysql-connector-odbc-commercial-%1-win32.msi
-move /Y bin\dist\mysql-connector-odbc-%1-win32.zip
bin\dist\mysql-connector-odbc-commercial-%1-win32.zip
-move /Y bin\dist\mysql-connector-odbc-%1-win32.msi.md5
bin\dist\mysql-connector-odbc-commercial-%1-win32.msi.md5
-move /Y bin\dist\mysql-connector-odbc-%1-win32.zip.md5
bin\dist\mysql-connector-odbc-commercial-%1-win32.zip.md5
-copy bin\mysql-connector-odbc-%1-win32\Windows\System32\LICENSE.gpl
bin\mysql-connector-odbc-%1-win32\Windows\System32\myodbc3-license.rtf
-copy bin\mysql-connector-odbc-%1-win32\Windows\System32\LICENSE.exceptions
bin\mysql-connector-odbc-%1-win32\Windows\System32\myodbc3-exceptions.rtf
-call OdbcMakeSetup.bat %1 %2 gpl
-
-cd ..\*odbc3
-
-EXIT /B 0
-
-:doSyntax
-ECHO "+-----------------------------------------------------+"
-ECHO "| CreateBinaryMsi.bat |"
-ECHO "+-----------------------------------------------------+"
-ECHO "| |"
-ECHO "| DESCRIPTION |"
-ECHO "| |"
-ECHO "| Use this to build sources and create a MSI based |"
-ECHO "| installers for commercial and GPL. |"
-ECHO "| |"
-ECHO "| SYNTAX |"
-ECHO "| |"
-ECHO "| CreateBinaryMsi <version> <build-type> |"
-ECHO "| |"
-ECHO "| <version> must be a 3 number version |"
-ECHO "| |"
-ECHO "| <built-type> must be; |"
-ECHO "| a - alpha |"
-ECHO "| b - beta |"
-ECHO "| r - release candidate |"
-ECHO "| p - production |"
-ECHO "| i - internal |"
-ECHO "| |"
-ECHO "| EXAMPLE |"
-ECHO "| |"
-ECHO "| CreateBinaryMsi 3.51.12 p |"
-ECHO "| |"
-ECHO "+-----------------------------------------------------+"
-
Deleted: CreateBinaryZip.bat
===================================================================
--- CreateBinaryZip.bat 2006-09-08 03:49:09 UTC (rev 71)
+++ CreateBinaryZip.bat 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,92 +0,0 @@
-@ECHO OFF
-REM #########################################################
-REM
-REM \brief Create binary distribution (without installer).
-REM
-REM Creates binary distribution - without installer.
-REM This may be useful for those wishing to incorporate
-REM myodbc into their own installer.
-REM
-REM \note To do this you are going to need pkzipc (the command-line
-REM version of pkzip) somewhere in your path.
-REM
-REM \sa CreateBinaryMsi.bat
-REM CreateSourceZip.bat
-REM
-REM #########################################################
-
-IF "%1"=="" GOTO doSyntax
-
-ECHO Building...
-call Build.bat
-
-ECHO Clean any existing stage area...
-IF EXIST .\mysql-connector-odbc-noinstall-%1-win32.zip (
- del mysql-connector-odbc-noinstall-%1-win32.zip
-)
-IF EXIST .\mysql-connector-odbc-noinstall-%1-win32 (
- rmdir /S /Q mysql-connector-odbc-noinstall-%1-win32
-)
-
-IF EXIST .\mysql-connector-odbc-commercial-noinstall-%1-win32.zip (
- del mysql-connector-odbc-commercial-noinstall-%1-win32.zip
-)
-IF EXIST .\mysql-connector-odbc-commercial-noinstall-%1-win32 (
- rmdir /S /Q mysql-connector-odbc-commercial-noinstall-%1-win32
-)
-
-ECHO GPL: Create stage area and populate...
-mkdir mysql-connector-odbc-noinstall-%1-win32
-mkdir mysql-connector-odbc-noinstall-%1-win32\bin
-mkdir mysql-connector-odbc-noinstall-%1-win32\lib
-mkdir mysql-connector-odbc-noinstall-%1-win32\doc
-xcopy /E /Y bin\* mysql-connector-odbc-noinstall-%1-win32\bin
-xcopy /E /Y lib\* mysql-connector-odbc-noinstall-%1-win32\lib
-xcopy /E /Y doc\* mysql-connector-odbc-noinstall-%1-win32\doc
-copy Install.bat mysql-connector-odbc-noinstall-%1-win32
-copy Uninstall.bat mysql-connector-odbc-noinstall-%1-win32
-copy ChangeLog mysql-connector-odbc-noinstall-%1-win32\ChangeLog.rtf
-copy LICENSE.gpl mysql-connector-odbc-noinstall-%1-win32\LICENSE.rtf
-copy LICENSE.exceptions mysql-connector-odbc-noinstall-%1-win32\EXCEPTIONS.rtf
-copy README mysql-connector-odbc-noinstall-%1-win32\README.rtf
-copy INSTALL mysql-connector-odbc-noinstall-%1-win32\INSTALL.rtf
-copy INSTALL.win mysql-connector-odbc-noinstall-%1-win32\INSTALL-win.rtf
-
-ECHO Zipping...
-pkzipc -add -maximum -recurse -path=current mysql-connector-odbc-noinstall-%1-win32.zip
mysql-connector-odbc-noinstall-%1-win32\*.*
-
-ECHO COMMERCIAL: Create stage area and populate...
-move mysql-connector-odbc-noinstall-%1-win32
mysql-connector-odbc-commercial-noinstall-%1-win32
-copy LICENSE.commercial mysql-connector-odbc-commercial-noinstall-%1-win32\LICENSE.rtf
-del mysql-connector-odbc-commercial-noinstall-%1-win32\EXCEPTIONS.rtf
-
-ECHO Zipping...
-pkzipc -add -maximum -recurse -path=current
mysql-connector-odbc-commercial-noinstall-%1-win32.zip
mysql-connector-odbc-commercial-noinstall-%1-win32/*.*
-IF EXIST .\mysql-connector-odbc-commercial-noinstall-%1-win32 (
- rmdir /S /Q mysql-connector-odbc-commercial-noinstall-%1-win32
-)
-
-EXIT /B 0
-
-:doSyntax
-ECHO "+-----------------------------------------------------+"
-ECHO "| CreateBinaryZip.bat |"
-ECHO "+-----------------------------------------------------+"
-ECHO "| |"
-ECHO "| DESCRIPTION |"
-ECHO "| |"
-ECHO "| Use this to build sources and create a ZIP based |"
-ECHO "| noinstaller distribution for commercial and GPL. |"
-ECHO "| |"
-ECHO "| SYNTAX |"
-ECHO "| |"
-ECHO "| CreateBinaryZip <version> |"
-ECHO "| |"
-ECHO "| <version> must be a 3 number version |"
-ECHO "| |"
-ECHO "| EXAMPLE |"
-ECHO "| |"
-ECHO "| CreateBinaryZip 3.51.12 |"
-ECHO "| |"
-ECHO "+-----------------------------------------------------+"
-
Deleted: CreateMakefiles.bat
===================================================================
--- CreateMakefiles.bat 2006-09-08 03:49:09 UTC (rev 71)
+++ CreateMakefiles.bat 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,101 +0,0 @@
-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 ****
-qmake
-
-ECHO MYODBCDbg...
-cd MYODBCDbg\MYODBCDbgLib
-qmake
-cd ..
-qmake
-cd ..
-
-ECHO dltest...
-cd dltest
-qmake
-cd ..
-
-ECHO myodbc3u...
-cd myodbc3u
-qmake
-cd ..
-
-ECHO myodbc3S...
-cd myodbc3S
-qmake
-cd ..
-
-ECHO myodbc3i...
-cd myodbc3i
-qmake
-cd ..
-
-ECHO myodbc3m...
-cd myodbc3m
-qmake
-cd ..
-
-ECHO myodbc3c...
-cd myodbc3c
-qmake
-cd ..
-
-ECHO myodbc3...
-cd myodbc3
-qmake
-cd ..
-
-ECHO MYODBCCls...
-cd MYODBCCls\MYODBCClsLib
-qmake
-cd ..\MYODBCClsApp
-qmake
-cd ..
-qmake
-cd ..
-
-ECHO MYQTODBCCls...
-cd MYQTODBCCls\MYQTODBCClsLib
-qmake
-cd ..\MYQTODBCClsApp
-qmake
-cd ..
-qmake
-cd ..
-
-ECHO MYODBCBrw...
-cd MYODBCBrw\MYODBCBrwLib
-qmake
-cd ..\MYODBCBrwApp
-qmake
-cd ..
-qmake
-cd ..
-
-ECHO ****
-ECHO * You should now have fresh makefiles to work with. Any changes to
-ECHO * qmake project files should be reflected in these new makefiles.
-ECHO ****
-
-
Deleted: CreateMakefiles.sh
===================================================================
--- CreateMakefiles.sh 2006-09-08 03:49:09 UTC (rev 71)
+++ CreateMakefiles.sh 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,61 +0,0 @@
-# #########################################################
-#
-# \brief Create Makefiles from qmake project files.
-#
-#
-# #########################################################
-
-echo "+-----------------------"
-echo "| Recreating Makefiles..."
-echo "+-----------------------"
-qmake
-
-echo "MYODBCDbg..."
-cd MYODBCDbg/MYODBCDbgLib
-rm -f Makefile
-qmake
-cd ..
-
-echo "dltest..."
-cd dltest
-rm -f Makefile
-qmake
-cd ..
-
-echo "myodbc3u..."
-cd myodbc3u
-rm -f Makefile
-qmake
-cd ..
-
-echo "myodbc3S..."
-cd myodbc3S
-rm -f Makefile
-qmake
-cd ..
-
-echo "myodbc3i..."
-cd myodbc3i
-rm -f Makefile
-qmake
-cd ..
-
-echo "myodbc3m..."
-cd myodbc3m
-rm -f Makefile
-qmake
-cd ..
-
-echo "myodbc3c..."
-cd myodbc3c
-rm -f Makefile
-qmake
-cd ..
-
-echo "myodbc3..."
-cd myodbc3
-rm -f Makefile
-qmake
-cd ..
-
-
Deleted: CreateSourceZip.bat
===================================================================
--- CreateSourceZip.bat 2006-09-08 03:49:09 UTC (rev 71)
+++ CreateSourceZip.bat 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,185 +0,0 @@
-@ECHO OFF
-REM #########################################################
-REM
-REM \brief Create source distribution.
-REM
-REM Creates source distribution for windows.
-REM
-REM \note To do this you are going to need pkzipc (the command-line
-REM version of pkzip) somewhere in your path.
-REM
-REM \sa CreateBinaryMsi.bat
-REM CreateBinaryZip.bat
-REM
-REM #########################################################
-
-IF "%1"=="" GOTO doSyntax
-
-ECHO Clean any existing stage area...
-IF EXIST mysql-connector-odbc-%1-win-src.zip (
- del mysql-connector-odbc-%1-win-src.zip
-)
-IF EXIST mysql-connector-odbc-%1-win-src (
- rmdir /S /Q mysql-connector-odbc-%1-win-src
-)
-
-ECHO Create stage area and populate...
-mkdir mysql-connector-odbc-%1-win-src
-
-REM Its easier to copy specific files then try
-REM to clean out garbage (in this case).
-REM xcopy /E /Y * mysql-connector-odbc-%1-win-src
-
-REM root
-mkdir mysql-connector-odbc-%1-win-src
-copy ChangeLog mysql-connector-odbc-%1-win-src\ChangeLog.rtf
-copy LICENSE.gpl mysql-connector-odbc-%1-win-src\LICENSE.rtf
-copy LICENSE.exceptions mysql-connector-odbc-%1-win-src\EXCEPTIONS.rtf
-copy Build.bat mysql-connector-odbc-%1-win-src
-copy Install.bat mysql-connector-odbc-%1-win-src
-copy Uninstall.bat mysql-connector-odbc-%1-win-src
-copy CreateMakefiles.bat mysql-connector-odbc-%1-win-src
-copy CreateVisualStudioProjects.bat mysql-connector-odbc-%1-win-src
-copy config.pri mysql-connector-odbc-%1-win-src
-copy defines.pri mysql-connector-odbc-%1-win-src
-copy mysql.pri mysql-connector-odbc-%1-win-src
-copy odbc.pri mysql-connector-odbc-%1-win-src
-copy root.pro mysql-connector-odbc-%1-win-src
-copy README mysql-connector-odbc-%1-win-src\README.rtf
-copy BUILD mysql-connector-odbc-%1-win-src\BUILD.rtf
-copy BUILD.win mysql-connector-odbc-%1-win-src\BUILD-win.rtf
-copy INSTALL mysql-connector-odbc-%1-win-src\INSTALL.rtf
-copy INSTALL.win mysql-connector-odbc-%1-win-src\INSTALL-win.rtf
-copy resource.h mysql-connector-odbc-%1-win-src
-copy VersionInfo.h mysql-connector-odbc-%1-win-src
-copy mysql.bmp mysql-connector-odbc-%1-win-src
-
-REM dltest
-mkdir mysql-connector-odbc-%1-win-src\dltest
-copy dltest\*.pro mysql-connector-odbc-%1-win-src\dltest
-copy dltest\*.c mysql-connector-odbc-%1-win-src\dltest
-
-REM myodbc3u
-mkdir mysql-connector-odbc-%1-win-src\myodbc3u
-copy myodbc3u\*.pro mysql-connector-odbc-%1-win-src\myodbc3u
-copy myodbc3u\*.h mysql-connector-odbc-%1-win-src\myodbc3u
-copy myodbc3u\*.c mysql-connector-odbc-%1-win-src\myodbc3u
-
-REM myodbc3S
-mkdir mysql-connector-odbc-%1-win-src\myodbc3S
-copy myodbc3S\*.pro mysql-connector-odbc-%1-win-src\myodbc3S
-copy myodbc3S\*.def mysql-connector-odbc-%1-win-src\myodbc3S
-copy myodbc3S\*.xpm mysql-connector-odbc-%1-win-src\myodbc3S
-copy myodbc3S\*.rc mysql-connector-odbc-%1-win-src\myodbc3S
-copy myodbc3S\*.c mysql-connector-odbc-%1-win-src\myodbc3S
-copy myodbc3S\*.cpp mysql-connector-odbc-%1-win-src\myodbc3S
-copy myodbc3S\*.h mysql-connector-odbc-%1-win-src\myodbc3S
-
-REM myodbc3i
-mkdir mysql-connector-odbc-%1-win-src\myodbc3i
-copy myodbc3i\*.pro mysql-connector-odbc-%1-win-src\myodbc3i
-copy myodbc3i\*.c mysql-connector-odbc-%1-win-src\myodbc3i
-
-REM myodbc3m
-mkdir mysql-connector-odbc-%1-win-src\myodbc3m
-copy myodbc3m\*.pro mysql-connector-odbc-%1-win-src\myodbc3m
-copy myodbc3m\*.c mysql-connector-odbc-%1-win-src\myodbc3m
-copy myodbc3m\*.h mysql-connector-odbc-%1-win-src\myodbc3m
-
-REM myodbc3c
-mkdir mysql-connector-odbc-%1-win-src\myodbc3c
-copy myodbc3c\*.pro mysql-connector-odbc-%1-win-src\myodbc3c
-copy myodbc3c\*.cpp mysql-connector-odbc-%1-win-src\myodbc3c
-
-REM myodbc3
-mkdir mysql-connector-odbc-%1-win-src\myodbc3
-copy myodbc3\*.pro mysql-connector-odbc-%1-win-src\myodbc3
-copy myodbc3\*.c mysql-connector-odbc-%1-win-src\myodbc3
-copy myodbc3\*.h mysql-connector-odbc-%1-win-src\myodbc3
-copy myodbc3\*.rc mysql-connector-odbc-%1-win-src\myodbc3
-copy myodbc3\*.def mysql-connector-odbc-%1-win-src\myodbc3
-
-REM MYODBCCls
-mkdir mysql-connector-odbc-%1-win-src\MYODBCCls
-copy MYODBCCls\*.pro mysql-connector-odbc-%1-win-src\MYODBCCls
-
-mkdir mysql-connector-odbc-%1-win-src\MYODBCCls\include
-copy MYODBCCls\include\*.h mysql-connector-odbc-%1-win-src\MYODBCCls\include
-
-mkdir mysql-connector-odbc-%1-win-src\MYODBCCls\MYODBCClsLib
-copy MYODBCCls\MYODBCClsLib\*.pro mysql-connector-odbc-%1-win-src\MYODBCCls\MYODBCClsLib
-copy MYODBCCls\MYODBCClsLib\*.cpp mysql-connector-odbc-%1-win-src\MYODBCCls\MYODBCClsLib
-
-mkdir mysql-connector-odbc-%1-win-src\MYODBCCls\MYODBCClsApp
-copy MYODBCCls\MYODBCClsApp\*.pro mysql-connector-odbc-%1-win-src\MYODBCCls\MYODBCClsApp
-copy MYODBCCls\MYODBCClsApp\*.cpp mysql-connector-odbc-%1-win-src\MYODBCCls\MYODBCClsApp
-copy MYODBCCls\MYODBCClsApp\*.h mysql-connector-odbc-%1-win-src\MYODBCCls\MYODBCClsApp
-
-REM MYQTODBCCls
-mkdir mysql-connector-odbc-%1-win-src\MYQTODBCCls
-copy MYQTODBCCls\*.pro mysql-connector-odbc-%1-win-src\MYQTODBCCls
-
-mkdir mysql-connector-odbc-%1-win-src\MYQTODBCCls\include
-copy MYQTODBCCls\include\*.h mysql-connector-odbc-%1-win-src\MYQTODBCCls\include
-copy MYQTODBCCls\include\*.xpm mysql-connector-odbc-%1-win-src\MYQTODBCCls\include
-
-mkdir mysql-connector-odbc-%1-win-src\MYQTODBCCls\MYQTODBCClsLib
-copy MYQTODBCCls\MYQTODBCClsLib\*.pro
mysql-connector-odbc-%1-win-src\MYQTODBCCls\MYQTODBCClsLib
-copy MYQTODBCCls\MYQTODBCClsLib\*.cpp
mysql-connector-odbc-%1-win-src\MYQTODBCCls\MYQTODBCClsLib
-
-mkdir mysql-connector-odbc-%1-win-src\MYQTODBCCls\MYQTODBCClsApp
-copy MYQTODBCCls\MYQTODBCClsApp\*.pro
mysql-connector-odbc-%1-win-src\MYQTODBCCls\MYQTODBCClsApp
-copy MYQTODBCCls\MYQTODBCClsApp\*.cpp
mysql-connector-odbc-%1-win-src\MYQTODBCCls\MYQTODBCClsApp
-copy MYQTODBCCls\MYQTODBCClsApp\*.h
mysql-connector-odbc-%1-win-src\MYQTODBCCls\MYQTODBCClsApp
-
-REM MYODBCBrw
-mkdir mysql-connector-odbc-%1-win-src\MYODBCBrw
-copy MYODBCBrw\*.pro mysql-connector-odbc-%1-win-src\MYODBCBrw
-
-mkdir mysql-connector-odbc-%1-win-src\MYODBCBrw\include
-copy MYODBCBrw\include\*.h mysql-connector-odbc-%1-win-src\MYODBCBrw\include
-copy MYODBCBrw\include\*.xpm mysql-connector-odbc-%1-win-src\MYODBCBrw\include
-
-mkdir mysql-connector-odbc-%1-win-src\MYODBCBrw\MYODBCBrwLib
-copy MYODBCBrw\MYODBCBrwLib\*.pro mysql-connector-odbc-%1-win-src\MYODBCBrw\MYODBCBrwLib
-copy MYODBCBrw\MYODBCBrwLib\*.cpp mysql-connector-odbc-%1-win-src\MYODBCBrw\MYODBCBrwLib
-
-mkdir mysql-connector-odbc-%1-win-src\MYODBCBrw\MYODBCBrwApp
-copy MYODBCBrw\MYODBCBrwApp\*.pro mysql-connector-odbc-%1-win-src\MYODBCBrw\MYODBCBrwApp
-copy MYODBCBrw\MYODBCBrwApp\*.cpp mysql-connector-odbc-%1-win-src\MYODBCBrw\MYODBCBrwApp
-copy MYODBCBrw\MYODBCBrwApp\*.h mysql-connector-odbc-%1-win-src\MYODBCBrw\MYODBCBrwApp
-copy MYODBCBrw\MYODBCBrwApp\*.xpm mysql-connector-odbc-%1-win-src\MYODBCBrw\MYODBCBrwApp
-copy MYODBCBrw\MYODBCBrwApp\*.ico mysql-connector-odbc-%1-win-src\MYODBCBrw\MYODBCBrwApp
-copy MYODBCBrw\MYODBCBrwApp\*.rc mysql-connector-odbc-%1-win-src\MYODBCBrw\MYODBCBrwApp
-
-REM doc
-mkdir mysql-connector-odbc-%1-win-src\doc
-copy doc\* mysql-connector-odbc-%1-win-src\doc
-
-ECHO Zipping...
-pkzipc -add -maximum -recurse -path=current mysql-connector-odbc-%1-win-src.zip
mysql-connector-odbc-%1-win-src/*.*
-IF EXIST mysql-connector-odbc-%1-win-src (
- rmdir /S /Q mysql-connector-odbc-%1-win-src
-)
-
-ECHO ****
-ECHO * Hopefully things went well and you have a fresh new source distribution
-ECHO * in the source root directory.
-ECHO ****
-
-EXIT /B 0
-
-:doSyntax
-ECHO CreateSourceZip
-ECHO ===============
-ECHO .
-ECHO Usage:
-ECHO .
-ECHO %0 VERSION
-ECHO .
-ECHO VERSION must be; a 3 number version code
-ECHO .
-ECHO Examples:
-ECHO .
-ECHO %0 3.51.12
-
Deleted: CreateVisualStudioProjects.bat
===================================================================
--- CreateVisualStudioProjects.bat 2006-09-08 03:49:09 UTC (rev 71)
+++ CreateVisualStudioProjects.bat 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,95 +0,0 @@
-@ECHO OFF
-REM #########################################################
-REM
-REM \brief Create Visual Studio project files.
-REM
-REM The Visual Studio project files may already exist
-REM but this can be used to create/recreate them. The Visual
-REM Studio project files are created using qmake and
-REM the qmake project files. So if the qmake project files
-REM change for some reason - it may be a good idea to use
-REM this to recreate the corresponding Visual Studio
-REM project files.
-REM
-REM A Visual Studio 'Solution' containing all the projects
-REM may be found in sources.
-REM
-REM \note The command-line is the preferred method of building
-REM on all platforms - including MS Windows.
-REM
-REM \sa root.pro
-REM
-REM #########################################################
-
-ECHO Creating Visual Studio project files...
-
-ECHO MYODBCDbg...
-cd MYODBCDbg\MYODBCDbgLib
-qmake -t vclib
-cd ..
-qmake
-cd ..
-
-ECHO dltest...
-cd dltest
-qmake -t vcapp
-cd ..
-
-ECHO myodbc3u...
-cd myodbc3u
-qmake -t vclib
-cd ..
-
-ECHO myodbc3S...
-cd myodbc3S
-qmake -t vclib
-cd ..
-
-ECHO myodbc3i...
-cd myodbc3i
-qmake -t vcapp
-cd ..
-
-ECHO myodbc3m...
-cd myodbc3m
-qmake -t vcapp
-cd ..
-
-ECHO myodbc3c...
-cd myodbc3c
-qmake -t vcapp
-cd ..
-
-ECHO myodbc3...
-cd myodbc3
-qmake -t vclib
-cd ..
-
-ECHO MYODBCCls...
-cd MYODBCCls\MYODBCClsLib
-qmake -t vclib
-cd ..\MYODBCClsApp
-qmake -t vcapp
-cd ..
-qmake
-cd ..
-
-ECHO MYQTODBCCls...
-cd MYQTODBCCls\MYQTODBCClsLib
-qmake -t vclib
-cd ..\MYQTODBCClsApp
-qmake -t vcapp
-cd ..
-qmake
-cd ..
-
-ECHO MYODBCBrw...
-cd MYODBCBrw\MYODBCBrwLib
-qmake -t vclib
-cd ..\MYODBCBrwApp
-qmake -t vcapp
-cd ..
-qmake
-cd ..
-
-
Deleted: acconfig.h
===================================================================
--- acconfig.h 2006-09-08 03:49:09 UTC (rev 71)
+++ acconfig.h 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,49 +0,0 @@
-/***************************************************************************
- * Copyright (C) 1995-2005 MySQL AB, www.mysql.com *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software Foundation *
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
-****************************************************************************/
-
-/***************************************************************************
- * ACCONFIG.H *
- * *
- * @description: Defines for UNIX *
- * *
- * @author : MySQL AB *
- * @date : 2001-Aug-15 *
- * @product : myodbc3 *
- * *
-****************************************************************************/
-#undef _UNIX_
-
-/* odbc types */
-#undef SQLHENV
-#undef SQLHDBC
-#undef SQLHSTMT
-#undef SQLINTEGER
-#undef SQLUINTEGER
-#undef SQLSMALLINT
-#undef SQLUSMALLINT
-#undef SQLPOINTER
-#undef SQLRETURN
-#undef SQLCHAR
-#undef SQLHWND
-
-#undef HAVE_SQLGETPRIVATEPROFILESTRING
-
-#undef SYSTEM_ODBC_INI
-
-#undef HAVE_LOCALTIME_R
-
Deleted: acinclude.m4
===================================================================
--- acinclude.m4 2006-09-08 03:49:09 UTC (rev 71)
+++ acinclude.m4 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,183 +0,0 @@
-dnl ---------------------------------------------------------
-dnl
-dnl Macro:
-dnl AC_FIND_FILE
-dnl
-dnl Arguments:
-dnl
-dnl Description:
-dnl Find file(s) in given directories.
-dnl
-dnl ---------------------------------------------------------
-
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
- for j in $1;
- do
- if test -r "$i/$j"; then
- $3=$i
- break 2
- fi
- done
-done
-])
-
-dnl ---------------------------------------------------------
-dnl
-dnl Macro:
-dnl AC_CHECK_ODBC_TYPE
-dnl
-dnl Arguments:
-dnl
-dnl Description:
-dnl Checks if $1 is a valid type in the ODBC environment,
-dnl and #defines it to $2 if not
-dnl
-dnl ---------------------------------------------------------
-
-AC_DEFUN([AC_CHECK_ODBC_TYPE],
-[
-
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(ac_cv_odbc_$1,
-[
-echo > conftest.c
-
-for i in $odbc_headers
-do
- echo "#include <$i>" >> conftest.c
-done
-
-echo "int main(void) { $1 x; return 0; }" >> conftest.c
-
-if $CC -c $CFLAGS $CPPFLAGS conftest.c > /dev/null 2> /dev/null
-then
- eval ac_cv_odbc_$1=yes
-else
- eval ac_cv_odbc_$2=no
-fi
-rm -f conftest*
-])
-
-eval ac_odbc_check_res=$ac_cv_odbc_$1
-if test "x$ac_odbc_check_res" = "xyes"
-then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT([no ($2)])
- AC_DEFINE($1,$2,[Define if $1 is undefined])
-fi
-])
-
-
-dnl ---------------------------------------------------------
-dnl
-dnl Macro:
-dnl AC_CHECK_IODBC
-dnl
-dnl Arguments:
-dnl $1=includedir
-dnl $2=libdir
-dnl
-dnl Description:
-dnl Checks for iODBC. If found configure for it.
-dnl
-dnl ---------------------------------------------------------
-
-AC_DEFUN([AC_CHECK_IODBC],
-[
-CPPFLAGS="$CPPFLAGS $ODBC_FLAGS -I$1"
-AC_CHECK_HEADERS([isql.h isqlext.h isqltypes.h],
-[iodbc_ok=yes;odbc_headers="$odbc_headers $ac_hdr"],[iodbc_ok=no; break])
-
-if test "x$iodbc_ok" != "xyes"
-then
- AC_MSG_ERROR([Unable to find the iodbc headers in '$1'])
-fi
-
-
-# new autoconf tools doesn't detect through ac_hdr, so define
-# odbc_headers manually to make AC_CHECK_ODBC_TYPE to work
-if test "x$odbc_headers" = "x"
-then
- odbc_headers="isql.h isqlext.h isqltypes.h"
-fi
-
-AC_CHECK_HEADERS(iodbcinst.h)
-
-if test "x$ac_cv_header_iodbcinst_h" = "xyes"
-then
-
- odbc_headers="$odbc_headers iodbcinst.h"
- save_LIBS="$LIBS"
- LIBS="-L$2 $LIBS"
-
- AC_CHECK_LIB(iodbcadm,_iodbcdm_admin_dialbox,
- [LIBS="$LIBS -liodbcadm"
- have_iodbcadm=yes],
- [LIBS="$save_LIBS"])
-
- AC_CHECK_LIB(iodbcinst,SQLGetPrivateProfileString,
- [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING,1,[Define if SQLGetPrivateProfileString is
defined])
- LIBS="$LIBS -liodbcinst"
- have_iodbcinst=yes],
- [LIBS="$save_LIBS"])
-fi
-])
-
-
-dnl ---------------------------------------------------------
-dnl
-dnl Macro:
-dnl AC_CHECK_UNIXODBC
-dnl
-dnl Arguments:
-dnl $1=includedir
-dnl $2=libdir
-dnl
-dnl Description:
-dnl Check for unixODBC. If found configure for it.
-dnl
-dnl ---------------------------------------------------------
-
-AC_DEFUN([AC_CHECK_UNIXODBC],
-[
-CPPFLAGS="$CPPFLAGS $ODBC_FLAGS -I$1"
-AC_CHECK_HEADERS([sql.h sqlext.h sqltypes.h],
-[unixODBC_ok=yes;odbc_headers="$odbc_headers $ac_hdr"],[unixODBC_ok=no; break])
-
-if test "x$unixODBC_ok" != "xyes"
-then
- AC_MSG_ERROR([Unable to find the unixODBC headers in '$1'])
-fi
-
-# new autoconf tools doesn't detect through ac_hdr, so define
-# odbc_headers manually to make AC_CHECK_ODBC_TYPE to work
-if test "x$odbc_headers" = "x "
-then
- odbc_headers="sql.h sqlext.h sqltypes.h"
-fi
-
-AC_CHECK_HEADERS(odbcinst.h)
-
-if test "x$ac_cv_header_odbcinst_h" = "xyes"
-then
-
- odbc_headers="$odbc_headers odbcinst.h"
- save_LIBS="$LIBS"
- LIBS="-L$2 $LIBS"
-
- AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,
- [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING,1,[Define if SQLGetPrivateProfileString is
defined])
- LIBS="$LIBS -lodbcinst"
- have_odbcinst=yes],
- [LIBS="$save_LIBS"])
-fi
-])
-
-
-m4_include([qt.m4])
-
Deleted: common.pri
===================================================================
--- common.pri 2006-09-08 03:49:09 UTC (rev 71)
+++ common.pri 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,14 +0,0 @@
-#
-# \brief These are misc options which are common among all
-# sources.
-#
-OBJECTS_DIR = .tmp
-UI_DIR = .tmp
-MOC_DIR = .tmp
-
-win32 {
-}
-
-unix {
-}
-
Deleted: config.pri
===================================================================
--- config.pri 2006-09-08 03:49:09 UTC (rev 71)
+++ config.pri 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,34 +0,0 @@
-# #########################################################
-#
-# \brief These settings are used when building
-# Connector/ODBC using the qmake utility.
-#
-# Edit these settings before using qmake to
-# generate the Makefiles.
-#
-# \sa defines.pri
-#
-# #########################################################
-
-# #########################################################
-# Set this for config options which can be applied to all
-# sources. For example you may want to turn the following
-# on or off;
-#
-# thread
-# warn_on
-# debug | release
-#
-# #########################################################
-CONFIG += thread warn_on release
-CONFIG -= debug
-
-mac {
-# CONFIG -= thread
-} else:unix {
- INCLUDEPATH += $(LIBTOOL_DIR)/include
- LIBS += -L$(LIBTOOL_DIR)/lib
-}
-
-
-
Deleted: configure.in
===================================================================
--- configure.in 2006-09-08 03:49:09 UTC (rev 71)
+++ configure.in 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,907 +0,0 @@
-##########################################################################
-# Copyright (C) 1995-2006 MySQL AB, www.mysql.com #
-# #
-# This program is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program; if not, write to the Free Software Foundation #
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-##########################################################################
-
-##########################################################################
-# #
-# configure.in #
-# #
-# @description: This is the MyODBC 3.51 driver configure.in #
-# #
-# @author : MySQL AB (monty@stripped, venu@stripped) #
-# @date : 2001-Aug-15 #
-# @product : myodbc3 #
-# #
-##########################################################################
-
-###################################################################
-# #
-# Initializations #
-# #
-###################################################################
-
-AC_INIT(myodbc3/myodbc3.c)
-#AC_PREREQ(2.53)
-#AC_INIT([MySQL ODBC 3.51 Driver],[3.51.12],[myodbc@stripped],[libmyodbc3])
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(mysql-connector-odbc,3.51.13)
-
-myodbc_version=$VERSION
-###################################################################
-# #
-# See the libtool docs for information on how to do shared lib #
-# versions. #
-# #
-###################################################################
-
-SHARED_LIB_VERSION=1:0:0
-AM_CONFIG_HEADER(myodbc3/myconf.h)
-AC_SUBST(myodbc_version)
-
-# Canonicalize the configuration name.
-SYSTEM_TYPE="$host_vendor-$host_os"
-MACHINE_TYPE="$host_cpu"
-AC_SUBST(SYSTEM_TYPE)
-# AC_DEFINE_UNQUOTED(SYSTEM_TYPE, "$SYSTEM_TYPE", [Define SYSTEM_TYPE])
-AC_SUBST(MACHINE_TYPE)
-# AC_DEFINE_UNQUOTED(MACHINE_TYPE, "$MACHINE_TYPE", [Define MACHINE_TYPE])
-
-# Detect intel x86 like processor
-BASE_MACHINE_TYPE=$MACHINE_TYPE
-case $MACHINE_TYPE in
- i?86) BASE_MACHINE_TYPE=i386 ;;
-esac
-
-# Save some variables and the command line options for mysqlbug
-SAVE_CFLAGS="$CFLAGS"
-SAVE_LDFLAGS="$LDFLAGS"
-CONF_COMMAND="$0 $ac_configure_args"
-AC_SUBST(CONF_COMMAND)
-AC_SUBST(SAVE_CFLAGS)
-AC_SUBST(SAVE_LDFLAGS)
-
-AC_PREREQ(2.12)dnl Minimum Autoconf version required.
-
-# This is need before AC_PROG_CC
-#
-
-if test "x${CFLAGS-}" = x ; then
- cflags_is_set=no
-else
- cflags_is_set=yes
-fi
-
-if test "x${LDFLAGS-}" = x ; then
- ldflags_is_set=no
-else
- ldflags_is_set=yes
-fi
-
-# The following hack should ensure that configure doesn't add optimizing
-# or debugging flags to CFLAGS or CXXFLAGS
-CFLAGS="$CFLAGS "
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CPP
-
-# Fix for sgi gcc / sgiCC which tries to emulate gcc
-if test "$CC" = "sgicc"
-then
- ac_cv_prog_gcc="no"
-fi
-
-if test "$ac_cv_prog_gcc" = "yes"
-then
- AS="$CC -c"
- AC_SUBST(AS)
-else
- AC_PATH_PROG(AS, as, as)
-fi
-
-AM_ENABLE_SHARED
-AM_DISABLE_STATIC
-
-# define _UNIX_
-AC_DEFINE(_UNIX_,1,[Define if we are using unix build environment (always true)])
-
-AM_PROG_LIBTOOL
-AC_CHECK_LIB(z,compress)
-
-###################################################################
-#
-# IS_DARWIN
-#
-###################################################################
-IS_DARWIN=
-case $SYSTEM_TYPE in
- *darwin*)
- AC_SUBST([IS_DARWIN])
- ;;
-esac
-
-###################################################################
-#
-# THREADED
-#
-###################################################################
-# AC_MSG_CHECKING([if building of thread safe library is enabled])
-# AC_ARG_ENABLE( threads,
-# [AC_HELP_STRING([--enable-threads],[Build with thread support [default=yes]])],
-# [ case "${enableval}" in
-# yes) thread=true ;;
-# no) thread=false ;;
-# *) AC_MSG_ERROR(bad value ${enableval} for --enable-threads) ;;
-# esac],[thread=true])
-
-# AC_MSG_RESULT([$thread])
-
-# pass it along to qt.m4
-# if test "x$thread" = "xtrue"; then
- gotthread="yes";
-# else
-# gotthread="no";
-# fi
-
-###################################################################
-#
-# LTDL
-#
-###################################################################
-AC_CHECK_LIB(ltdl, lt_dlinit, [0], [AC_MSG_WARN([libltdl not installed])])
-LDFLAGS="$LDFLAGS -lltdl"
-
-###################################################################
-#
-# X
-#
-###################################################################
-
-AC_PATH_X
-if test -z "$ac_x_libraries" || test "x$ac_x_libraries" = xNONE; then
- X_LDFLAGS=""
- x_libraries="/usr/lib"; dnl better than nothing :-
- else
- x_libraries=$ac_x_libraries
- X_LDFLAGS="-L$x_libraries"
-fi
-all_includes="$all_includes $X_INCLUDES"
-all_libraries="$all_libraries $X_LDFLAGS"
-
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_libraries)
-AC_SUBST(x_includes)
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-AC_SUBST(LIB_X11)
-
-###################################################################
-#
-# --enable-gui
-#
-###################################################################
-AC_ARG_ENABLE( gui,
-[AC_HELP_STRING([--enable-gui],[Build GUI bits (needs qt) [default=yes]])],
-[ case "${enableval}" in
- yes) gui=true ;;
- no) gui=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-gui) ;;
- esac],[gui=true])
-
-if test "x$gui" = "xtrue"; then
- AC_PROG_CXX
-else
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
- am__fastdepCXX_TRUE=
- am__fastdepCXX_FALSE='#'
- else
- am__fastdepCXX_TRUE='#'
- am__fastdepCXX_FALSE=
- fi
-fi
-
-have_qt="no"
-if test "x$gui" = "xtrue"; then
- FUN_CHECK_QT
-fi
-
-AM_CONDITIONAL(QT, test "x$have_qt" = "xyes" )
-
-###################################################################
-#
-# --enable-bundles
-#
-###################################################################
-bundles=false
-AC_ARG_ENABLE( bundles,
-[AC_HELP_STRING([--enable-bundles],[make OSX bundles [default=no]])],
-[ case "${enableval}" in
- yes)
- bundles=true ;;
- no)
- bundles=false ;;
- *)
- AC_MSG_ERROR(bad value ${enableval} for --enable-bundles) ;;
-esac], [bundles=false])
-
-#
-# bundles always false on non-darwin. Would be better to
-# never even show the option on other platforms but making
-# AM_CONDITIONAL conditional confuses automake.
-#
-if test "x$IS_DARWIN" = "xtrue"; then
- bundles="false";
-fi
-
-AM_CONDITIONAL(ENABLE_BUNDLES, test x$bundles = xtrue)
-
-###################################################################
-#
-# --enable-myodbc3i
-#
-###################################################################
-AC_ARG_ENABLE( myodbc3i,
-[AC_HELP_STRING([--enable-myodbc3i],[Build myodbc installer command-line interface
[default=yes]])],
-[ case "${enableval}" in
- yes) myodbc3i=true ;;
- no) myodbc3i=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-myodbc3i) ;;
- esac],[myodbc3i=true])
-#
-# TO DO: Ensure we have libltdl.
-#
-
-AM_CONDITIONAL(MYODBCINST, test "x$myodbc3i" = "xtrue" )
-
-###################################################################
-#
-# --enable-myodbc3m
-#
-###################################################################
-AC_ARG_ENABLE( myodbc3m,
-[AC_HELP_STRING([--enable-myodbc3m],[Build myodbc command-line shell [default=yes]])],
-[ case "${enableval}" in
- yes) myodbc3m=true ;;
- no) myodbc3m=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-myodbc3m) ;;
- esac],[myodbc3m=true])
-#
-# TO DO: Ensure we have libltdl.
-#
-
-AM_CONDITIONAL(IMYODBC, test "x$myodbc3m" = "xtrue" )
-
-###################################################################
-#
-# option, cache_name, variable,
-# code to execute if yes, code to exectute if fail
-#
-###################################################################
-AC_DEFUN([AC_SYS_COMPILER_FLAG],
-[
- AC_MSG_CHECKING($1)
- OLD_CFLAGS="[$]CFLAGS"
- AC_CACHE_VAL(mysql_cv_option_$2,
- [
- CFLAGS="[$]OLD_CFLAGS $1"
- AC_TRY_RUN([int
main(){exit(0);}],mysql_cv_option_$2=yes,mysql_cv_option_$2=no,mysql_cv_option_$2=no)
- ])
- CFLAGS="[$]OLD_CFLAGS"
- if test x"[$]mysql_cv_option_$2" = "xyes" ; then
- $3="[$]$3 $1"
- AC_MSG_RESULT(yes)
- $5
- else
- AC_MSG_RESULT(no)
- $4
- fi
-])
-
-###################################################################
-#
-# arch, option, cache_name, variable
-#
-###################################################################
-AC_DEFUN([AC_SYS_CPU_COMPILER_FLAG],
-[
- if test "`uname -m 2>/dev/null`" = "$1" ; then
- AC_SYS_COMPILER_FLAG($2,$3,$4)
- fi
-])
-
-# os, option, cache_name, variable
-AC_DEFUN([AC_SYS_OS_COMPILER_FLAG],
-[
- if test "x$mysql_cv_sys_os" = "x$1" ; then
- AC_SYS_COMPILER_FLAG($2,$3,$4)
- fi
-])
-
-# We need some special hacks when running solaris
-AC_PATH_PROG(uname_prog, uname, no)
-
-# We should go through this and put all the explictly system dependent
-# stuff in one place
-AC_MSG_CHECKING(operating system)
-AC_CACHE_VAL(mysql_cv_sys_os,
-[
- if test "$uname_prog" != "no"; then
- mysql_cv_sys_os="`uname`"
- else
- mysql_cv_sys_os="Not Solaris"
- fi
-])
-AC_MSG_RESULT($mysql_cv_sys_os)
-
-# This should be rewritten to use $target_os
-case "$target_os" in
- sco3.2v5*)
- CFLAGS="$CFLAGS -DSCO"
- LD='$(CC) $(CFLAGS)'
- case "$CFLAGS" in
- *-belf*)
- AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[
- case "$LDFLAGS" in
- *-belf*) ;;
- *) echo "Adding -belf option to ldflags."
- LDFLAGS="$LDFLAGS -belf"
- ;;
- esac
- ])
- ;;
- *)
- AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[
- case "$LDFLAGS" in
- *-belf*) ;;
- *)
- echo "Adding -belf option to ldflags."
- LDFLAGS="$LDFLAGS -belf"
- ;;
- esac
- ])
- ;;
- esac
- ;;
- sysv5UnixWare*)
- if test "$GCC" != "yes"; then
- # We are using built-in inline function
- CFLAGS="$CFLAGS -Kalloca"
- fi
- ;;
- sysv5OpenUNIX8*)
- if test "$GCC" != "yes"; then
- # We are using built-in inline function
- CFLAGS="$CFLAGS -Kalloca"
- fi
- ;;
-esac
-
-AC_SUBST(CC)
-AC_SUBST(CFLAGS)
-AC_SUBST(LD)
-AC_SUBST(INSTALL_SCRIPT)
-
-export CC CFLAGS LD LDFLAGS
-
-#
-# Some system specific hacks
-#
-MAX_C_OPTIMIZE="-O3"
-case $SYSTEM_TYPE in
- *darwin*)
- if test "$ac_cv_prog_gcc" = "yes"
- then
- MAX_C_OPTIMIZE="-O"
- fi
- ;;
-esac
-
-# To avoid configure to fail when used with gcc 3.x along with
-# iodbc/unixodbc search path in system directories; add -isystem
-# to CFLAGS
-
-using_gcc_3x=no
-if test "$CC" = "gcc"
-then
- AC_MSG_CHECKING([if we are using gcc >= 3.x])
- gcc_version=`${CC} --version | head -n 1`
- case "$gcc_version" in
- "gcc (GCC) 3."*)
- using_gcc_3x=yes;
- esac
-
- if test "$using_gcc_3x" = "yes"
- then
- AC_MSG_RESULT([yes (${gcc_version})])
- else
- AC_MSG_RESULT([no (${gcc_version})])
- fi
-fi
-
-
-###################################################################
-# #
-# Check if localtime_r exists in libc or not #
-# #
-###################################################################
-
-AC_CHECK_LIB(c, localtime_r,
- [AC_DEFINE(HAVE_LOCALTIME_R, 1,
- [Define if we detected a localtime_r])
- ]
- )
-###################################################################
-# #
-# Perl existance (For Docs) #
-# #
-###################################################################
-AC_PATH_PROG(PERL, perl, no)
-if test "$PERL" != "no" && $PERL -e 'require 5' > /dev/null 2>&1
-then
- PERL5=$PERL
-else
- AC_PATH_PROG(PERL5, perl5, no)
- if test "$PERL5" != no
- then
- PERL=$PERL5
- ac_cv_path_PERL=$ac_cv_path_PERL5
- fi
-fi
-
-AC_SUBST(PERL)
-AC_SUBST(PERL5)
-
-###################################################################
-# #
-# Check if we want to link with thread safe client libraries #
-# #
-###################################################################
-# echo ""
-# echo "MySQL CONFIGURATION - CLIENT LIBS AND HEADERS"
-#
-# if test "x$thread" = "xtrue"; then
-# myodbc_thread_dir="driver_r"
-# myodbc_test_linklib="../driver_r/libmyodbc3_r.la"
-# AC_SUBST(myodbc_thread_dir)
-# else
- myodbc_test_linklib="../myodbc3/libmyodbc3.la"
-# fi
-
-###################################################################
-# #
-# Check for the client libraries and compile options #
-# Options are taken from the output of mysql_config #
-# #
-###################################################################
-
-AC_ARG_WITH(mysql-path,
-[ --with-mysql-path=DIR Path where MySQL is installed],
-mysql_path=$withval,mysql_path="")
-
-mysql_config=""
-if test "$mysql_path" != ""
-then
- mysql_config="$mysql_path/bin/mysql_config"
- if test ! -x $mysql_config
- then
- AC_MSG_ERROR([File $mysql_config doesn't exists or isn't executable. Please specify
with --with-mysql-path where bin/mysql_config can be found]);
- fi
-else
- # Search where mysql_config is installed
- TEST_PATHS="/usr/local/mysql /usr"
- for i in $TEST_PATHS
- do
- mysql_config="$i/bin/mysql_config"
- if test -x $mysql_config
- then
- break;
- fi
- mysql_config=""
- done
-
- if test "$mysql_config" = ""
- then
- AC_MSG_ERROR([Can't find mysql_config in $TEST_PATHS]);
- fi
-fi
-
-OPT=`$mysql_config --cflags`
-if test $? != "0"
-then
- AC_MSG_ERROR([Could not execute $mysql_config. Please check your installation])
-fi
-# We have to remove any ' around paths as this confuses configure
-OPT=`echo $OPT | sed -e "s;';;g"`
-CFLAGS="$CFLAGS $OPT"
-
-MYSQL_LIB=`$mysql_config --libs | sed -e "s;';;g"`
-OPT=`$mysql_config --libs_r`
-if test $? != "0"
-then
- # mysql_config that is before 4.0.17
- # In this case assume we can use the same compile options for the
- # thread safe library as for the normal
- OPT=`echo $MYSQL_LIB | sed -e 's;lmysqlclient;lmysqlclient_r;'`
-else
- OPT=`echo $OPT | sed -e "s;';;g"`
-fi
-MYSQL_THREADSAFE_LIB="$OPT"
-
-AC_SUBST(MYSQL_LIB)
-AC_SUBST(MYSQL_THREADSAFE_LIB)
-
-SAVE_LIBS=$LIBS
-LIBS="$LIBS $MYSQL_LIB"
-AC_CHECK_FUNC(mysql_real_query,[],
-[ AC_MSG_ERROR([Could not find compile MySQL single user test program. Please check
config.log for errors]) ])
-
-if test "x$gotthread" = "xyes"
-then
- LIBS="$LIBS $MYSQL_THREADSAFE_LIB"
- AC_CHECK_FUNC(mysql_real_query,[],
- [ AC_MSG_ERROR([Could not find compile MySQL single user test program. Please check
config.log for errors]) ])
-fi
-LIBS=$SAVE_LIBS
-
-echo "END OF MYSQL CONFIGURATION"
-echo ""
-echo "ODBC DRIVER MANAGER CONFIGURATION - LIBRARIES AND HEADERS"
-###################################################################
-# #
-# iODBC #
-# #
-###################################################################
-
-use_iODBC=no
-AC_ARG_WITH(iODBC,
-[ --with-iODBC[=DIR] Use iODBC located in DIR],
-[use_iODBC=yes;iODBC="$withval"],use_iODBC=no)
-
-if test "x$use_iODBC" = "xyes"
-then
-
-myodbc_link_dmlib="-liodbc"
-
-AC_ARG_WITH(iodbc-includes,
-[ --with-iodbc-includes=DIR Find iODBC headers in DIR],
-iodbc_includes="$withval",iodbc_includes="$iodbc/include")
-
-AC_ARG_WITH(iodbc-libs,
-[ --with-iodbc-libs=DIR Find iODBC libraries in DIR],
-iodbc_libs="$withval",iodbc_libs="$iodbc/lib")
-
-
-# if gcc 3.x used, and system search paths specified for
-# unixodbc / iodbc, then overcome the gcc error by specifying
-# -isystem
-
-if test "$using_gcc_3x" = "yes"
-then
- if test "x$iodbc" = "x/usr" ||
- test "x$iodbc" = "x/usr/" ||
- test "x$iodbc" = "x/usr/local" ||
- test "x$iodbc" = "x/usr/local/"
- then
- ODBC_FLAGS="-isystem"
- fi
-fi
-
-# add iodbc version
-AC_PATH_PROG(iodbc_conf,iodbc-config,no)
-if test "$iodbc_conf" != "no"
-then
- iodbc_version=`$iodbc_conf --version`
-else
- iodbc_version="unknown"
-fi
-AC_MSG_CHECKING([for iodbc version])
-AC_MSG_RESULT([$iodbc_version])
-
-AC_CHECK_IODBC($iodbc_includes,$iodbc_libs)
-
-AC_ARG_WITH(odbc-ini,
-[ --with-odbc-ini=PATH Location of system odbc.ini [IODBCDIR/etc/odbc.ini]],
-odbc_ini="$withval",odbc_ini="$iodbc/etc/odbc.ini")
-
-if test "x$have_iodbcinst" != "xyes"
-then
- AC_DEFINE_UNQUOTED(SYSTEM_ODBC_INI,"$odbc_ini",
- [Define path to system wide odbc.ini file])
-fi
-ODBC_DM_PATH="--with-iodbc=$iodbc"
-AC_SUBST(ODBC_DM_PATH)
-ODBC_DM_LIB="-liodbc"
-AC_SUBST(ODBC_DM_LIB)
-
-else
-
-###################################################################
-#
-# unixODBC
-#
-###################################################################
-
-AC_ARG_WITH(unixODBC,
-[ --with-unixODBC[=DIR] Use unixODBC located in DIR],
-unixODBC="$withval",unixODBC="/usr/local/")
-
-myodbc_link_dmlib="-lodbc"
-# add unixodbc version
-AC_PATH_PROG(isql,isql,no)
-if test "$isql" != "no"
-then
- unixodbc_version=`$isql --version`
-else
- unixodbc_version="unknown"
-fi
-AC_MSG_CHECKING([for unixODBC version])
-AC_MSG_RESULT([$unixodbc_version])
-
-# Default to /usr if not specified
-if test "x$unixODBC" = "x"
-then
- unixODBC="/usr";
-fi
-
-# if gcc 3.x used, and system search paths specified for
-# unixodbc / iodbc, then overcome the gcc error by specifying
-# -isystem
-
-if test "$using_gcc_3x" = "yes"
-then
- if test "x$unixODBC" = "x/usr" ||
- test "x$unixODBC" = "x/usr/" ||
- test "x$unixODBC" = "x/usr/local" ||
- test "x$unixODBC" = "x/usr/local/"
- then
- ODBC_FLAGS="-isystem"
- fi
-fi
-
-AC_ARG_WITH(unixODBC-includes,
-[ --with-unixODBC-includes=DIR Find unixODBC headers in DIR],
-unixODBC_includes="$withval",unixODBC_includes="$unixODBC/include")
-
-AC_ARG_WITH(unixODBC-libs,
-[ --with-unixODBC-libs=DIR Find unixODBC libraries in DIR],
-unixODBC_libs="$withval",unixODBC_libs="$unixODBC/lib")
-
-AC_CHECK_UNIXODBC($unixODBC_includes,$unixODBC_libs)
-
-AC_ARG_WITH(odbc-ini,
-[ --with-odbc-ini=PATH Location of system odbc.ini [UnixODBCDIR/etc/odbc.ini]],
-odbc_ini="$withval",odbc_ini="$unixODBC/etc/odbc.ini")
-
-if test "x$have_odbcinst" != "xyes"
-then
- AC_DEFINE_UNQUOTED(SYSTEM_ODBC_INI,"$odbc_ini",
- [Define path to system wide odbc.ini file])
-fi
-ODBC_DM_PATH="--with-unixODBC=$unixODBC"
-AC_SUBST(ODBC_DM_PATH)
-ODBC_DM_LIB="-lodbc"
-AC_SUBST(ODBC_DM_LIB)
-
-fi
-
-###################################################################
-# if we're working in an older odbc environment, #
-# we don't have the SQL* types, so we need to fall #
-# back to the old versions #
-###################################################################
-
-AC_CHECK_ODBC_TYPE(SQLHENV,HENV)
-AC_CHECK_ODBC_TYPE(SQLHDBC,HDBC)
-AC_CHECK_ODBC_TYPE(SQLHSTMT,HSTMT)
-
-AC_CHECK_ODBC_TYPE(SQLINTEGER,SDWORD)
-AC_CHECK_ODBC_TYPE(SQLUINTEGER,UDWORD)
-AC_CHECK_ODBC_TYPE(SQLSMALLINT,SWORD)
-AC_CHECK_ODBC_TYPE(SQLUSMALLINT,UWORD)
-
-AC_CHECK_ODBC_TYPE(SQLPOINTER,PTR)
-AC_CHECK_ODBC_TYPE(SQLHWND,HWND)
-
-AC_CHECK_ODBC_TYPE(SQLRETURN,RETCODE)
-
-AC_CHECK_ODBC_TYPE(SQLCHAR,UCHAR)
-
-###################################################################
-# #
-# Check and validate for odbc.ini #
-# #
-###################################################################
-
-if test "x$iodbc_ok" = "xyes" && test "x$have_iodbcinst" != "xyes"
-then
-cat <<EOF
-----------------------------------------------------------------
-Warning: using iODBC but libiodbcinst library not found.
-Enabling workaround, which will search for mysql datasource
-configuration as follows:
-
-1. \$ODBCINI, and if not found - \$HOME/.odbc.ini (User data sources)
-2. $odbc_ini (System data sources)
-
-If you want to change (2), re-run configure using the
- --with-odbc-ini=/some/other/path/odbc.ini
-option.
-----------------------------------------------------------------
-EOF
-fi
-
-echo "END OF DRIVER MANAGER CONFIGURATION"
-echo
-
-###################################################################
-# #
-# Build optimized or debug version ? #
-# #
-###################################################################
-if test "$ac_cv_prog_gcc" = "yes"
-then
- DEBUG_CFLAGS="-g"
- DEBUG_OPTIMIZE_CC="-O"
- OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
-else
- DEBUG_CFLAGS="-g"
- DEBUG_OPTIMIZE_CC=""
- OPTIMIZE_CFLAGS="-O"
-fi
-
-AC_MSG_CHECKING([if debug mode is enabled])
-AC_ARG_WITH(debug,
-[ --with-debug Build the debug version default=no],
- [with_debug=$withval],
- [with_debug=no])
-AC_MSG_RESULT([$with_debug])
-
-if test "$with_debug" = "yes" || test "$with_debug" = "full"
-then
- CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON $CFLAGS"
-else
- # Optimized version. No debug
- CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"
-fi
-AC_SUBST(CFLAGS)
-
-
-###################################################################
-# #
-# Build Samples ? #
-# #
-###################################################################
-
-myodbc_samples_dir="samples"
-AC_MSG_CHECKING([if building of samples is enabled])
-AC_ARG_WITH(samples,
-[ --with-samples Build the samples default=yes],
- [with_samples=$withval],
- [with_samples=yes]
- )
-AC_MSG_RESULT([$with_samples])
-
-if test "$with_samples" = "no"
-then
- myodbc_samples_dir=""
-fi
-AC_SUBST(myodbc_samples_dir)
-
-###################################################################
-# #
-# Add some extra LDFLAGS to the linking of the shared library #
-# #
-###################################################################
-
-AC_ARG_WITH(ldflags,
- [ --with-ldflags=option Extra arguments for linking. Normally -lmysqlclient],
- EXTRA_LDFLAGS="$withval",EXTRA_LDFLAGS="")
-AC_SUBST(EXTRA_LDFLAGS)
-LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
-
-###################################################################
-# #
-# Build test library ? #
-# #
-###################################################################
-
-AC_MSG_CHECKING([if building of test is enabled])
-AC_ARG_ENABLE(test,
-[AC_HELP_STRING([--enable-test],[Enable building of test library [default=yes]])],
- [ case "${enableval}" in
- yes) enable_test=yes ;;
- no) enable_test=no ;;
- *) AC_MSG_ERROR(bad value '${enableval}' for --enable-test);;
- esac
- ],[enable_test=yes])
- AC_MSG_RESULT([$enable_test])
-
-if test "x$enable_test" = "xyes"
-then
- myodbc_test_dir="test"
-fi
-AC_SUBST(myodbc_test_dir)
-
-###################################################################
-# #
-# Link test library againt Driver Manager supplied ? #
-# #
-###################################################################
-
-
-AC_MSG_CHECKING([if linking of test library is specified])
-AC_ARG_ENABLE(dmlink,
-[AC_HELP_STRING([--enable-dmlink],[Enable linking of test library againt supplied driver
manager [default=no]])],
- [ case "${enableval}" in
- yes) enable_dmlink=yes ;;
- no) enable_dmlink=no ;;
- *) AC_MSG_ERROR(bad value '${enableval}' for --enable-dmlink);;
- esac
- ],[enable_dmlink=no])
- AC_MSG_RESULT([$enable_dmlink])
-
-if test "x$enable_dmlink" = "xyes"
-then
- myodbc_test_linklib="$myodbc_link_dmlib"
-fi
-AC_SUBST(myodbc_test_linklib)
-
-
-echo
-###################################################################
-# #
-# Generate Makefiles #
-# #
-###################################################################
-
-AC_OUTPUT([
- Makefile
- MYODBCDbg/Makefile
- MYODBCDbg/MYODBCDbgLib/Makefile
- myodbc3u/Makefile
- myodbc3/Makefile
- myodbc3S/Makefile
- myodbc3c/Makefile
- myodbc3i/Makefile
- myodbc3m/Makefile
- samples/Makefile
- test/Makefile
- scripts/Makefile
-])
-
-echo
-echo "Success!!"
-echo " -------------------------------------------------------------------- "
-echo "| Remember to check the MyODBC FAQ for detailed installation and |"
-echo "| setup instructions from: |"
-echo "| http://www.mysql.com/products/myodbc/faq_toc.html |"
-echo "| |"
-echo "| MyODBC Home page: |"
-echo "| http://www.mysql.com/products/myodbc/ |"
-echo "| |"
-echo "| MySQL/MyODBC Mail archive: |"
-echo "| http://lists.mysql.com/ |"
-echo "| |"
-echo "| If you have any questions or improvements to driver, then send a |"
-echo "| detailed mail to 'myodbc@stripped' |"
-echo " -------------------------------------------------------------------- "
-echo
-
Deleted: connector-odbc3.vpj
===================================================================
--- connector-odbc3.vpj 2006-09-08 03:49:09 UTC (rev 71)
+++ connector-odbc3.vpj 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,115 +0,0 @@
-<!DOCTYPE Project SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpj.dtd">
-<Project
- Version="10.0"
- VendorName="SlickEdit"
- WorkingDir=".">
- <Config
- Name="Release"
- OutputFile=""
- CompilerConfigName="Latest Version">
- <Menu>
- <Target
- Name="Compile"
- MenuCaption="&Compile"
- CaptureOutputWith="ProcessBuffer"
- SaveOption="SaveCurrent"
- RunFromDir="%rw">
- <Exec/>
- </Target>
- <Target
- Name="Build"
- MenuCaption="&Build"
- CaptureOutputWith="ProcessBuffer"
- SaveOption="SaveWorkspaceFiles"
- RunFromDir="%rw">
- <Exec CmdLine="make"/>
- </Target>
- <Target
- Name="Rebuild"
- MenuCaption="&Rebuild"
- CaptureOutputWith="ProcessBuffer"
- SaveOption="SaveWorkspaceFiles"
- RunFromDir="%rw">
- <Exec/>
- </Target>
- <Target
- Name="Debug"
- MenuCaption="&Debug"
- SaveOption="SaveNone"
- RunFromDir="%rw">
- <Exec/>
- </Target>
- <Target
- Name="Execute"
- MenuCaption="E&xecute"
- SaveOption="SaveNone"
- RunFromDir="%rw">
- <Exec CmdLine='"root.exe"'/>
- </Target>
- </Menu>
- </Config>
- <Files>
- <Folder
- Name="Source Files"
- Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl"/>
- <Folder
- Name="Header Files"
- Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
- <F N="Build.sh"/>
- <F N="CreateMakefiles.sh"/>
- <F N="MYODBC_CONF.h"/>
- <F N="MYODBC_MYSQL.h"/>
- <F N="MYODBC_ODBC.h"/>
- <F N="RemoveMakefiles.sh"/>
- <F N="resource.h"/>
- <F N="VersionInfo.h"/>
- </Folder>
- <Folder
- Name="Resource Files"
- Filters="*.ico;*.cur;*.dlg"/>
- <Folder
- Name="Bitmaps"
- Filters="*.bmp">
- <F N="mysql.bmp"/>
- </Folder>
- <Folder
- Name="Other Files"
- Filters="">
- <F N="acinclude.m4"/>
- <F N="Build.bat"/>
- <F N="BUILD.osx"/>
- <F N="BUILD.unix"/>
- <F N="BUILD.win"/>
- <F N="ChangeLog"/>
- <F N="common.pri"/>
- <F N="config.pri"/>
- <F N="configure.in"/>
- <F N="COPYING"/>
- <F N="CreateBinaryMsi.bat"/>
- <F N="CreateBinaryZip.bat"/>
- <F N="CreateMakefiles.bat"/>
- <F N="CreateSourceZip.bat"/>
- <F N="CreateVisualStudioProjects.bat"/>
- <F N="defines.pri"/>
- <F N="EXCEPTIONS"/>
- <F N="INSTALL"/>
- <F N="Install.bat"/>
- <F N="INSTALL.win"/>
- <F N="LICENSE.commercial"/>
- <F N="LICENSE.exceptions"/>
- <F N="LICENSE.gpl"/>
- <F N="Makefile.am"/>
- <F N="Makefile.svn"/>
- <F N="mysql.pri"/>
- <F N="odbc.pri"/>
- <F N="PostBuildTest.bat"/>
- <F N="qt.m4"/>
- <F N="README"/>
- <F N="README.debug"/>
- <F N="README.dist"/>
- <F N="root.pro"/>
- <F N="Uninstall.bat"/>
- <F N="Upgrade.bat"/>
- </Folder>
- </Files>
-</Project>
Deleted: connector-odbc3.vpw
===================================================================
--- connector-odbc3.vpw 2006-09-08 03:49:09 UTC (rev 71)
+++ connector-odbc3.vpw 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,28 +0,0 @@
-<!DOCTYPE Workspace SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpw.dtd">
-<Workspace Version="10.0" VendorName="SlickEdit">
- <Projects>
- <Project File="connector-odbc3.vpj" />
- <Project File="dltest/dltest.vpj" />
- <Project File="../connector-odbc/trunk/examples/CPP/ADO/exampleADO.vpj" />
- <Project File="myodbc3/myodbc3.vpj" />
- <Project File="myodbc3c/myodbc3c.vpj" />
- <Project File="myodbc3i/myodbc3i.vpj" />
- <Project File="myodbc3m/myodbc3m.vpj" />
- <Project File="myodbc3S/myodbc3S.vpj" />
- <Project File="myodbc3u/myodbc3u.vpj" />
- <Project File="MYODBCBrw/MYODBCBrw.vpj" />
- <Project File="MYODBCBrw/MYODBCBrwApp/MYODBCBrwApp.vpj" />
- <Project File="MYODBCBrw/MYODBCBrwLib/MYODBCBrwLib.vpj" />
- <Project File="MYODBCCls/MYODBCCls.vpj" />
- <Project File="MYODBCCls/MYODBCClsApp/MYODBCClsApp.vpj" />
- <Project File="MYODBCCls/MYODBCClsLib/MYODBCClsLib.vpj" />
- <Project File="MYODBCDbg/MYODBCDbg.vpj" />
- <Project File="MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.vpj" />
- <Project File="MYQTODBCCls/MYQTODBCCls.vpj" />
- <Project File="MYQTODBCCls/MYQTODBCClsApp/MYQTODBCClsApp.vpj" />
- <Project File="MYQTODBCCls/MYQTODBCClsLib/MYQTODBCClsLib.vpj" />
- <Project File="../mysql-include.vpj" />
- <Project File="scripts/scripts.vpj" />
- <Project File="test/test.vpj" />
- </Projects>
-</Workspace>
Deleted: defines.pri
===================================================================
--- defines.pri 2006-09-08 03:49:09 UTC (rev 71)
+++ defines.pri 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,38 +0,0 @@
-# #########################################################
-#
-# \brief These settings are used when building
-# Connector/ODBC using the qmake utility.
-#
-# Edit these settings before using qmake to
-# generate the Makefiles.
-#
-# \sa config.pri
-#
-# #########################################################
-
-DEFINES += SETUP_VERSION=\"3.51.13\"
-
-win32 {
- DEFINES -= UNICODE
-}
-
-#
-# LDFLAGS was brought in to get -ldl for Solaris 8 build
-#
-unix {
- DEFINES += _UNIX_
- LIBS += $(LDFLAGS)
-}
-
-# #########################################################
-# Define DBUG_OFF to leave trace code out of the build. The
-# default is to include the trace code.
-# #########################################################
-DEFINES += DBUG_OFF
-
-# #########################################################
-# Define the ammount of output from post-build tests. The
-# higher the number the more output.
-# #########################################################
-DEFINES += DEBUG_LEVEL=2
-
Deleted: depcomp
===================================================================
--- depcomp 2006-09-08 03:49:09 UTC (rev 71)
+++ depcomp 2006-09-08 03:53:31 UTC (rev 72)
@@ -1,411 +0,0 @@
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@stripped>.
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
-fi
-# `libtool' can also be set to `yes' or `no'.
-
-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags. We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write. Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
- # HP compiler uses -M and no extra arg.
- gccflag=-M
- depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want. Yay! Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff. Hmm.
- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- mv "$tmpdepfile" "$depfile"
- ;;
-
-gcc)
-## There are various ways to get dependency output from gcc. Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-## up in a subdir. Having to rename by hand is ugly.
-## (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-## than renaming).
- if test -z "$gccflag"; then
- gccflag=-MD,
- fi
- "$@" -Wp,"$gccflag$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
- sed -e 's/^[^:]*: / /' \
- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header). We avoid this by adding
-## dummy dependencies for each header file. Too bad gcc doesn't do
-## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
-sgi)
- if test "$libtool" = yes; then
- "$@" "-Wp,-MDupdate,$tmpdepfile"
- else
- "$@" -MDupdate "$tmpdepfile"
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
-
- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
- echo "$object : \\" > "$depfile"
-
- # Clip off the initial element (the dependent). Don't try to be
- # clever and replace this with sed code, as IRIX sed won't handle
- # lines with more than a fixed number of characters (4096 in
- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
- # dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> $depfile
- echo >> $depfile
-
- # The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> $depfile
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-aix)
- # The C for AIX Compiler uses -M and outputs the dependencies
- # in a .u file. This file always lives in the current directory.
- # Also, the AIX compiler puts `$object:' at the start of each line;
- # $object doesn't have directory information.
- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
- outname="$stripped.o"
- if test "$libtool" = yes; then
- "$@" -Wc,-M
- else
- "$@" -M
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
-
- if test -f "$tmpdepfile"; then
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-tru64)
- # The Tru64 AIX compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
-
- tmpdepfile1="$object.d"
- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
- if test "$libtool" = yes; then
- "$@" -Wc,-MD
- else
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
- exit $stat
- fi
-
- if test -f "$tmpdepfile1"; then
- tmpdepfile="$tmpdepfile1"
- else
- tmpdepfile="$tmpdepfile2"
- fi
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a space and a tab in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-#nosideeffect)
- # This comment above is used by automake to tell side-effect
- # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
- # Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
- test -z "$dashmflag" && dashmflag=-M
- ( IFS=" "
- case " $* " in
- *" --mode=compile "*) # this is libtool, let us make it quiet
- for arg
- do # cycle over the arguments
- case "$arg" in
- "--mode=compile")
- # insert --quiet before "--mode=compile"
- set fnord "$@" --quiet
- shift # fnord
- ;;
- esac
- set fnord "$@" "$arg"
- shift # fnord
- shift # "$arg"
- done
- ;;
- esac
- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
- ) &
- proc=$!
- "$@"
- stat=$?
- wait "$proc"
- if test "$stat" != 0; then exit $stat; fi
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-dashXmstdout)
- # This case only exists to satisfy depend.m4. It is never actually
- # run, as this mode is specially recognized in the preamble.
- exit 1
- ;;
-
-makedepend)
- # X makedepend
- (
- shift
- cleared=no
- for arg in "$@"; do
- case $cleared in no)
- set ""; shift
- cleared=yes
- esac
- case "$arg" in
- -D*|-I*)
- set fnord "$@" "$arg"; shift;;
- -*)
- ;;
- *)
- set fnord "$@" "$arg"; shift;;
- esac
- done
- obj_suffix="`echo $object | sed 's/^.*\././'`"
- touch "$tmpdepfile"
- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
- ) &
- proc=$!
- "$@"
- stat=$?
- wait "$proc"
- if test "$stat" != 0; then exit $stat; fi
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- tail +3 "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile" "$tmpdepfile".bak
- ;;
-
-cpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
- ( IFS=" "
- case " $* " in
- *" --mode=compile "*)
- for arg
- do # cycle over the arguments
- case $arg in
- "--mode=compile")
- # insert --quiet before "--mode=compile"
- set fnord "$@" --quiet
- shift # fnord
- ;;
- esac
- set fnord "$@" "$arg"
- shift # fnord
- shift # "$arg"
- done
- ;;
- esac
- "$@" -E |
- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
- ) &
- proc=$!
- "$@"
- stat=$?
- wait "$proc"
- if test "$stat" != 0; then exit $stat; fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- cat < "$tmpdepfile" >> "$depfile"
- sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
- ( IFS=" "
- case " $* " in
- *" --mode=compile "*)
- for arg
- do # cycle over the arguments
- case $arg in
- "--mode=compile")
- # insert --quiet before "--mode=compile"
- set fnord "$@" --quiet
- shift # fnord
- ;;
- esac
- set fnord "$@" "$arg"
- shift # fnord
- shift # "$arg"
- done
- ;;
- esac
- "$@" -E |
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort |
uniq > "$tmpdepfile"
- ) &
- proc=$!
- "$@"
- stat=$?
- wait "$proc"
- if test "$stat" != 0; then exit $stat; fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-none)
- exec "$@"
- ;;
-
-*)
- echo "Unknown depmode $depmode" 1>&2
- exit 1
- ;;
-esac
-
-exit 0
Copied: trunk/BUILD.osx (from rev 70, BUILD.osx)
Copied: trunk/BUILD.unix (from rev 70, BUILD.unix)
Copied: trunk/BUILD.win (from rev 70, BUILD.win)
Copied: trunk/Build.bat (from rev 70, Build.bat)
Copied: trunk/Build.sh (from rev 70, Build.sh)
Copied: trunk/COPYING (from rev 70, COPYING)
Copied: trunk/ChangeLog (from rev 70, ChangeLog)
Copied: trunk/CreateBinaryMsi.bat (from rev 70, CreateBinaryMsi.bat)
Copied: trunk/CreateBinaryZip.bat (from rev 70, CreateBinaryZip.bat)
Copied: trunk/CreateMakefiles.bat (from rev 70, CreateMakefiles.bat)
Copied: trunk/CreateMakefiles.sh (from rev 70, CreateMakefiles.sh)
Copied: trunk/CreateSourceZip.bat (from rev 70, CreateSourceZip.bat)
Copied: trunk/CreateVisualStudioProjects.bat (from rev 70, CreateVisualStudioProjects.bat)
Copied: trunk/acconfig.h (from rev 70, acconfig.h)
Copied: trunk/acinclude.m4 (from rev 70, acinclude.m4)
Copied: trunk/common.pri (from rev 70, common.pri)
Copied: trunk/config.pri (from rev 70, config.pri)
Copied: trunk/configure.in (from rev 70, configure.in)
Copied: trunk/connector-odbc3.vpj (from rev 70, connector-odbc3.vpj)
Copied: trunk/connector-odbc3.vpw (from rev 70, connector-odbc3.vpw)
Copied: trunk/defines.pri (from rev 70, defines.pri)
Copied: trunk/depcomp (from rev 70, depcomp)
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r72 - / trunk | pharvey | 8 Sep |
