Connector/ODBC 3.51 commit: r152 - in trunk: . dsn-editor installer monitor myodbc3 setup

[jwinstead]

Added:
   trunk/util/
Removed:
   trunk/myodbc3u/
Modified:
   trunk/CreateMakefiles.bat
   trunk/CreateMakefiles.sh
   trunk/CreateSourceZip.bat
   trunk/CreateVisualStudioProjects.bat
   trunk/Makefile.am
   trunk/RemoveMakefiles.sh
   trunk/configure.in
   trunk/connector-odbc3.vpw
   trunk/dsn-editor/myodbc3c.pro
   trunk/installer/Makefile.am
   trunk/installer/myodbc3i.c
   trunk/installer/myodbc3i.pro
   trunk/monitor/myodbc3m.pro
   trunk/myodbc3/Makefile.am
   trunk/myodbc3/connect.c
   trunk/myodbc3/myodbc3.pro
   trunk/root.pro
   trunk/setup/MYODBCSetup.h
   trunk/setup/Makefile.am
   trunk/setup/myodbc3S.pro
Log:
Rename myodbc3u directory to util (but no change to outputs)


Modified: trunk/CreateMakefiles.bat
===================================================================
--- trunk/CreateMakefiles.bat	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/CreateMakefiles.bat	2007-02-07 20:16:26 UTC (rev 152)
@@ -41,8 +41,8 @@
 qmake
 cd ..
 
-ECHO myodbc3u...
-cd myodbc3u
+ECHO util...
+cd util
 qmake
 cd ..
 

Modified: trunk/CreateMakefiles.sh
===================================================================
--- trunk/CreateMakefiles.sh	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/CreateMakefiles.sh	2007-02-07 20:16:26 UTC (rev 152)
@@ -22,8 +22,8 @@
 qmake
 cd ..
 
-echo "myodbc3u..."
-cd myodbc3u
+echo "util..."
+cd util
 rm -f Makefile
 qmake
 cd ..

Modified: trunk/CreateSourceZip.bat
===================================================================
--- trunk/CreateSourceZip.bat	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/CreateSourceZip.bat	2007-02-07 20:16:26 UTC (rev 152)
@@ -59,11 +59,11 @@
 copy dltest\*.pro mysql-connector-odbc-%1-win-src\dltest
 copy dltest\*.c mysql-connector-odbc-%1-win-src\dltest
 
-REM myodbc3u
-mkdir mysql-connector-odbc-%1-win-src\myodbc3u
-copy myodbc3u\*.pro mysql-connector-odbc-%1-win-src\myodbc3u
-copy myodbc3u\*.h mysql-connector-odbc-%1-win-src\myodbc3u
-copy myodbc3u\*.c mysql-connector-odbc-%1-win-src\myodbc3u
+REM util
+mkdir mysql-connector-odbc-%1-win-src\util
+copy util\*.pro mysql-connector-odbc-%1-win-src\util
+copy util\*.h mysql-connector-odbc-%1-win-src\util
+copy util\*.c mysql-connector-odbc-%1-win-src\util
 
 REM setup
 mkdir mysql-connector-odbc-%1-win-src\setup

Modified: trunk/CreateVisualStudioProjects.bat
===================================================================
--- trunk/CreateVisualStudioProjects.bat	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/CreateVisualStudioProjects.bat	2007-02-07 20:16:26 UTC (rev 152)
@@ -35,8 +35,8 @@
 qmake -t vcapp
 cd ..
 
-ECHO myodbc3u...
-cd myodbc3u
+ECHO util...
+cd util
 qmake -t vclib
 cd ..
 

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/Makefile.am	2007-02-07 20:16:26 UTC (rev 152)
@@ -35,7 +35,7 @@
 
 SUBDIRS = \
 	@myodbc_dbg_dir@ \
-	myodbc3u \
+	util \
 	myodbc3 \
 	setup \
 	dsn-editor \
@@ -48,12 +48,12 @@
 
 DIST_SUBDIRS = \
 	MYODBCDbg \
-	myodbc3u \
+	util \
 	myodbc3 \
 	setup \
 	dsn-editor \
 	installer \
-	myodbc3m \
+	monitor \
 	samples \
 	test \
 	scripts \

Modified: trunk/RemoveMakefiles.sh
===================================================================
--- trunk/RemoveMakefiles.sh	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/RemoveMakefiles.sh	2007-02-07 20:16:26 UTC (rev 152)
@@ -15,8 +15,8 @@
 rm -f Makefile
 cd ..
 
-echo "myodbc3u..."
-cd myodbc3u
+echo "util..."
+cd util
 rm -f Makefile.in
 rm -f Makefile
 cd ..

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/configure.in	2007-02-07 20:16:26 UTC (rev 152)
@@ -1012,7 +1012,7 @@
   Makefile 
   MYODBCDbg/Makefile
   MYODBCDbg/MYODBCDbgLib/Makefile
