Modified:
MYODBCInstaller/MYODBCInstaller.cpp
MYODBCInstaller/MYODBCInstaller.h
MYODBCInstaller/main.cpp
MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.pro
MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.vpj
MYODBCSetup/MYODBCSetupTest/MYODBCSetupTest.c
connector-odbc.vpw
Log:
Modified: MYODBCInstaller/MYODBCInstaller.cpp
===================================================================
--- MYODBCInstaller/MYODBCInstaller.cpp 2006-04-22 04:12:10 UTC (rev 98)
+++ MYODBCInstaller/MYODBCInstaller.cpp 2006-04-22 19:38:35 UTC (rev 99)
@@ -65,7 +65,7 @@
return true;
}
-bool MYODBCInstaller::doShowDataSources( MYODBC_INS_DATASOURCE_SCOPE nScope )
+bool MYODBCInstaller::doShowDataSources( MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
QStringList stringlistDataSourceNames =
MYODBCIns::getDataSourceNames( nScope );
QStringList::const_iterator i;
@@ -97,10 +97,12 @@
return true;
}
-bool MYODBCInstaller::doShowDataSource( const QString &stringName,
MYODBC_INS_DATASOURCE_SCOPE nScope )
+bool MYODBCInstaller::doShowDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
- MYODBCInsDataSource datasource( MYODBC_INS_DATASOURCE_MODE_DSN_VIEW );
+ MYODBCInsDataSource datasource;
+ datasource.setMode( MYODBCInsDataSource::DATASOURCE_MODE_DSN_VIEW );
+
if ( !datasource.doRead( stringName, nScope ) )
{
doShowErrors();
@@ -138,7 +140,7 @@
return true;
}
-bool MYODBCInstaller::doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBC_INS_DATASOURCE_SCOPE nScope )
+bool MYODBCInstaller::doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
if ( !MYODBCIns::doInsertDataSource( stringName, stringAttributes, nScope ) )
{
@@ -151,7 +153,7 @@
return true;
}
-bool MYODBCInstaller::doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBC_INS_DATASOURCE_SCOPE nScope )
+bool MYODBCInstaller::doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
if ( !MYODBCIns::doUpdateDataSource( stringName, stringAttributes, nScope ) )
{
@@ -164,7 +166,7 @@
return true;
}
-bool MYODBCInstaller::doDeleteDataSource( const QString &stringName,
MYODBC_INS_DATASOURCE_SCOPE nScope )
+bool MYODBCInstaller::doDeleteDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope )
{
if ( !MYODBCIns::doDeleteDataSource( stringName, nScope ) )
{
Modified: MYODBCInstaller/MYODBCInstaller.h
===================================================================
--- MYODBCInstaller/MYODBCInstaller.h 2006-04-22 04:12:10 UTC (rev 98)
+++ MYODBCInstaller/MYODBCInstaller.h 2006-04-22 19:38:35 UTC (rev 99)
@@ -63,14 +63,14 @@
QTextStream *pstreamStdErr;
bool doShowDrivers();
- bool doShowDataSources( MYODBC_INS_DATASOURCE_SCOPE nScope =
MYODBC_INS_DATASOURCE_SCOPE_BOTH );
+ bool doShowDataSources( MYODBCInsDataSource::DATASOURCE_SCOPE nScope =
MYODBCInsDataSource::DATASOURCE_SCOPE_BOTH );
bool doShowDriver( const QString &stringName );
- bool doShowDataSource( const QString &stringName, MYODBC_INS_DATASOURCE_SCOPE
nScope = MYODBC_INS_DATASOURCE_SCOPE_BOTH );
+ bool doShowDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope = MYODBCInsDataSource::DATASOURCE_SCOPE_BOTH
);
bool doRegisterDriver( const QString &stringName, const QString
&stringAttributes );
bool doDeregisterDriver( const QString &stringName );
- bool doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBC_INS_DATASOURCE_SCOPE nScope =
MYODBC_INS_DATASOURCE_SCOPE_BOTH );
- bool doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBC_INS_DATASOURCE_SCOPE nScope =
MYODBC_INS_DATASOURCE_SCOPE_BOTH );
- bool doDeleteDataSource( const QString &stringName, MYODBC_INS_DATASOURCE_SCOPE
nScope = MYODBC_INS_DATASOURCE_SCOPE_BOTH );
+ bool doInsertDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope =
MYODBCInsDataSource::DATASOURCE_SCOPE_BOTH );
+ bool doUpdateDataSource( const QString &stringName, const QString
&stringAttributes, MYODBCInsDataSource::DATASOURCE_SCOPE nScope =
MYODBCInsDataSource::DATASOURCE_SCOPE_BOTH );
+ bool doDeleteDataSource( const QString &stringName,
MYODBCInsDataSource::DATASOURCE_SCOPE nScope = MYODBCInsDataSource::DATASOURCE_SCOPE_BOTH
);
protected:
bool doShowErrors();
Modified: MYODBCInstaller/main.cpp
===================================================================
--- MYODBCInstaller/main.cpp 2006-04-22 04:12:10 UTC (rev 98)
+++ MYODBCInstaller/main.cpp 2006-04-22 19:38:35 UTC (rev 99)
@@ -128,18 +128,18 @@
bool doDataSource()
{
// validate scope and translate to internal type
- MYODBC_INS_DATASOURCE_SCOPE nScope;
+ MYODBCInsDataSource::DATASOURCE_SCOPE nScope;
switch ( cScope.toAscii() )
{
case '1':
- nScope = MYODBC_INS_DATASOURCE_SCOPE_SYSTEM;
+ nScope = MYODBCInsDataSource::DATASOURCE_SCOPE_SYSTEM;
break;
case '2':
- nScope = MYODBC_INS_DATASOURCE_SCOPE_USER;
+ nScope = MYODBCInsDataSource::DATASOURCE_SCOPE_USER;
break;
case '3':
- nScope = MYODBC_INS_DATASOURCE_SCOPE_BOTH;
+ nScope = MYODBCInsDataSource::DATASOURCE_SCOPE_BOTH;
break;
default:
*pinstaller->pstreamStdOut << "[ERROR] Invalid scope " <<
cScope << endl;
Modified: MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.pro
===================================================================
--- MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.pro 2006-04-22 04:12:10 UTC (rev 98)
+++ MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.pro 2006-04-22 19:38:35 UTC (rev 99)
@@ -1,6 +1,46 @@
-TEMPLATE = subdirs
+# TEMPLATE = subdirs
+#
+# win32 {
+# SUBDIRS = MYODBCSetupLibMFC
+# }
+# #########################################################
+# COMMON
+# #########################################################
+TEMPLATE = lib
+DESTDIR = ../../lib
+include( ../common.pri )
+include( ../config.pri )
+CONFIG += qt plugin
+include( ../defines.pri )
+include( ../odbc.pri )
+
+TARGET = MYODBCSetup
+
+# #########################################################
+# WIN
+# #########################################################
win32 {
- SUBDIRS = MYODBCSetupLibMFC
+ LIBS += user32.lib
+# LIBS += /VERBOSE:LIB
+ DEF_FILE = MYODBCSetup.def
+ RC_FILE = MYODBCSetup.rc
+ libraries.path = /windows/system32
+ libraries.files = MYODBCSetup.dll
}
+# #########################################################
+# INSTALL
+# #########################################################
+INSTALLS += libraries
+
+# #########################################################
+# FILES
+# #########################################################
+HEADERS = \
+ MYODBCSetupInternal.h \
+ MYODBCSetupDataSourceDialog.h
+SOURCES = \
+ ConfigDSN.cpp \
+ MYODBCSetupDataSourceDialog.cpp
+
Modified: MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.vpj
===================================================================
--- MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.vpj 2006-04-22 04:12:10 UTC (rev 98)
+++ MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.vpj 2006-04-22 19:38:35 UTC (rev 99)
@@ -184,10 +184,17 @@
<Folder
Name="Source Files"
Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl">
+ <F N="ConfigDSN.cpp"/>
+ <F N="MYODBCSetup.rc"/>
+ <F N="MYODBCSetupDataSourceDialog.cpp"/>
</Folder>
<Folder
Name="Header Files"
Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
+ <F N="MYODBCSetupDataSourceDialog.h"/>
+ <F N="MYODBCSetupInternal.h"/>
+ <F N="resource.h"/>
+ <F N="VersionInfo.h"/>
</Folder>
<Folder
Name="Resource Files"
@@ -199,6 +206,7 @@
Name="Other Files"
Filters="">
<F N="CMakeLists.txt"/>
+ <F N="MYODBCSetup.def"/>
<F N="MYODBCSetupLib.pro"/>
</Folder>
</Files>
Modified: MYODBCSetup/MYODBCSetupTest/MYODBCSetupTest.c
===================================================================
--- MYODBCSetup/MYODBCSetupTest/MYODBCSetupTest.c 2006-04-22 04:12:10 UTC (rev 98)
+++ MYODBCSetup/MYODBCSetupTest/MYODBCSetupTest.c 2006-04-22 19:38:35 UTC (rev 99)
@@ -1,9 +1,9 @@
#include <MYODBCC.h>
#ifdef WIN32
-#define MYODBC_SETUP_LIBNAME "..\\lib\\myodbc5S.dll"
+#define MYODBC_SETUP_LIBNAME "..\\lib\\MYODBCSetup.dll"
#else
-#define MYODBC_SETUP_LIBNAME "../lib/libmyodbc5S.so"
+#define MYODBC_SETUP_LIBNAME "../lib/libMYODBCSetup.so"
#endif
#define MYODBC_SETUP_SYMBOL "ConfigDSN"
Modified: connector-odbc.vpw
===================================================================
--- connector-odbc.vpw 2006-04-22 04:12:10 UTC (rev 98)
+++ connector-odbc.vpw 2006-04-22 19:38:35 UTC (rev 99)
@@ -2,6 +2,7 @@
<Workspace Version="10.0" VendorName="SlickEdit">
<Projects>
<Project File="dltest/dltest.vpj" />
+ <Project File="../connector-odbc3/myodbc3S/myodbc3S.vpj" />
<Project File="MYODBCAtt/MYODBCAtt.vpj" />
<Project File="MYODBCAtt/MYODBCAttLib/MYODBCAttLib.vpj" />
<Project File="MYODBCAtt/MYODBCAttTest/MYODBCAttTest.vpj" />
| Thread |
|---|
| • Connector/ODBC 5 commit: r99 - / MYODBCInstaller MYODBCSetup/MYODBCSetupLib MYODBCSetup/MYODBCSetupTest | pharvey | 22 Apr |
