Added:
trunk/driver/driver.pro
trunk/dsn-editor/dsn-editor.pro
trunk/installer/installer.pro
trunk/monitor/monitor.pro
trunk/setup/setup.pro
trunk/util/util.pro
Removed:
trunk/driver/myodbc3.pro
trunk/dsn-editor/myodbc3c.pro
trunk/installer/myodbc3i.pro
trunk/monitor/myodbc3m.pro
trunk/setup/myodbc3S.pro
trunk/util/myodbc3u.pro
Log:
Renamed .pro files for make clean
Copied: trunk/driver/driver.pro (from rev 157, trunk/driver/myodbc3.pro)
Deleted: trunk/driver/myodbc3.pro
===================================================================
--- trunk/driver/myodbc3.pro 2007-02-09 13:19:59 UTC (rev 159)
+++ trunk/driver/myodbc3.pro 2007-02-10 09:46:39 UTC (rev 160)
@@ -1,157 +0,0 @@
-# #########################################################
-#
-# \brief Use qt qmake on this to make the Makefile.
-#
-# This setup code is based upon the Qt class library
-# where the usual way to build code is to use the
-# Qt qmake tool to create a Makefile from a project
-# (this file).
-#
-# On UNIX, Linux and OSX your preference should be
-# to use the GNU auto-build but this will do as an
-# alternative.
-#
-# We need to build as a 'plugin' and not just a 'dll'
-# because on OSX plugins are special share libraries
-# called 'bundles' which can be explicitly loaded.
-#
-# The target directory is hard-coded but could be
-# done using an environment variable substitution
-# - or one could just edit this file. The hard coding
-# has been done just to save some time (for me).
-#
-# #########################################################
-
-# #########################################################
-# COMMON
-# #########################################################
-TEMPLATE = lib
-DESTDIR = ../lib
-!win32:VERSION = 3.51.13
-include( ../common.pri )
-include( ../config.pri )
-CONFIG += dll
-# CONFIG += plugin
-include( ../defines.pri )
-include( ../odbc.pri )
-include( ../mysql.pri )
-
-# Set TARGET based upon what we pickup in config.pri
-release {
- TARGET = myodbc3
-}
-debug {
- TARGET = myodbc3d
-}
-
-# #########################################################
-# WIN
-# We alter qmake cflags so as to use same libs as mysqlclient. We
-# also bring in the util sources so as to be same :)
-# #########################################################
-win32 {
- debug {
- QMAKE_CFLAGS_DEBUG -= -MDd
- QMAKE_CFLAGS_DEBUG += -MTd
- }
- release {
- QMAKE_CFLAGS_RELEASE -= -MD
- QMAKE_CFLAGS_RELEASE += -MT
- }
-
- DEFINES += __WIN__ ENGLISH MYODBC_EXPORTS _USERDLL
DONT_DEFINE_VOID
- LIBS += user32.lib advapi32.lib wsock32.lib
- DEF_FILE = myodbc3.def
- RC_FILE = myodbc3.rc
- libraries.path = /windows/system32
- libraries.files = myodbc3*.dll myodbc3*.lib
-}
-
-# #########################################################
-# UNIX
-# #########################################################
-unix {
- INCLUDEPATH += /usr/include
- LIBS += -L../util -lmyodbc3u -lltdl
- libraries.path = /usr/lib
- libraries.files = libmyodbc*
-}
-
-# #########################################################
-# OSX
-# #########################################################
-mac {
-# QMAKE_LFLAGS_PLUGIN += -bundle -flat_namespace -undefined suppress
- libraries.path = /usr/lib
- libraries.files = libmyodbc3.dylib
-}
-
-# #########################################################
-# INSTALL
-# #########################################################
-INSTALLS += libraries
-
-# #########################################################
-# FILES
-# #########################################################
-HEADERS = \
- myodbc3.h \
- error.h \
- myutil.h \
- ../util/MYODBCUtil.h \
- ../MYODBCDbg/include/MYODBCDbg.h
-SOURCES = \
- catalog.c \
- connect.c \
- cursor.c \
- dll.c \
- error.c \
- execute.c \
- handle.c \
- info.c \
- myodbc3.c \
- options.c \
- prepare.c \
- results.c \
- transact.c \
- utility.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 \
- ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgEnvAttrString.c \
- ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgFunctionsString.c \
- ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgHandleTypeString.c \
- ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgInfoTypeString.c \
- ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgPosTypeString.c \
- ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgReturnString.c \
- ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtAttrString.c \
- ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtOptionString.c \
- ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtTypeString.c \
- ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgTransactionTypeString.c
-
-win32 {
-HEADERS += \
- ../resource.h \
- ../VersionInfo.h
-}
-
Copied: trunk/dsn-editor/dsn-editor.pro (from rev 157, trunk/dsn-editor/myodbc3c.pro)
Deleted: trunk/dsn-editor/myodbc3c.pro
===================================================================
--- trunk/dsn-editor/myodbc3c.pro 2007-02-09 13:19:59 UTC (rev 159)
+++ trunk/dsn-editor/myodbc3c.pro 2007-02-10 09:46:39 UTC (rev 160)
@@ -1,103 +0,0 @@
-# #########################################################
-#
-# \brief This is a qmake project file for building the
-# the Qt based GUI MYODBCConfig application.
-#
-# The build here is done by using the setup code
-# directly - at build-time.
-#
-# #########################################################
-
-# #########################################################
-# COMMON
-# #########################################################
-TEMPLATE = app
-TARGET = myodbc3c
-DESTDIR = ../bin
-include( ../common.pri )
-include( ../config.pri )
-CONFIG += qt
-include( ../defines.pri )
-include( ../odbc.pri )
-
-INCLUDEPATH += ../util ../setup
-
-# #########################################################
-# WIN32
-# #########################################################
-win32 {
- LIBS += user32.lib ..\util\myodbc3u.lib
-# RC_FILE += MYODBCConfig.rc
-}
-
-# #########################################################
-# UNIX
-# #########################################################
-mac {
-} else:unix {
-# INCLUDEPATH += ../util ../setup /usr/include
- LIBS += -L../util -lmyodbc3u
-}
-
-# #########################################################
-# OSX
-# On OSX we produce a directory called; MYODBCConfig.app
-# which contains everything needed to execute the app
-# using the 'open' command or by double-clicking in
-# Finder. MYODBCConfig.app can be copied to where desired
-# in the file system (for example; /Applications/Utilities).
-# #########################################################
-mac {
-# DEFINES -= HAVE_ODBCINST_H
-# DEFINES += HAVE_IODBCINST_H
- LIBS -= -lmyodbc3S
- LIBS += -L../util -lmyodbc3u
- LIBS += -lltdl -framework Carbon -framework QuickTime -lz -framework
OpenGL -framework AGL -lz
- RC_FILE = MYODBCConfig.icns
-}
-
-# #########################################################
-# FILES
-# #########################################################
-HEADERS += \
- ../util/MYODBCUtil.h \
- ../setup/MYODBCSetup.h \
- ../setup/MYODBCSetupAssistText.h \
- ../setup/MYODBCSetupCheckBox.h \
- ../setup/MYODBCSetupComboBox.h \
- ../setup/MYODBCSetupComboBoxDatabases.h \
- ../setup/MYODBCSetupDataSourceDialog.h \
- ../setup/MYODBCSetupDataSourceTab1.h \
- ../setup/MYODBCSetupDataSourceTab2.h \
- ../setup/MYODBCSetupDataSourceTab3.h \
- ../setup/MYODBCSetupDataSourceTab3a.h \
- ../setup/MYODBCSetupDataSourceTab3b.h \
- ../setup/MYODBCSetupDataSourceTab3c.h \
- ../setup/MYODBCSetupDataSourceTab3d.h \
- ../setup/MYODBCSetupLineEdit.h
-
-SOURCES += \
- main.cpp \
- ../setup/MYODBCSetupAssistText.cpp \
- ../setup/MYODBCSetupCheckBox.cpp \
- ../setup/MYODBCSetupComboBox.cpp \
- ../setup/MYODBCSetupComboBoxDatabases.cpp \
- ../setup/MYODBCSetupConfigDSNAdd.c \
- ../setup/MYODBCSetupConfigDSNEdit.c \
- ../setup/MYODBCSetupConfigDSNRemove.c \
- ../setup/MYODBCSetupDataSourceConfig.cpp \
- ../setup/MYODBCSetupDataSourceDialog.cpp \
- ../setup/MYODBCSetupDataSourceTab1.cpp \
- ../setup/MYODBCSetupDataSourceTab2.cpp \
- ../setup/MYODBCSetupDataSourceTab3.cpp \
- ../setup/MYODBCSetupDataSourceTab3a.cpp \
- ../setup/MYODBCSetupDataSourceTab3b.cpp \
- ../setup/MYODBCSetupDataSourceTab3c.cpp \
- ../setup/MYODBCSetupDataSourceTab3d.cpp \
- ../setup/MYODBCSetupDriverConnect.c \
- ../setup/MYODBCSetupDriverConnectPrompt.cpp \
- ../setup/MYODBCSetupHandleInstallerError.c \
- ../setup/MYODBCSetupLineEdit.cpp
-
-
-
Copied: trunk/installer/installer.pro (from rev 157, trunk/installer/myodbc3i.pro)
Deleted: trunk/installer/myodbc3i.pro
===================================================================
--- trunk/installer/myodbc3i.pro 2007-02-09 13:19:59 UTC (rev 159)
+++ trunk/installer/myodbc3i.pro 2007-02-10 09:46:39 UTC (rev 160)
@@ -1,54 +0,0 @@
-# #########################################################
-#
-# \brief Use qt qmake on this to make the Makefile.
-#
-# This file is really only for XP because UNIX,
-# Linux, and OSX can use the gnu automake.
-#
-# This file exists for those that have qt (such as
-# myself). Others may simply use the Makefile.win
-#
-# #########################################################
-
-# #########################################################
-# COMMON
-# #########################################################
-TEMPLATE = app
-TARGET = myodbc3i
-DESTDIR = ../bin
-include( ../common.pri )
-include( ../config.pri )
-CONFIG += console
-include( ../defines.pri )
-include( ../odbc.pri )
-
-# #########################################################
-# WIN
-# #########################################################
-win32 {
- LIBS += user32.lib ..\util\myodbc3u.lib
-}
-
-# #########################################################
-# UNIX
-# #########################################################
-unix {
- LIBS += -L../util -lmyodbc3u -lltdl
-}
-
-# #########################################################
-# OSX
-# #########################################################
-mac {
-# CONFIG -= thread
-# DEFINES -= HAVE_ODBCINST_H
-# DEFINES += HAVE_IODBCINST_H
-}
-
-# #########################################################
-# FILES
-# #########################################################
-HEADERS =
-SOURCES = \
- myodbc3i.c
-
Copied: trunk/monitor/monitor.pro (from rev 157, trunk/monitor/myodbc3m.pro)
Deleted: trunk/monitor/myodbc3m.pro
===================================================================
--- trunk/monitor/myodbc3m.pro 2007-02-09 13:19:59 UTC (rev 159)
+++ trunk/monitor/myodbc3m.pro 2007-02-10 09:46:39 UTC (rev 160)
@@ -1,52 +0,0 @@
-# #########################################################
-#
-# \brief Use qt qmake on this to make the Makefile.
-#
-# This file is really only for XP because UNIX,
-# Linux, and OSX can use the gnu automake.
-#
-# This file exists for those that have qt (such as
-# myself). Others may simply use the Makefile.win
-#
-# #########################################################
-
-# #########################################################
-# COMMON
-# #########################################################
-TEMPLATE = app
-TARGET = myodbc3m
-DESTDIR = ../bin
-include( ../common.pri )
-include( ../config.pri )
-CONFIG += console
-include( ../defines.pri )
-include( ../odbc.pri )
-
-# #########################################################
-# WIN
-# #########################################################
-win32 {
- LIBS += ..\util\myodbc3u.lib
-}
-
-# #########################################################
-# UNIX
-# #########################################################
-unix {
- LIBS += -L../util -lmyodbc3u
-}
-
-# #########################################################
-# OSX
-# #########################################################
-mac {
-}
-
-# #########################################################
-# FILES
-# #########################################################
-HEADERS = \
- myodbc3m.h
-SOURCES = \
- myodbc3m.c
-
Deleted: trunk/setup/myodbc3S.pro
===================================================================
--- trunk/setup/myodbc3S.pro 2007-02-09 13:19:59 UTC (rev 159)
+++ trunk/setup/myodbc3S.pro 2007-02-10 09:46:39 UTC (rev 160)
@@ -1,127 +0,0 @@
-# #########################################################
-#
-# \brief Use qt qmake on this to make the Makefile.
-#
-# This setup code is based upon the Qt class library
-# where the usual way to build code is to use the
-# Qt qmake tool to create a Makefile from a project
-# (this file).
-#
-# On UNIX, Linux and OSX your preference should be
-# to use the GNU auto-build but this will do as an
-# alternative.
-#
-# We need to build as a 'plugin' and not just a 'dll'
-# because on OSX plugins are special share libraries
-# called 'bundles' which can be explicitly loaded.
-#
-# The target directory is hard-coded but could be
-# done using an environment variable substitution
-# - or one could just edit this file. The hard coding
-# has been done just to save some time (for me).
-#
-# #########################################################
-
-# #########################################################
-# COMMON
-# #########################################################
-TEMPLATE = lib
-DESTDIR = ../lib
-include( ../common.pri )
-include( ../config.pri )
-CONFIG += qt plugin
-include( ../defines.pri )
-include( ../odbc.pri )
-
-# Set TARGET based upon what we pickup in config.pri. It is
-# natural to make debug target myodbc3Sd but we want to keep
-# the name len down to 8 chars.
-release {
- TARGET = myodbc3S
-}
-debug {
- TARGET = myodbc3E
-}
-
-# #########################################################
-# WIN
-# #########################################################
-win32 {
- LIBS += user32.lib ../util/myodbc3u.lib
-# LIBS += /VERBOSE:LIB
- DEF_FILE = myodbc3S.def
- RC_FILE = myodbc3S.rc
- libraries.path = /windows/system32
- libraries.files = myodbc3S.dll
-}
-
-# #########################################################
-# UNIX
-# #########################################################
-unix {
- LIBS += -L../util -lmyodbc3u
- libraries.path = /usr/lib
- libraries.files = libmyodbc*
-}
-
-# #########################################################
-# OSX
-# #########################################################
-mac {
-# QMAKE_LFLAGS_PLUGIN += -bundle -flat_namespace -undefined suppress
- libraries.path = /usr/lib
- libraries.files = libmyodbc3S.dylib
-}
-
-# #########################################################
-# INSTALL
-# #########################################################
-INSTALLS += libraries
-
-# #########################################################
-# FILES
-# #########################################################
-HEADERS = \
- MYODBCSetupAssistText.h \
- MYODBCSetupCheckBox.h \
- MYODBCSetupComboBox.h \
- MYODBCSetupComboBoxDatabases.h \
- MYODBCSetup.h \
- MYODBCSetupDataSourceDialog.h \
- MYODBCSetupDataSourceTab1.h \
- MYODBCSetupDataSourceTab2.h \
- MYODBCSetupDataSourceTab3.h \
- MYODBCSetupDataSourceTab3a.h \
- MYODBCSetupDataSourceTab3b.h \
- MYODBCSetupDataSourceTab3c.h \
- MYODBCSetupDataSourceTab3d.h \
- MYODBCSetupLineEdit.h
-SOURCES = \
- ConfigDSN.c \
- MYODBCSetupAssistText.cpp \
- MYODBCSetupCheckBox.cpp \
- MYODBCSetupComboBox.cpp \
- MYODBCSetupComboBoxDatabases.cpp \
- MYODBCSetupConfigDSNAdd.c \
- MYODBCSetupConfigDSNEdit.c \
- MYODBCSetupConfigDSNRemove.c \
- MYODBCSetupDataSourceConfig.cpp \
- MYODBCSetupDataSourceDialog.cpp \
- MYODBCSetupDataSourceTab1.cpp \
- MYODBCSetupDataSourceTab2.cpp \
- MYODBCSetupDataSourceTab3.cpp \
- MYODBCSetupDataSourceTab3a.cpp \
- MYODBCSetupDataSourceTab3b.cpp \
- MYODBCSetupDataSourceTab3c.cpp \
- MYODBCSetupDataSourceTab3d.cpp \
- MYODBCSetupDriverConnect.c \
- MYODBCSetupDriverConnectPrompt.cpp \
- MYODBCSetupHandleInstallerError.c \
- MYODBCSetupLineEdit.cpp
-
-win32 {
-HEADERS += \
- ../resource.h \
- ../VersionInfo.h
-}
-
Copied: trunk/setup/setup.pro (from rev 157, trunk/setup/myodbc3S.pro)
Deleted: trunk/util/myodbc3u.pro
===================================================================
--- trunk/util/myodbc3u.pro 2007-02-09 13:19:59 UTC (rev 159)
+++ trunk/util/myodbc3u.pro 2007-02-10 09:46:39 UTC (rev 160)
@@ -1,79 +0,0 @@
-# #########################################################
-#
-# \brief This is a qt qmake project file. Use this to
-# create a regular make file.
-#
-# This file is really only for XP because UNIX,
-# Linux, and OSX can use the gnu automake.
-#
-# This file exists for those that have qt (such as
-# myself). Others may simply use the Makefile as is.
-#
-# The idea is that we create a static lib which can
-# be used, in-place, by the setup library and the
-# driver.
-#
-# Util does not include any Qt but Qt based code
-# in MyODBC does depend upon Util.
-#
-# #########################################################
-
-# #########################################################
-# COMMON
-# #########################################################
-
-TEMPLATE = lib
-TARGET = myodbc3u
-DESTDIR = ./
-include( ../common.pri )
-include( ../config.pri )
-CONFIG += staticlib console
-# plugin needed on sparc64 to get relocatable code in a static lib
-# CONFIG += staticlib plugin
-include( ../defines.pri )
-include( ../odbc.pri )
-
-# #########################################################
-# WIN
-# #########################################################
-win32 {
-}
-
-# #########################################################
-# UNIX
-# #########################################################
-unix {
-}
-
-# #########################################################
-# OSX
-# #########################################################
-mac {
-}
-
-# #########################################################
-# FILES
-# #########################################################
-HEADERS = \
- MYODBCUtil.h
-SOURCES = \
- MYODBCUtilAllocDataSource.c \
- MYODBCUtilAllocDriver.c \
- MYODBCUtilClearDataSource.c \
- MYODBCUtilClearDriver.c \
- MYODBCUtilDefaultDataSource.c \
- MYODBCUtilDSNExists.c \
- MYODBCUtilFreeDataSource.c \
- MYODBCUtilFreeDriver.c \
- MYODBCUtilGetDataSourceNames.c \
- MYODBCUtilGetDriverNames.c \
- MYODBCUtilInsertStr.c \
- MYODBCUtilReadConnectStr.c \
- MYODBCUtilReadDataSource.c \
- MYODBCUtilReadDataSourceStr.c \
- MYODBCUtilReadDriver.c \
- MYODBCUtilWriteConnectStr.c \
- MYODBCUtilWriteDataSource.c \
- MYODBCUtilWriteDataSourceStr.c \
- MYODBCUtilWriteDriver.c
-
Copied: trunk/util/util.pro (from rev 157, trunk/util/myodbc3u.pro)
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r160 - in trunk: driver dsn-editor installer monitor setup util | grichter | 10 Feb |