-  myodbc3u/Makefile
+  util/Makefile
   myodbc3/Makefile
   setup/Makefile
   dsn-editor/Makefile

Modified: trunk/connector-odbc3.vpw
===================================================================
--- trunk/connector-odbc3.vpw	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/connector-odbc3.vpw	2007-02-07 20:16:26 UTC (rev 152)
@@ -8,7 +8,7 @@
 		<Project File="installer/myodbc3i.vpj" />
 		<Project File="monitor/myodbc3m.vpj" />
 		<Project File="setup/myodbc3S.vpj" />
-		<Project File="myodbc3u/myodbc3u.vpj" />
+		<Project File="util/myodbc3u.vpj" />
 		<Project File="MYODBCDbg/MYODBCDbg.vpj" />
 		<Project File="MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.vpj" />
 		<Project File="../../mysql-include.vpj" />

Modified: trunk/dsn-editor/myodbc3c.pro
===================================================================
--- trunk/dsn-editor/myodbc3c.pro	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/dsn-editor/myodbc3c.pro	2007-02-07 20:16:26 UTC (rev 152)
@@ -20,13 +20,13 @@
 include( ../defines.pri )
 include( ../odbc.pri )
 
-INCLUDEPATH             += ../myodbc3u ../setup
+INCLUDEPATH             += ../util ../setup
 
 # #########################################################
 # WIN32
 # #########################################################
 win32 {
-        LIBS            += user32.lib ..\myodbc3u\myodbc3u.lib
+        LIBS            += user32.lib ..\util\myodbc3u.lib
 # RC_FILE         += MYODBCConfig.rc
 }
 
@@ -35,8 +35,8 @@
 # #########################################################
 mac {
 } else:unix {
-#        INCLUDEPATH     += ../myodbc3u ../setup /usr/include
-        LIBS            += -L../myodbc3u -lmyodbc3u
+#        INCLUDEPATH     += ../util ../setup /usr/include
+        LIBS            += -L../util -lmyodbc3u
 }
 
 # #########################################################
@@ -51,7 +51,7 @@
 #        DEFINES		-= HAVE_ODBCINST_H
 #        DEFINES		+= HAVE_IODBCINST_H
         LIBS            -= -lmyodbc3S
-        LIBS            += -L../myodbc3u -lmyodbc3u
+        LIBS            += -L../util -lmyodbc3u
         LIBS            += -lltdl -framework Carbon -framework QuickTime -lz -framework
OpenGL -framework AGL -lz
         RC_FILE         = MYODBCConfig.icns
 }
@@ -60,7 +60,7 @@
 # FILES
 # #########################################################
 HEADERS                 += \
-                        ../myodbc3u/MYODBCUtil.h \ 
+                        ../util/MYODBCUtil.h \ 
                         ../setup/MYODBCSetup.h \
                         ../setup/MYODBCSetupAssistText.h \
                         ../setup/MYODBCSetupCheckBox.h \

Modified: trunk/installer/Makefile.am
===================================================================
--- trunk/installer/Makefile.am	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/installer/Makefile.am	2007-02-07 20:16:26 UTC (rev 152)
@@ -20,8 +20,8 @@
 
 bin_PROGRAMS = myodbc3i
 myodbc3i_SOURCES = myodbc3i.c
-myodbc3i_LDADD        = ../myodbc3u/libmyodbc3u.la @LTDL_LIB@
-myodbc3i_DEPENDENCIES = ../myodbc3u/libmyodbc3u.la
+myodbc3i_LDADD        = ../util/libmyodbc3u.la @LTDL_LIB@
+myodbc3i_DEPENDENCIES = ../util/libmyodbc3u.la
 
 # LDFLAGS=@EXTRA_LDFLAGS@
 

Modified: trunk/installer/myodbc3i.c
===================================================================
--- trunk/installer/myodbc3i.c	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/installer/myodbc3i.c	2007-02-07 20:16:26 UTC (rev 152)
@@ -52,7 +52,7 @@
     #include <ltdl.h>
 #endif
 
-#include "../myodbc3u/MYODBCUtil.h"
+#include "../util/MYODBCUtil.h"
 
 #ifdef USE_IODBC
 #include <iodbcinst.h>

Modified: trunk/installer/myodbc3i.pro
===================================================================
--- trunk/installer/myodbc3i.pro	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/installer/myodbc3i.pro	2007-02-07 20:16:26 UTC (rev 152)
@@ -26,14 +26,14 @@
 # WIN
 # #########################################################
 win32 {
-        LIBS              += user32.lib ..\myodbc3u\myodbc3u.lib
+        LIBS              += user32.lib ..\util\myodbc3u.lib
 }
 
 # #########################################################
 # UNIX
 # #########################################################
 unix {
-        LIBS               += -L../myodbc3u -lmyodbc3u -lltdl
+        LIBS               += -L../util -lmyodbc3u -lltdl
 }
 
 # #########################################################

