[prev in list] [next in list] [prev in thread] [next in thread]
List: mysql-odbc
Subject: bk commit - MyODBC 3.51 (1.511)
From: pharvey () mysql ! com
Date: 2005-09-21 5:19:50
Message-ID: 200509210519.j8L5JoEi011403 () sun ! codebydesign ! com
[Download RAW message or body]
Below is the list of changes that have just been commited into a local
MyODBC 3.51 repository of 'pharvey'. When 'pharvey' does a push, they will
be propogaged to the main repository and within 2 hours after the push
into the public repository.
For more information on how to access the public repository see:
http://www.mysql.com/products/myodbc/faq_2.html#Development_source
You can also browse the changes from public repository:
Complete repository: http://mysql.bkbits.net:8080/myodbc3/
This changeset : http://mysql.bkbits.net:8080/myodbc3/cset@1.511
ChangeSet
1.511 05/09/20 22:19:42 pharvey@sun.codebydesign.com +11 -0
- updates to pro files
util/util.pro
1.10 05/09/20 22:19:19 pharvey@sun.codebydesign.com +4 -6
- updates to pro files
setup/setup.pro
1.26 05/09/20 22:19:19 pharvey@sun.codebydesign.com +5 -13
- updates to pro files
myodbcinst/myodbcinst.pro
1.7 05/09/20 22:19:19 pharvey@sun.codebydesign.com +6 -7
- updates to pro files
imyodbc/imyodbc.pro
1.5 05/09/20 22:19:19 pharvey@sun.codebydesign.com +3 -5
- updates to pro files
driver/driver.pro
1.5 05/09/20 22:19:19 pharvey@sun.codebydesign.com +2 -9
- updates to pro files
dltest/dltest.pro
1.4 05/09/20 22:19:19 pharvey@sun.codebydesign.com +0 -1
- updates to pro files
dltest/dltest.c
1.4 05/09/20 22:19:19 pharvey@sun.codebydesign.com +1 -1
- updates to pro files
MYODBCConfig/MYODBCConfig.pro
1.16 05/09/20 22:19:19 pharvey@sun.codebydesign.com +7 -7
- updates to pro files
odbc.qmake
1.1 05/09/20 15:19:43 pharvey@sun.codebydesign.com +43 -0
odbc.qmake
1.0 05/09/20 15:19:43 pharvey@sun.codebydesign.com +0 -0
BitKeeper file /home/pharvey/SandBox/64/myodbc-3.51/odbc.qmake
CreateMakefiles.sh
1.1 05/09/20 14:28:50 pharvey@sun.codebydesign.com +62 -0
Build.sh
1.1 05/09/20 14:28:50 pharvey@sun.codebydesign.com +51 -0
CreateMakefiles.sh
1.0 05/09/20 14:28:50 pharvey@sun.codebydesign.com +0 -0
BitKeeper file /home/pharvey/SandBox/64/myodbc-3.51/CreateMakefiles.sh
Build.sh
1.0 05/09/20 14:28:50 pharvey@sun.codebydesign.com +0 -0
BitKeeper file /home/pharvey/SandBox/64/myodbc-3.51/Build.sh
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: pharvey
# Host: sun.codebydesign.com
# Root: /home/pharvey/SandBox/64/myodbc-3.51
--- 1.15/MYODBCConfig/MYODBCConfig.pro 2005-08-22 02:27:52 -07:00
+++ 1.16/MYODBCConfig/MYODBCConfig.pro 2005-09-20 22:19:19 -07:00
@@ -22,14 +22,15 @@
include( ../config.qmake )
CONFIG += qt
include( ../defines.qmake )
+include( ../odbc.qmake )
+
INCLUDEPATH += ../util ../setup
# #########################################################
# WIN32
# #########################################################
win32 {
-# DEFINES += WIN32
- LIBS += user32.lib ..\util\myodbcutil.lib odbc32.lib odbccp32.lib \
..\lib\myodbc3S.lib + LIBS += user32.lib ..\util\myodbcutil.lib \
..\lib\myodbc3S.lib # RC_FILE += MYODBCConfig.rc
}
@@ -38,7 +39,7 @@
# #########################################################
unix {
INCLUDEPATH += ../util ../setup /usr/include
- LIBS += -L../util -lmyodbcutil -L/usr/lib -L/usr/local/lib \
-lodbc -lodbcinst + LIBS += -L../util -lmyodbcutil
}
# #########################################################
@@ -50,10 +51,9 @@
# in the file system (for example; /Applications/Utilities).
# #########################################################
mac {
- DEFINES -= HAVE_ODBCINST_H
- DEFINES += HAVE_IODBCINST_H
- LIBS -= -lodbc -lodbcinst -lmyodbc3S
- LIBS += -liodbc -liodbcinst
+# DEFINES -= HAVE_ODBCINST_H
+# DEFINES += HAVE_IODBCINST_H
+ LIBS -= -lmyodbc3S
LIBS += -lltdl -framework Carbon -framework QuickTime -lz \
-framework OpenGL -framework AGL -lz RC_FILE = MYODBCConfig.icns
}
--- 1.3/dltest/dltest.c 2005-08-21 14:01:04 -07:00
+++ 1.4/dltest/dltest.c 2005-09-20 22:19:19 -07:00
@@ -1,6 +1,6 @@
-
#include <stdio.h>
#include <stdlib.h>
+
#ifdef _UNIX_
#include <ltdl.h>
#else
--- 1.25/setup/setup.pro 2005-08-22 02:27:52 -07:00
+++ 1.26/setup/setup.pro 2005-09-20 22:19:19 -07:00
@@ -28,21 +28,22 @@
TEMPLATE = lib
TARGET = myodbc3S
DESTDIR = ../lib
-!win32:VERSION = 3.51.12
UI_DIR = .tmp
MOC_DIR = .tmp
OBJECTS_DIR = .tmp
# LANGUAGE = C++
# CPP_ALWAYS_CREATE_SOURCE = TRUE
include( ../config.qmake )
-CONFIG += qt plugin
+# CONFIG += qt plugin
+CONFIG += dll
include( ../defines.qmake )
+include( ../odbc.qmake )
# #########################################################
# WIN
# #########################################################
win32 {
- LIBS += user32.lib odbc32.lib odbccp32.lib \
../util/myodbcutil.lib + LIBS += user32.lib \
../util/myodbcutil.lib # LIBS += /VERBOSE:LIB
DEF_FILE = myodbc3S.def
RC_FILE = myodbc3S.rc
@@ -52,26 +53,17 @@
# #########################################################
# UNIX
-# Your preference should be to use the GNU auto-build
-# on unix - but this will do as alternative.
# #########################################################
unix {
-# DEFINES += HAVE_CONFIG_H
- INCLUDEPATH += /usr/include
- LIBS += -L../util -lmyodbcutil -L/usr/lib -lodbc \
-lodbcinst + LIBS += -L../util -lmyodbcutil
libraries.path = /usr/lib
libraries.files = libmyodbc*
}
# #########################################################
# OSX
-# Your preference should be to use the GNU auto-build
-# on OSX - but this will do as alternative.
# #########################################################
mac {
- CONFIG -= thread
- LIBS -= -lodbc -lodbcinst
- LIBS += -liodbc -liodbcinst
libraries.path = /usr/lib
libraries.files = libmyodbc3S.dylib
}
--- 1.3/dltest/dltest.pro 2005-08-25 00:06:32 -07:00
+++ 1.4/dltest/dltest.pro 2005-09-20 22:19:19 -07:00
@@ -32,7 +32,6 @@
# UNIX
# #########################################################
unix {
- DEFINES += _UNIX_
LIBS += -lltdl
}
--- 1.4/driver/driver.pro 2005-08-25 00:06:32 -07:00
+++ 1.5/driver/driver.pro 2005-09-20 22:19:19 -07:00
@@ -32,6 +32,7 @@
include( ../config.qmake )
CONFIG += plugin
include( ../defines.qmake )
+include( ../odbc.qmake )
include( ../mysql.qmake )
# Set TARGET based upon what we pickup in config.qmake
@@ -61,7 +62,6 @@
DEFINES += __WIN__ ENGLISH MYODBC_EXPORTS _USERDLL \
DONT_DEFINE_VOID LIBS += user32.lib advapi32.lib wsock32.lib
- LIBS += odbc32.lib odbccp32.lib
DEF_FILE = myodbc3.def
RC_FILE = myodbc3.rc
libraries.path = /windows/system32
@@ -71,26 +71,19 @@
# #########################################################
# UNIX
-# Your preference should be to use the GNU auto-build
-# on unix - but this will do as alternative.
# #########################################################
unix {
# DEFINES += HAVE_CONFIG_H
INCLUDEPATH += /usr/include
- LIBS += -L../util -lmyodbcutil -L/usr/lib -lodbc \
-lodbcinst -lltdl + LIBS += -L../util -lmyodbcutil -lltdl
libraries.path = /usr/lib
libraries.files = libmyodbc*
}
# #########################################################
# OSX
-# Your preference should be to use the GNU auto-build
-# on OSX - but this will do as alternative.
# #########################################################
mac {
- CONFIG -= thread
- LIBS -= -lodbc -lodbcinst
- LIBS += -liodbc -liodbcinst
libraries.path = /usr/lib
libraries.files = libmyodbc3.dylib
}
--- 1.4/imyodbc/imyodbc.pro 2005-08-21 22:02:03 -07:00
+++ 1.5/imyodbc/imyodbc.pro 2005-09-20 22:19:19 -07:00
@@ -20,28 +20,26 @@
include( ../config.qmake )
CONFIG += console
include( ../defines.qmake )
+include( ../odbc.qmake )
# #########################################################
# WIN
# #########################################################
win32 {
- LIBS += ..\util\myodbcutil.lib odbc32.lib odbccp32.lib
+ LIBS += ..\util\myodbcutil.lib
}
# #########################################################
# UNIX
# #########################################################
unix {
- LIBS += -L../util -lmyodbcutil -L/usr/lib -lodbc -lodbcinst
+ LIBS += -L../util -lmyodbcutil
}
# #########################################################
# OSX
# #########################################################
mac {
- CONFIG -= thread
- LIBS -= -lodbc -lodbcinst
- LIBS += -liodbc -liodbcinst
}
# #########################################################
--- 1.6/myodbcinst/myodbcinst.pro 2005-08-21 22:02:03 -07:00
+++ 1.7/myodbcinst/myodbcinst.pro 2005-09-20 22:19:19 -07:00
@@ -24,30 +24,29 @@
include( ../config.qmake )
CONFIG += console
include( ../defines.qmake )
+include( ../odbc.qmake )
# #########################################################
# WIN
# #########################################################
win32 {
- LIBS += user32.lib ..\util\myodbcutil.lib odbc32.lib \
odbccp32.lib + LIBS += user32.lib ..\util\myodbcutil.lib
}
# #########################################################
# UNIX
# #########################################################
unix {
- LIBS += -L../util -lmyodbcutil -L/usr/lib -lodbc -lodbcinst \
-lltdl + LIBS += -L../util -lmyodbcutil -lltdl
}
# #########################################################
# OSX
# #########################################################
mac {
- CONFIG -= thread
- DEFINES -= HAVE_ODBCINST_H
- DEFINES += HAVE_IODBCINST_H
- LIBS -= -lodbc -lodbcinst
- LIBS += -liodbc -liodbcinst
+# CONFIG -= thread
+# DEFINES -= HAVE_ODBCINST_H
+# DEFINES += HAVE_IODBCINST_H
}
# #########################################################
--- 1.9/util/util.pro 2005-08-19 02:28:47 -07:00
+++ 1.10/util/util.pro 2005-09-20 22:19:19 -07:00
@@ -27,30 +27,28 @@
DESTDIR = ./
OBJECTS_DIR = .tmp
include( ../config.qmake )
-CONFIG += staticlib console
+# CONFIG += staticlib console
+# plugin needed on sparc64 to get relocatable code in a static lib
+CONFIG += staticlib plugin
include( ../defines.qmake )
+include( ../odbc.qmake )
# #########################################################
# WIN
# #########################################################
win32 {
- LIBS += odbc32.lib odbccp32.lib
}
# #########################################################
# UNIX
# #########################################################
unix {
- LIBS += -L/usr/lib -lodbc -lodbcinst
}
# #########################################################
# OSX
# #########################################################
mac {
- CONFIG -= thread
- LIBS -= -lodbc -lodbcinst
- LIBS += -liodbc -liodbcinst
}
# #########################################################
--- New file ---
+++ Build.sh 05/09/20 14:28:50
ECHO OFF
REM #########################################################
REM
REM \brief Make the sources.
REM
REM This exists as a temp solution to a problem with qmake
REM generated Makefile.
REM
REM Normally running 'qmake' and 'make' from the source root
REM would work fine but until the qmake pro file for the
REM driver is working we can use this to automate the build.
REM
REM This should not be required in platforms other than
REM MS Windows.
REM
REM \note WARNING: This will do a;
REM
REM "del /Q /F \Windows\System32\MYODBC*.*"
REM
REM \note If you do not have a 'make' then copy nmake to make.
REM
REM #########################################################
ECHO ****
ECHO * Removing libraries and executables to force relink...
ECHO ****
rmdir /Q /S lib
rmdir /Q /S bin
del /Q /F \Windows\System32\*myodbc*.*
REM Invoke qmake - without relying upon its mechanism to dive into sub dirs.
CALL CreateMakefiles.bat
ECHO ****
ECHO * Making the libraries and executables...
ECHO ****
ECHO Make...
make
ECHO ****
ECHO * Replacing the registered files with our newly built files...
ECHO ****
copy lib\myodbc3S.dll \Windows\System32
copy lib\myodbc3S.lib \Windows\System32
copy lib\myodbc3.dll \Windows\System32
copy lib\myodbc3.lib \Windows\System32
copy bin\myodbc3i.exe \Windows\System32
copy bin\myodbc3m.exe \Windows\System32
copy bin\myodbc3c.exe \Windows\System32
--- New file ---
+++ CreateMakefiles.sh 05/09/20 14:28:50
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 dltest...
cd dltest
qmake
cd ..
ECHO util...
cd util
qmake
cd ..
ECHO setup...
cd setup
qmake
cd ..
ECHO myodbcinst...
cd myodbcinst
qmake
cd ..
ECHO imyodbc...
cd imyodbc
qmake
cd ..
ECHO MYODBCConfig...
cd MYODBCConfig
qmake
cd ..
ECHO driver...
cd driver
qmake
cd ..
--- New file ---
+++ odbc.qmake 05/09/20 15:19:43
# #########################################################
#
# \brief These settings are used when building
# Connector/ODBC using the qmake utility.
#
# Edit these settings before using qmake to
# generate the Makefiles.
#
# \note The plan is to generate this file using a
# qconfigure.bat/qconfigure at some point in
# the future.
#
# \sa defines.qmake
# config.qmake
# mysql.qmake
#
# #########################################################
# #########################################################
# WIN32
# #########################################################
win32 {
LIBS += odbc32.lib odbccp32.lib
}
# #########################################################
# UNIX
# #########################################################
unix {
INCLUDEPATH += $UNIXODBC_DIR/include
LIBS += -L$UNIXODBC_DIR/lib -lodbc -lodbcinst
}
# #########################################################
# OSX
# #########################################################
mac {
LIBS -= -lodbc -lodbcinst
LIBS += -liodbc -liodbcinst
}
--
MySQL ODBC Mailing List
For list archives: http://lists.mysql.com/myodbc
To unsubscribe: http://lists.mysql.com/myodbc?unsub=mysql-odbc@progressive-comp.com
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic