bk commit - MyODBC 3.51 (1.502)

[pharvey]

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@ style="color:#666">stripped

ChangeSet
  1.502 05/09/11 16:46:35 pharvey@stripped +4 -0
  - tweaks for Linux build

  setup/Makefile.am
    1.10 05/09/11 16:46:34 pharvey@stripped +6 -0
    - tweaks for Linux build

  setup/MYODBCSetupDataSourceDialog.cpp
    1.32 05/09/11 16:46:34 pharvey@stripped +6 -2
    - tweaks for Linux build

  myodbc-3.51.vpw
    1.5 05/09/11 16:46:34 pharvey@stripped +0 -1
    - tweaks for Linux build

  driver/driver.vpj
    1.4 05/09/11 16:46:34 pharvey@stripped +0 -1
    - tweaks for Linux build

# 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:	mercury.codebydesign.com
# Root:	/home/pharvey/SandBox/MySQL/myodbc-3.51

--- 1.31/setup/MYODBCSetupDataSourceDialog.cpp	2005-09-10 14:43:16 -07:00
+++ 1.32/setup/MYODBCSetupDataSourceDialog.cpp	2005-09-11 16:46:34 -07:00
@@ -23,6 +23,10 @@
 #include "MySQL-16.xpm"
 #include "TopImage.xpm"
 
+#ifdef HAVE_CONFIG_H
+#include "../driver/myconf.h" 
+#define SETUP_VERSION VERSION
+#endif
 
 MYODBCSetupDataSourceDialog::MYODBCSetupDataSourceDialog( QWidget *pwidgetParent,
MYODBCUTIL_DATASOURCE *pDataSource )
     : QDialog( pwidgetParent )
@@ -104,7 +108,7 @@
     // UNIX folks...
     pprocess->addArgument( "netscape" );
     pprocess->addArgument( stringURL );
-    if ( pprocess->startDetached( "netscape", QStringList() << stringURL ) )
+    if ( pprocess->start() )
         return;
 
     // KDE folks...
@@ -118,7 +122,7 @@
     pprocess->clearArguments();
     pprocess->addArgument( "htmlview" );
     pprocess->addArgument( stringURL );
-    if ( pprocess->startDetached( "htmlview", QStringList() << stringURL ) )
+    if ( pprocess->start() )
         return;
 #endif
 

--- 1.9/setup/Makefile.am	2005-02-01 22:06:00 -08:00
+++ 1.10/setup/Makefile.am	2005-09-11 16:46:34 -07:00
@@ -35,6 +35,7 @@
 
 libmyodbc3S_la_SOURCES = \
 	ConfigDSN.c \
+	MYODBCSetupAssistText.cpp \
 	MYODBCSetupCheckBox.cpp \
 	MYODBCSetupComboBox.cpp \
 	MYODBCSetupComboBoxDatabases.cpp \
@@ -54,6 +55,7 @@
 	MYODBCSetupDriverConnectPrompt.cpp \
 	MYODBCSetupHandleInstallerError.c \
 	MYODBCSetupLineEdit.cpp \
+	mMYODBCSetupAssistText.cpp \
 	mMYODBCSetupCheckBox.cpp \
 	mMYODBCSetupComboBox.cpp \
 	mMYODBCSetupComboBoxDatabases.cpp \
@@ -67,6 +69,9 @@
 	mMYODBCSetupDataSourceTab3d.cpp \
 	mMYODBCSetupLineEdit.cpp
 
+mMYODBCSetupAssistText.cpp: @srcdir@/MYODBCSetupAssistText.h
+	@MOC@ @srcdir@/MYODBCSetupAssistText.h -o mMYODBCSetupAssistText.cpp
+
 mMYODBCSetupCheckBox.cpp: @srcdir@/MYODBCSetupCheckBox.h
 	@MOC@ @srcdir@/MYODBCSetupCheckBox.h -o mMYODBCSetupCheckBox.cpp
 
@@ -129,6 +134,7 @@
 ###################################################################
 
 EXTRA_DIST = \
+	MYODBCSetupAssistText.h \
 	MYODBCSetupCheckBox.h \
 	MYODBCSetupComboBox.h \
 	MYODBCSetupComboBoxDatabases.h \

--- 1.3/driver/driver.vpj	2005-08-19 02:28:44 -07:00
+++ 1.4/driver/driver.vpj	2005-09-11 16:46:34 -07:00
@@ -77,7 +77,6 @@
 			<F N="error.h"/>
 			<F N="myodbc3.h"/>
 			<F N="myutil.h"/>
-			<F N="resource.h"/>
 			<F N="../win32/resource.h"/>
 		</Folder>
 		<Folder

--- 1.4/myodbc-3.51.vpw	2005-09-02 10:45:50 -07:00
+++ 1.5/myodbc-3.51.vpw	2005-09-11 16:46:34 -07:00
@@ -6,7 +6,6 @@
 		<Project File="imyodbc/imyodbc.vpj"/>
 		<Project File="MYODBCConfig/MYODBCConfig.vpj"/>
 		<Project File="myodbcinst/myodbcinst.vpj"/>
-		<Project File="../MySQL_Includes.vpj"/>
 		<Project File="root.vpj"/>
 		<Project File="setup/setup.vpj"/>
 		<Project File="util/util.vpj"/>