Modified: trunk/monitor/myodbc3m.pro
===================================================================
--- trunk/monitor/myodbc3m.pro	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/monitor/myodbc3m.pro	2007-02-07 20:16:26 UTC (rev 152)
@@ -26,14 +26,14 @@
 # WIN
 # #########################################################
 win32 {
-        LIBS              += ..\myodbc3u\myodbc3u.lib
+        LIBS              += ..\util\myodbc3u.lib
 }
 
 # #########################################################
 # UNIX
 # #########################################################
 unix {
-        LIBS               += -L../myodbc3u -lmyodbc3u
+        LIBS               += -L../util -lmyodbc3u
 }
 
 # #########################################################

Modified: trunk/myodbc3/Makefile.am
===================================================================
--- trunk/myodbc3/Makefile.am	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/myodbc3/Makefile.am	2007-02-07 20:16:26 UTC (rev 152)
@@ -94,10 +94,10 @@
 if WITH_DEBUG
 LTLIBS_DEPS = $(LTLIBS_DEBUG_DEPS)
 else
-LTLIBS_DEPS = ../myodbc3u/libmyodbc3u.la
+LTLIBS_DEPS = ../util/libmyodbc3u.la
 endif
 LTLIBS_DEBUG_DEPS = \
-	../myodbc3u/libmyodbc3u.la \
+	../util/libmyodbc3u.la \
 	../MYODBCDbg/MYODBCDbgLib/libMYODBCDbg.la
 
 libmyodbc3_la_LIBADD         = $(LTLIBS_DEPS) @LTDL_LIB@ @MYSQL_LIB@

Modified: trunk/myodbc3/connect.c
===================================================================
--- trunk/myodbc3/connect.c	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/myodbc3/connect.c	2007-02-07 20:16:26 UTC (rev 152)
@@ -48,7 +48,7 @@
     #endif
 #endif
 
-#include "../myodbc3u/MYODBCUtil.h"
+#include "../util/MYODBCUtil.h"
 
 #ifndef CLIENT_NO_SCHEMA
     #define CLIENT_NO_SCHEMA      16

Modified: trunk/myodbc3/myodbc3.pro
===================================================================
--- trunk/myodbc3/myodbc3.pro	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/myodbc3/myodbc3.pro	2007-02-07 20:16:26 UTC (rev 152)
@@ -72,7 +72,7 @@
 # #########################################################
 unix {
         INCLUDEPATH	        += /usr/include
-        LIBS                    += -L../myodbc3u -lmyodbc3u -lltdl
+        LIBS                    += -L../util -lmyodbc3u -lltdl
         libraries.path	        = /usr/lib
         libraries.files	        = libmyodbc*
 }
@@ -98,7 +98,7 @@
                         myodbc3.h \
                         error.h \
 			myutil.h \
-                        ../myodbc3u/MYODBCUtil.h \
+                        ../util/MYODBCUtil.h \
 		        ../MYODBCDbg/include/MYODBCDbg.h
 SOURCES			= \
 			catalog.c \
@@ -115,26 +115,26 @@
                         results.c \
                         transact.c \
                         utility.c \
