bk commit - MyODBC 3.51 (1.363)

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@xxxxx

ChangeSet
  1.363 04/08/15 22:13:20 peterh@xxxxxxxxx +7 -0
  tweeks for Linux distros

  scripts/myodbc3.spec.sh
    1.10 04/08/15 22:13:19 peterh@xxxxxxxxx +1 -1
    binary rpm installs should go to /usr

  scripts/makerpm.sh
    1.9 04/08/15 22:13:19 peterh@xxxxxxxxx +1 -1
    newer linux distros use rpmbuild not rpm for this. to support older distros 
try making alias for rpmbuild

  scripts/Makefile.am
    1.9 04/08/15 22:13:19 peterh@xxxxxxxxx +1 -1
    update copyright date

  configure.in
    1.40 04/08/15 22:13:19 peterh@xxxxxxxxx +1 -1
    had 3 diff names for packages trying to make MyODBC for now - perhaps 
connecor-odbc later

  Makefile.am
    1.24 04/08/15 22:13:19 peterh@xxxxxxxxx +1 -0
    new addition to license 

  README.dist
    1.1 04/08/15 22:09:43 peterh@xxxxxxxxx +99 -0

  README.dist
    1.0 04/08/15 22:09:43 peterh@xxxxxxxxx +0 -0
    BitKeeper file /home/pharvey/SandBox/MySQL/myodbc-3.51/README.dist

  scripts/myodbc3.spec.sh
    1.9 04/08/14 22:19:12 peterh@xxxxxxxxx +3 -3
    update ver level etc

  configure.in
    1.39 04/08/14 22:19:12 peterh@xxxxxxxxx +70 -70
    make configure find unixODBC without help

  Makefile.am
    1.23 04/08/14 22:19:11 peterh@xxxxxxxxx +2 -2
    update date 

  INSTALL
    1.23 04/08/14 22:19:11 peterh@xxxxxxxxx +0 -1
    libtoolize is in Makefile.cvs

# 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: peterh
# Host: thinkpad.peterharvey.org
# Root: /home/pharvey/SandBox/MySQL/myodbc-3.51

--- 1.22/INSTALL        Fri Aug 13 11:28:50 2004
+++ 1.23/INSTALL        Sat Aug 14 22:19:11 2004
@@ -54,7 +54,6 @@
 
   cd myodbc-3.51  
   bk -r edit
-  libtoolize
   make -f Makefile.cvs
 
 ====================================

--- 1.22/Makefile.am    Fri Aug 13 11:28:50 2004
+++ 1.24/Makefile.am    Sun Aug 15 22:13:19 2004
@@ -1,5 +1,5 @@
 ##########################################################################
-# Copyright (C) 1995-2002 MySQL AB, www.mysql.com                        #
+# Copyright (C) 1995-2004 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   #
@@ -31,7 +31,7 @@
 AUTOMAKE_OPTIONS=foreign
 INCLUDES = @MYSQL_INCLUDES@
 LDFLAGS=@EXTRA_LDFLAGS@
-build="connector-odbc-@VERSION@-@SYSTEM_TYPE@-@MACHINE_TYPE@"
+build="MyODBC-@VERSION@-@SYSTEM_TYPE@-@MACHINE_TYPE@"
 
 SUBDIRS = driver \
           @myodbc_thread_dir@ \
@@ -123,6 +123,7 @@
              MYODBCConfig/MYODBCConfig.icns \
              MYODBCConfig/MYODBCConfig.pro \
              README.OSX \
+             EXCEPTIONS \
              osx/MyODBC/mac-install.pmsp \
              osx/MyODBC/resources/License.html \
              osx/MyODBC/resources/odbc.ini \

--- 1.38/configure.in   Wed Jul 28 21:40:31 2004
+++ 1.40/configure.in   Sun Aug 15 22:13:19 2004
@@ -1,5 +1,5 @@
 ##########################################################################
-# Copyright (C) 1995-2002 MySQL AB, www.mysql.com                        #
+# Copyright (C) 1995-2004 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   #
@@ -38,7 +38,7 @@
 #AC_PREREQ(2.53)
 #AC_INIT([MySQL ODBC 3.51 
Driver],[3.51.05],[myodbc@xxxxxxxxxxxxxxx],[libmyodbc3])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(connector-odbc,3.51.09)
+AM_INIT_AUTOMAKE(MyODBC,3.51.09)
 
 myodbc_version=$VERSION
 ###################################################################
@@ -407,17 +407,80 @@
 echo "ODBC DRIVER MANAGER CONFIGURATION - LIBRARIES AND HEADERS"
 ###################################################################
 #                                                                 #
+# Check if we want to include iODBC header files                  #
+#                                                                 #
+###################################################################
+
+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 overcum 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)
+
+else
+
+###################################################################
+#                                                                 #
 # Check if we want to include unixODBC header files               #
 #                                                                 #
 ###################################################################
 
-use_unixODBC=no
 AC_ARG_WITH(unixODBC,
 [  --with-unixODBC[=DIR]     Use unixODBC located in DIR],
-[use_unixODBC=yes;unixODBC="$withval"],use_unixODBC=no)
-
-if test "x$use_unixODBC" = "xyes"
-then
+unixODBC="$withval",unixODBC="/usr/local/")
 
 myodbc_link_dmlib="-lodbc"
 # add unixodbc version
@@ -472,69 +535,6 @@
                      [Define path to system wide odbc.ini file])
 fi
 ODBC_DM_PATH="--with-unixODBC=$unixODBC"
