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 [at] 1.452
ChangeSet
1.452 05/01/31 23:30:49 pharvey [at] mysql.com +10 -0
- looks like the final changes for 3.51.11-1 for OSX
osx/MyODBC/root/usr/lib/BillOfMaterials.txt
1.2 05/01/31 23:30:49 pharvey [at] mysql.com +2 -11
- looks like the final changes for 3.51.11-1 for OSX
osx/MyODBC/resources/postinstall
1.3 05/01/31 23:30:49 pharvey [at] mysql.com +4 -3
- looks like the final changes for 3.51.11-1 for OSX
osx/MyODBC/resources/ReadMe.html
1.4 05/01/31 23:30:49 pharvey [at] mysql.com +1 -1
- looks like the final changes for 3.51.11-1 for OSX
osx/MyODBC/resources/License.html
1.4 05/01/31 23:30:48 pharvey [at] mysql.com +1 -1
- looks like the final changes for 3.51.11-1 for OSX
osx/MyODBC/mac-install.pmsp
1.2 05/01/31 23:30:48 pharvey [at] mysql.com +16 -15
- looks like the final changes for 3.51.11-1 for OSX
SandBox/index.sh
1.4 05/01/31 23:30:48 pharvey [at] mysql.com +1 -1
- looks like the final changes for 3.51.11-1 for OSX
SandBox/config.sh
1.6 05/01/31 23:30:48 pharvey [at] mysql.com +8 -17
- looks like the final changes for 3.51.11-1 for OSX
SandBox/OSX/10.3/ppc/64/package-MyODBC/Build.sh
1.2 05/01/31 23:30:48 pharvey [at] mysql.com +35 -7
- looks like the final changes for 3.51.11-1 for OSX
SandBox/OSX/10.3/ppc/64/index.sh
1.2 05/01/31 23:30:48 pharvey [at] mysql.com +0 -7
- looks like the final changes for 3.51.11-1 for OSX
SandBox/OSX/10.3/ppc/64/config.sh
1.2 05/01/31 23:30:48 pharvey [at] mysql.com +0 -8
- looks like the final changes for 3.51.11-1 for OSX
# 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: g5.local
# Root: /Users/pharvey/SandBox/MySQL/myodbc-3.51
--- 1.5/SandBox/config.sh 2005-01-21 21:48:55 -08:00
+++ 1.6/SandBox/config.sh 2005-01-31 23:30:48 -08:00
[at] [at] -1,4 +1,4 [at] [at]
-#!/usr/bin/sh
+#!/bin/sh
#
# CONFIG
[at] [at] -9,40 +9,31 [at] [at]
# MY_OS - The O/S to build for. Can be;
# * Solaris
# * OSX
-# * HPUX
# MY_OS_VER - The O/S version to build for. Can be;
# * Solaris
# * 8
# * 9
# * OSX
# * 10.3
-# * HPUX
-# * 11
-# * 11.11
# MY_CPU - The CPU to build for. Can be;
# * Solaris
# * Sparc
# * Intel
# * OSX
# * ppc
-# * HPUX
-# * hppa2
# MY_BITS - 32 or 64 bit binary
# * 32
# * 64
# MY_COMPILER - denotes tool set
# * SunStudio8
-# * SunStudio9
# * xcode
-# * aCC
-# * gnu
#
-MY_BUILD_DIR=$HOME/MyODBC/3.51.10/SandBox
-MY_OS=HPUX
-MY_OS_VER=11.11
-MY_CPU=hppa2
+MY_BUILD_DIR=$HOME/MyODBC/3.51.11/SandBox
+MY_OS=OSX
+MY_OS_VER=10.3
+MY_CPU=ppc
MY_BITS=64
-MY_COMPILER=aCC
+MY_COMPILER=xcode
export MY_BUILD_DIR MY_OS MY_OS_VER MY_CPU MY_BITS MY_COMPILER
#
[at] [at] -54,9 +45,9 [at] [at]
#
MY_LIBTOOL_VER=1.5.10
MY_IODBC_VER=3.51.2
-MY_QT_VER=3.3.2
+MY_QT_VER=3.3.3
MY_UNIXODBC_VER=2.2.10
MY_SQL_VER=4.1.9
-MY_ODBC_VER=3.51.10
+MY_ODBC_VER=3.51.11
export MY_LIBTOOL_VER MY_IODBC_VER MY_QT_VER MY_UNIXODBC_VER MY_SQL_VER MY_ODBC_VER
--- 1.3/SandBox/index.sh 2005-01-21 21:48:55 -08:00
+++ 1.4/SandBox/index.sh 2005-01-31 23:30:48 -08:00
[at] [at] -1,4 +1,4 [at] [at]
-#!/usr/bin/sh
+#!/bin/sh
# CONFIG
#
Binary files /Users/pharvey/SandBox/MySQL/myodbc-3.51/BitKeeper/tmp/bk_ma c-install.pmsp-1.1_EvLoFV and /Users/pharvey/SandBox/MySQL/myodbc-3.51/BitKeeper/tmp/bk_ma c-install.pmsp-1.2_mXbNRD differ
--- 1.1/SandBox/OSX/10.3/ppc/64/config.sh 2004-11-21 08:23:01 -08:00
+++ 1.2/SandBox/OSX/10.3/ppc/64/config.sh 2005-01-31 23:30:48 -08:00
[at] [at] -6,11 +6,3 [at] [at]
MY_PATH_ORIG=$PATH
MY_LD_LIBRARY_PATH_ORIG=$LD_LIBRARY_PATH
-#
-# CONFIG - Qt
-#
-QTDIR=$MY_BUILD_DIR/$MY_OS/$MY_OS_VER/$MY_CPU/$MY_BITS/Qt
-PATH=$QTDIR/bin:$PATH
-LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
-export QTDIR PATH LD_LIBRARY_PATH
-
--- 1.1/SandBox/OSX/10.3/ppc/64/index.sh 2004-11-21 08:23:01 -08:00
+++ 1.2/SandBox/OSX/10.3/ppc/64/index.sh 2005-01-31 23:30:48 -08:00
[at] [at] -13,13 +13,6 [at] [at]
#./index.sh
#
-# CREATE QT RUN-TIME DISTRO
-#
-#cd $MY_BUILD_DIR/$MY_OS/$MY_OS_VER/$MY_CPU/$MY_BITS/package-Qt
-#pwd
-#./index.sh
-
-#
# BUILD MySQL
#
#cd $MY_BUILD_DIR/$MY_OS/$MY_OS_VER/$MY_CPU/$MY_BITS/package-MyS QL
--- 1.1/SandBox/OSX/10.3/ppc/64/package-MyODBC/Build.sh 2004-11-21 08:23:20 -08:00
+++ 1.2/SandBox/OSX/10.3/ppc/64/package-MyODBC/Build.sh 2005-01-31 23:30:48 -08:00
[at] [at] -3,18 +3,43 [at] [at]
#
# ADD iODBC CONFIG HEADER
#
-CFLAGS="$CFLAGS -I$MY_IODBC_INST_DIR/include"
-CXXFLAGS="$CXXFLAGS -I$MY_IODBC_INST_DIR/include"
-export CFLAGS CXXFLAGS
+#CFLAGS="$CFLAGS -I$MY_IODBC_INST_DIR/include"
+#CXXFLAGS="$CXXFLAGS -I$MY_IODBC_INST_DIR/include"
+#export CFLAGS CXXFLAGS
#
# BUILD - MyODBC
#
cd $MY_ODBC_BUILD_DIR
pwd
-./configure --prefix=$MY_ODBC_INST_DIR --disable-gui --enable-bundles --with-mysql-path=$MY_SQL_INST_DIR --enable-thread-safe --disable-gui --enable-myodbcinst --enable-imyodbc --disable-test --without-samples
+./configure --prefix=$MY_ODBC_INST_DIR --with-iODBC=/usr --enable-bundles --with-mysql-path=$MY_SQL_INST_DIR --enable-thread-safe --disable-gui --disable-test --without-samples
make
make install
+# presumably we have bundles so lets message names
+mv $MY_ODBC_INST_DIR/lib/libmyodbc3-3.51.11.so $MY_ODBC_INST_DIR/lib/libmyodbc3.bundle
+rm $MY_ODBC_INST_DIR/lib/*la
+rm $MY_ODBC_INST_DIR/lib/*so
+
+#
+# This is being done because auto build needs to be tweeked
+# and I have no time to do it now.
+#
+cd $MY_ODBC_BUILD_DIR/myodbcinst
+pwd
+qmake
+make
+cp myodbcinst $MY_ODBC_INST_DIR/bin
+
+#
+DBC_INST_DIR/lib/
+# This is being done because auto build needs to be tweeked
+# and I have no time to do it now.
+#
+cd $MY_ODBC_BUILD_DIR/imyodbc
+pwd
+qmake
+make
+cp imyodbc $MY_ODBC_INST_DIR/bin
#
# BUILD - GUI DRIVER SETUP LIBRARY
[at] [at] -25,9 +50,11 [at] [at]
#
cd $MY_ODBC_BUILD_DIR/setup
pwd
-qmake "INCLUDEPATH+=$MY_IODBC_INST_DIR/include"
+# qmake "INCLUDEPATH+=$MY_IODBC_INST_DIR/include"
+qmake
make
-cp libmyodbc3S.so $MY_ODBC_INST_DIR/lib
+# we have a bundle so rename during 'install'
+cp libmyodbc3S.dylib $MY_ODBC_INST_DIR/lib/libmyodbc3S.bundle
#
# BUILD - GUI UTILITY APP
[at] [at] -35,7 +62,8 [at] [at]
#
cd $MY_ODBC_BUILD_DIR/MYODBCConfig
pwd
-qmake "INCLUDEPATH+=$MY_IODBC_INST_DIR/include"
+# qmake "INCLUDEPATH+=$MY_IODBC_INST_DIR/include"
+qmake
make
cp -r MYODBCConfig.app $MY_ODBC_INST_DIR/bin
--- 1.3/osx/MyODBC/resources/License.html 2004-11-30 12:31:39 -08:00
+++ 1.4/osx/MyODBC/resources/License.html 2005-01-31 23:30:48 -08:00
[at] [at] -14,7 +14,7 [at] [at]
<tr>
<td> <img src="MyODBC.png"> </td>
<td> <b><font face="Arial,Helvetica"> MySQL Connctor/ODBC <br>
-v3.51.10 </font></b> </td>
+v3.51.11 </font></b> </td>
</tr>
</tbody>
</table>
--- 1.3/osx/MyODBC/resources/ReadMe.html 2004-08-10 12:38:39 -07:00
+++ 1.4/osx/MyODBC/resources/ReadMe.html 2005-01-31 23:30:49 -08:00
[at] [at] -18,7 +18,7 [at] [at]
<b><font face="Arial,Helvetica">
MySQL Connctor/ODBC
<br>
- v3.51.9
+ v3.51.11
</font></b>
</td>
</tr>
--- 1.2/osx/MyODBC/resources/postinstall 2004-08-09 22:06:26 -07:00
+++ 1.3/osx/MyODBC/resources/postinstall 2005-01-31 23:30:49 -08:00
[at] [at] -35,12 +35,12 [at] [at]
#
# REGISTER THE DRIVER
#
-myodbcinst -i
+myodbcinst -a -d -t"MySQL ODBC 3.51 Driver;Driver=/usr/lib/libmyodbc3.bundle;Setup=/usr/lib/libm yodbc3S.bundle;"
#
# CREATE A SAMPLE DSN
#
-myodbcinst -s
+myodbcinst -a -s -t"DSN=myodbc;Driver=MySQL ODBC 3.51 Driver;SERVER=localhost;"
#
# ALLOW USER TO EDIT SAMPLE DSN
[at] [at] -48,9 +48,10 [at] [at]
# This invokes a GUI interface to make it easier for a novice
# to get started with myodbc.
#
-# We could do the same thing with "myodbcinst -e -g" but
+# We could do the same thing with "myodbcinst -e -s -nmyodbc" but
# MYODBCConfig integrates better with the OSX GUI.
#
+# Use of 'open' not good in this context (not sure why).
# open /Applications/Utilities/MYODBCConfig.app
/Applications/Utilities/MYODBCConfig.app/Contents/MacOS/MYOD BCConfig
--- 1.1/osx/MyODBC/root/usr/lib/BillOfMaterials.txt 2004-08-09 14:24:51 -07:00
+++ 1.2/osx/MyODBC/root/usr/lib/BillOfMaterials.txt 2005-01-31 23:30:49 -08:00
[at] [at] -1,11 +1,2 [at] [at]
-libmyodbc3-3.51.09.dylib
-libmyodbc3.dylib -> libmyodbc3-3.51.09.dylib
-libmyodbc3.la
-libmyodbc3S.3.51.9.dylib
-libmyodbc3S.3.51.dylib -> libmyodbc3S.3.51.9.dylib
-libmyodbc3S.3.dylib -> libmyodbc3S.3.51.9.dylib
-libmyodbc3S.dylib -> libmyodbc3S.3.51.9.dylib
-libmyodbc3_r-3.51.09.dylib
-libmyodbc3_r.dylib -> libmyodbc3_r-3.51.09.dylib
-libmyodbc3_r.la
-libmyodbc_r3-3.51.09.dylib
+libmyodbc3.bundle
+libmyodbc3S.bundle
--
MySQL ODBC Mailing List
For list archives: http://lists.mysql.com/myodbc
To unsubscribe: http://lists.mysql.com/myodbc?unsub=gcdmo-myodbc [at] m.gmane.org
