Added:
trunk/driver/
Removed:
trunk/myodbc3/
Modified:
trunk/CreateMakefiles.bat
trunk/CreateMakefiles.sh
trunk/CreateSourceZip.bat
trunk/CreateVisualStudioProjects.bat
trunk/MYODBC_CONF.h
trunk/Makefile.am
trunk/RemoveMakefiles.sh
trunk/configure.in
trunk/connector-odbc3.vpw
trunk/root.pro
trunk/samples/Makefile.am
trunk/scripts/make_binary_distribution.sh
trunk/scripts/makerpm.sh
trunk/setup/MYODBCSetupDataSourceDialog.cpp
Log:
Rename myodbc3 directory to driver (but outputs are not changed).
Modified: trunk/CreateMakefiles.bat
===================================================================
--- trunk/CreateMakefiles.bat 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/CreateMakefiles.bat 2007-02-07 21:38:37 UTC (rev 153)
@@ -66,8 +66,8 @@
qmake
cd ..
-ECHO myodbc3...
-cd myodbc3
+ECHO driver...
+cd driver
qmake
cd ..
Modified: trunk/CreateMakefiles.sh
===================================================================
--- trunk/CreateMakefiles.sh 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/CreateMakefiles.sh 2007-02-07 21:38:37 UTC (rev 153)
@@ -52,8 +52,8 @@
qmake
cd ..
-echo "myodbc3..."
-cd myodbc3
+echo "driver..."
+cd driver
rm -f Makefile
qmake
cd ..
Modified: trunk/CreateSourceZip.bat
===================================================================
--- trunk/CreateSourceZip.bat 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/CreateSourceZip.bat 2007-02-07 21:38:37 UTC (rev 153)
@@ -91,13 +91,13 @@
copy dsn-editor\*.pro mysql-connector-odbc-%1-win-src\dsn-editor
copy dsn-editor\*.cpp mysql-connector-odbc-%1-win-src\dsn-editor
-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 driver
+mkdir mysql-connector-odbc-%1-win-src\driver
+copy driver\*.pro mysql-connector-odbc-%1-win-src\driver
+copy driver\*.c mysql-connector-odbc-%1-win-src\driver
+copy driver\*.h mysql-connector-odbc-%1-win-src\driver
+copy driver\*.rc mysql-connector-odbc-%1-win-src\driver
+copy driver\*.def mysql-connector-odbc-%1-win-src\driver
REM doc
mkdir mysql-connector-odbc-%1-win-src\doc
Modified: trunk/CreateVisualStudioProjects.bat
===================================================================
--- trunk/CreateVisualStudioProjects.bat 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/CreateVisualStudioProjects.bat 2007-02-07 21:38:37 UTC (rev 153)
@@ -60,7 +60,7 @@
qmake -t vcapp
cd ..
-ECHO myodbc3...
-cd myodbc3
+ECHO driver...
+cd driver
qmake -t vclib
cd ..
Modified: trunk/MYODBC_CONF.h
===================================================================
--- trunk/MYODBC_CONF.h 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/MYODBC_CONF.h 2007-02-07 21:38:37 UTC (rev 153)
@@ -1,12 +1,9 @@
#ifndef MYODBC_CONF_H
-#define MYODBC_CONF_H
-
-#ifdef HAVE_CONFIG_H
- #include "myodbc3/myconf.h"
- #define SETUP_VERSION VERSION
- /* Work around iODBC header bug on Mac OS X 10.3 */
- #undef HAVE_CONFIG_H
+# define MYODBC_CONF_H
+# ifdef HAVE_CONFIG_H
+# include "driver/myconf.h"
+# define SETUP_VERSION VERSION
+/* Work around iODBC header bug on Mac OS X 10.3 */
+# undef HAVE_CONFIG_H
+# endif
#endif
-
-#endif
-
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/Makefile.am 2007-02-07 21:38:37 UTC (rev 153)
@@ -36,7 +36,7 @@
SUBDIRS = \
@myodbc_dbg_dir@ \
util \
- myodbc3 \
+ driver \
setup \
dsn-editor \
installer \
@@ -49,7 +49,7 @@
DIST_SUBDIRS = \
MYODBCDbg \
util \
- myodbc3 \
+ driver \
setup \
dsn-editor \
installer \
Modified: trunk/RemoveMakefiles.sh
===================================================================
--- trunk/RemoveMakefiles.sh 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/RemoveMakefiles.sh 2007-02-07 21:38:37 UTC (rev 153)
@@ -45,8 +45,8 @@
rm -f Makefile
cd ..
-echo "myodbc3..."
-cd myodbc3
+echo "driver..."
+cd driver
rm -f Makefile.in
rm -f Makefile
cd ..
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/configure.in 2007-02-07 21:38:37 UTC (rev 153)
@@ -34,7 +34,7 @@
# #
###################################################################
-AC_INIT(myodbc3/myodbc3.c)
+AC_INIT(driver/myodbc3.c)
AC_PREREQ(2.12)dnl Minimum Autoconf version required.
#AC_INIT([MySQL ODBC 3.51 Driver],[3.51.12],[myodbc@stripped],[libmyodbc3])
AC_CANONICAL_SYSTEM
@@ -49,7 +49,7 @@
###################################################################
SHARED_LIB_VERSION=1:0:0
-AM_CONFIG_HEADER(myodbc3/myconf.h)
+AM_CONFIG_HEADER(driver/myconf.h)
AC_SUBST(myodbc_version)
# Canonicalize the configuration name.
@@ -861,9 +861,9 @@
if test "x$enable_dmlink" = "xyes" ; then
myodbc_test_linklib="$myodbc_link_dmlib"
elif test "x$gotthread" = "xno" ; then
- myodbc_test_linklib="../myodbc3/libmyodbc3.la"
+ myodbc_test_linklib="../driver/libmyodbc3.la"
else
- myodbc_test_linklib="../myodbc3/libmyodbc3_r.la"
+ myodbc_test_linklib="../driver/libmyodbc3_r.la"
fi
AC_SUBST(myodbc_test_linklib)
@@ -1013,7 +1013,7 @@
MYODBCDbg/Makefile
MYODBCDbg/MYODBCDbgLib/Makefile
util/Makefile
- myodbc3/Makefile
+ driver/Makefile
setup/Makefile
dsn-editor/Makefile
installer/Makefile
Modified: trunk/connector-odbc3.vpw
===================================================================
--- trunk/connector-odbc3.vpw 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/connector-odbc3.vpw 2007-02-07 21:38:37 UTC (rev 153)
@@ -3,7 +3,7 @@
<Projects>
<Project File="connector-odbc3.vpj" />
<Project File="dltest/dltest.vpj" />
- <Project File="myodbc3/myodbc3.vpj" />
+ <Project File="driver/myodbc3.vpj" />
<Project File="dsn-editor/myodbc3c.vpj" />
<Project File="installer/myodbc3i.vpj" />
<Project File="monitor/myodbc3m.vpj" />
Copied: trunk/driver (from rev 152, trunk/myodbc3)
Modified: trunk/root.pro
===================================================================
--- trunk/root.pro 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/root.pro 2007-02-07 21:38:37 UTC (rev 153)
@@ -82,6 +82,6 @@
installer \
monitor \
dsn-editor \
- myodbc3 \
+ driver \
test
Modified: trunk/samples/Makefile.am
===================================================================
--- trunk/samples/Makefile.am 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/samples/Makefile.am 2007-02-07 21:38:37 UTC (rev 153)
@@ -29,7 +29,7 @@
##########################################################################
noinst_PROGRAMS=my_basics my_connect my_cursor my_param my_result my_tran
INCLUDES=-I..
-AM_LDFLAGS=../myodbc3/libmyodbc3.la @MYSQL_THREADSAFE_LIB@
+AM_LDFLAGS=../driver/libmyodbc3.la @MYSQL_THREADSAFE_LIB@
EXTRA_DIST=my_utility.h run-samples WIN-Makefile
# test samples
Modified: trunk/scripts/make_binary_distribution.sh
===================================================================
--- trunk/scripts/make_binary_distribution.sh 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/scripts/make_binary_distribution.sh 2007-02-07 21:38:37 UTC (rev 153)
@@ -21,7 +21,7 @@
# This script must run from MyODBC top directory
-if ! test -f myodbc3/myodbc3.c
+if ! test -f driver/myodbc3.c
then
echo "ERROR : You must run this script from the MyODBC top-level directory"
exit 1
@@ -63,7 +63,7 @@
fi
done
-for i in myodbc3/.libs/*
+for i in driver/.libs/*
do
if [ -f $i ]
then
Modified: trunk/scripts/makerpm.sh
===================================================================
--- trunk/scripts/makerpm.sh 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/scripts/makerpm.sh 2007-02-07 21:38:37 UTC (rev 153)
@@ -32,7 +32,7 @@
# This script must run from MyODBC top directory
#
-if [ ! -f "./myodbc3/myodbc3.c" ];
+if [ ! -f "./driver/myodbc3.c" ];
then
echo "ERROR : You must run this script from the MyODBC top-level directory"
exit 1
Modified: trunk/setup/MYODBCSetupDataSourceDialog.cpp
===================================================================
--- trunk/setup/MYODBCSetupDataSourceDialog.cpp 2007-02-07 20:16:26 UTC (rev 152)
+++ trunk/setup/MYODBCSetupDataSourceDialog.cpp 2007-02-07 21:38:37 UTC (rev 153)
@@ -24,7 +24,7 @@
#include "TopImage.xpm"
#ifdef HAVE_CONFIG_H
-#include "../myodbc3/myconf.h"
+#include "../driver/myconf.h"
#define SETUP_VERSION VERSION
#endif
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r153 - in trunk: . samples scripts setup | jwinstead | 7 Feb |