-                        ../myodbc3u/MYODBCUtilAllocDataSource.c \
-                        ../myodbc3u/MYODBCUtilAllocDriver.c \          
-                        ../myodbc3u/MYODBCUtilClearDataSource.c \
-                        ../myodbc3u/MYODBCUtilClearDriver.c \          
-                        ../myodbc3u/MYODBCUtilDefaultDataSource.c \          
-                        ../myodbc3u/MYODBCUtilDSNExists.c \
-                        ../myodbc3u/MYODBCUtilFreeDataSource.c \       
-                        ../myodbc3u/MYODBCUtilFreeDriver.c \
-                        ../myodbc3u/MYODBCUtilGetDataSourceNames.c \
-                        ../myodbc3u/MYODBCUtilGetDriverNames.c \
-                        ../myodbc3u/MYODBCUtilGetIniFileName.c \
-                        ../myodbc3u/MYODBCUtilInsertStr.c \            
-                        ../myodbc3u/MYODBCUtilReadConnectStr.c \
-                        ../myodbc3u/MYODBCUtilReadDataSource.c \       
-                        ../myodbc3u/MYODBCUtilReadDataSourceStr.c \
-                        ../myodbc3u/MYODBCUtilReadDriver.c \           
-                        ../myodbc3u/MYODBCUtilWriteConnectStr.c \
-                        ../myodbc3u/MYODBCUtilWriteDataSource.c \      
-                        ../myodbc3u/MYODBCUtilWriteDataSourceStr.c \
-                        ../myodbc3u/MYODBCUtilWriteDriver.c \
+                        ../util/MYODBCUtilAllocDataSource.c \
+                        ../util/MYODBCUtilAllocDriver.c \          
+                        ../util/MYODBCUtilClearDataSource.c \
+                        ../util/MYODBCUtilClearDriver.c \          
+                        ../util/MYODBCUtilDefaultDataSource.c \          
+                        ../util/MYODBCUtilDSNExists.c \
+                        ../util/MYODBCUtilFreeDataSource.c \       
+                        ../util/MYODBCUtilFreeDriver.c \
+                        ../util/MYODBCUtilGetDataSourceNames.c \
+                        ../util/MYODBCUtilGetDriverNames.c \
+                        ../util/MYODBCUtilGetIniFileName.c \
+                        ../util/MYODBCUtilInsertStr.c \            
+                        ../util/MYODBCUtilReadConnectStr.c \
+                        ../util/MYODBCUtilReadDataSource.c \       
+                        ../util/MYODBCUtilReadDataSourceStr.c \
+                        ../util/MYODBCUtilReadDriver.c \           
+                        ../util/MYODBCUtilWriteConnectStr.c \
+                        ../util/MYODBCUtilWriteDataSource.c \      
+                        ../util/MYODBCUtilWriteDataSourceStr.c \
+                        ../util/MYODBCUtilWriteDriver.c \
                         ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgConnectAttrString.c \
                         ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgConnectOptionString.c \
                         ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgDiagFieldString.c \

Modified: trunk/root.pro
===================================================================
--- trunk/root.pro	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/root.pro	2007-02-07 20:16:26 UTC (rev 152)
@@ -77,7 +77,7 @@
 SUBDIRS         = \
                 MYODBCDbg \
                 dltest \
-		myodbc3u \
+		util \
 		setup \
                 installer \
                 monitor \

Modified: trunk/setup/MYODBCSetup.h
===================================================================
--- trunk/setup/MYODBCSetup.h	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/setup/MYODBCSetup.h	2007-02-07 20:16:26 UTC (rev 152)
@@ -21,7 +21,7 @@
 #ifndef MYODBCSETUP_H
 #define MYODBCSETUP_H
 
-#include "../myodbc3u/MYODBCUtil.h"
+#include "../util/MYODBCUtil.h"
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/setup/Makefile.am
===================================================================
--- trunk/setup/Makefile.am	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/setup/Makefile.am	2007-02-07 20:16:26 UTC (rev 152)
@@ -127,10 +127,10 @@
 	-release @myodbc_version@ \
 	-module
 
-# libmyodbc3S_la_LIBADD = @QT_LDFLAGS@ @LIB_QT@ ../myodbc3u/libmyodbc3u.la
-libmyodbc3S_la_LIBADD = $(QT_LDFLAGS) $(QT_LIBS) ../myodbc3u/libmyodbc3u.la
+# libmyodbc3S_la_LIBADD = @QT_LDFLAGS@ @LIB_QT@ ../util/libmyodbc3u.la
+libmyodbc3S_la_LIBADD = $(QT_LDFLAGS) $(QT_LIBS) ../util/libmyodbc3u.la
 
-libmyodbc3S_la_DEPENDENCIES = ../myodbc3u/libmyodbc3u.la
+libmyodbc3S_la_DEPENDENCIES = ../util/libmyodbc3u.la
 
 # LDFLAGS=@EXTRA_LDFLAGS@ 
 

Modified: trunk/setup/myodbc3S.pro
===================================================================
--- trunk/setup/myodbc3S.pro	2007-02-07 19:59:56 UTC (rev 151)
+++ trunk/setup/myodbc3S.pro	2007-02-07 20:16:26 UTC (rev 152)
@@ -47,7 +47,7 @@
 # WIN 
 # #########################################################
 win32 {
-        LIBS                    += user32.lib ../myodbc3u/myodbc3u.lib 
+        LIBS                    += user32.lib ../util/myodbc3u.lib 
 #        LIBS                    += /VERBOSE:LIB
         DEF_FILE                = myodbc3S.def
         RC_FILE                 = myodbc3S.rc
@@ -59,7 +59,7 @@
 # UNIX
 # #########################################################
 unix {
-        LIBS                    += -L../myodbc3u -lmyodbc3u
+        LIBS                    += -L../util -lmyodbc3u
         libraries.path	        = /usr/lib
         libraries.files	        = libmyodbc*
 }

Copied: trunk/util (from rev 151, trunk/myodbc3u)