-AC_SUBST(ODBC_DM_PATH)
-
-else
-
-###################################################################
-#                                                                 #
-# Check if we want to include iODBC header files                  #
-#                                                                 #
-###################################################################
-
-myodbc_link_dmlib="-liodbc"
-
-AC_ARG_WITH(iodbc,
-[  --with-iodbc[=DIR]        Use iODBC located in DIR],
-iodbc="$withval",iodbc="/usr/local")
-
-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 overcum 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)
 
 fi

--- 1.8/scripts/makerpm.sh      Thu Feb 27 00:56:48 2003
+++ 1.9/scripts/makerpm.sh      Sun Aug 15 22:13:19 2004
@@ -90,7 +90,7 @@
 
 echo "Running the spec file from '${RPM_BUILD_AREA}/SPECS'"
 
-rpm -ba ${SPEC_FILE}
+rpmbuild -ba ${SPEC_FILE}
 if test $? -eq 0 
 then
   ln -s ${RPM_BUILD_AREA}/RPMS/${ARCH}/$SRC_FILE-1.${ARCH}.rpm 
$SRC_FILE-1.${ARCH}.rpm
--- New file ---
+++ README.dist 04/08/15 22:09:43
+-------------------------------------------------------------+
| MyODBC                                                      |
| Making Distributions                                        |
+-------------------------------------------------------------+


Linux

Source tar-ball

- bk clone
- change current ver to new ver in source/config files
- make -f Makefile.cvs
- ./configure --with-docs
- make dist
- source tar-ball will be in current dir

RPM's

- bk clone
- change current ver to new ver in source/config files
- make -f Makefile.cvs
- ./configure --with-docs
- make dist
- cd scripts
- make
- cd ..
- su 
- scripts/makerpm
- source RPM will be in /usr/src/packages/SRPMS
- binary RPM will be in /usr/src/packages/RPMS/i586
 

<draft> <draft> <draft>

 
INTRODUCTION
---------------------------------------------------------------

You want to read this if you are interested in creating a source
or binary distribution of MyODBC.

What follows are my notes of my experience creating various types
of MyODBC distributions on various platforms. In other words - 
making a Generally Available (GA) release of MyODBC suitable
for the download area of the MySQL web-site.

In this document I start from MyODBC sources as found in the 
MyODBC bitkeeper source code respository and end with the 
creation of a number of tar-balls, rpm, OSX Packages, and Windows
installer.

I expect this document to be of interest to MySQL developers,
support persons, and engineers. 

Finally; please consider this to be a working document. If you
notice that it has become out of date then please update it :)


MySQL RELEASE PROCEDURE
---------------------------------------------------------------

You must have a clear understanding of the changes included in 
the new distribution and these should be documented.

A message should be sent out stating that the MyODBC source 
code repository is frozen in preparation for a release. All
departments should be aware of this. Engineering should be aware
that they will be making a release GA and where they can find
the distributions.

Make the distributions and provide them to engineering. It is
likely that engineering will actually be making the 
distributions but perhaps not someone with the authority to 
to make GA.

Quality Assurance (QA) process is applied here. QA typically
means that volunteers within the organization will try out
the distribution but most importantly release should be run
through standard test suite.

Engineering should send notice to community and internally that 
a new release is GA.

A message should be sent out stating that the MyODBC source
is no longer frozen and normal development may continue.

GETTING CODE
--------------------------------------------------------------

Get the source code from the source code repository;

$ bk clone bk-internal:/home/bk/myodbc-3.51 myodbc-3.51

This will get the latest myodbc-3.51 sources.

LINUX
--------------------------------------------------------------



--- 1.8/scripts/myodbc3.spec.sh Thu Dec 19 18:30:23 2002
+++ 1.10/scripts/myodbc3.spec.sh        Sun Aug 15 22:13:19 2004
@@ -16,9 +16,9 @@
 Source0:       %{name}-%{version}.tar.gz
 URL:           http://www.mysql.com/
 Vendor:                MySQL AB
-Packager:      Venu Anuganti<venu@xxxxxxxxx>
+Packager:      Peter Harvey<peterh@xxxxxxxxx>
 
-%define prefix /usr/local
+%define prefix /usr
 
 # Think about what you use here since the first step is to
 # run a rm -rf
@@ -26,9 +26,9 @@
 
 # From the manual
 %description
-MyODBC is a 32-bit ODBC (2.50) level 0 (with level 1 and level 2 features)
+MyODBC is a 32-bit ODBC (3.50) level 0 (with level 1 and level 2 features)
 driver for connecting an ODBC-aware application to MySQL. MyODBC works on
-Windows 9x/Me/NT/2000/XP and most Unix platforms.
+Windows 9x/Me/NT/2000/XP, and most Unix platforms (incl. OSX and Linux).
 
 MyODBC 3.51 is an enhanced version of MyODBC 2.50 to meet ODBC 3.5 
 specification. The driver is commonly referred to as 'MySQL ODBC 3.51 Driver'.

--- 1.8/scripts/Makefile.am     Tue Sep 23 18:23:07 2003
+++ 1.9/scripts/Makefile.am     Sun Aug 15 22:13:19 2004
@@ -1,5 +1,5 @@
 ##########################################################################
-# Copyright (C) 1995-2002 MySQL AB, www.mysql.com                        #
+# Copyright (C) 1995-2004 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   #

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