From: <ibr...@us...> - 2009-05-22 02:23:30
|
Revision: 3198 http://tora.svn.sourceforge.net/tora/?rev=3198&view=rev Author: ibre5041 Date: 2009-05-22 02:00:15 +0000 (Fri, 22 May 2009) Log Message: ----------- second try Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/toconnection.cpp branches/tora-trotl/src/toconnection.h branches/tora-trotl/src/toconnectionpool.cpp branches/tora-trotl/src/toconnectionpool.h branches/tora-trotl/src/toeventquery.cpp branches/tora-trotl/src/tonoblockquery.cpp branches/tora-trotl/src/tooracleconnection.cpp branches/tora-trotl/src/toresultstorage.cpp Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2009-05-22 01:55:21 UTC (rev 3197) +++ branches/tora-trotl/CMakeLists.txt 2009-05-22 02:00:15 UTC (rev 3198) @@ -131,13 +131,13 @@ SET(CMAKE_CXX_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions ${CXX_WARNINGS}") SET(CMAKE_C_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions ${CXX_WARNINGS}") ELSE(APPLE) - SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 ${CXX_WARNINGS} -fstrict-aliasing") - SET(CMAKE_C_FLAGS_DEBUG "-O0 -g3 ${CXX_WARNINGS} -fstrict-aliasing") + SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS} -fstrict-aliasing") + SET(CMAKE_C_FLAGS_DEBUG "-O0 -ggbb3 -fno-inline ${CXX_WARNINGS} -fstrict-aliasing") ENDIF(APPLE) -SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") -SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") +SET(CMAKE_CXX_FLAGS_RELEASE "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS}") +SET(CMAKE_C_FLAGS_RELEASE "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS}") # Required for win wjen there is used an external qscintilla lib IF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) SET(CMAKE_CXX_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_CXX_FLAGS_RELEASE}") @@ -330,4 +330,3 @@ COMMAND make package_source COMMAND rpmbuild -ba ${RPM_DEFINES} "${RPM_SPEC}" ) - Modified: branches/tora-trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/CMakeLists.txt 2009-05-22 01:55:21 UTC (rev 3197) +++ branches/tora-trotl/src/CMakeLists.txt 2009-05-22 02:00:15 UTC (rev 3198) @@ -464,7 +464,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/loki/include ${CMAKE_CURRENT_SOURCE_DIR}/otl "/usr/local/trotl/include" - "/home/ibrezina/workspace/boost_1_38_0" +# "/home/ibrezina/workspace/boost_1_38_0" ) IF (POSTGRESQL_INCLUDE_DIR) Modified: branches/tora-trotl/src/toconnection.cpp =================================================================== --- branches/tora-trotl/src/toconnection.cpp 2009-05-22 01:55:21 UTC (rev 3197) +++ branches/tora-trotl/src/toconnection.cpp 2009-05-22 02:00:15 UTC (rev 3198) @@ -1,3 +1,6 @@ +#include <iomanip> +#include <iostream> +#include <string> /* BEGIN_COMMON_COPYRIGHT_HEADER * @@ -652,6 +655,8 @@ toQValue toQuery::readValue(void) { + std::cout << "toQValue toQuery::readValue(void)" << this->sql().toUtf8().constData() << "'" << std::endl; + if (!Connection) return toQValue(0); @@ -662,6 +667,8 @@ toQValue toQuery::readValueNull(void) { + //TODO + std::cout << "toQuery::readValueNull(void): '" << this->sql().toUtf8().constData() << "'" << std::endl; if (!Connection) return toQValue(0); Modified: branches/tora-trotl/src/toconnection.h =================================================================== --- branches/tora-trotl/src/toconnection.h 2009-05-22 01:55:21 UTC (rev 3197) +++ branches/tora-trotl/src/toconnection.h 2009-05-22 02:00:15 UTC (rev 3198) @@ -708,14 +708,14 @@ connectionImpl *Connection; -class cacheObjects : public toTask + class cacheObjects : public toTask { - QPointer<toConnection> Connection; + QPointer<toConnection> Connection; public: - cacheObjects(toConnection *conn) - : Connection(conn) - { } - virtual void run(void); + cacheObjects(toConnection *conn) + : Connection(conn) + { } + virtual void run(void); }; friend class cacheObjects; @@ -1078,6 +1078,7 @@ class toConnectionProvider { + public: static std::map<QString, toConnectionProvider *> *Providers; static std::map<QString, toConnectionProvider *> *Types; QString Provider; Modified: branches/tora-trotl/src/toconnectionpool.cpp =================================================================== --- branches/tora-trotl/src/toconnectionpool.cpp 2009-05-22 01:55:21 UTC (rev 3197) +++ branches/tora-trotl/src/toconnectionpool.cpp 2009-05-22 02:00:15 UTC (rev 3198) @@ -1,3 +1,6 @@ +#include <iomanip> +#include <iostream> +#include <string> /* BEGIN_COMMON_COPYRIGHT_HEADER * @@ -51,7 +54,7 @@ #include <QApplication> -static const int TEST_MSEC = 5000; +static const int TEST_MSEC = 5000000; toConnectionPoolTest::toConnectionPoolTest(toConnectionPool *pool) @@ -75,6 +78,7 @@ void toConnectionPoolTest::test() { for(int i = 0; Pool && i < Pool->size(); i++) { + std::cout << "void toConnectionPoolTest::test(" << i << ")" << std::endl; toConnectionPool::PooledState state = Pool->test(i); if(state == toConnectionPool::Busy) continue; @@ -239,6 +243,8 @@ PooledState state = Free; try { QString sql = toSQL::string("Global:Now", *Connection); + std::cout << "toConnectionPool::PooledState toConnectionPool::test(PooledSub *sub) {:" + << sql.toUtf8().constData() << std::endl; if(sql.isEmpty()) return state; Modified: branches/tora-trotl/src/toconnectionpool.h =================================================================== --- branches/tora-trotl/src/toconnectionpool.h 2009-05-22 01:55:21 UTC (rev 3197) +++ branches/tora-trotl/src/toconnectionpool.h 2009-05-22 02:00:15 UTC (rev 3198) @@ -131,7 +131,7 @@ toConnectionPoolTest *TestThread; // for future configuration - static const int PreferredSize = 3; + static const int PreferredSize = 2; enum PooledState { Busy, Modified: branches/tora-trotl/src/toeventquery.cpp =================================================================== --- branches/tora-trotl/src/toeventquery.cpp 2009-05-22 01:55:21 UTC (rev 3197) +++ branches/tora-trotl/src/toeventquery.cpp 2009-05-22 02:00:15 UTC (rev 3198) @@ -1,3 +1,6 @@ +#include <iomanip> +#include <iostream> +#include <string> /* BEGIN_COMMON_COPYRIGHT_HEADER * @@ -50,6 +53,8 @@ toQValue toEventQuery::readValueNull() { + std::cout << "toQValue toEventQuery::readValueNull()" << std::endl; + if(Values.isEmpty()) throw tr("Read past end of query"); Modified: branches/tora-trotl/src/tonoblockquery.cpp =================================================================== --- branches/tora-trotl/src/tonoblockquery.cpp 2009-05-22 01:55:21 UTC (rev 3197) +++ branches/tora-trotl/src/tonoblockquery.cpp 2009-05-22 02:00:15 UTC (rev 3198) @@ -1,3 +1,6 @@ +#include <iomanip> +#include <iostream> +#include <string> /* BEGIN_COMMON_COPYRIGHT_HEADER * @@ -161,6 +164,8 @@ toQValue toNoBlockQuery::readValueNull() { + std::cout << "toQValue toNoBlockQuery::readValueNull()" << std::endl; + if (CurrentValue == Values.end()) { Lock.lock(); Modified: branches/tora-trotl/src/tooracleconnection.cpp =================================================================== --- branches/tora-trotl/src/tooracleconnection.cpp 2009-05-22 01:55:21 UTC (rev 3197) +++ branches/tora-trotl/src/tooracleconnection.cpp 2009-05-22 02:00:15 UTC (rev 3198) @@ -1,3 +1,6 @@ +#include <iomanip> +#include <iostream> +#include <string> /* BEGIN_COMMON_COPYRIGHT_HEADER * @@ -55,6 +58,7 @@ */ //#define OTL_STREAM_POOLING_ON +#if 0 //ivan #define OTL_STL #define OTL_EXCEPTION_ENABLE_ERROR_OFFSET #define OTL_ORA_UTF8 @@ -72,6 +76,8 @@ #endif #endif +#endif + #if 0 /* OTL tracing */ #define OTL_TRACE_LEVEL 0xff #define OTL_TRACE_STREAM cerr @@ -79,7 +85,8 @@ using namespace std; #endif -#include "otlv4.h" +//#include "otlv4.h" +#include <trotl.h> #include "toconf.h" #include "toconnection.h" @@ -135,1199 +142,1331 @@ " order by table_owner,table_name", "List the synonyms available to a user, should have same columns and binds"); -static void ThrowException(const otl_exception &exc) +static void ThrowException(const ::trotl::OciException &exc) { - if (exc.code == 24344) - throw toConnection::exception(QString::fromLatin1("ORA-24344 success with compilation error")); - else - { - toConnection::exception ret(QString::fromUtf8((const char *)exc.msg)); - - if (ret.isEmpty()) - { - if (exc.code != 0) - { - ret = QString::fromLatin1("ORA-") + - QString::number(exc.code) + - QString::fromLatin1(" missing error description"); - } - else if (ret.isEmpty()) - { - ret = QString::fromLatin1( - "Missing error description. This may be caused by a library " - "version mismatch. Check that your ORACLE_HOME and library path is correct."); - } - } - - if (exc.stm_text && strlen(exc.stm_text)) - { - ret += QString::fromLatin1("\n"); - QString sql = QString::fromUtf8((const char *)exc.stm_text); - if (exc.code >= 0) - { - QString t = QString::fromUtf8((const char *)exc.stm_text, exc.error_offset); - ret.setOffset(t.length()); - sql.insert(t.length(), QString::fromLatin1("<ERROR>")); - } - ret += sql; - } - throw ret; - } + std::cout << "static void ThrowException(const ::trotl::OciException &exc)" << std::endl; + std::cout << "What:" << exc.what() << std::endl + << exc.get_sql() << std::endl + << "--------------------------------------------------------------------------------" << std::endl; + if (exc.get_code() == 24344) + throw toConnection::exception(QString::fromLatin1("ORA-24344 success with compilation error")); + else + { + toConnection::exception ret(QString::fromUtf8(exc.get_mesg())); + /*** + if (ret.isEmpty()) + { + if (exc.code != 0) + { + ret = QString::fromLatin1("ORA-") + + QString::number(exc.code) + + QString::fromLatin1(" missing error description"); + } + else if (ret.isEmpty()) + { + ret = QString::fromLatin1( + "Missing error description. This may be caused by a library " + "version mismatch. Check that your ORACLE_HOME and library path is correct."); + } + } + */ + /*** + if (exc.stm_text && strlen(exc.stm_text)) + { + ret += QString::fromLatin1("\n"); + QString sql = QString::fromUtf8((const char *)exc.stm_text); + if (exc.code >= 0) + { + QString t = QString::fromUtf8((const char *)exc.stm_text, exc.error_offset); + ret.setOffset(t.length()); + sql.insert(t.length(), QString::fromLatin1("<ERROR>")); + } + ret += sql; + } + */ + throw ret; + } } class toOracleProvider : public toConnectionProvider { + ::trotl::OciEnv *_envp; public: - class oracleSub : public toConnectionSub - { - public: - otl_connect *Connection; - oracleSub(otl_connect *conn) - { - Connection = conn; - } - ~oracleSub() - { - try { - delete Connection; - } - catch(...) { - } + class oracleSub : public toConnectionSub + { + public: + + ::trotl::OciConnection *Connection; + oracleSub(::trotl::OciConnection *conn) + { + Connection = conn; + } + + ~oracleSub() + { + try { + delete Connection; + } + catch(...) { + } - Connection = 0; - } - virtual void cancel(void) - { - Connection->cancel(); - } - virtual void throwExtendedException(toConnection &conn, const otl_exception &exc) - { - if (conn.version() < "0800" && exc.code == 0) - { - // Serious OCI voodoo to get the Parse error location on Oracle7 servers + Connection = 0; + } + + virtual void cancel(void) + { + Connection->cancel(); + } + + virtual void throwExtendedException(toConnection &conn, const ::trotl::OciException &exc) + { + std::cout << "virtual void throwExtendedException(toConnection &conn, const ::trotl::OciException &exc)" << std::endl; + std::cout << "What:" << exc.what() << std::endl + << exc.get_sql() << std::endl + << "--------------------------------------------------------------------------------" << std::endl; + if (conn.version() < "0800" && exc.get_code() == 0) + { + // Serious OCI voodoo to get the Parse error location on Oracle7 servers + // TODO + /* + Lda_Def lda; + Cda_Def cda; + if (OCISvcCtxToLda(Connection->connect_struct.svchp, + Connection->connect_struct.errhp, + &lda) == OCI_SUCCESS) + { + if (oopen(&cda, + &lda, + (OraText *)0, -1, + -1, + (OraText *)0, -1) == OCI_SUCCESS) + { + cda.peo = 0; + oparse(&cda, (OraText *)exc.stm_text, -1, FALSE, 1); + ((::trotl::OciException &)exc).code = cda.peo; + oclose(&cda); + } + OCILdaToSvcCtx(&Connection->connect_struct.svchp, + Connection->connect_struct.errhp, + &lda); + } + */ + } + ThrowException(exc); + } + }; + + class oracleQuery : public toQuery::queryImpl + { + bool Cancel; + bool Running; + bool SaveInPool; + ::trotl::SqlStatement *Query; + public: + oracleQuery(toQuery *query, oracleSub *) + : toQuery::queryImpl(query) + { + std::cout << "oracleQuery::oracleQuery(toQuery *query, oracleSub *)" << std::endl; + Running = Cancel = false; + SaveInPool = false; + Query = NULL; + } + virtual ~oracleQuery() + { + if (!Query) + return; + + Query->close(); + delete Query; + } + + virtual void execute(void); - Lda_Def lda; - Cda_Def cda; - if (OCISvcCtxToLda(Connection->connect_struct.svchp, - Connection->connect_struct.errhp, - &lda) == OCI_SUCCESS) - { - if (oopen(&cda, - &lda, - (OraText *)0, -1, - -1, - (OraText *)0, -1) == OCI_SUCCESS) - { - cda.peo = 0; - oparse(&cda, (OraText *)exc.stm_text, -1, FALSE, 1); - ((otl_exception &)exc).code = cda.peo; - oclose(&cda); - } - OCILdaToSvcCtx(&Connection->connect_struct.svchp, - Connection->connect_struct.errhp, - &lda); - } - } - ThrowException(exc); - } - }; + virtual toQValue readValue(void) + { + std::string val; + (*Query) >> val; + //std::cout << "TODO: readValue:" << val << std::endl << __HERE_SHORT__ << std::endl; + std::cout << '\'' << val << '\''; + return toQValue(val.c_str()); + + /* + char *buffer = NULL; + otl_var_desc *dsc = Query->describe_next_out_var(); + if (!dsc) + throw QString::fromLatin1("Couldn't get description of next column to read"); + + oracleSub *conn = dynamic_cast<oracleSub *>(query()->connectionSub()); + if (!conn) + throw QString::fromLatin1("Internal error, not oracle sub connection"); + if (Cancel) + throw QString::fromLatin1("Cancelled while waiting to read value"); + Running = true; + SaveInPool = true; + try + { + toQValue null; + switch (dsc->ftype) + { + case otl_var_double: + case otl_var_float: + { + double d = 0; + (*Query) >> d; + Running = false; + if (Query->is_null()) + return null; + return toQValue(d); + } + break; + case otl_var_int: + case otl_var_unsigned_int: + case otl_var_short: + case otl_var_long_int: + { + int i = 0; + (*Query) >> i; + Running = false; + if (Query->is_null()) + return null; + return toQValue(i); + } + break; + case otl_var_varchar_long: + case otl_var_raw: + case otl_var_raw_long: + { + int len = toMaxLong; + if (toMaxLong < 0) + len = DEFAULT_MAX_LONG; + buffer = (char *)malloc(len + 1); + buffer[len] = 0; + otl_long_string str(buffer, len); + (*Query) >> str; + Running = false; + + if (!str.len()) { + free(buffer); + return null; + } + + QString buf; + if (dsc->ftype == otl_var_varchar_long) + { + buf = (QString::fromUtf8(buffer)); + free(buffer); + return buf; + } + else + { + QByteArray ret(buffer, str.len()); + free(buffer); + return toQValue::createBinary(ret); + } + } + case otl_var_clob: + case otl_var_blob: + { + otl_lob_stream lob; + (*Query) >> lob; + if (lob.len() == 0) + { + Running = false; + return null; + } + int len = lob.len(); + if (toMaxLong >= 0 && len > toMaxLong) + len = toMaxLong; + if (dsc->ftype == otl_var_clob) + len *= 5; + else + len *= 2; + buffer = (char *)malloc(len + 1); + buffer[0] = 0; + otl_long_string data(buffer, len); + lob >> data; + if (!lob.eof()) + { + otl_long_string sink(10000); + do + { + lob >> sink; + } + while (!lob.eof() && sink.len() > 0); -class oracleQuery : public toQuery::queryImpl - { - bool Cancel; - bool Running; - bool SaveInPool; - otl_stream *Query; - public: - oracleQuery(toQuery *query, oracleSub *) - : toQuery::queryImpl(query) - { - Running = Cancel = false; - SaveInPool = false; - Query = NULL; - } - virtual ~oracleQuery() - { - if (!Query) - return; + toStatusMessage(QString::fromLatin1("Data exists past length of LOB")); + } + buffer[data.len()] = 0; + Running = false; - Query->close(); - delete Query; - } - virtual void execute(void); + if (dsc->ftype == otl_var_clob) + { + QString buf = QString::fromUtf8(buffer); + free(buffer); + return buf; + } + else + { + QByteArray ret(buffer, data.len()); + free(buffer); + return toQValue::createBinary(ret); + } + } + break; + default: // Try using char if all else fails + { + // The *5 is for raw columns or UTF expanded data, also dates and numbers + // are a bit tricky but if someone specifies a dateformat longer than 100 bytes he + // deserves everything he gets! + buffer = new char[std::max(dsc->elem_size * 5 + 1, 100)]; + buffer[0] = 0; + (*Query) >> buffer; + QString buf = QString::fromUtf8(buffer); + delete[] buffer; - virtual toQValue readValue(void) - { - char *buffer = NULL; - otl_var_desc *dsc = Query->describe_next_out_var(); - if (!dsc) - throw QString::fromLatin1("Couldn't get description of next column to read"); + Running = false; - oracleSub *conn = dynamic_cast<oracleSub *>(query()->connectionSub()); - if (!conn) - throw QString::fromLatin1("Internal error, not oracle sub connection"); - if (Cancel) - throw QString::fromLatin1("Cancelled while waiting to read value"); - Running = true; - SaveInPool = true; - try - { - toQValue null; - switch (dsc->ftype) - { - case otl_var_double: - case otl_var_float: - { - double d = 0; - (*Query) >> d; - Running = false; - if (Query->is_null()) - return null; - return toQValue(d); - } - break; - case otl_var_int: - case otl_var_unsigned_int: - case otl_var_short: - case otl_var_long_int: - { - int i = 0; - (*Query) >> i; - Running = false; - if (Query->is_null()) - return null; - return toQValue(i); - } - break; - case otl_var_varchar_long: - case otl_var_raw: - case otl_var_raw_long: - { - int len = toMaxLong; - if (toMaxLong < 0) - len = DEFAULT_MAX_LONG; - buffer = (char *)malloc(len + 1); - buffer[len] = 0; - otl_long_string str(buffer, len); - (*Query) >> str; - Running = false; + if (Query->is_null()) + return null; + return buf; + } + break; + } + } + catch (const ::trotl::OciException &exc) + { + Running = false; + delete[] buffer; + if(conn && query()) + conn->throwExtendedException(query()->connection(), exc); + } + catch (...) + { + Running = false; + delete[] buffer; + throw; + } + */ + // Never get here + return QString(); //qt4 ::null; + } + + virtual void cancel(void); + + virtual bool eof(void) + { + if (!Query || Cancel) { + std::cout << "eof - noquery" << __HERE_SHORT__ << std::endl; + return true; + } + try { + std::cout << "eof - yes/no" << __HERE_SHORT__ << std::endl; + return Query->eof(); + } + catch (const ::trotl::OciException &exc) + { + std::cout << "eof - exception" << __HERE_SHORT__ << std::endl; + if(query()) + { + oracleSub *conn = dynamic_cast<oracleSub *>(query()->connectionSub()); + if(conn) + conn->throwExtendedException(query()->connection(), exc); + } + return true; + } + } + + virtual int rowsProcessed(void) + { + std::cout << "TODO: rowsProcessed:" << std::endl + << __HERE_SHORT__ << std::endl; + if (!Query) + return 0; + //return Query->get_last_row(); ???? + unsigned i = Query->get_last_row(); + std::cout << "TODO: rowsProcessed: " << i << std::endl << __HERE_SHORT__ << std::endl; + return i; + } + + virtual int columns(void) + { + //int descriptionLen; + //Query->describe_select(descriptionLen); + std::cout << "TODO: columns:" << std::endl + << __HERE_SHORT__ << std::endl; + return Query->get_column_count(); + } + + virtual std::list<toQuery::queryDescribe> describe(void) + { + std::cout << "virtual std::list<toQuery::queryDescribe> describe(void)" << std::endl; + std::list<toQuery::queryDescribe> ret; + int descriptionLen; + int datatypearg1 = 0; + int datatypearg2 = 0; + std::cout << "TODO describe:" << std::cout + << __HERE_SHORT__ << std::endl; + //otl_column_desc *description = Query->describe_select(descriptionLen); - if (!str.len()) { - free(buffer); - return null; - } + // TODO trotl should return const iterator - QString buf; - if (dsc->ftype == otl_var_varchar_long) - { - buf = (QString::fromUtf8(buffer)); - free(buffer); - return buf; - } - else - { - QByteArray ret(buffer, str.len()); - free(buffer); - return toQValue::createBinary(ret); - } - } - case otl_var_clob: - case otl_var_blob: - { - otl_lob_stream lob; - (*Query) >> lob; - if (lob.len() == 0) - { - Running = false; - return null; - } - int len = lob.len(); - if (toMaxLong >= 0 && len > toMaxLong) - len = toMaxLong; - if (dsc->ftype == otl_var_clob) - len *= 5; - else - len *= 2; - buffer = (char *)malloc(len + 1); - buffer[0] = 0; - otl_long_string data(buffer, len); - lob >> data; - if (!lob.eof()) - { - otl_long_string sink(10000); - do - { - lob >> sink; - } - while (!lob.eof() && sink.len() > 0); + const std::vector<trotl::ColumnType> &col = Query->get_columns(); + std::vector<trotl::ColumnType>::const_iterator it = col.begin(); ++it; // start with 1st + //std::cout << "Columns: " << q1.get_column_count() << std::endl; + for(it; it != col.end(); ++it) + { + std::cout << "Var: " << (*it).get_type_str(true) << std::endl; + toQuery::queryDescribe desc; + desc.AlignRight = false; + desc.Name = QString::fromUtf8( (*it)._column_name.c_str() ); + desc.Datatype = QString::fromLatin1( (*it).get_type_str(true).c_str() ); - toStatusMessage(QString::fromLatin1("Data exists past length of LOB")); - } - buffer[data.len()] = 0; - Running = false; + //datatypearg1 = description[i].char_size; + desc.Datatype.sprintf(desc.Datatype.toUtf8().constData(), datatypearg1, datatypearg2); + //desc.Null = description[i].nullok; - if (dsc->ftype == otl_var_clob) - { - QString buf = QString::fromUtf8(buffer); - free(buffer); - return buf; - } - else - { - QByteArray ret(buffer, data.len()); - free(buffer); - return toQValue::createBinary(ret); - } - } - break; - default: // Try using char if all else fails - { - // The *5 is for raw columns or UTF expanded data, also dates and numbers - // are a bit tricky but if someone specifies a dateformat longer than 100 bytes he - // deserves everything he gets! - buffer = new char[std::max(dsc->elem_size * 5 + 1, 100)]; - buffer[0] = 0; - (*Query) >> buffer; - QString buf = QString::fromUtf8(buffer); - delete[] buffer; + ret.insert(ret.end(), desc); + } +// for (int i = 0;i < descriptionLen;i++) +// { +// toQuery::queryDescribe desc; +// desc.AlignRight = false; +// desc.Name = QString::fromUtf8(description[i].name); +// /* +// * http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10758/sqlqr06.htm +// * include ocidfn.h +// */ +// switch (description[i].dbtype) +// { +// case 1: /* VARCHAR2, NVARCHAR2 */ +// desc.Datatype = QString::fromLatin1("VARCHAR2(%i)"); +// datatypearg1 = description[i].char_size; +// #ifdef OTL_ORA_UNICODE +// if (description[i].charset_form == 2) +// { +// desc.Datatype = QString::fromLatin1("N") + desc.Datatype; +// } +// #endif +// break; - Running = false; +// case 2: /* NUMBER */ +// desc.Datatype = QString::fromLatin1("NUMBER"); - if (Query->is_null()) - return null; - return buf; - } - break; - } - } - catch (const otl_exception &exc) - { - Running = false; - delete[] buffer; - if(conn && query()) - conn->throwExtendedException(query()->connection(), exc); - } - catch (...) - { - Running = false; - delete[] buffer; - throw; - } - // Never get here - return QString(); //qt4 ::null; - } - virtual void cancel(void); - virtual bool eof(void) - { - if (!Query || Cancel) - return true; - try { - return Query->eof(); - } - catch (const otl_exception &exc) - { - if(query()) - { - oracleSub *conn = dynamic_cast<oracleSub *>(query()->connectionSub()); - if(conn) - conn->throwExtendedException(query()->connection(), exc); - } +// if (description[i].prec) +// { +// desc.Datatype = QString::fromLatin1("NUMBER(%i)"); +// datatypearg1 = description[i].prec; +// if (description[i].scale != 0) +// { +// desc.Datatype = QString::fromLatin1("NUMBER(%i,%i)"); +// datatypearg2 = description[i].scale; +// } +// } +// desc.AlignRight = true; +// break; - return true; - } - } - virtual int rowsProcessed(void) - { - if (!Query) - return 0; - return Query->get_rpc(); - } - virtual int columns(void) - { - int descriptionLen; - Query->describe_select(descriptionLen); - return descriptionLen; - } - virtual std::list<toQuery::queryDescribe> describe(void) - { - std::list<toQuery::queryDescribe> ret; - int descriptionLen; - int datatypearg1 = 0; - int datatypearg2 = 0; - otl_column_desc *description = Query->describe_select(descriptionLen); +// case 8: /* LONG */ +// desc.Datatype = QString::fromLatin1("LONG"); +// break; - for (int i = 0;i < descriptionLen;i++) - { - toQuery::queryDescribe desc; - desc.AlignRight = false; - desc.Name = QString::fromUtf8(description[i].name); - /* - * http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10758/sqlqr06.htm - * include ocidfn.h - */ - switch (description[i].dbtype) - { - case 1: /* VARCHAR2, NVARCHAR2 */ - desc.Datatype = QString::fromLatin1("VARCHAR2(%i)"); - datatypearg1 = description[i].char_size; -#ifdef OTL_ORA_UNICODE - if (description[i].charset_form == 2) - { - desc.Datatype = QString::fromLatin1("N") + desc.Datatype; - } -#endif - break; +// case 12: /* DATE */ +// desc.Datatype = QString::fromLatin1("DATE"); +// desc.AlignRight = true; +// break; - case 2: /* NUMBER */ - desc.Datatype = QString::fromLatin1("NUMBER"); +// case 23: /* RAW */ +// desc.Datatype = QString::fromLatin1("RAW(%i)"); +// datatypearg1 = description[i].dbsize; +// break; - if (description[i].prec) - { - desc.Datatype = QString::fromLatin1("NUMBER(%i)"); - datatypearg1 = description[i].prec; - if (description[i].scale != 0) - { - desc.Datatype = QString::fromLatin1("NUMBER(%i,%i)"); - datatypearg2 = description[i].scale; - } - } - desc.AlignRight = true; - break; +// case 24: /* LONG RAW */ +// desc.Datatype = QString::fromLatin1("LONG RAW"); +// break; - case 8: /* LONG */ - desc.Datatype = QString::fromLatin1("LONG"); - break; +// case 104: /* ROWID, docu: 69, ocidfn.h: 104 */ +// case 208: /* UROWID */ +// desc.Datatype = QString::fromLatin1("ROWID"); +// break; - case 12: /* DATE */ - desc.Datatype = QString::fromLatin1("DATE"); - desc.AlignRight = true; - break; +// case 96: /* CHAR, NCHAR */ +// desc.Datatype = QString::fromLatin1("CHAR(%i)"); +// datatypearg1 = description[i].char_size; +// #ifdef OTL_ORA_UNICODE +// if (description[i].charset_form == 2) +// { +// desc.Datatype = QString::fromLatin1("N") + desc.Datatype; +// } +// #endif +// break; +// #ifdef OTL_ORA_NATIVE_TYPES +// case 100: /* BINARY_FLOAT */ +// desc.Datatype = QString::fromLatin1("BINARY_FLOAT"); +// break; - case 23: /* RAW */ - desc.Datatype = QString::fromLatin1("RAW(%i)"); - datatypearg1 = description[i].dbsize; - break; +// case 101: /* BINARY_DOUBLE */ +// desc.Datatype = QString::fromLatin1("BINARY_DOUBLE"); +// break; +// #endif +// case 112: /* CLOB, NCLOB */ +// desc.Datatype = QString::fromLatin1("CLOB"); +// #ifdef OTL_ORA_UNICODE +// if (description[i].charset_form == 2) +// { +// desc.Datatype = QString::fromLatin1("N") + desc.Datatype; +// } +// #endif +// break; - case 24: /* LONG RAW */ - desc.Datatype = QString::fromLatin1("LONG RAW"); - break; +// case 113: /* BLOB */ +// desc.Datatype = QString::fromLatin1("BLOB"); +// break; +// #ifdef OTL_ORA_TIMESTAMP +// case 187: /* TIMESTAMP, docu: 180, ocidfn.h: 187 */ +// desc.Datatype = QString::fromLatin1("TIMESTAMP(%i)"); +// datatypearg1 = description[i].scale; +// break; - case 104: /* ROWID, docu: 69, ocidfn.h: 104 */ - case 208: /* UROWID */ - desc.Datatype = QString::fromLatin1("ROWID"); - break; +// case 188: /* TIMESTAMP WITH TIME ZONE, docu: 181, ocidfn.h: 188 */ +// desc.Datatype = QString::fromLatin1("TIMESTAMP(%i) WITH TIME ZONE"); +// datatypearg1 = description[i].scale; +// break; - case 96: /* CHAR, NCHAR */ - desc.Datatype = QString::fromLatin1("CHAR(%i)"); - datatypearg1 = description[i].char_size; -#ifdef OTL_ORA_UNICODE - if (description[i].charset_form == 2) - { - desc.Datatype = QString::fromLatin1("N") + desc.Datatype; - } -#endif - break; -#ifdef OTL_ORA_NATIVE_TYPES - case 100: /* BINARY_FLOAT */ - desc.Datatype = QString::fromLatin1("BINARY_FLOAT"); - break; +// case 189: /* INTERVAL YEAR TO MONTH, docu: 182, ocidfn.h: 189 */ +// desc.Datatype = QString::fromLatin1("INTERVAL YEAR(%i) TO MONTH"); +// datatypearg1 = description[i].prec; +// break; - case 101: /* BINARY_DOUBLE */ - desc.Datatype = QString::fromLatin1("BINARY_DOUBLE"); - break; -#endif - case 112: /* CLOB, NCLOB */ - desc.Datatype = QString::fromLatin1("CLOB"); -#ifdef OTL_ORA_UNICODE - if (description[i].charset_form == 2) - { - desc.Datatype = QString::fromLatin1("N") + desc.Datatype; - } -#endif - break; +// case 190: /* INTERVAL DAY TO SECOND, docu: 183, ocidfn.h: 190 */ +// desc.Datatype = QString::fromLatin1("INTERVAL DAY(%i) TO SECOND(%i)"); +// datatypearg1 = description[i].prec; +// datatypearg2 = description[i].scale; +// break; - case 113: /* BLOB */ - desc.Datatype = QString::fromLatin1("BLOB"); - break; -#ifdef OTL_ORA_TIMESTAMP - case 187: /* TIMESTAMP, docu: 180, ocidfn.h: 187 */ - desc.Datatype = QString::fromLatin1("TIMESTAMP(%i)"); - datatypearg1 = description[i].scale; - break; +// case 232: /* TIMESTAMP WITH LOCAL TIME ZONE docu: 231, ocidfn.h: 232 */ +// desc.Datatype = QString::fromLatin1("TIMESTAMP(%i) WITH LOCAL TIME ZONE"); +// datatypearg1 = description[i].scale; +// break; +// #endif +// default: +// desc.Datatype = QString::fromLatin1("UNKNOWN"); - case 188: /* TIMESTAMP WITH TIME ZONE, docu: 181, ocidfn.h: 188 */ - desc.Datatype = QString::fromLatin1("TIMESTAMP(%i) WITH TIME ZONE"); - datatypearg1 = description[i].scale; - break; +// /* report unmatched datatypes for adding later */ +// printf("File a bug report and include the table layout and the following data:\n"); +// printf(" type=%i, otl_type=%i, size=%i, nullok=%i, charset_form=%i, charset_size=%i, prec=%i, scale=%i\n", +// description[i].dbtype, +// description[i].otl_var_dbtype, +// description[i].dbsize, +// description[i].nullok, +// description[i].charset_form, +// description[i].char_size, +// description[i].prec, +// description[i].scale); +// } +// desc.Datatype.sprintf(desc.Datatype.toUtf8().constData(), datatypearg1, datatypearg2); - case 189: /* INTERVAL YEAR TO MONTH, docu: 182, ocidfn.h: 189 */ - desc.Datatype = QString::fromLatin1("INTERVAL YEAR(%i) TO MONTH"); - datatypearg1 = description[i].prec; - break; +// desc.Null = description[i].nullok; - case 190: /* INTERVAL DAY TO SECOND, docu: 183, ocidfn.h: 190 */ - desc.Datatype = QString::fromLatin1("INTERVAL DAY(%i) TO SECOND(%i)"); - datatypearg1 = description[i].prec; - datatypearg2 = description[i].scale; - break; +// ret.insert(ret.end(), desc); +// } - case 232: /* TIMESTAMP WITH LOCAL TIME ZONE docu: 231, ocidfn.h: 232 */ - desc.Datatype = QString::fromLatin1("TIMESTAMP(%i) WITH LOCAL TIME ZONE"); - datatypearg1 = description[i].scale; - break; -#endif - default: - desc.Datatype = QString::fromLatin1("UNKNOWN"); + return ret; + } + }; - /* report unmatched datatypes for adding later */ - printf("File a bug report and include the table layout and the following data:\n"); - printf(" type=%i, otl_type=%i, size=%i, nullok=%i, charset_form=%i, charset_size=%i, prec=%i, scale=%i\n", - description[i].dbtype, - description[i].otl_var_dbtype, - description[i].dbsize, - description[i].nullok, - description[i].charset_form, - description[i].char_size, - description[i].prec, - description[i].scale); - } - desc.Datatype.sprintf(desc.Datatype.toUtf8().constData(), datatypearg1, datatypearg2); + class oracleConnection : public toConnection::connectionImpl + { + QString connectString(void); - desc.Null = description[i].nullok; + oracleSub *oracleConv(toConnectionSub *sub) + { + oracleSub *conn = dynamic_cast<oracleSub *>(sub); + if (!conn) + throw QString::fromLatin1("Internal error, not oracle sub connection"); + return conn; + } + public: + oracleConnection(toConnection *conn, ::trotl::OciEnv &env) : + _env(env), toConnection::connectionImpl(conn) + { } - ret.insert(ret.end(), desc); - } - return ret; - } - }; + /** Return a string representation to address an object. + * @param name The name to be quoted. + * @return String addressing table. + */ + virtual QString quote(const QString &name) + { + bool ok = true; + for (int i = 0;i < name.length();i++) + { + if (name.at(i).toUpper() != name.at(i) || !toIsIdent(name.at(i))) + ok = false; + } + if (ok) + return name.toLower(); + else + return QString::fromLatin1("\"") + name + QString::fromLatin1("\""); + } + virtual QString unQuote(const QString &str) + { + if (str.at(0).toLatin1() == '\"' && str.at(str.length() - 1).toLatin1() == '\"') + return str.left(str.length() - 1).right(str.length() - 2); + return str.toUpper(); + } -class oracleConnection : public toConnection::connectionImpl - { - QString connectString(void) - { - QString ret; - ret = connection().user().toUtf8(); - ret += QString::fromLatin1("/"); - ret += connection().password().toUtf8(); - if (!connection().host().isEmpty()) - { - ret += QString::fromLatin1("@"); - ret += connection().database().toUtf8(); - } - return ret; - } - oracleSub *oracleConv(toConnectionSub *sub) - { - oracleSub *conn = dynamic_cast<oracleSub *>(sub); - if (!conn) - throw QString::fromLatin1("Internal error, not oracle sub connection"); - return conn; - } - public: - oracleConnection(toConnection *conn) - : toConnection::connectionImpl(conn) - { } + virtual std::list<toConnection::objectName> objectNames(void) + { + std::list<toConnection::objectName> ret; - /** Return a string representation to address an object. - * @param name The name to be quoted. - * @return String addressing table. - */ - virtual QString quote(const QString &name) - { - bool ok = true; - for (int i = 0;i < name.length();i++) - { - if (name.at(i).toUpper() != name.at(i) || !toIsIdent(name.at(i))) - ok = false; - } - if (ok) - return name.toLower(); - else - return QString::fromLatin1("\"") + name + QString::fromLatin1("\""); - } - virtual QString unQuote(const QString &str) - { - if (str.at(0).toLatin1() == '\"' && str.at(str.length() - 1).toLatin1() == '\"') - return str.left(str.length() - 1).right(str.length() - 2); - return str.toUpper(); - } + std::list<toQValue> par; + toQuery objects(connection(), toQuery::Long, + SQLListObjects, par); + toConnection::objectName cur; + while (!objects.eof()) + { + cur.Owner = objects.readValueNull(); + cur.Name = objects.readValueNull(); + cur.Type = objects.readValueNull(); + cur.Comment = objects.readValueNull(); + ret.insert(ret.end(), cur); + } - virtual std::list<toConnection::objectName> objectNames(void) - { - std::list<toConnection::objectName> ret; + return ret; + } + virtual std::map<QString, toConnection::objectName> synonymMap(std::list<toConnection::objectName> &objects) + { + std::map<QString, toConnection::objectName> ret; - std::list<toQValue> par; - toQuery objects(connection(), toQuery::Long, - SQLListObjects, par); - toConnection::objectName cur; - while (!objects.eof()) - { - cur.Owner = objects.readValueNull(); - cur.Name = objects.readValueNull(); - cur.Type = objects.readValueNull(); - cur.Comment = objects.readValueNull(); - ret.insert(ret.end(), cur); - } + toConnection::objectName cur; + cur.Type = QString::fromLatin1("A"); + std::list<toQValue> par; + par.insert(par.end(), toQValue(connection().user().toUpper())); + toQuery synonyms(connection(), toQuery::Long, + SQLListSynonyms, par); + std::list<toConnection::objectName>::iterator i = objects.begin(); + while (!synonyms.eof()) + { + QString synonym = synonyms.readValueNull(); + cur.Owner = synonyms.readValueNull(); + cur.Name = synonyms.readValueNull(); + while (i != objects.end() && (*i) < cur) + i++; + if (i == objects.end()) + break; + if (cur.Name == (*i).Name && cur.Owner == (*i).Owner) + { + ret[synonym] = (*i); + (*i).Synonyms.insert((*i).Synonyms.end(), synonym); + } + } - return ret; - } - virtual std::map<QString, toConnection::objectName> synonymMap(std::list<toConnection::objectName> &objects) - { - std::map<QString, toConnection::objectName> ret; + return ret; + } + virtual toQDescList columnDesc(const toConnection::objectName &table) + { + toBusy busy; + if (table.Type == QString::fromLatin1("PACKAGE")) + { + toQDescList ret; + try + { + toQuery::queryDescribe desc; + desc.Datatype = ("MEMBER"); + desc.Null = false; + QString lastName; + QString lastOver; + toQuery member(connection(), SQLMembers, table.Owner, table.Name); + bool hasArgs = false; + while (!member.eof()) + { + QString name = member.readValue(); + QString overld = member.readValue(); + QString arg = member.readValueNull(); + QString type = member.readValueNull(); + if (lastName != name || overld != lastOver) + { + if (hasArgs) + desc.Name += ")"; + if (!desc.Name.isEmpty()) + ret.insert(ret.end(), desc); + desc.Name = name; + lastName = name; + lastOver = overld; + hasArgs = false; + } + if (arg.isEmpty()) + { + if (hasArgs) + { + desc.Name += ")"; + hasArgs = false; + } + desc.Name += " RETURNING "; + } + else + { + if (hasArgs) + desc.Name += ", "; + else + { + desc.Name += "("; + hasArgs = true; + } + desc.Name += arg; + desc.Name += " "; + } + desc.Name += type; + } + if (desc.Name.contains("(")) + desc.Name += ")"; + if (!desc.Name.isEmpty()) + ret.insert(ret.end(), desc); + } + catch (...) + {} + return ret; + } - toConnection::objectName cur; - cur.Type = QString::fromLatin1("A"); - std::list<toQValue> par; - par.insert(par.end(), toQValue(connection().user().toUpper())); - toQuery synonyms(connection(), toQuery::Long, - SQLListSynonyms, par); - std::list<toConnection::objectName>::iterator i = objects.begin(); - while (!synonyms.eof()) - { - QString synonym = synonyms.readValueNull(); - cur.Owner = synonyms.readValueNull(); - cur.Name = synonyms.readValueNull(); - while (i != objects.end() && (*i) < cur) - i++; - if (i == objects.end()) - break; - if (cur.Name == (*i).Name && cur.Owner == (*i).Owner) - { - ret[synonym] = (*i); - (*i).Synonyms.insert((*i).Synonyms.end(), synonym); - } - } + std::map<QString, QString> comments; + try + { + toQuery comment(connection(), SQLComment, table.Owner, table.Name); + while (!comment.eof()) + { + QString col = comment.readValue(); + comments[col] = comment.readValueNull(); + } + } + catch (...) + {} - return ret; - } - virtual toQDescList columnDesc(const toConnection::objectName &table) - { - toBusy busy; - if (table.Type == QString::fromLatin1("PACKAGE")) - { - toQDescList ret; - try - { - toQuery::queryDescribe desc; - desc.Datatype = ("MEMBER"); - desc.Null = false; - QString lastName; - QString lastOver; - toQuery member(connection(), SQLMembers, table.Owner, table.Name); - bool hasArgs = false; - while (!member.eof()) - { - QString name = member.readValue(); - QString overld = member.readValue(); - QString arg = member.readValueNull(); - QString type = member.readValueNull(); - if (lastName != name || overld != lastOver) - { - if (hasArgs) - desc.Name += ")"; - if (!desc.Name.isEmpty()) - ret.insert(ret.end(), desc); - desc.Name = name; - lastName = name; - lastOver = overld; - hasArgs = false; - } - if (arg.isEmpty()) - { - if (hasArgs) - { - desc.Name += ")"; - hasArgs = false; - } - desc.Name += " RETURNING "; - } - else - { - if (hasArgs) - desc.Name += ", "; - else - { - desc.Name += "("; - hasArgs = true; - } - desc.Name += arg; - desc.Name += " "; - } - desc.Name += type; - } - if (desc.Name.contains("(")) - desc.Name += ")"; - if (!desc.Name.isEmpty()) - ret.insert(ret.end(), desc); - } - catch (...) - {} - return ret; - } - - std::map<QString, QString> comments; - try - { - toQuery comment(connection(), SQLComment, table.Owner, table.Name); - while (!comment.eof()) - { - QString col = comment.readValue(); - comments[col] = comment.readValueNull(); - } - } - catch (...) - {} - - try - { - toQuery query(connection()); + try + { + toQuery query(connection()); #ifdef OTL_STREAM_POOLING_ON - // Need to clear the stream cache first. - oracleSub *sub = dynamic_cast<oracleSub *>(query.connectionSub()); - sub->Lock.down(); - sub->Connection->set_stream_pool_size(std::max(toConfigurationSingle::Instance().openCursors(), 1)); - sub->Lock.up(); + // Need to clear the stream cache first. + oracleSub *sub = dynamic_cast<oracleSub *>(query.connectionSub()); + sub->Lock.down(); + sub->Connection->set_stream_pool_size(std::max(toConfigurationSingle::Instance().openCursors(), 1)); + sub->Lock.up(); #endif - QString SQL = QString::fromLatin1("SELECT * FROM \""); - SQL += table.Owner; - SQL += QString::fromLatin1("\".\""); - SQL += table.Name; - SQL += QString::fromLatin1("\" WHERE NULL=NULL"); - toQList par; - query.execute(SQL, par); - toQDescList desc = query.describe(); - for (toQDescList::iterator j = desc.begin();j != desc.end();j++) - (*j).Comment = comments[(*j).Name]; + QString SQL = QString::fromLatin1("SELECT * FROM \""); + SQL += table.Owner; + SQL += QString::fromLatin1("\".\""); + SQL += table.Name; + SQL += QString::fromLatin1("\" WHERE NULL=NULL"); + toQList par; + query.execute(SQL, par); + toQDescList desc = query.describe(); + for (toQDescList::iterator j = desc.begin();j != desc.end();j++) + (*j).Comment = comments[(*j).Name]; - return desc; - } - catch ( ... ) - { - throw; - } + return desc; + } + catch ( ... ) + { + throw; + } - toQDescList ret; - return ret; - } + toQDescList ret; + return ret; + } - virtual void commit(toConnectionSub *sub) - { - oracleSub *conn = oracleConv(sub); - try - { - conn->Connection->commit(); - } - catch (const otl_exception &exc) - { - ThrowException(exc); - } - } - virtual void rollback(toConnectionSub *sub) - { - oracleSub *conn = oracleConv(sub); - try - { - conn->Connection->rollback(); - } - catch (const otl_exception &exc) - { - ThrowException(exc); - } - } + virtual void commit(toConnectionSub *sub) + { + oracleSub *conn = oracleConv(sub); + try + { + conn->Connection->commit(); + } + catch (const ::trotl::OciException &exc) + { + ThrowException(exc); + } + } + virtual void rollback(toConnectionSub *sub) + { + oracleSub *conn = oracleConv(sub); + try + { + conn->Connection->rollback(); + } + catch (const ::trotl::OciException &exc) + { + ThrowException(exc); + } + } - virtual toConnectionSub *createConnection(void); + virtual toConnectionSub *createConnection(void); + + void closeConnection(toConnectionSub *conn) + { + delete conn; + } - void closeConnection(toConnectionSub *conn) - { - delete conn; - } + virtual QString version(toConnectionSub *sub) + { + std::cout << __HERE_SHORT__ << std::endl; + oracleSub *connp = oracleConv(sub); + try + { + // Todo - there better ways to do this + ::trotl::OciConnection &conn( *(connp->Connection) ); + ::trotl::SqlStatement version( conn, + "SELECT version FROM product_component_version " + " where product like 'Oracle%'" + ); + if (!version.eof()) + { + std::string s; + //char buffer[1024]; + version >> s; + QStringList vl = QString(s.c_str()).split('.'); + QString ve; + QString verrj; + for ( QStringList::iterator vi = vl.begin(); vi != vl.end(); ++vi ) + { + ve = *vi; + verrj += ve.rightJustified(2, '0'); + } + return verrj; + } + } + catch (::trotl::OciException e) { + std::cerr << __HERE_SHORT__ << std::endl << e.what(); + exit(0); + } + catch (...) + { + // Ignore any errors here + } + return QString::QString(); + } - virtual QString version(toConnectionSub *sub) - { - oracleSub *conn = oracleConv(sub); - try - { - otl_stream version(1, - "SELECT version FROM product_component_version where product like 'Oracle%'", - *(conn->Connection)); - if (!version.eof()) - { - char buffer[1024]; - version >> buffer; - QStringList vl = QString(buffer).split('.'); - QString ve; - QString verrj; - for ( QStringList::iterator vi = vl.begin(); vi != vl.end(); ++vi ) - { - ve = *vi; - verrj += ve.rightJustified(2, '0'); - } - return verrj; - } - } - catch (...) - { - // Ignore any errors here - } - return QString::QString(); - } + virtual toQuery::queryImpl *createQuery(toQuery *query, toConnectionSub *sub) + { + return new oracleQuery(query, oracleConv(sub)); + } - virtual toQuery::queryImpl *createQuery(toQuery *query, toConnectionSub *sub) - { - return new oracleQuery(query, oracleConv(sub)); - } + virtual void execute(toConnectionSub *sub, const QString &sql, toQList ¶ms) + { + oracleSub *conn = oracleConv(sub); - virtual void execute(toConnectionSub *sub, const QString &sql, toQList ¶ms) - { - oracleSub *conn = oracleConv(sub); + if ( params.empty() ) + { + try + { + //otl_cursor::direct_exec(*(conn->Connection), sql.toUtf8().constData()); + //TODO + //std::cout << "TODO: otl_cursor::direct_exec" << __HERE_SHORT__ << std::endl; + } + catch (const ::trotl::OciException &exc) + { + conn->throwExtendedException(connection(), exc); + } + } + else + toQuery query(connection(), sql, params); + } - if ( params.empty() ) - { - try - { - otl_cursor::direct_exec(*(conn->Connection), sql.toUtf8().constData()); - } - catch (const otl_exception &exc) - { - conn->throwExtendedException(connection(), exc); - } - } - else - toQuery query(connection(), sql, params); - } + virtual void parse(toConnectionSub *sub, const QString &sql) + { + oracleSub *conn = oracleConv(sub); + try + { + ::trotl::SqlStatement s1(*conn->Connection, sql.toUtf8().constData()); + //conn->Connection->reset_throw_count(); + //conn->Connection->syntax_check(sql.toUtf8().constData()); - virtual void parse(toConnectionSub *sub, const QString &sql) - { - oracleSub *conn = oracleConv(sub); - try - { - conn->Connection->reset_throw_count(); - conn->Connection->syntax_check(sql.toUtf8().constData()); + } + catch (const ::trotl::OciException &exc) + { + //conn->Connection->throw_count++; + ThrowException(exc); + } + } - } - catch (const otl_exception &exc) - { - conn->Connection->throw_count++; - ThrowException(exc); - } - } - }; + ::trotl::OciEnv &_env; + }; // class oracleConnection : public toConnection::connectionImpl - toOracleProvider(void) - : toConnectionProvider("Oracle", false) - {} + toOracleProvider(void) + : toConnectionProvider("Oracle", false) + {} - virtual void initialize(void) - { - toMaxLong = toConfigurationSingle::Instance().maxLong(); - if (otl_connect::otl_initialize(1)) - addProvider("Oracle"); - else - fprintf(stderr, "otl_initialize failed!\n"); - } + virtual void initialize(void) + { + //toMaxLong = toConfigurationSingle::Instance().maxLong(); + ::trotl::OciEnvAlloc *_envallocp = new ::trotl::OciEnvAlloc; + _envp = new ::trotl::OciEnv(*_envallocp); - virtual toConnection::connectionImpl ... [truncated message content] |
From: <ibr...@us...> - 2009-06-19 22:43:56
|
Revision: 3205 http://tora.svn.sourceforge.net/tora/?rev=3205&view=rev Author: ibre5041 Date: 2009-06-19 22:43:53 +0000 (Fri, 19 Jun 2009) Log Message: ----------- Modified Paths: -------------- branches/tora-trotl/cmake/modules/FindOracle.cmake branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/toalert.h branches/tora-trotl/src/tothread.h Modified: branches/tora-trotl/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora-trotl/cmake/modules/FindOracle.cmake 2009-06-01 21:45:18 UTC (rev 3204) +++ branches/tora-trotl/cmake/modules/FindOracle.cmake 2009-06-19 22:43:53 UTC (rev 3205) @@ -10,49 +10,48 @@ SET(ORACLE_FOUND "NO") +SET(ORACLE_HOME $ENV{ORACLE_HOME}) -set(ORACLE_HOME $ENV{ORACLE_HOME}) - IF (ORACLE_PATH_INCLUDES) - SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) + SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) ELSE (ORACLE_PATH_INCLUDES) - SET (ORACLE_INCLUDES_LOCATION - ${ORACLE_HOME}/rdbms/public - ${ORACLE_HOME}/include - # sdk - ${ORACLE_HOME}/sdk/include - # xe on windows - ${ORACLE_HOME}/OCI/include - ) + SET (ORACLE_INCLUDES_LOCATION + ${ORACLE_HOME}/rdbms/public + ${ORACLE_HOME}/include + # sdk + ${ORACLE_HOME}/sdk/include + # xe on windows + ${ORACLE_HOME}/OCI/include + ) ENDIF (ORACLE_PATH_INCLUDES) IF (ORACLE_PATH_LIB) - SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) + SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) ELSE (ORACLE_PATH_LIB) - SET (ORACLE_LIB_LOCATION - ${ORACLE_HOME}/lib - # xe on windows - ${ORACLE_HOME}/OCI/lib/MSVC - ) + SET (ORACLE_LIB_LOCATION + ${ORACLE_HOME}/lib + # xe on windows + ${ORACLE_HOME}/OCI/lib/MSVC + ) ENDIF (ORACLE_PATH_LIB) FIND_PATH( - ORACLE_INCLUDES - oci.h - ${ORACLE_INCLUDES_LOCATION} -) + ORACLE_INCLUDES + oci.h + ${ORACLE_INCLUDES_LOCATION} + ) FIND_LIBRARY( - ORACLE_LIBRARY_OCCI - NAMES libocci occi oraocci10 - PATHS ${ORACLE_LIB_LOCATION} -) + ORACLE_LIBRARY_OCCI + NAMES libocci occi oraocci10 + PATHS ${ORACLE_LIB_LOCATION} + ) FIND_LIBRARY( - ORACLE_LIBRARY_CLNTSH - NAMES libclntsh clntsh oci - PATHS ${ORACLE_LIB_LOCATION} -) + ORACLE_LIBRARY_CLNTSH + NAMES libclntsh clntsh oci + PATHS ${ORACLE_LIB_LOCATION} + ) #FIND_LIBRARY( # ORACLE_LIBRARY_LNNZ # NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32 @@ -62,64 +61,64 @@ SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_LNNZ}) IF (ORACLE_LIBRARY AND ORACLE_INCLUDES) - SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY}) - SET(ORACLE_FOUND "YES") + SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY}) + SET(ORACLE_FOUND "YES") ENDIF (ORACLE_LIBRARY AND ORACLE_INCLUDES) # guess OCI version IF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) - FIND_PROGRAM(AWK awk) - FIND_PROGRAM(SQLPLUS sqlplus PATHS ENV ORACLE_HOME NO_DEFAULT_PATH) - FIND_PROGRAM(SQLPLUS sqlplus) - SET (sqlplus_version "${SQLPLUS} -version | ${AWK} '/Release/ {print $3}'") - EXEC_PROGRAM(${sqlplus_version} OUTPUT_VARIABLE sqlplus_out) - MESSAGE(STATUS "found sqlplus version: ${sqlplus_out}") + FIND_PROGRAM(AWK awk) + FIND_PROGRAM(SQLPLUS sqlplus PATHS ENV ORACLE_HOME NO_DEFAULT_PATH) + FIND_PROGRAM(SQLPLUS sqlplus) + SET (sqlplus_version "${SQLPLUS} -version | ${AWK} '/Release/ {print $3}'") + EXEC_PROGRAM(${sqlplus_version} OUTPUT_VARIABLE sqlplus_out) + MESSAGE(STATUS "found sqlplus version: ${sqlplus_out}") + + # WARNING! + # MATCHES operator is using Cmake regular expression. + # so the e.g. 9.* does not expand like shell file mask + # but as "9 and then any sequence of characters" + IF (${sqlplus_out} MATCHES "8.*") + SET(ORACLE_OCI_VERSION "8I") + ELSEIF (${sqlplus_out} MATCHES "9.*") + SET(ORACLE_OCI_VERSION "9") + # do not change the order of the ora10 checking! + ELSEIF (${sqlplus_out} MATCHES "10.2.*") + SET(ORACLE_OCI_VERSION "10G_R2") + ELSEIF (${sqlplus_out} MATCHES "10.*") + SET(ORACLE_OCI_VERSION "10G") + ELSEIF (${sqlplus_out} MATCHES "11.*") + SET(ORACLE_OCI_VERSION "11G") + ELSE (${sqlplus_out} MATCHES "8.*") + SET(ORACLE_OCI_VERSION "10G_R2") + ENDIF (${sqlplus_out} MATCHES "8.*") - # WARNING! - # MATCHES operator is using Cmake regular expression. - # so the e.g. 9.* does not expand like shell file mask - # but as "9 and then any sequence of characters" - IF (${sqlplus_out} MATCHES "8.*") - SET(ORACLE_OCI_VERSION "8I") - ELSEIF (${sqlplus_out} MATCHES "9.*") - SET(ORACLE_OCI_VERSION "9") -# do not change the order of the ora10 checking! - ELSEIF (${sqlplus_out} MATCHES "10.2.*") - SET(ORACLE_OCI_VERSION "10G_R2") - ELSEIF (${sqlplus_out} MATCHES "10.*") - SET(ORACLE_OCI_VERSION "10G") - ELSEIF (${sqlplus_out} MATCHES "11.*") - SET(ORACLE_OCI_VERSION "11G") - ELSE (${sqlplus_out} MATCHES "8.*") - SET(ORACLE_OCI_VERSION "10G_R2") - ENDIF (${sqlplus_out} MATCHES "8.*") - - MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION}") + MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION}") ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) IF (ORACLE_FOUND) - IF (NOT ORACLE_FIND_QUIETLY) - MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") - ENDIF (NOT ORACLE_FIND_QUIETLY) - # there *must* be OCI version defined for internal libraries - IF (ORACLE_OCI_VERSION) - ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) - ELSE (ORACLE_OCI_VERSION) - MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") - ENDIF (ORACLE_OCI_VERSION) + IF (NOT ORACLE_FIND_QUIETLY) + MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") + ENDIF (NOT ORACLE_FIND_QUIETLY) + # there *must* be OCI version defined for internal libraries + IF (ORACLE_OCI_VERSION) + ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) + ELSE (ORACLE_OCI_VERSION) + MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") + ENDIF (ORACLE_OCI_VERSION) ELSE (ORACLE_FOUND) - MESSAGE(STATUS "Oracle not found.") - MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") - MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") - MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") - MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARY}") - IF (ORACLE_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Oracle library") - ELSE (ORACLE_FIND_REQUIRED) - # setup the variables for silent continue - SET (ORACLE_INCLUDES "") - ENDIF (ORACLE_FIND_REQUIRED) + MESSAGE(STATUS "Oracle not found.") + MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") + MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") + MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") + MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARY}") + IF (ORACLE_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find Oracle library") + ELSE (ORACLE_FIND_REQUIRED) + # setup the variables for silent continue + SET (ORACLE_INCLUDES "") + ENDIF (ORACLE_FIND_REQUIRED) ENDIF (ORACLE_FOUND) Modified: branches/tora-trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/CMakeLists.txt 2009-06-01 21:45:18 UTC (rev 3204) +++ branches/tora-trotl/src/CMakeLists.txt 2009-06-19 22:43:53 UTC (rev 3205) @@ -24,223 +24,226 @@ SET(TORA_RCC_FILES tora.qrc) SET(TORA_UI_SRC - toaboutui.ui - tobrowserconstraintui.ui - tobrowserfilterui.ui - tobrowserindexui.ui - tobrowsertableui.ui - toconnectionimportui.ui - todatabasesettingui.ui - todebugchangeui.ui - todebugwatch.ui - todescribeui.ui - todroptablespaceui.ui - toeditextensionsetupui.ui - toglobalsettingui.ui - tohelpaddfileui.ui - tohelpui.ui - tohelpsetupui.ui - tochartalarmui.ui - tochartsetupui.ui - tolinechartsetupui.ui - tomessageui.ui - tonewconnectionui.ui - topreferencesui.ui - toresultcontentfilterui.ui - toresultlistformatui.ui - torollbackdialogui.ui -# toschedulerui.ui - toscriptui.ui - toscriptschemawidgetui.ui - tosearchreplaceui.ui - tosecurityquotaui.ui - tosecurityroleui.ui - tosecurityuserui.ui - tostoragedatafileui.ui - tostoragedefinitionui.ui - tostoragedialogui.ui - tostorageprefsui.ui - tostoragetablespaceui.ui - tosyntaxsetupui.ui - totemplateaddfileui.ui - totemplateeditui.ui - totemplatesetupui.ui - totoolsettingui.ui - totuningoverviewui.ui - totuningsettingui.ui - toworksheetsetupui.ui - # shortcuteditor - shortcuteditor/shortcuteditordialog.ui + toaboutui.ui + tobrowserconstraintui.ui + tobrowserfilterui.ui + tobrowserindexui.ui + tobrowsertableui.ui + toconnectionimportui.ui + todatabasesettingui.ui + todebugchangeui.ui + todebugwatch.ui + todescribeui.ui + todroptablespaceui.ui + toeditextensionsetupui.ui + toglobalsettingui.ui + tohelpaddfileui.ui + tohelpui.ui + tohelpsetupui.ui + tochartalarmui.ui + tochartsetupui.ui + tolinechartsetupui.ui + tomessageui.ui + tonewconnectionui.ui + topreferencesui.ui + toresultcontentfilterui.ui + toresultlistformatui.ui + torollbackdialogui.ui + # toschedulerui.ui + toscriptui.ui + toscriptschemawidgetui.ui + tosearchreplaceui.ui + tosecurityquotaui.ui + tosecurityroleui.ui + tosecurityuserui.ui + tostoragedatafileui.ui + tostoragedefinitionui.ui + tostoragedialogui.ui + tostorageprefsui.ui + tostoragetablespaceui.ui + tosyntaxsetupui.ui + totemplateaddfileui.ui + totemplateeditui.ui + totemplatesetupui.ui + totoolsettingui.ui + totuningoverviewui.ui + totuningsettingui.ui + toworksheetsetupui.ui + # shortcuteditor + shortcuteditor/shortcuteditordialog.ui ) + + IF (ORACLE_FOUND) - LIST (APPEND TORA_UI_SRC tooraclesettingui.ui) + LIST (APPEND TORA_UI_SRC tooraclesettingui.ui) ENDIF (ORACLE_FOUND) SET(TORA_MOC_CLASSES - toabout.h - toalert.h - toanalyze.h -# tobackground.h -# tobackgroundlabel.h - tobackup.h -# tobackuptool.h - tobarchart.h - tobackgroundlabel.h - tobrowserconstraint.h - tobrowser.h - toresultgrants.h - tobrowserindex.h - tobrowsertable.h - tobrowserbasewidget.h - tobrowseraccesswidget.h - tobrowsertablewidget.h - tobrowserviewwidget.h - tobrowserindexwidget.h - tobrowserschemawidget.h - tobrowsersequencewidget.h - tobrowsersynonymwidget.h - tobrowsercodewidget.h - tobrowsertriggerwidget.h - tobrowserdblinkswidget.h -# tobrowserschemabasewidget.h -# toconf.h -# toconfiguration.h - toconnection.h - toconnectionimport.h - toconnectionmodel.h - toconnectionpool.h - todocklet.h - todockbar.h - topushbutton.h - torunnable.h - tonoblockquery.h - tocurrent.h - todatatype.h - todebug.h - todebugtext.h - todescribe.h -# todefaultkeywords.h - toeditextensions.h -# toeditwidget.h -# toextract.h - toeventquery.h - toeventquerytask.h - tofilesize.h - toglobalsetting.h - tohelp.h - tohelpsetup.h - tohighlightedtext.h -# tohtml.h - tochangeconnection.h - tochartmanager.h - toinvalid.h - tolegendchart.h - tolinechart.h -# tolistviewformattercsv.h -# tolistviewformatterfactory.h -# tolistviewformatter.h -# tolistviewformatterhtml.h -# tolistviewformatteridentifier.h -# tolistviewformattersql.h -# tolistviewformattertabdel.h -# tolistviewformattertext.h - tomain.h - tomainwindow.h -# tomainwindow.kde.h - tomarkedtext.h - tomemoeditor.h - tomodeleditor.h - tomessage.h -# tomysqlkeywords.h - tonewconnection.h -# tonoblockquery.h - tooutput.h - toparamget.h - topiechart.h - toplsqleditor.h - toplsqltext.h - topreferences.h - toprofiler.h - toproject.h -# toqvalue.h -# toreport.h - toresultbar.h - toresultcolscomment.h - toresultcols.h - toresultcombo.h - toresultschema.h - toresultdepend.h - toresultextract.h - toresultfield.h - toresult.h - toresultitem.h - toresultlabel.h - toresultline.h - toresultlock.h - toresultlong.h - toresultmodel.h - tocodemodel.h - toresultparam.h - toresultpie.h - toresultplan.h -# toresultresources.h - toresultstats.h - toresultstorage.h - toresulttableview.h - toresulttableviewedit.h - toresultdata.h - toresultdatasingle.h - toresultview.h - toresultlistformat.h - torollback.h -# toscheduler.h - toscript.h - toscriptschemawidget.h -# toscripttreeitem.h - toscripttreemodel.h - tosearchreplace.h - tosecurity.h - tosecuritytreemodel.h -# tosecuritytreeitem.h - tosession.h - tosgastatement.h - tosgatrace.h - tosmtp.h -# tosplash.h - tosqledit.h -# tosql.h -# tosqlparse.h -# tostoragedefinition.h - tostorage.h - tosyntaxsetup.h - totableselect.h - totabwidget.h - totemplate.h - totemporary.h -# totextview.h - tothread_p.h - totreewidget.h -# totimer.h - totool.h - totuning.h - tounittest.h - tovisualize.h - towaitevents.h - toworksheet.h - toworkingwidget.h - toeditablemenu.h - toworksheetstatistic.h -# toworksheettext.h - toworksheetwidget.h - utils.h -# shortcuteditor - shortcuteditor/shortcuteditordialog.h - shortcuteditor/shortcutmodel.h -# docklets - docklets/toviewconnections.h - docklets/toviewdirectory.h -) + toabout.h + toalert.h + toanalyze.h + # tobackground.h + # tobackgroundlabel.h + tobackup.h + # tobackuptool.h + tobarchart.h + tobackgroundlabel.h + tobrowserconstraint.h + tobrowser.h + toresultgrants.h + tobrowserindex.h + tobrowsertable.h + tobrowserbasewidget.h + tobrowseraccesswidget.h + tobrowsertablewidget.h + tobrowserviewwidget.h + tobrowserindexwidget.h + tobrowserschemawidget.h + tobrowsersequencewidget.h + tobrowsersynonymwidget.h + tobrowsercodewidget.h + tobrowsertriggerwidget.h + tobrowserdblinkswidget.h + # tobrowserschemabasewidget.h + # toconf.h + # toconfiguration.h + toconnection.h + toconnectionimport.h + toconnectionmodel.h + toconnectionpool.h + todocklet.h + todockbar.h + topushbutton.h + torunnable.h + tonoblockquery.h + tocurrent.h + todatatype.h + todebug.h + todebugtext.h + todescribe.h + # todefaultkeywords.h + toeditextensions.h + # toeditwidget.h + # toextract.h + toeventquery.h + toeventquerytask.h + tofilesize.h + toglobalsetting.h + tohelp.h + tohelpsetup.h + tohighlightedtext.h + # tohtml.h + tochangeconnection.h + tochartmanager.h + toinvalid.h + tolegendchart.h + tolinechart.h + # tolistviewformattercsv.h + # tolistviewformatterfactory.h + # tolistviewformatter.h + # tolistviewformatterhtml.h + # tolistviewformatteridentifier.h + # tolistviewformattersql.h + # tolistviewformattertabdel.h + # tolistviewformattertext.h + tomain.h + tomainwindow.h + # tomainwindow.kde.h + tomarkedtext.h + tomemoeditor.h + tomodeleditor.h + tomessage.h + # tomysqlkeywords.h + tonewconnection.h + # tonoblockquery.h + tooutput.h + toparamget.h + topiechart.h + toplsqleditor.h + toplsqltext.h + topreferences.h + toprofiler.h + toproject.h + # toqvalue.h + # toreport.h + toresultbar.h + toresultcolscomment.h + toresultcols.h + toresultcombo.h + toresultschema.h + toresultdepend.h + toresultextract.h + toresultfield.h + toresult.h + toresultitem.h + toresultlabel.h + toresultline.h + toresultlock.h + toresultlong.h + toresultmodel.h + tocodemodel.h + toresultparam.h + toresultpie.h + toresultplan.h + # toresultresources.h + toresultstats.h + toresultstorage.h + toresulttableview.h + toresulttableviewedit.h + toresultdata.h + toresultdatasingle.h + toresultview.h + toresultlistformat.h + torollback.h + # toscheduler.h + toscript.h + toscriptschemawidget.h + # toscripttreeitem.h + toscripttreemodel.h + tosearchreplace.h + tosecurity.h + tosecuritytreemodel.h + # tosecuritytreeitem.h + tosession.h + tosgastatement.h + tosgatrace.h + tosmtp.h + # tosplash.h + tosqledit.h + # tosql.h + # tosqlparse.h + # tostoragedefinition.h + tostorage.h + tosyntaxsetup.h + totableselect.h + totabwidget.h + totemplate.h + totemporary.h + # totextview.h + tothread_p.h + totreewidget.h + # totimer.h + totool.h + totuning.h + tounittest.h + tovisualize.h + towaitevents.h + toworksheet.h + toworkingwidget.h + toeditablemenu.h + toworksheetstatistic.h + # toworksheettext.h + toworksheetwidget.h + utils.h + # shortcuteditor + shortcuteditor/shortcuteditordialog.h + shortcuteditor/shortcutmodel.h + # docklets + docklets/toviewconnections.h + docklets/toviewdirectory.h + ) + IF (ORACLE_FOUND) LIST(APPEND TORA_MOC_CLASSES tooraclesetting.h) ENDIF (ORACLE_FOUND) @@ -425,10 +428,9 @@ -i${CMAKE_CURRENT_SOURCE_DIR}/tora.rc -o ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o) SET(TORA_SOURCES ${TORA_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o) -endif (WIN32 AND MINGW) +ENDIF (WIN32 AND MINGW) - QT4_ADD_TRANSLATION(TORA_I18N_QM ${TORA_I18N_TS}) QT4_WRAP_UI(TORA_UI_SOURCES ${TORA_UI_SRC} ) QT4_WRAP_CPP(TORA_MOC_SOURCES ${TORA_MOC_CLASSES}) @@ -446,12 +448,12 @@ SET(TORA_LOKI_LIB "tora_loki_lib") IF (WANT_INTERNAL_QSCINTILLA) - SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib) + SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib) ENDIF (WANT_INTERNAL_QSCINTILLA) IF (WIN32) - SET (WINDOWS_LIB "windows_lib") + SET (WINDOWS_LIB "windows_lib") ENDIF (WIN32) @@ -464,7 +466,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/loki/include ${CMAKE_CURRENT_SOURCE_DIR}/otl "/usr/local/trotl/include" - "/home/ibrezina/workspace/boost_1_38_0" +# "/home/ibrezina/workspace/boost_1_38_0" ) IF (POSTGRESQL_INCLUDE_DIR) @@ -472,12 +474,12 @@ ENDIF (POSTGRESQL_INCLUDE_DIR) IF (WANT_INTERNAL_QSCINTILLA) - INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR}/src/qscintilla2/Qt4 - ${CMAKE_SOURCE_DIR}/src/qscintilla2/Qt4/Qci + INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/src/qscintilla2/Qt4 + ${CMAKE_SOURCE_DIR}/src/qscintilla2/Qt4/Qci ) ELSE (WANT_INTERNAL_QSCINTILLA) - INCLUDE_DIRECTORIES(${QSCINTILLA_INCLUDE_DIR}) + INCLUDE_DIRECTORIES(${QSCINTILLA_INCLUDE_DIR}) ENDIF (WANT_INTERNAL_QSCINTILLA) Modified: branches/tora-trotl/src/toalert.h =================================================================== --- branches/tora-trotl/src/toalert.h 2009-06-01 21:45:18 UTC (rev 3204) +++ branches/tora-trotl/src/toalert.h 2009-06-19 22:43:53 UTC (rev 3205) @@ -50,7 +50,7 @@ #include <QMenu> #include "totool.h" -#include "tothread.h" +//#include "tothread.h" class QComboBox; class QLineEdit; Modified: branches/tora-trotl/src/tothread.h =================================================================== --- branches/tora-trotl/src/tothread.h 2009-06-01 21:45:18 UTC (rev 3204) +++ branches/tora-trotl/src/tothread.h 2009-06-19 22:43:53 UTC (rev 3205) @@ -184,7 +184,7 @@ toThreadInfo *i = toThread::toThreadInfoStorage.localData(); return i->threadNumber; } else { - throw QString("This thread has no in information associated"); + throw QString("This thread has no in information associated"); } } virtual ~toThreadInfo(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2009-07-12 22:30:13
|
Revision: 3214 http://tora.svn.sourceforge.net/tora/?rev=3214&view=rev Author: ibre5041 Date: 2009-07-12 22:30:05 +0000 (Sun, 12 Jul 2009) Log Message: ----------- upstream merged. small bug fixed Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/Makefile.am branches/tora-trotl/README.CMAKE branches/tora-trotl/README.OSX branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/toconnectionpool.cpp branches/tora-trotl/src/tooracleconnection.cpp branches/tora-trotl/src/toqsqlconnection.cpp branches/tora-trotl/src/toresulttableview.cpp branches/tora-trotl/src/toresultview.cpp Added Paths: ----------- branches/tora-trotl/osx_tools/ branches/tora-trotl/osx_tools/CompleteBundle.cmake.in branches/tora-trotl/osx_tools/CreateBundle.sh.in branches/tora-trotl/src/icons/tora.icns Removed Paths: ------------- branches/tora-trotl/osx_tools/CompleteBundle.cmake.in branches/tora-trotl/osx_tools/CreateBundle.sh.in Property Changed: ---------------- branches/tora-trotl/ Property changes on: branches/tora-trotl ___________________________________________________________________ Added: svn:mergeinfo + /trunk/tora:3192-3213 Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2009-07-08 22:43:32 UTC (rev 3213) +++ branches/tora-trotl/CMakeLists.txt 2009-07-12 22:30:05 UTC (rev 3214) @@ -32,7 +32,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") #Project Setup -PROJECT(tora) +PROJECT(TOra) #Set our version values #Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX} #where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level) @@ -123,21 +123,37 @@ ENDIF (MSVC) -#Based on our build type, setup our build options -IF(APPLE) - SET( ENV{MACOSX_DEPLOYMENT_TARGET} 10.3 ) - SET( ENV{LD_PREBIND} 1 ) - SET( ENV{LD_PREBIND_ALLOW_OVERLAP} 1 ) - SET(CMAKE_CXX_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions ${CXX_WARNINGS}") - SET(CMAKE_C_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions ${CXX_WARNINGS}") -ELSE(APPLE) - SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS} -fstrict-aliasing") - SET(CMAKE_C_FLAGS_DEBUG "-O0 -ggbb3 -fno-inline ${CXX_WARNINGS} -fstrict-aliasing") -ENDIF(APPLE) +# --- If we are on OS X copy all the embedded libraries to the app bundle +IF (APPLE AND WANT_BUNDLE) + # -------- Function to build OS X Stand Alone Bundles ----------------- + function(MakeOSXBundleApp target binary_dir) + #-- Set some useful variables + SET (OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.cmake") + SET (OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.sh") + #-- Configure the cmake file and the shell script + CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CompleteBundle.cmake.in" + "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}" @ONLY IMMEDIATE) + CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CreateBundle.sh.in" + "${OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT}" @ONLY IMMEDIATE) + #-- Create the installation code + install(SCRIPT "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}") + endfunction(MakeOSXBundleApp) + #IF(CMAKE_BUILD_TYPE MATCHES "Debug") + # MakeOSXBundleApp( "QtTest${EXE_DEBUG_EXTENSION}" ${PROJECT_BINARY_DIR}) + #ELSE (CMAKE_BUILD_TYPE MATCHES "Debug") + MakeOSXBundleApp(TOra ${PROJECT_BINARY_DIR}) + #ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug") + +ENDIF (APPLE AND WANT_BUNDLE) + + +#SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") +#SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") SET(CMAKE_CXX_FLAGS_RELEASE "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS}") SET(CMAKE_C_FLAGS_RELEASE "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS}") + # Required for win wjen there is used an external qscintilla lib IF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) SET(CMAKE_CXX_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_CXX_FLAGS_RELEASE}") @@ -270,6 +286,7 @@ ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(doc) +IF (NOT WANT_BUNDLE) #Install our READMEs etc. INSTALL(FILES AUTHORS @@ -291,6 +308,7 @@ TODO DESTINATION ${TORA_DOC_DIR} ) +ENDIF (NOT WANT_BUNDLE) # packaging related stuff #SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") Modified: branches/tora-trotl/Makefile.am =================================================================== --- branches/tora-trotl/Makefile.am 2009-07-08 22:43:32 UTC (rev 3213) +++ branches/tora-trotl/Makefile.am 2009-07-12 22:30:05 UTC (rev 3214) @@ -45,6 +45,7 @@ README.CODESTYLE \ README.LICENSE \ README.OSX \ + README.LAYOUT \ README.CMAKE \ README.SVN \ README.BINARIES \ Modified: branches/tora-trotl/README.CMAKE =================================================================== --- branches/tora-trotl/README.CMAKE 2009-07-08 22:43:32 UTC (rev 3213) +++ branches/tora-trotl/README.CMAKE 2009-07-12 22:30:05 UTC (rev 3214) @@ -58,6 +58,11 @@ etc. +TOra allows to be built as "bundle" application on Mac OS X. +-DWANT_BUNDLE=1 +The bundle will be created in the CMAKE_INSTALL_PREFIX. + + Search following for more info: http://cmake.org http://docs.scribus.net/index.php?lang=en&page=install4 Modified: branches/tora-trotl/README.OSX =================================================================== --- branches/tora-trotl/README.OSX 2009-07-08 22:43:32 UTC (rev 3213) +++ branches/tora-trotl/README.OSX 2009-07-12 22:30:05 UTC (rev 3214) @@ -1,6 +1,7 @@ TOra is reported to build on Mac OS X (10.4 Tiger and later). Only Cmake build method is tested. See README.CMAKE. +Mac OS X bundle can be created with WANT_BUNDLE. See README.CMAKE. Notes on Oracle Instantclient: @@ -18,3 +19,7 @@ It's caused by Oracle - you'll need to fix Instantclient libraries yourself: ln -s /path/to/instantclient/libclntsh.dylib.10.2 /path/to/instantclient/libclntsh.dylib ln -s /path/to/instantclient/libocci.dylib.10.2 /path/to/instantclient/libocci.dylib + +3) Keyboard shortcuts for Tool windows swicthing (AppleKey+number) can conflict with +Mac's Open Spaces shortcuts in some cases. + Deleted: branches/tora-trotl/osx_tools/CompleteBundle.cmake.in =================================================================== --- trunk/tora/osx_tools/CompleteBundle.cmake.in 2009-07-08 22:43:32 UTC (rev 3213) +++ branches/tora-trotl/osx_tools/CompleteBundle.cmake.in 2009-07-12 22:30:05 UTC (rev 3214) @@ -1,69 +0,0 @@ -#-- Need this for link line stuff? -if(COMMAND cmake_policy) - cmake_policy(SET CMP0009 NEW) -endif(COMMAND cmake_policy) - - -# gp_item_default_embedded_path item default_embedded_path_var -# -# Return the path that others should refer to the item by when the item -# is embedded inside a bundle. -# -# Override on a per-project basis by providing a project-specific -# gp_item_default_embedded_path_override function. -# -function(gp_item_default_embedded_path_override item default_embedded_path_var) - # - # The assumption here is that all executables in the bundle will be - # in same-level-directories inside the bundle. The parent directory - # of an executable inside the bundle should be MacOS or a sibling of - # MacOS and all embedded paths returned from here will begin with - # "@loader_path/../" and will work from all executables in all - # such same-level-directories inside the bundle. - # - - # By default, embed things right next to the main bundle executable: - # - set (install_name_prefix "@executable_path") - # ------------------------------------------------------------------- - # If your application uses plugins then you should consider using the following - # instead but will limit your deployment to OS X 10.4. There is also a patch - # needed for CMake that as of Sept 30, 2008 has NOT been applied to CMake. - # set (install_name_prefix "@loader_path") - - set(path "${install_name_prefix}/../../Contents/MacOS") - - set(overridden 0) - - # Embed .dylibs in the Libraries Directory - # - if(item MATCHES "\\.dylib$") - set(path "${install_name_prefix}/../Libraries") - set(overridden 1) - endif(item MATCHES "\\.dylib$") - - # Embed .so files in the Plugins directory - # - if(item MATCHES "\\.so$") - set(path "${install_name_prefix}/../Plugins") - set(overridden 1) - endif(item MATCHES "\\.so$") - - # Embed frameworks in the embedded "Frameworks" directory (sibling of MacOS): - # - if(NOT overridden) - if(item MATCHES "[^/]+\\.framework/") - set(path "${install_name_prefix}/../Frameworks") - set(overridden 1) - endif(item MATCHES "[^/]+\\.framework/") - endif(NOT overridden) - - set(${default_embedded_path_var} "${path}" PARENT_SCOPE) -endfunction(gp_item_default_embedded_path_override) - -# -- Copy the App bundle to the installation location first -EXECUTE_PROCESS( COMMAND "@OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT@" ) - -# -- Run the BundleUtilities cmake code -include(BundleUtilities) -fixup_bundle("@CMAKE_INSTALL_PREFIX@/@target@.app" "${PluginList}" "Plugins") Copied: branches/tora-trotl/osx_tools/CompleteBundle.cmake.in (from rev 3213, trunk/tora/osx_tools/CompleteBundle.cmake.in) =================================================================== --- branches/tora-trotl/osx_tools/CompleteBundle.cmake.in (rev 0) +++ branches/tora-trotl/osx_tools/CompleteBundle.cmake.in 2009-07-12 22:30:05 UTC (rev 3214) @@ -0,0 +1,69 @@ +#-- Need this for link line stuff? +if(COMMAND cmake_policy) + cmake_policy(SET CMP0009 NEW) +endif(COMMAND cmake_policy) + + +# gp_item_default_embedded_path item default_embedded_path_var +# +# Return the path that others should refer to the item by when the item +# is embedded inside a bundle. +# +# Override on a per-project basis by providing a project-specific +# gp_item_default_embedded_path_override function. +# +function(gp_item_default_embedded_path_override item default_embedded_path_var) + # + # The assumption here is that all executables in the bundle will be + # in same-level-directories inside the bundle. The parent directory + # of an executable inside the bundle should be MacOS or a sibling of + # MacOS and all embedded paths returned from here will begin with + # "@loader_path/../" and will work from all executables in all + # such same-level-directories inside the bundle. + # + + # By default, embed things right next to the main bundle executable: + # + set (install_name_prefix "@executable_path") + # ------------------------------------------------------------------- + # If your application uses plugins then you should consider using the following + # instead but will limit your deployment to OS X 10.4. There is also a patch + # needed for CMake that as of Sept 30, 2008 has NOT been applied to CMake. + # set (install_name_prefix "@loader_path") + + set(path "${install_name_prefix}/../../Contents/MacOS") + + set(overridden 0) + + # Embed .dylibs in the Libraries Directory + # + if(item MATCHES "\\.dylib$") + set(path "${install_name_prefix}/../Libraries") + set(overridden 1) + endif(item MATCHES "\\.dylib$") + + # Embed .so files in the Plugins directory + # + if(item MATCHES "\\.so$") + set(path "${install_name_prefix}/../Plugins") + set(overridden 1) + endif(item MATCHES "\\.so$") + + # Embed frameworks in the embedded "Frameworks" directory (sibling of MacOS): + # + if(NOT overridden) + if(item MATCHES "[^/]+\\.framework/") + set(path "${install_name_prefix}/../Frameworks") + set(overridden 1) + endif(item MATCHES "[^/]+\\.framework/") + endif(NOT overridden) + + set(${default_embedded_path_var} "${path}" PARENT_SCOPE) +endfunction(gp_item_default_embedded_path_override) + +# -- Copy the App bundle to the installation location first +EXECUTE_PROCESS( COMMAND "@OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT@" ) + +# -- Run the BundleUtilities cmake code +include(BundleUtilities) +fixup_bundle("@CMAKE_INSTALL_PREFIX@/@target@.app" "${PluginList}" "Plugins") Deleted: branches/tora-trotl/osx_tools/CreateBundle.sh.in =================================================================== --- trunk/tora/osx_tools/CreateBundle.sh.in 2009-07-08 22:43:32 UTC (rev 3213) +++ branches/tora-trotl/osx_tools/CreateBundle.sh.in 2009-07-12 22:30:05 UTC (rev 3214) @@ -1,45 +0,0 @@ -#!/bin/sh - -# Are we using Xcode to compile. If we are then the CMake variable -# XCODE will be '1' otherwise it will be blank -Xcode="@XCODE@x" -InstallPrefix="@CMAKE_INSTALL_PREFIX@" -ProjectBinaryDir="@binary_dir@" -OSX_App_Name="@target@" - -# Check for a Debug build. Note that the EXE_DEBUG_EXTENSION was set -# in the CMakeLists.txt file -if [[ $Xcode == "1x" ]]; then - if [[ $BUILD_STYLE == "Debug" ]]; then - OSX_App_Name="@target@@EXE_DEBUG_EXTENSION@" - fi - OSX_App="@EXECUTABLE_OUTPUT_PATH@/$BUILD_STYLE/$OSX_App_Name.app" -else - OSX_App="@EXECUTABLE_OUTPUT_PATH@/$OSX_App_Name.app" -fi - - -# Remove the previous @target@ app package so we start with a clean bundle -echo "Removing Previous $OSX_App_Name.app bundle at $InstallPrefix/" -rm -rf "$InstallPrefix/$OSX_App_Name.app" - -# copy the @target@.app bundle to the installation location -echo "Copying $OSX_App_Name.app from the build tree to $InstallPrefix/" -cp -Rp "$OSX_App" "$InstallPrefix/" - -OSX_App="@CMAKE_INSTALL_PREFIX@/$OSX_App_Name.app" -ContentsDir="$OSX_App/Contents" -SupportDir="$OSX_App/Contents/Support" -LibrariesDir="$OSX_App/Contents/Libraries" -FrameworksDir="$OSX_App/Contents/Frameworks" -PluginsDir="$OSX_App/Contents/Plugins" - - -# create directories in the @target@.app bundle -mkdir -p "$SupportDir" -if [ ! -e $LibrariesDir ] - then - mkdir -p "$LibrariesDir" -fi - - Copied: branches/tora-trotl/osx_tools/CreateBundle.sh.in (from rev 3213, trunk/tora/osx_tools/CreateBundle.sh.in) =================================================================== --- branches/tora-trotl/osx_tools/CreateBundle.sh.in (rev 0) +++ branches/tora-trotl/osx_tools/CreateBundle.sh.in 2009-07-12 22:30:05 UTC (rev 3214) @@ -0,0 +1,45 @@ +#!/bin/sh + +# Are we using Xcode to compile. If we are then the CMake variable +# XCODE will be '1' otherwise it will be blank +Xcode="@XCODE@x" +InstallPrefix="@CMAKE_INSTALL_PREFIX@" +ProjectBinaryDir="@binary_dir@" +OSX_App_Name="@target@" + +# Check for a Debug build. Note that the EXE_DEBUG_EXTENSION was set +# in the CMakeLists.txt file +if [[ $Xcode == "1x" ]]; then + if [[ $BUILD_STYLE == "Debug" ]]; then + OSX_App_Name="@target@@EXE_DEBUG_EXTENSION@" + fi + OSX_App="@EXECUTABLE_OUTPUT_PATH@/$BUILD_STYLE/$OSX_App_Name.app" +else + OSX_App="@EXECUTABLE_OUTPUT_PATH@/$OSX_App_Name.app" +fi + + +# Remove the previous @target@ app package so we start with a clean bundle +echo "Removing Previous $OSX_App_Name.app bundle at $InstallPrefix/" +rm -rf "$InstallPrefix/$OSX_App_Name.app" + +# copy the @target@.app bundle to the installation location +echo "Copying $OSX_App_Name.app from the build tree to $InstallPrefix/" +cp -Rp "$OSX_App" "$InstallPrefix/" + +OSX_App="@CMAKE_INSTALL_PREFIX@/$OSX_App_Name.app" +ContentsDir="$OSX_App/Contents" +SupportDir="$OSX_App/Contents/Support" +LibrariesDir="$OSX_App/Contents/Libraries" +FrameworksDir="$OSX_App/Contents/Frameworks" +PluginsDir="$OSX_App/Contents/Plugins" + + +# create directories in the @target@.app bundle +mkdir -p "$SupportDir" +if [ ! -e $LibrariesDir ] + then + mkdir -p "$LibrariesDir" +fi + + Modified: branches/tora-trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/CMakeLists.txt 2009-07-08 22:43:32 UTC (rev 3213) +++ branches/tora-trotl/src/CMakeLists.txt 2009-07-12 22:30:05 UTC (rev 3214) @@ -483,22 +483,31 @@ ENDIF (WANT_INTERNAL_QSCINTILLA) +# Handle win/mac special stuff - it's left empty for linux/unix +SET (GUI_TYPE) + IF(WIN32) IF (MSVC) # this is a must to switch off subsystem:console (console window poping up) # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified LINK_LIBRARIES(${QT_QTMAIN_LIBRARY}) - SET (WIN32_SUBSYSTEM WIN32) - IF (WANT_DEBUG) + SET (GUI_TYPE WIN32) + IF (WANT_DEBUG) SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") - ELSE (WANT_DEBUG) + ELSE (WANT_DEBUG) SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") - ENDIF (WANT_DEBUG) + ENDIF (WANT_DEBUG) ENDIF (MSVC) ENDIF(WIN32) +IF (APPLE AND WANT_BUNDLE) + SET(GUI_TYPE MACOSX_BUNDLE) + SET(MACOSX_BUNDLE_ICON_FILE ${CMAKE_SOURCE_DIR}/src/icons/tora.icns) + SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/src/icons/tora.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) +ENDIF (APPLE AND WANT_BUNDLE) -ADD_EXECUTABLE(${EXE_NAME} ${WIN32_SUBSYSTEM} + +ADD_EXECUTABLE(${EXE_NAME} ${GUI_TYPE} ${TORA_I18N_QM} ${TORA_MOC_SOURCES} ${TORA_SOURCES} @@ -534,7 +543,11 @@ IF (WIN32) INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION .) ELSE (WIN32) - INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib) + IF (NOT WANT_BUNDLE) + INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib) + ELSE (NOT WANT_BUNDLE) + INSTALL(TARGETS ${EXE_NAME} BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}) + ENDIF (NOT WANT_BUNDLE) ENDIF (WIN32) Copied: branches/tora-trotl/src/icons/tora.icns (from rev 3213, trunk/tora/src/icons/tora.icns) =================================================================== (Binary files differ) Modified: branches/tora-trotl/src/toconnectionpool.cpp =================================================================== --- branches/tora-trotl/src/toconnectionpool.cpp 2009-07-08 22:43:32 UTC (rev 3213) +++ branches/tora-trotl/src/toconnectionpool.cpp 2009-07-12 22:30:05 UTC (rev 3214) @@ -48,14 +48,13 @@ #include "toconnectionpool.h" #include "tosql.h" -#include "tothread.h" #include <QTimer> #include <QCoreApplication> #include <QApplication> -static const int TEST_MSEC = 50000; +static const int TEST_MSEC = 5000000; toConnectionPoolTest::toConnectionPoolTest(toConnectionPool *pool) @@ -179,6 +178,11 @@ toConnectionPool::~toConnectionPool() { QMetaObject::invokeMethod(TestThread, "quit", Qt::QueuedConnection); +#ifdef Q_WS_MAC + // This is propably mandatory on Mac. If it's missing, the TestThread->wait() + // will block entire GUI for ever. + TestThread->quit(); +#endif // must call this or the queued call never executes while we wait // on the thread. Awesome. qApp->processEvents(); Modified: branches/tora-trotl/src/tooracleconnection.cpp =================================================================== --- branches/tora-trotl/src/tooracleconnection.cpp 2009-07-08 22:43:32 UTC (rev 3213) +++ branches/tora-trotl/src/tooracleconnection.cpp 2009-07-12 22:30:05 UTC (rev 3214) @@ -1201,7 +1201,8 @@ //otl_null null; for (toQList::iterator i = query()->params().begin();i != query()->params().end();i++) { - const ::trotl::BindPar& bp = (*Query).get_next_in_bindpar(); + const ::trotl::BindPar& bp = (*Query).get_curr_in_bindpar(); + if( (bp._bind_type & ( ::trotl::BindPar::BIND_IN | ::trotl::BindPar::BIND_OUT )) == 0) throw toConnection::exception(QString::fromLatin1("Fatal pruser error - invalid BindPar")); @@ -1210,13 +1211,22 @@ get_log().ts( std::string(__HERE_SHORT__)) << "VERY VERY TODO: bind param:" << (*i).toInt() << std::endl; } else if( bp.bind_typename == "char" && (*i).isString()) { + std::string param((const char*)((*i).toString().toUtf8().constData())); + get_log().ts( std::string(__HERE_SHORT__)) + << "VERY VERY TODO: bind param:" + << bp.bind_name << '\t' + << param << " of:" << query()->params().size() << std::endl; + (*Query) << (const char*)((*i).toString().toUtf8().constData()); get_log().ts( std::string(__HERE_SHORT__)) << "VERY VERY TODO: bind param:" << (const char*)((*i).toString().toUtf8().constData()) << std::endl; - } else + } else { + std::cerr << "Fatal pruser error - unsupported BindPar:" << std::endl; + exit(-1); throw toConnection::exception( QString::fromLatin1("Fatal pruser error - unsupported BindPar:") + bp.bind_typename.c_str()); + } // TODO Modified: branches/tora-trotl/src/toqsqlconnection.cpp =================================================================== --- branches/tora-trotl/src/toqsqlconnection.cpp 2009-07-08 22:43:32 UTC (rev 3213) +++ branches/tora-trotl/src/toqsqlconnection.cpp 2009-07-12 22:30:05 UTC (rev 3214) @@ -1750,14 +1750,19 @@ } } + ~toQSqlProvider() { +#ifdef Q_WS_MAC +#warning "toQSqlProvider is disabled for Mac OS X due crashes. Maybe it is not a correct solution..." +#else for (int i = 0;i < Drivers.count();i++) { QString t = fromQSqlName(Drivers[i]); if (!t.isEmpty()) removeProvider(t); } +#endif } virtual QWidget *providerConfigurationTab(const QString &provider, Modified: branches/tora-trotl/src/toresulttableview.cpp =================================================================== --- branches/tora-trotl/src/toresulttableview.cpp 2009-07-08 22:43:32 UTC (rev 3213) +++ branches/tora-trotl/src/toresulttableview.cpp 2009-07-12 22:30:05 UTC (rev 3214) @@ -52,7 +52,7 @@ #include "toresultlistformat.h" #include "tolistviewformatter.h" #include "tolistviewformatterfactory.h" -#include "tolistviewformatteridentifier.h" +//#include "tolistviewformatteridentifier.h" #include "toworkingwidget.h" #include "tosearchreplace.h" Modified: branches/tora-trotl/src/toresultview.cpp =================================================================== --- branches/tora-trotl/src/toresultview.cpp 2009-07-08 22:43:32 UTC (rev 3213) +++ branches/tora-trotl/src/toresultview.cpp 2009-07-12 22:30:05 UTC (rev 3214) @@ -44,7 +44,7 @@ #include "toconf.h" #include "tolistviewformatter.h" #include "tolistviewformatterfactory.h" -#include "tolistviewformatteridentifier.h" +//#include "tolistviewformatteridentifier.h" #include "tomain.h" #include "tomemoeditor.h" #include "toparamget.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2009-07-27 23:42:43
|
Revision: 3225 http://tora.svn.sourceforge.net/tora/?rev=3225&view=rev Author: ibre5041 Date: 2009-07-27 23:42:34 +0000 (Mon, 27 Jul 2009) Log Message: ----------- use original Tora's build system Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/src/CMakeLists.txt Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2009-07-27 23:41:10 UTC (rev 3224) +++ branches/tora-trotl/CMakeLists.txt 2009-07-27 23:42:34 UTC (rev 3225) @@ -1,350 +1,346 @@ -############################################################################################################## -########## CMake Setup ########## - -#Set our CMake minimum version -#Require 2.4.2 for Qt finding -#Require 2.4.3 for moc change detection and rpath updates for custom cairo install -CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR) -# FIXME: dont't forget to change CMP0005 policy to NEW after 2.6.0 minimum required! - -# handle new cmake versions correctly -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) - cmake_policy(SET CMP0005 OLD) # FIXME change it to new when there will be cmake 2.6.x in most distros -endif(COMMAND cmake_policy) - - -#Pretty colors -SET(CMAKE_COLOR_MAKEFILE ON) -#Dont force verbose -SET(CMAKE_VERBOSE_MAKEFILE OFF) -#Include current dir -SET(CMAKE_INCLUDE_CURRENT_DIR TRUE) - - -INCLUDE(CheckIncludeFile) -INCLUDE(CheckCCompilerFlag) -INCLUDE(CheckCXXCompilerFlag) -INCLUDE(CheckTypeSize) -INCLUDE(TestBigEndian) - -#Set the custom CMake module directory where our include/lib finders are -SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") - -#Project Setup -PROJECT(TOra) -#Set our version values -#Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX} -#where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level) -SET (VERSION_MAJOR "2") -SET (VERSION_MINOR "1") -SET (VERSION_PATCH "0") -SET (VERSION_SUFFIX "") -SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) -MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") - -SET (EXE_NAME "tora") - -ADD_DEFINITIONS("-DTOVERSION=\\\"${VERSION}\\\"") -# Allow using CMAKE-related ifdefs in the code. See e.g. toqsqlconnection.cpp. -ADD_DEFINITIONS("-DCMAKE_BUILD") - -#Set the permissions to be used when installing plugins -SET(PLUGIN_PERMISSIONS WORLD_EXECUTE GROUP_EXECUTE OWNER_EXECUTE WORLD_READ GROUP_READ OWNER_READ OWNER_WRITE) - -if (NOT TORA_PLUGIN_DIR) - SET (TORA_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/share/tora/") -endif (NOT TORA_PLUGIN_DIR) -ADD_DEFINITIONS("-DDEFAULT_PLUGIN_DIR=\\\"${TORA_PLUGIN_DIR}\\\"") - -if (NOT TORA_DOC_DIR) - IF (UNIX) - SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/tora/") # it would be pain for upgrade configs -${VERSION}/") - ELSE (UNIX) - SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/doc/") - ENDIF (UNIX) -endif (NOT TORA_DOC_DIR) - -#if (NOT TORA_HELP_DIR) -# SET (TORA_HELP_DIR "${TORA_PLUGIN_DIR}/help/") -#endif (NOT TORA_HELP_DIR) -#ADD_DEFINITIONS("-DTORA_HELP_DIR=\\\"${TORA_HELP_DIR}\\\"") - -############################################################################################################## -########## check for the CPU we build for ########## - -IF (GCC) - -EXECUTE_PROCESS( - COMMAND ${CMAKE_C_COMPILER} -dumpmachine - OUTPUT_VARIABLE MACHINE - OUTPUT_STRIP_TRAILING_WHITESPACE -) -MESSAGE(STATUS "Building for target ${MACHINE}") - -STRING(REGEX MATCH "(i?86-*)|(athlon-*)|(pentium-*)" _machine_x86 "${MACHINE}") -IF (_machine_x86) - MESSAGE(STATUS "Found target X86") - SET(ARCH_X86 1) -ENDIF (_machine_x86) - -STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _machine_x86_64 "${MACHINE}") -IF (_machine_x86_64) - MESSAGE(STATUS "Found target X86_64") - SET(ARCH_X86_64 1) -ENDIF (_machine_x86_64) - -STRING(REGEX MATCH "(ppc-*)" _machine_ppc "${MACHINE}") -IF (_machine_ppc) - MESSAGE(STATUS "Found target PPC") - SET(ARCH_PPC 1) -ENDIF (_machine_ppc) - -ENDIF (GCC) - -#Convert our simpler command line option to the CMake style -#None, Debug, Release, .. or custom ones -# SET(WANT_DEBUG 1) -IF(WANT_DEBUG) - SET(CMAKE_BUILD_TYPE Debug) -ELSE(WANT_DEBUG) - SET(CMAKE_BUILD_TYPE RELEASE) -ENDIF(WANT_DEBUG) - - -# Lets disable Wall warnings due the MSVC too much talkative -# output. Wall can slow down compiletion up to hours and -# my boxes can boil eggs too. -# MSVC, MSVC_IDE, MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005 -IF (MSVC) - SET (CXX_WARNINGS "") -ELSE (MSVC) - SET (CXX_WARNINGS "-Wall") -ENDIF (MSVC) - - -# --- If we are on OS X copy all the embedded libraries to the app bundle -IF (APPLE AND WANT_BUNDLE) - # -------- Function to build OS X Stand Alone Bundles ----------------- - function(MakeOSXBundleApp target binary_dir) - #-- Set some useful variables - SET (OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.cmake") - SET (OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.sh") - #-- Configure the cmake file and the shell script - CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CompleteBundle.cmake.in" - "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}" @ONLY IMMEDIATE) - CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CreateBundle.sh.in" - "${OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT}" @ONLY IMMEDIATE) - #-- Create the installation code - install(SCRIPT "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}") - - endfunction(MakeOSXBundleApp) - - #IF(CMAKE_BUILD_TYPE MATCHES "Debug") - # MakeOSXBundleApp( "QtTest${EXE_DEBUG_EXTENSION}" ${PROJECT_BINARY_DIR}) - #ELSE (CMAKE_BUILD_TYPE MATCHES "Debug") - MakeOSXBundleApp(TOra ${PROJECT_BINARY_DIR}) - #ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug") - -ENDIF (APPLE AND WANT_BUNDLE) - - -#SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") -#SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") -SET(CMAKE_CXX_FLAGS_RELEASE "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS}") -SET(CMAKE_C_FLAGS_RELEASE "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS}") - -# Required for win wjen there is used an external qscintilla lib -IF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) - SET(CMAKE_CXX_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_CXX_FLAGS_RELEASE}") - SET(CMAKE_C_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_C_FLAGS_RELEASE}") -ENDIF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) - - -############################################################################################################## -########## Find Dependencies ########## - -# wo don't want to plugin build -ADD_DEFINITIONS(-DTOMONOLITHIC) - - -SET (QT_MT_REQUIRED true) -SET (QT_MIN_VERSION "4.3.0") -SET (QT_USE_QTSQL TRUE) -SET (QT_USE_QTNETWORK TRUE) -SET (QT_USE_QTXML TRUE) -FIND_PACKAGE(Qt4 REQUIRED) -INCLUDE( ${QT_USE_FILE} ) -IF (QT_FOUND) - MESSAGE("Qt4 Found OK") - #Add our Qt definitions - ADD_DEFINITIONS( - ${QT_DEFINITIONS} - -DQT_CORE_LIB - -DQT_GUI_LIB - -DQT_THREAD_LIB - ) -ELSE(QT_FOUND) - MESSAGE(FATAL_ERROR "No Qt4 found") -ENDIF(QT_FOUND) - - -IF (WANT_INTERNAL_QSCINTILLA) - MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.") - MESSAGE(STATUS "QSci: It's recomended to use external library for it") -ELSE (WANT_INTERNAL_QSCINTILLA) - - FIND_PACKAGE(QScintilla REQUIRED) - IF (QSCINTILLA_FOUND) - MESSAGE("QScintilla2 Found OK") - ADD_DEFINITIONS("-DQT -DSCI_LEXER") - ELSE (QSCINTILLA_FOUND) - MESSAGE(STATUS "QSci: No QScintilla2 libraries found") - MESSAGE(STATUS "QSci: You can use -DWANT_INTERNAL_QSCINTILLA=1 to build included copy of it.") - MESSAGE(FATAL_ERROR "No QScintilla2 found") - ENDIF (QSCINTILLA_FOUND) - -ENDIF (WANT_INTERNAL_QSCINTILLA) - - -FIND_PACKAGE(Oracle) -IF(ORACLE_FOUND) - MESSAGE("Oracle OCI Library Found OK") - # what else is hidden in the ifdef hell?! - ADD_DEFINITIONS("-DDBLINK") -ELSE(ORACLE_FOUND) - MESSAGE(STATUS "No Oracle OCI found. TOra will be build without Oracle support") - ADD_DEFINITIONS("-DTO_NO_ORACLE") -ENDIF(ORACLE_FOUND) - - -FIND_PACKAGE(PostgreSQL) -IF (POSTGRESQL_FOUND) - ADD_DEFINITIONS(-DLIBPQ_DECL_CANCEL) - ADD_DEFINITIONS(-DHAVE_POSTGRESQL_LIBPQ_FE_H) - MESSAGE(STATUS "PostgreSQL environment found: ${POSTGRESQL_INCLUDE_DIR} ${POSTGRESQL_LIBRARIES}") -ELSE (POSTGRESQL_FOUND) - MESSAGE(" ") - MESSAGE(WARNING " No PostgreSQL environment has been found.") - MESSAGE(WARNING " Specify -DPOSTGRESQL_PATH_INCLUDES=path") - MESSAGE(WARNING " and -DPOSTGRESQL_PATH_LIB manually") - #MESSAGE (STATUS "PostgreSQL includes: ${POSTGRESQL_INCLUDE_DIR} vs. ${POSTGRESQL_PATH_INCLUDES}") - #MESSAGE (STATUS "PostgreSQL libs: ${POSTGRESQL_LIBRARIES} vs. ${POSTGRESQL_PATH_LIB}") - MESSAGE(" ") -ENDIF (POSTGRESQL_FOUND) - - - -############################################################################################################## -########## Include Setup ########## - -TEST_BIG_ENDIAN(WORDS_BIGENDIAN) - -CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) -IF(HAVE_DLFCN_H) - ADD_DEFINITIONS(-DHAVE_DLFCN_H) -ENDIF(HAVE_DLFCN_H) - -CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) -IF(HAVE_UNISTD_H) - ADD_DEFINITIONS(-DHAVE_UNISTD_H) -ENDIF(HAVE_UNISTD_H) - -CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) -# IF(HAVE_SYS_TYPES_H) -# ADD_DEFINITIONS(-DHAVE_SYS_TYPES_H) -# ENDIF(HAVE_SYS_TYPES_H) - -CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H) -# IF(HAVE_SYS_STAT_H) -# ADD_DEFINITIONS(-DHAVE_SYS_STAT_H) -# ENDIF(HAVE_SYS_STAT_H) -#>>Test for existing include files - - -#Create configure files.. config.h and uninstall -#config.h -# INCLUDE (ConfigureChecks.cmake) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) -ADD_DEFINITIONS("-DHAVE_CONFIG_H") - - - -############################################################################################################## -########## Uninstall Setup ########## - -CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY -) - -ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - -#Add our source subdirs -ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(doc) - -IF (NOT WANT_BUNDLE) -#Install our READMEs etc. -INSTALL(FILES - AUTHORS - BUGS - ChangeLog - COPYING - INSTALL - NEWS - README - README.BINARIES - README.CMAKE - README.CODESTYLE - README.LAYOUT - README.LICENSE - README.OSX - README.RELEASE - README.SVN - README.WINDOWS - TODO - DESTINATION ${TORA_DOC_DIR} -) -ENDIF (NOT WANT_BUNDLE) - -# packaging related stuff -#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") -SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) -#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") -#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") -SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -SET(CPACK_SOURCE_GENERATOR "TGZ") -#SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") -SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") -SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt") -SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) -INCLUDE(CPack) - -# Check for SVN -FIND_PACKAGE(Subversion) -IF(NOT Subversion_FOUND) - SET(Subversion_SVN_EXECUTABLE true) -ENDIF(NOT Subversion_FOUND) - -# get svn revision in rpmbuild time (and not in Makefile generation time) -SET(SVN_REVISION - "\"$$(" ${Subversion_SVN_EXECUTABLE} info ${CMAKE_SOURCE_DIR} | awk '/Revision:/ {print \$\$2 }' ")\"" - ) -SET(RPM_DEFINES - --define "_sourcedir ${CMAKE_SOURCE_DIR}" - ) -SET(SPEC_IN_SUBST - "\"" - "s/(%define\\s+_version) .*/\\\\1 ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/\;" - "s/(%define\\s+_release) .*/\\\\1 0.${SVN_REVISION}svn/\;" - "\"" - ) -SET(RPM_SPEC "rpm/tora.spec") -ADD_CUSTOM_TARGET(package-rpm - COMMAND sed -r ${SPEC_IN_SUBST} "${RPM_SPEC}.in" >"${RPM_SPEC}" - COMMAND make package_source - COMMAND rpmbuild -ba ${RPM_DEFINES} "${RPM_SPEC}" - ) +############################################################################################################## +########## CMake Setup ########## + +#Set our CMake minimum version +#Require 2.4.2 for Qt finding +#Require 2.4.3 for moc change detection and rpath updates for custom cairo install +CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR) +# FIXME: dont't forget to change CMP0005 policy to NEW after 2.6.0 minimum required! + +# handle new cmake versions correctly +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) + cmake_policy(SET CMP0005 OLD) # FIXME change it to new when there will be cmake 2.6.x in most distros +endif(COMMAND cmake_policy) + + +#Pretty colors +SET(CMAKE_COLOR_MAKEFILE ON) +#Dont force verbose +SET(CMAKE_VERBOSE_MAKEFILE OFF) +#Include current dir +SET(CMAKE_INCLUDE_CURRENT_DIR TRUE) + + +INCLUDE(CheckIncludeFile) +INCLUDE(CheckCCompilerFlag) +INCLUDE(CheckCXXCompilerFlag) +INCLUDE(CheckTypeSize) +INCLUDE(TestBigEndian) + +#Set the custom CMake module directory where our include/lib finders are +SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") + +#Project Setup +PROJECT(TOra) +#Set our version values +#Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX} +#where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level) +SET (VERSION_MAJOR "2") +SET (VERSION_MINOR "1") +SET (VERSION_PATCH "0") +SET (VERSION_SUFFIX "") +SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) +MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") + +SET (EXE_NAME "tora") + +ADD_DEFINITIONS("-DTOVERSION=\\\"${VERSION}\\\"") +# Allow using CMAKE-related ifdefs in the code. See e.g. toqsqlconnection.cpp. +ADD_DEFINITIONS("-DCMAKE_BUILD") + +ADD_DEFINITIONS("-DTROTL_DLL") + +#Set the permissions to be used when installing plugins +SET(PLUGIN_PERMISSIONS WORLD_EXECUTE GROUP_EXECUTE OWNER_EXECUTE WORLD_READ GROUP_READ OWNER_READ OWNER_WRITE) + +if (NOT TORA_PLUGIN_DIR) + SET (TORA_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/share/tora/") +endif (NOT TORA_PLUGIN_DIR) +ADD_DEFINITIONS("-DDEFAULT_PLUGIN_DIR=\\\"${TORA_PLUGIN_DIR}\\\"") + +if (NOT TORA_DOC_DIR) + IF (UNIX) + SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/tora/") # it would be pain for upgrade configs -${VERSION}/") + ELSE (UNIX) + SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/doc/") + ENDIF (UNIX) +endif (NOT TORA_DOC_DIR) + +#if (NOT TORA_HELP_DIR) +# SET (TORA_HELP_DIR "${TORA_PLUGIN_DIR}/help/") +#endif (NOT TORA_HELP_DIR) +#ADD_DEFINITIONS("-DTORA_HELP_DIR=\\\"${TORA_HELP_DIR}\\\"") + +############################################################################################################## +########## check for the CPU we build for ########## + +IF (GCC) + +EXECUTE_PROCESS( + COMMAND ${CMAKE_C_COMPILER} -dumpmachine + OUTPUT_VARIABLE MACHINE + OUTPUT_STRIP_TRAILING_WHITESPACE +) +MESSAGE(STATUS "Building for target ${MACHINE}") + +STRING(REGEX MATCH "(i?86-*)|(athlon-*)|(pentium-*)" _machine_x86 "${MACHINE}") +IF (_machine_x86) + MESSAGE(STATUS "Found target X86") + SET(ARCH_X86 1) +ENDIF (_machine_x86) + +STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _machine_x86_64 "${MACHINE}") +IF (_machine_x86_64) + MESSAGE(STATUS "Found target X86_64") + SET(ARCH_X86_64 1) +ENDIF (_machine_x86_64) + +STRING(REGEX MATCH "(ppc-*)" _machine_ppc "${MACHINE}") +IF (_machine_ppc) + MESSAGE(STATUS "Found target PPC") + SET(ARCH_PPC 1) +ENDIF (_machine_ppc) + +ENDIF (GCC) + +#Convert our simpler command line option to the CMake style +#None, Debug, Release, .. or custom ones +# SET(WANT_DEBUG 1) +IF(WANT_DEBUG) + SET(CMAKE_BUILD_TYPE Debug) +ELSE(WANT_DEBUG) + SET(CMAKE_BUILD_TYPE RELEASE) +ENDIF(WANT_DEBUG) + + +# Lets disable Wall warnings due the MSVC too much talkative +# output. Wall can slow down compiletion up to hours and +# my boxes can boil eggs too. +# MSVC, MSVC_IDE, MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005 +IF (MSVC) + SET (CXX_WARNINGS "") +ELSE (MSVC) + SET (CXX_WARNINGS "-Wall") +ENDIF (MSVC) + + +# --- If we are on OS X copy all the embedded libraries to the app bundle +IF (APPLE AND WANT_BUNDLE) + # -------- Function to build OS X Stand Alone Bundles ----------------- + function(MakeOSXBundleApp target binary_dir) + #-- Set some useful variables + SET (OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.cmake") + SET (OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.sh") + #-- Configure the cmake file and the shell script + CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CompleteBundle.cmake.in" + "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}" @ONLY IMMEDIATE) + CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CreateBundle.sh.in" + "${OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT}" @ONLY IMMEDIATE) + #-- Create the installation code + install(SCRIPT "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}") + + endfunction(MakeOSXBundleApp) + + MakeOSXBundleApp(TOra ${PROJECT_BINARY_DIR}) + +ENDIF (APPLE AND WANT_BUNDLE) + + +SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") +SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") +# Required for win wjen there is used an external qscintilla lib +IF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) + SET(CMAKE_CXX_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_CXX_FLAGS_RELEASE}") + SET(CMAKE_C_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_C_FLAGS_RELEASE}") +ENDIF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) + + +############################################################################################################## +########## Find Dependencies ########## + +# wo don't want to plugin build +ADD_DEFINITIONS(-DTOMONOLITHIC) + + +SET (QT_MT_REQUIRED true) +SET (QT_MIN_VERSION "4.3.0") +SET (QT_USE_QTSQL TRUE) +SET (QT_USE_QTNETWORK TRUE) +SET (QT_USE_QTXML TRUE) +FIND_PACKAGE(Qt4 REQUIRED) +INCLUDE( ${QT_USE_FILE} ) +IF (QT_FOUND) + MESSAGE("Qt4 Found OK") + #Add our Qt definitions + ADD_DEFINITIONS( + ${QT_DEFINITIONS} + -DQT_CORE_LIB + -DQT_GUI_LIB + -DQT_THREAD_LIB + ) +ELSE(QT_FOUND) + MESSAGE(FATAL_ERROR "No Qt4 found") +ENDIF(QT_FOUND) + + +IF (WANT_INTERNAL_QSCINTILLA) + MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.") + MESSAGE(STATUS "QSci: It's recomended to use external library for it") +ELSE (WANT_INTERNAL_QSCINTILLA) + + FIND_PACKAGE(QScintilla REQUIRED) + IF (QSCINTILLA_FOUND) + MESSAGE("QScintilla2 Found OK") + ADD_DEFINITIONS("-DQT -DSCI_LEXER") + ELSE (QSCINTILLA_FOUND) + MESSAGE(STATUS "QSci: No QScintilla2 libraries found") + MESSAGE(STATUS "QSci: You can use -DWANT_INTERNAL_QSCINTILLA=1 to build included copy of it.") + MESSAGE(FATAL_ERROR "No QScintilla2 found") + ENDIF (QSCINTILLA_FOUND) + +ENDIF (WANT_INTERNAL_QSCINTILLA) + + +FIND_PACKAGE(Oracle) +IF(ORACLE_FOUND) + MESSAGE("Oracle OCI Library Found OK") + # what else is hidden in the ifdef hell?! + ADD_DEFINITIONS("-DDBLINK") +ELSE(ORACLE_FOUND) + MESSAGE(STATUS "No Oracle OCI found. TOra will be build without Oracle support") + ADD_DEFINITIONS("-DTO_NO_ORACLE") +ENDIF(ORACLE_FOUND) + + +FIND_PACKAGE(PostgreSQL) +IF (POSTGRESQL_FOUND) + ADD_DEFINITIONS(-DLIBPQ_DECL_CANCEL) + ADD_DEFINITIONS(-DHAVE_POSTGRESQL_LIBPQ_FE_H) + MESSAGE(STATUS "PostgreSQL environment found: ${POSTGRESQL_INCLUDE_DIR} ${POSTGRESQL_LIBRARIES}") +ELSE (POSTGRESQL_FOUND) + MESSAGE(" ") + MESSAGE(WARNING " No PostgreSQL environment has been found.") + MESSAGE(WARNING " Specify -DPOSTGRESQL_PATH_INCLUDES=path") + MESSAGE(WARNING " and -DPOSTGRESQL_PATH_LIB manually") + #MESSAGE (STATUS "PostgreSQL includes: ${POSTGRESQL_INCLUDE_DIR} vs. ${POSTGRESQL_PATH_INCLUDES}") + #MESSAGE (STATUS "PostgreSQL libs: ${POSTGRESQL_LIBRARIES} vs. ${POSTGRESQL_PATH_LIB}") + MESSAGE(" ") +ENDIF (POSTGRESQL_FOUND) + + + +############################################################################################################## +########## Include Setup ########## + +TEST_BIG_ENDIAN(WORDS_BIGENDIAN) + +CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) +IF(HAVE_DLFCN_H) + ADD_DEFINITIONS(-DHAVE_DLFCN_H) +ENDIF(HAVE_DLFCN_H) + +CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) +IF(HAVE_UNISTD_H) + ADD_DEFINITIONS(-DHAVE_UNISTD_H) +ENDIF(HAVE_UNISTD_H) + +CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) +# IF(HAVE_SYS_TYPES_H) +# ADD_DEFINITIONS(-DHAVE_SYS_TYPES_H) +# ENDIF(HAVE_SYS_TYPES_H) + +CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H) +# IF(HAVE_SYS_STAT_H) +# ADD_DEFINITIONS(-DHAVE_SYS_STAT_H) +# ENDIF(HAVE_SYS_STAT_H) +#>>Test for existing include files + + +#Create configure files.. config.h and uninstall +#config.h +# INCLUDE (ConfigureChecks.cmake) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) +ADD_DEFINITIONS("-DHAVE_CONFIG_H") + + + +############################################################################################################## +########## Uninstall Setup ########## + +CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY +) + +ADD_CUSTOM_TARGET(uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") + +#Add our source subdirs +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(doc) + +IF (NOT WANT_BUNDLE) +#Install our READMEs etc. +INSTALL(FILES + AUTHORS + BUGS + ChangeLog + COPYING + INSTALL + NEWS + README + README.BINARIES + README.CMAKE + README.CODESTYLE + README.LAYOUT + README.LICENSE + README.OSX + README.RELEASE + README.SVN + README.WINDOWS + TODO + DESTINATION ${TORA_DOC_DIR} +) +ENDIF (NOT WANT_BUNDLE) + +# packaging related stuff +#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") +SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) +#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") +#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") +SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") +SET(CPACK_SOURCE_GENERATOR "TGZ") +#SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt") +SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) +INCLUDE(CPack) + +# Check for SVN +FIND_PACKAGE(Subversion) +IF(NOT Subversion_FOUND) + SET(Subversion_SVN_EXECUTABLE true) +ENDIF(NOT Subversion_FOUND) + +# get svn revision in rpmbuild time (and not in Makefile generation time) +SET(SVN_REVISION + "\"$$(" ${Subversion_SVN_EXECUTABLE} info ${CMAKE_SOURCE_DIR} | awk '/Revision:/ {print \$\$2 }' ")\"" + ) +SET(RPM_DEFINES + --define "_sourcedir ${CMAKE_SOURCE_DIR}" + ) +SET(SPEC_IN_SUBST + "\"" + "s/(%define\\s+_version) .*/\\\\1 ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/\;" + "s/(%define\\s+_release) .*/\\\\1 0.${SVN_REVISION}svn/\;" + "\"" + ) +SET(RPM_SPEC "rpm/tora.spec") +ADD_CUSTOM_TARGET(package-rpm + COMMAND sed -r ${SPEC_IN_SUBST} "${RPM_SPEC}.in" >"${RPM_SPEC}" + COMMAND make package_source + COMMAND rpmbuild -ba ${RPM_DEFINES} "${RPM_SPEC}" + ) + Modified: branches/tora-trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/CMakeLists.txt 2009-07-27 23:41:10 UTC (rev 3224) +++ branches/tora-trotl/src/CMakeLists.txt 2009-07-27 23:42:34 UTC (rev 3225) @@ -1,801 +1,548 @@ -ENABLE_TESTING() - -INCLUDE(ToraCompat) - -#Subdirectories -# ADD_SUBDIRECTORY(i18n) -ADD_SUBDIRECTORY(loki) -IF (WIN32) - ADD_SUBDIRECTORY(windows) -ENDIF (WIN32) - - -# Default: qsci2 as 3rd party lib! -IF (WANT_INTERNAL_QSCINTILLA) - ADD_SUBDIRECTORY(qscintilla2) -ENDIF(WANT_INTERNAL_QSCINTILLA) - - -# only toad bindings are here. All others qm files will blow the binary too much -set (TORA_I18N_TS - i18n/tora_toad.ts -) - -SET(TORA_RCC_FILES tora.qrc) - -SET(TORA_UI_SRC - toaboutui.ui - tobrowserconstraintui.ui - tobrowserfilterui.ui - tobrowserindexui.ui - tobrowsertableui.ui - toconnectionimportui.ui - todatabasesettingui.ui - todebugchangeui.ui - todebugwatch.ui - todescribeui.ui - todroptablespaceui.ui - toeditextensionsetupui.ui - toglobalsettingui.ui - tohelpaddfileui.ui - tohelpui.ui - tohelpsetupui.ui - tochartalarmui.ui - tochartsetupui.ui - tolinechartsetupui.ui - tomessageui.ui - tonewconnectionui.ui - topreferencesui.ui - toresultcontentfilterui.ui - toresultlistformatui.ui - torollbackdialogui.ui - # toschedulerui.ui - toscriptui.ui - toscriptschemawidgetui.ui - tosearchreplaceui.ui - tosecurityquotaui.ui - tosecurityroleui.ui - tosecurityuserui.ui - tostoragedatafileui.ui - tostoragedefinitionui.ui - tostoragedialogui.ui - tostorageprefsui.ui - tostoragetablespaceui.ui - tosyntaxsetupui.ui - totemplateaddfileui.ui - totemplateeditui.ui - totemplatesetupui.ui - totoolsettingui.ui - totuningoverviewui.ui - totuningsettingui.ui - toworksheetsetupui.ui - # shortcuteditor - shortcuteditor/shortcuteditordialog.ui -) - - -IF (ORACLE_FOUND) - LIST (APPEND TORA_UI_SRC tooraclesettingui.ui) -ENDIF (ORACLE_FOUND) - - -SET(TORA_MOC_CLASSES - toabout.h - toalert.h - toanalyze.h - # tobackground.h - # tobackgroundlabel.h - tobackup.h - # tobackuptool.h - tobarchart.h - tobackgroundlabel.h - tobrowserconstraint.h - tobrowser.h - toresultgrants.h - tobrowserindex.h - tobrowsertable.h - tobrowserbasewidget.h - tobrowseraccesswidget.h - tobrowsertablewidget.h - tobrowserviewwidget.h - tobrowserindexwidget.h - tobrowserschemawidget.h - tobrowsersequencewidget.h - tobrowsersynonymwidget.h - tobrowsercodewidget.h - tobrowsertriggerwidget.h - tobrowserdblinkswidget.h - # tobrowserschemabasewidget.h - # toconf.h - # toconfiguration.h - toconnection.h - toconnectionimport.h - toconnectionmodel.h - toconnectionpool.h - todocklet.h - todockbar.h - topushbutton.h - torunnable.h - tonoblockquery.h - tocurrent.h - todatatype.h - todebug.h - todebugtext.h - todescribe.h - # todefaultkeywords.h - toeditextensions.h - # toeditwidget.h - # toextract.h - toeventquery.h - toeventquerytask.h - tofilesize.h - toglobalsetting.h - tohelp.h - tohelpsetup.h - tohighlightedtext.h - # tohtml.h - tochangeconnection.h - tochartmanager.h - toinvalid.h - tolegendchart.h - tolinechart.h - # tolistviewformattercsv.h - # tolistviewformatterfactory.h - # tolistviewformatter.h - # tolistviewformatterhtml.h - # tolistviewformatteridentifier.h - # tolistviewformattersql.h - # tolistviewformattertabdel.h - # tolistviewformattertext.h - tomain.h - tomainwindow.h - # tomainwindow.kde.h - tomarkedtext.h - tomemoeditor.h - tomodeleditor.h - tomessage.h - # tomysqlkeywords.h - tonewconnection.h - # tonoblockquery.h - tooutput.h - toparamget.h - topiechart.h - toplsqleditor.h - toplsqltext.h - topreferences.h - toprofiler.h - toproject.h - # toqvalue.h - # toreport.h - toresultbar.h - toresultcolscomment.h - toresultcols.h - toresultcombo.h - toresultschema.h - toresultdepend.h - toresultextract.h - toresultfield.h - toresult.h - toresultitem.h - toresultlabel.h - toresultline.h - toresultlock.h - toresultlong.h - toresultmodel.h - tocodemodel.h - toresultparam.h - toresultpie.h - toresultplan.h - # toresultresources.h - toresultstats.h - toresultstorage.h - toresulttableview.h - toresulttableviewedit.h - toresultdata.h - toresultdatasingle.h - toresultview.h - toresultlistformat.h - torollback.h - # toscheduler.h - toscript.h - toscriptschemawidget.h - # toscripttreeitem.h - toscripttreemodel.h - tosearchreplace.h - tosecurity.h - tosecuritytreemodel.h - # tosecuritytreeitem.h - tosession.h - tosgastatement.h - tosgatrace.h - tosmtp.h - # tosplash.h - tosqledit.h - # tosql.h - # tosqlparse.h - # tostoragedefinition.h - tostorage.h - tosyntaxsetup.h - totableselect.h - totabwidget.h - totemplate.h - totemporary.h - # totextview.h - tothread_p.h - totreewidget.h - # totimer.h - totool.h - totuning.h - tounittest.h - tovisualize.h - towaitevents.h - toworksheet.h - toworkingwidget.h - toeditablemenu.h - toworksheetstatistic.h - # toworksheettext.h - toworksheetwidget.h - utils.h - # shortcuteditor - shortcuteditor/shortcuteditordialog.h - shortcuteditor/shortcutmodel.h - # docklets - docklets/toviewconnections.h - docklets/toviewdirectory.h - ) - -IF (ORACLE_FOUND) - LIST(APPEND TORA_MOC_CLASSES tooraclesetting.h) -ENDIF (ORACLE_FOUND) - - -SET(TORA_SOURCES - main.cpp - toabout.cpp - toalert.cpp - toanalyze.cpp - tobackground.cpp - tobackgroundlabel.cpp - tobackup.cpp - tobackuptool.cpp - tobarchart.cpp - tobrowserconstraint.cpp - tobrowser.cpp - toresultgrants.cpp - tobrowserindex.cpp - tobrowsertable.cpp - tobrowserbasewidget.cpp - tobrowseraccesswidget.cpp - tobrowsertablewidget.cpp - tobrowserviewwidget.cpp - tobrowserindexwidget.cpp - tobrowserschemawidget.cpp - tobrowsersequencewidget.cpp - tobrowsersynonymwidget.cpp - tobrowsercodewidget.cpp - tobrowsertriggerwidget.cpp - tobrowserdblinkswidget.cpp -# tobrowserschemabasewidget.cpp - toconfiguration.cpp - toconnection.cpp - toqvalue.cpp - toconnectionimport.cpp - toconnectionmodel.cpp - toconnectionpool.cpp - todocklet.cpp - todockbar.cpp - topushbutton.cpp - torunnable.cpp - tocurrent.cpp - todatatype.cpp - todebug.cpp - todebugtext.cpp - todescribe.cpp - toeditextensions.cpp - toeditwidget.cpp - toextract.cpp - toextratranslations.cpp - toeventquery.cpp - toeventquerytask.cpp - tofilesize.cpp -# temporarily disabled due the lack of firebird here tofyracleconnection.cpp - toglobalsetting.cpp - tohelp.cpp - tohighlightedtext.cpp - tohtml.cpp - tochangeconnection.cpp - tochartmanager.cpp - toinvalid.cpp - tolegendchart.cpp - tolinechart.cpp - tolistviewformatter.cpp - tolistviewformattercsv.cpp - tolistviewformatterhtml.cpp - tolistviewformattersql.cpp - tolistviewformattertabdel.cpp - tolistviewformattertext.cpp - tomain.cpp - tomainwindow.cpp - tomarkedtext.cpp - tomemoeditor.cpp - tomodeleditor.cpp - tomessage.cpp - tonewconnection.cpp - tonoblockquery.cpp -#win only? toocistub.cpp - tooracleconnection.cpp - tooracleextract.cpp - tooraclepreload.cpp - tooutput.cpp - toparamget.cpp - topassword.cpp - topiechart.cpp - toplsqleditor.cpp - toplsqltext.cpp - topreferences.cpp - toprofiler.cpp - toproject.cpp - toqsqlconnection.cpp - toreport.cpp - toresultbar.cpp - toresultcolscomment.cpp - toresultcols.cpp - toresultschema.cpp - toresultcombo.cpp - toresult.cpp - toresultdepend.cpp - toresultextract.cpp - toresultfield.cpp - toresultitem.cpp - toresultlabel.cpp - toresultline.cpp - toresultlock.cpp - toresultlong.cpp - toresultmodel.cpp - tocodemodel.cpp - toresultparam.cpp - toresultpie.cpp - toresultplan.cpp - toresultstats.cpp - toresultstorage.cpp - toresulttableview.cpp - toresulttableviewedit.cpp - toresultdata.cpp - toresultdatasingle.cpp - toresultview.cpp - toresultlistformat.cpp - torollback.cpp -# toscheduler.cpp - toscript.cpp - toscriptschemawidget.cpp - toscripttreeitem.cpp - toscripttreemodel.cpp - tosearchreplace.cpp - tosecurity.cpp - tosecuritytreemodel.cpp - tosecuritytreeitem.cpp - tosession.cpp - tosgastatement.cpp - tosgatrace.cpp - tosmtp.cpp - tosplash.cpp - tosql.cpp - tosqledit.cpp - tosqlparse.cpp - tostorage.cpp - tostoragedefinition.cpp - tosyntaxsetup.cpp - totableselect.cpp - totabwidget.cpp - totemplate.cpp - totemplateprovider.cpp - totemporary.cpp - totextview.cpp - tothread.cpp - totimer.cpp - totool.cpp - totreewidget.cpp - totuning.cpp - tounittest.cpp - tovisualize.cpp - towaitevents.cpp - toworksheet.cpp - toworkingwidget.cpp - toeditablemenu.cpp - toworksheetstatistic.cpp - toworksheettext.cpp - toworksheetwidget.cpp - utils.cpp - # - migratetool/sqldeveloper.cpp - migratetool/squirrelsql.cpp - migratetool/tora3.cpp - # shortcuteditor - shortcuteditor/shortcuteditordialog.cpp - shortcuteditor/shortcutmodel.cpp - # docklets - docklets/toviewconnections.cpp - docklets/toviewdirectory.cpp -) -# compiled in icons for windows -IF (WIN32 AND MSVC) - SET (TORA_SOURCES ${TORA_SOURCES} tora.rc) -ENDIF (WIN32 AND MSVC) -if (WIN32 AND MINGW) - # resource compilation for mingw - ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o - COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR} - -i${CMAKE_CURRENT_SOURCE_DIR}/tora.rc - -o ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o) - SET(TORA_SOURCES ${TORA_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o) -ENDIF (WIN32 AND MINGW) - - -QT4_ADD_TRANSLATION(TORA_I18N_QM ${TORA_I18N_TS}) -QT4_WRAP_UI(TORA_UI_SOURCES ${TORA_UI_SRC} ) -QT4_WRAP_CPP(TORA_MOC_SOURCES ${TORA_MOC_CLASSES}) -QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES}) - - -LINK_DIRECTORIES(./loki) -IF (WIN32) - LINK_DIRECTORIES(./windows) -ENDIF (WIN32) -IF (WANT_INTERNAL_QSCINTILLA) - LINK_DIRECTORIES(./qscintilla2) -ENDIF (WANT_INTERNAL_QSCINTILLA) - - -SET(TORA_LOKI_LIB "tora_loki_lib") -IF (WANT_INTERNAL_QSCINTILLA) - SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib) -ENDIF (WANT_INTERNAL_QSCINTILLA) - - -IF (WIN32) - SET (WINDOWS_LIB "windows_lib") -ENDIF (WIN32) - - -INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${QT_INCLUDES} - ${ORACLE_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/loki/include - ${CMAKE_CURRENT_SOURCE_DIR}/otl - "/usr/local/trotl/include" -# "/home/ibrezina/workspace/boost_1_38_0" -) - -IF (POSTGRESQL_INCLUDE_DIR) - INCLUDE_DIRECTORIES( ${POSTGRESQL_INCLUDE_DIR} ) -ENDIF (POSTGRESQL_INCLUDE_DIR) - -IF (WANT_INTERNAL_QSCINTILLA) - INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR}/src/qscintilla2/Qt4 - ${CMAKE_SOURCE_DIR}/src/qscintilla2/Qt4/Qci - ) -ELSE (WANT_INTERNAL_QSCINTILLA) - INCLUDE_DIRECTORIES(${QSCINTILLA_INCLUDE_DIR}) -ENDIF (WANT_INTERNAL_QSCINTILLA) - - -# Handle win/mac special stuff - it's left empty for linux/unix -SET (GUI_TYPE) - -IF(WIN32) - IF (MSVC) - # this is a must to switch off subsystem:console (console window poping up) - # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified - LINK_LIBRARIES(${QT_QTMAIN_LIBRARY}) - SET (GUI_TYPE WIN32) - IF (WANT_DEBUG) - SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") - ELSE (WANT_DEBUG) - SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") - ENDIF (WANT_DEBUG) - ENDIF (MSVC) -ENDIF(WIN32) - -IF (APPLE AND WANT_BUNDLE) - SET(GUI_TYPE MACOSX_BUNDLE) - SET(MACOSX_BUNDLE_ICON_FILE ${CMAKE_SOURCE_DIR}/src/icons/tora.icns) - SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/src/icons/tora.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) -ENDIF (APPLE AND WANT_BUNDLE) - - -ADD_EXECUTABLE(${EXE_NAME} ${GUI_TYPE} - ${TORA_I18N_QM} - ${TORA_MOC_SOURCES} - ${TORA_SOURCES} - ${TORA_UI_SOURCES} - ${TORA_RCC_SRCS} -) - -#Set up libraries to link with all found packages -# dynamic -TARGET_LINK_LIBRARIES(${EXE_NAME} - ${QT_LIBRARIES} - ${ORACLE_LIBRARIES} - ${LIBXML2_LIBRARIES} - ${QSCINTILLA_LIBRARIES} - -L/usr/local/trotl/lib -Wl,-rpath,/usr/local/trotl/lib -ltrotl -) - -IF (POSTGRESQL_LIBRARIES) - TARGET_LINK_LIBRARIES (${EXE_NAME} ${POSTGRESQL_LIBRARIES}) -ENDIF (POSTGRESQL_LIBRARIES) - -# static -TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LOKI_LIB}) -IF (WANT_INTERNAL_QSCINTILLA) - TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_QSCINTILLA_LIB} ${QT_LIBRARIES}) -ENDIF (WANT_INTERNAL_QSCINTILLA) -# prevent opening the cmd.exe window -IF (WIN32) - TARGET_LINK_LIBRARIES(${EXE_NAME} ${WINDOWS_LIB}) -ENDIF (WIN32) - - -IF (WIN32) - INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION .) -ELSE (WIN32) - IF (NOT WANT_BUNDLE) - INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib) - ELSE (NOT WANT_BUNDLE) - INSTALL(TARGETS ${EXE_NAME} BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}) - ENDIF (NOT WANT_BUNDLE) -ENDIF (WIN32) - - -SET(TORA_CHECK_SOURCES_ROOTS -# main - toabout - toalert - toanalyze - tobackground - tobackgroundlabel - tobackup - tobackuptool - tobarchart - tobrowserconstraint - tobrowser - toresultgrants - tobrowserindex - tobrowsertable - tobrowserbasewidget - tobrowseraccesswidget - tobrowsertablewidget - tobrowserviewwidget - tobrowserindexwidget - tobrowserschemawidget - tobrowsersequencewidget - tobrowsersynonymwidget - tobrowsercodewidget - tobrowsertriggerwidget - tobrowserdblinkswidget -# tobrowserschemabasewidget - toconfiguration - toconnection - toqvalue - toconnectionimport - toconnectionmodel - toconnectionpool - todocklet - todockbar - topushbutton - torunnable - tocurrent - todatatype - todebug - todebugtext - todescribe - toeditextensions - toeditwidget - toextract - toextratranslations - toeventquery - toeventquerytask - tofilesize -# temporarily disabled due the lack of firebird here tofyracleconnection - toglobalsetting - tohelp - tohighlightedtext - tohtml - tochangeconnection - tochartmanager - toinvalid - tolegendchart - tolinechart - tolistviewformatter - tolistviewformattercsv - tolistviewformatterhtml - tolistviewformattersql - tolistviewformattertabdel - tolistviewformattertext - tomain - tomainwindow - tomarkedtext - tomemoeditor - tomodeleditor - tomessage - tonewconnection - tonoblockquery -#win only? toocistub - tooracleconnection - tooracleextract - tooraclepreload - tooutput - toparamget - topassword - topiechart - toplsqleditor - toplsqltext - topreferences - toprofiler - toproject - toqsqlconnection - toreport - toresultbar - toresultcolscomment - toresultcols - toresultschema - toresultcombo - toresult - toresultdepend - toresultextract - toresultfield - toresultitem - toresultlabel - toresultline - toresultlock - toresultlong - toresultmodel - tocodemodel - toresultparam - toresultpie - toresultplan - toresultstats - toresultstorage - toresulttableview - toresulttableviewedit - toresultdata - toresultdatasingle - toresultview - toresultlistformat - torollback -# toscheduler - toscript - toscriptschemawidget - toscripttreeitem - toscripttreemodel - tosearchreplace - tosecurity - tosecuritytreemodel - tosecuritytreeitem - tosession - tosgastatement - tosgatrace - tosmtp - tosplash - tosql - tosqledit - tosqlparse - tostorage - tostoragedefinition - tosyntaxsetup - totableselect - totabwidget - totemplate - totemplateprovider - totemporary - totextview - tothread - totimer - totool - totreewidget - totuning - tounittest - tovisualize - towaitevents - toworksheet - toworkingwidget - toeditablemenu - toworksheetstatistic - toworksheettext - toworksheetwidget - utils - # - migratetool/sqldeveloper - migratetool/squirrelsql - migratetool/tora3 - # shortcuteditor - shortcuteditor/shortcuteditordialog - shortcuteditor/shortcutmodel - # docklets - docklets/toviewconnections - docklets/toviewdirectory -) - -## -## BEGIN: MESS SECTION -## -## This section is not used at all. This should allow me -## to reuse .o files from tora.dir in test binaries -## Ungly CMAKE hacks are needed -## - -MACRO(ADD_SUFFIX rootlist suffix) - SET(outlist) - FOREACH(root ${${rootlist}}) - LIST(APPEND outlist ${root}${suffix}) - ENDFOREACH(root) - SET(${rootlist} ${outlist}) -ENDMACRO(ADD_SUFFIX) - -MACRO(ADD_PREFIX prefix rootlist) - SET(outlist) - FOREACH(root ${${rootlist}}) - LIST(APPEND outlist ${prefix}${root}) - ENDFOREACH(root) - SET(${rootlist} ${outlist}) -ENDMACRO(ADD_PREFIX) - -IF(CMAKE_CONFIGURATION_TYPES) - # We have a multiple configuration generator. Use this directory structure. - # - # Note that CMAKE_BUILD_TYPE has no value when Visual Studio .sln files are generated. - # This is because on MSVC, no build type is actually selected at generation time. The MSVC - # user typically selects her build type after opening the .sln file. CMAKE_CFG_INTDIR expands - # to a Visual Studio macro that will contain the right value, once Visual Studio is opened and - # a build type is selected. - SET(TORA_CHECK_STATIC_OBJ_DIR ${CMAKE_BINARY_DIR}/src/tora.dir/${CMAKE_CFG_INTDIR}) - #MESSAGE("TORA_CHECK_STATIC_OBJ_DIR: " ${TORA_CHECK_STATIC_OBJ_DIR}) -ELSE(CMAKE_CONFIGURATION_TYPES) - # We have a single configuration generator. Use this directory structure: - SET(TORA_CHECK_STATIC_OBJ_DIR ${CMAKE_BINARY_DIR}/src/${CMAKE_FILES_DIRECTORY}/tora.dir) - #MESSAGE("TORA_CHECK_STATIC_OBJ_DIR: " ${TORA_CHECK_STATIC_OBJ_DIR}) -ENDIF(CMAKE_CONFIGURATION_TYPES) - -SET(TORA_CHECK_STATIC_OBJS ${TORA_CHECK_SOURCES_ROOTS}) -#ADD_SUFFIX(TORA_CHECK_STATIC_OBJS ${CMAKE_C_OUTPUT_EXTENSION}) -ADD_SUFFIX(TORA_CHECK_STATIC_OBJS ".cpp") -#ADD_PREFIX(${TORA_CHECK_STATIC_OBJ_DIR}/ TORA_CHECK_STATIC_OBJS) -#ADD_PREFIX("../src/" TORA_CHECK_STATIC_OBJS) - -LIST(APPEND TORA_CHECK_STATIC_OBJS ${TORA_MOC_SOURCES} ) -LIST(APPEND TORA_CHECK_STATIC_OBJS ${TORA_UI_SOURCES} ) - -##MESSAGE("TORA_CHECK_STATIC_OBJS: " ${TORA_CHECK_STATIC_OBJS}) -##MESSAGE("TORA_CHECK_SOURCES_ROOTS: " ${TORA_CHECK_SOURCES_ROOTS}) - -## -## END: MESS SECTION -## - -SET(TEST_LIBRARIES - -Wl,--whole-archive libtoracheck -Wl,--no-whole-archive - ${QT_LIBRARIES} - ${ORACLE_LIBRARIES} - ${LIBXML2_LIBRARIES} - ${QSCINTILLA_LIBRARIES} - ${POSTGRESQL_LIBRARIES} - ${TORA_LOKI_LIB} - -L/usr/local/trotl/lib -Wl,-rpath,/usr/local/trotl/lib -ltrotl - ) - -ADD_LIBRARY(libtoracheck STATIC ${TORA_CHECK_STATIC_OBJS}) - -ADD_EXECUTABLE(trotl_test0 trotl_test0.cpp ) -#TARGET_LINK_LIBRARIES(trotl_test0 ${TEST_LIBRARIES}) -TARGET_LINK_LIBRARIES(trotl_test0 ${QT_LIBRARIES} ) -ADD_EXECUTABLE(trotl_test1 trotl_test1.cpp ${TORA_I18N_QM} ) -TARGET_LINK_LIBRARIES(trotl_test1 ${TEST_LIBRARIES}) -ADD_EXECUTABLE(trotl_test2 trotl_test2.cpp ${TORA_I18N_QM} ) -TARGET_LINK_LIBRARIES(trotl_test2 ${TEST_LIBRARIES}) - - -# ADD_TEST(trotl_test1 trotl_test1 Hello) +INCLUDE(ToraCompat) + +#Subdirectories +# ADD_SUBDIRECTORY(i18n) +ADD_SUBDIRECTORY(loki) +IF (WIN32) + ADD_SUBDIRECTORY(windows) +ENDIF (WIN32) + + +# Default: qsci2 as 3rd party lib! +IF (WANT_INTERNAL_QSCINTILLA) + ADD_SUBDIRECTORY(qscintilla2) +ENDIF(WANT_INTERNAL_QSCINTILLA) + + +# only toad bindings are here. All others qm files will blow the binary too much +set (TORA_I18N_TS + i18n/tora_toad.ts +) + +SET(TORA_RCC_FILES tora.qrc) + +SET(TORA_UI_SRC + toaboutui.ui + tobrowserconstraintui.ui + tobrowserfilterui.ui + tobrowserindexui.ui + tobrowsertableui.ui + toconnectionimportui.ui + todatabasesettingui.ui + todebugchangeui.ui + todebugwatch.ui + todescribeui.ui + todroptablespaceui.ui + toeditextensionsetupui.ui + toglobalsettingui.ui + tohelpaddfileui.ui + tohelpui.ui + tohelpsetupui.ui + tochartalarmui.ui + tochartsetupui.ui + tolinechartsetupui.ui + tomessageui.ui + tonewconnectionui.ui + topreferencesui.ui + toresultcontentfilterui.ui + toresultlistformatui.ui + torollbackdialogui.ui +# toschedulerui.ui + toscriptui.ui + toscriptschemawidgetui.ui + tosearchreplaceui.ui + tosecurityquotaui.ui + tosecurityroleui.ui + tosecurityuserui.ui + tostoragedatafileui.ui + tostoragedefinitionui.ui + tostoragedialogui.ui + tostorageprefsui.ui + tostoragetablespaceui.ui + tosyntaxsetupui.ui + totemplateaddfileui.ui + totemplateeditui.ui + totemplatesetupui.ui + totoolsettingui.ui + totuningoverviewui.ui + totuningsettingui.ui + toworksheetsetupui.ui + # shortcuteditor + shortcuteditor/shortcuteditordialog.ui +) +IF (ORACLE_FOUND) + LIST (APPEND TORA_UI_SRC tooraclesettingui.ui) +ENDIF (ORACLE_FOUND) + + +SET(TORA_MOC_CLASSES + toabout.h + toalert.h + toanalyze.h +# tobackground.h +# tobackgroundlabel.h + tobackup.h +# tobackuptool.h + tobarchart.h + tobackgroundlabel.h + tobrowserconstraint.h + tobrowser.h + toresultgrants.h + tobrowserindex.h + tobrowsertable.h + tobrowserbasewidget.h + tobrowseraccesswidget.h + tobrowsertablewidget.h + tobrowserviewwidget.h + tobrowserindexwidget.h + tobrowserschemawidget.h + tobrowsersequencewidget.h + tobrowsersynonymwidget.h + tobrowsercodewidget.h + tobrowsertriggerwidget.h + tobrowserdblinkswidget.h +# tobrowserschemabasewidget.h +# toconf.h +# toconfiguration.h + toconnection.h + toconnectionimport.h + toconnectionmodel.h + toconnectionpool.h + todocklet.h + todockbar.h + topushbutton.h + torunnable.h + tonoblockquery.h + tocurrent.h + todatatype.h + todebug.h + todebugtext.h + todescribe.h +# todefaultkeywords.h + toeditextensions.h +# toeditwidget.h +# toextract.h + toeventquery.h + toeventquerytask.h + tofilesize.h + toglobalsetting.h + tohelp.h + tohelpsetup.h + tohighlightedtext.h +# tohtml.h + tochangeconnection.h + tochartmanager.h + toinvalid.h + tolegendchart.h + tolinechart.h +# tolistviewformattercsv.h +# tolistviewformatterfactory.h +# tolistviewformatter.h +# tolistviewformatterhtml.h +# tolistviewformatteridentifier.h +# tolistviewformattersql.h +# tolistviewformattertabdel.h +# tolistviewformattertext.h + tomain.h + tomainwindow.h +# tomainwindow.kde.h + tomarkedtext.h + tomemoeditor.h + tomodeleditor.h + tomessage.h +# tomysqlkeywords.h + tonewconnection.h +# tonoblockquery.h + tooutput.h + toparamget.h + topiechart.h + toplsqleditor.h + toplsqltext.h + topreferences.h + toprofiler.h + toproject.h +# toqvalue.h +# toreport.h + toresultbar.h + toresultcolscomment.h + toresultcols.h + toresultcombo.h + toresultschema.h + toresultdepend.h + toresultextract.h + toresultfield.h + toresult.h + toresultitem.h + toresultlabel.h + toresultline.h + toresultlock.h + toresultlong.h + toresultmodel.h + tocodemodel.h + toresultparam.h + toresultpie.h + toresultplan.h +# toresultresources.h + toresultstats.h + toresultstorage.h + toresulttableview.h + toresulttableviewedit.h + toresultdata.h + toresultdatasingle.h + toresultview.h + toresultlistformat.h + torollback.h +# toscheduler.h + toscript.h + toscriptschemawidget.h +# toscripttreeitem.h + toscripttreemodel.h + tosearchreplace.h + tosecurity.h + tosecuritytreemodel.h +# tosecuritytreeitem.h + tosession.h + tosgastatement.h + tosgatrace.h + tosmtp.h +# tosplash.h + tosqledit.h +# tosql.h +# tosqlparse.h +# tostoragedefinition.h + tostorage.h + tosyntaxsetup.h + totableselect.h + totabwidget.h + totemplate.h + totemporary.h +# totextview.h + tothread_p.h + totreewidget.h +# totimer.h + totool.h + totuning.h + tounittest.h + tovisualize.h + towaitevents.h + toworksheet.h + toworkingwidget.h + toeditablemenu.h + toworksheetstatistic.h +# toworksheettext.h + toworksheetwidget.h + utils.h +# shortcuteditor + shortcuteditor/shortcuteditordialog.h + shortcuteditor/shortcutmodel.h +# docklets + docklets/toviewconnections.h + docklets/toviewdirectory.h +) +IF (ORACLE_FOUND) + LIST(APPEND TORA_MOC_CLASSES tooraclesetting.h) +ENDIF (ORACLE_FOUND) + + +SET(TORA_SOURCES + main.cpp + toabout.cpp + toalert.cpp + toanalyze.cpp + tobackground.cpp + tobackgroundlabel.cpp + tobackup.cpp + tobackuptool.cpp + tobarchart.cpp + tobrowserconstraint.cpp + tobrowser.cpp + toresultgrants.cpp + tobrowserindex.cpp + tobrowsertable.cpp + tobrowserbasewidget.cpp + tobrowseraccesswidget.cpp + tobrowsertablewidget.cpp + tobrowserviewwidget.cpp + tobrowserindexwidget.cpp + tobrowserschemawidget.cpp + tobrowsersequencewidget.cpp + tobrowsersynonymwidget.cpp + tobrowsercodewidget.cpp + tobrowsertriggerwidget.cpp + tobrowserdblinkswidget.cpp +# tobrowserschemabasewidget.cpp + toconfiguration.cpp + toconnection.cpp + toqvalue.cpp + toconnectionimport.cpp + toconnectionmodel.cpp + toconnectionpool.cpp + todocklet.cpp + todockbar.cpp + topushbutton.cpp + torunnable.cpp + tocurrent.cpp + todatatype.cpp + todebug.cpp + todebugtext.cpp + todescribe.cpp + toeditextensions.cpp + toeditwidget.cpp + toextract.cpp + toextratranslations.cpp + toeventquery.cpp + toeventquerytask.cpp + tofilesize.cpp +# temporarily disabled due the lack of firebird here tofyracleconnection.cpp + toglobalsetting.cpp + tohelp.cpp + tohighlightedtext.cpp + tohtml.cpp + tochangeconnection.cpp + tochartmanager.cpp + toinvalid.cpp + tolegendchart.cpp + tolinechart.cpp + tolistviewformatter.cpp + tolistviewformattercsv.cpp + tolistviewformatterhtml.cpp + tolistviewformattersql.cpp + tolistviewformattertabdel.cpp + tolistviewformattertext.cpp + tomain.cpp + tomainwindow.cpp + tomarkedtext.cpp + tomemoeditor.cpp + tomodeleditor.cpp + tomessage.cpp + tonewconnection.cpp + tonoblockquery.cpp +#win only? toocistub.cpp + tooracleconnection.cpp + tooracleextract.cpp + tooraclepreload.cpp + tooutput.cpp + toparamget.cpp + topassword.cpp + topiechart.cpp + toplsqleditor.cpp + toplsqltext.cpp + topreferences.cpp + toprofiler.cpp + toproject.cpp + toqsqlconnection.cpp + toreport.cpp + toresultbar.cpp + toresultcolscomment.cpp + toresultcols.cpp + toresultschema.cpp + toresultcombo.cpp + toresult.cpp + toresultdepend.cpp + toresultextract.cpp + toresultfield.cpp + toresultitem.cpp + toresultlabel.cpp + toresultline.cpp + toresultlock.cpp + toresultlong.cpp + toresultmodel.cpp + tocodemodel.cpp + toresultparam.cpp + toresultpie.cpp + toresultplan.cpp + toresultstats.cpp + toresultstorage.cpp + toresulttableview.cpp + toresulttableviewedit.cpp + toresultdata.cpp + toresultdatasingle.cpp + toresultview.cpp + toresultlistformat.cpp + torollback.cpp +# toscheduler.cpp + toscript.cpp + toscriptschemawidget.cpp + toscripttreeitem.cpp + toscripttreemodel.cpp + tosearchreplace.cpp + tosecurity.cpp + tosecuritytreemodel.cpp + tosecuritytreeitem.cpp + tosession.cpp + tosgastatement.cpp + tosgatrace.cpp + tosmtp.cpp + tosplash.cpp + tosql.cpp + tosqledit.cpp + tosqlparse.cpp + tostorage.cpp + tostoragedefinition.cpp + tosyntaxsetup.cpp + totableselect.cpp + totabwidget.cpp + totemplate.cpp + totemplateprovider.cpp + totemporary.cpp + totextview.cpp + tothread.cpp + totimer.cpp + totool.cpp + totreewidget.cpp + totuning.cpp + tounittest.cpp + tovisualize.cpp + towaitevents.cpp + toworksheet.cpp + toworkingwidget.cpp + toeditablemenu.cpp + toworksheetstatistic.cpp + toworksheettext.cpp + toworksheetwidget.cpp + utils.cpp + # + migratetool/sqldeveloper.cpp + migratetool/squirrelsql.cpp + migratetool/tora3.cpp + # shortcuteditor + shortcuteditor/shortcuteditordialog.cpp + shortcuteditor/shortcutmodel.cpp + # docklets + docklets/toviewconnections.cpp + docklets/toviewdirectory.cpp +) +# compiled in icons for windows +IF (WIN32 AND MSVC) + SET (TORA_SOURCES ${TORA_SOURCES} tora.rc) +ENDIF (WIN32 AND MSVC) +if (WIN32 AND MINGW) + # resource compilation for mingw + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o + COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR} + -i${CMAKE_CURRENT_SOURCE_DIR}/tora.rc + -o ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o) + SET(TORA_SOURCES ${TORA_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o) +endif (WIN32 AND MINGW) + + + +QT4_ADD_TRANSLATION(TORA_I18N_QM ${TORA_I18N_TS}) +QT4_WRAP_UI(TORA_UI_SOURCES ${TORA_UI_SRC} ) +QT4_WRAP_CPP(TORA_MOC_SOURCES ${TORA_MOC_CLASSES}) +QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES}) + + +LINK_DIRECTORIES(./loki) +IF (WIN32) + LINK_DIRECTORIES(./windows) +ENDIF (WIN32) +IF (WANT_INTERNAL_QSCINTILLA) + LINK_DIRECTORIES(./qscintilla2) +ENDIF (WANT_INTERNAL_QSCINTILLA) + + +SET(TORA_LOKI_LIB "tora_loki_lib") +IF (WANT_INTERNAL_QSCINTILLA) + SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib) +ENDIF (WANT_INTERNAL_QSCINTILLA) + + +IF (WIN32) + SET (WINDOWS_LIB "windows_lib") +ENDIF (WIN32) + + +INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${QT_INCLUDES} + ${ORACLE_INCLUDES} + ${CMAKE_CURRENT_SOURCE_DIR}/loki/include + ${CMAKE_CURRENT_SOURCE_DIR}/otl +) + +IF (POSTGRESQL_INCLUDE_DIR) + INCLUDE_DIRECTORIES( ${POSTGRESQL_INCLUDE_DIR} ) +ENDIF (POSTGRESQL_INCLUDE_DIR) + +IF (WANT_INTERNAL_QSCINTILLA) + INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/src/qscintilla2/Qt4 + ${CMAKE_SOURCE_DIR}/src/qscintilla2/Qt4/Qci + ) +ELSE (WANT_INTERNAL_QSCINTILLA) + INCLUDE_DIRECTORIES(${QSCINTILLA_INCLUDE_DIR}) +ENDIF (WANT_INTERNAL_QSCINTILLA) + + +# Handle win/mac special stuff - it's left empty for linux/unix +SET (GUI_TYPE) + +IF(WIN32) + IF (MSVC) + # this is a must to switch off subsystem:console (console window poping up) + # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified + LINK_LIBRARIES(${QT_QTMAIN_LIBRARY}) + SET (GUI_TYPE WIN32) + IF (WANT_DEBUG) + SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") + ELSE (WANT_DEBUG) + SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") + ENDIF (WANT_DEBUG) + ENDIF (MSVC) +ENDIF(WIN32) + +IF (APPLE AND WANT_BUNDLE) + SET(GUI_TYPE MACOSX_BUNDLE) + SET(MACOSX_BUNDLE_ICON_FILE tora.icns) + SET(APPLE_BUNDLE_SOURCES icons/tora.icns) + SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/src/icons/tora.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) +ENDIF (APPLE AND WANT_BUNDLE) + + +ADD_EXECUTABLE(${EXE_NAME} ${GUI_TYPE} + ${TORA_I18N_QM} + ${TORA_MOC_SOURCES} + ${TORA_SOURCES} + ${TORA_UI_SOURCES} + ${TORA_RCC_SRCS} + ${APPLE_BUNDLE_SOURCES} +) + +#Set up libraries to link with all found packages +# dynamic +TARGET_LINK_LIBRARIES(${EXE_NAME} + ${QT_LIBRARIES} + ${ORACLE_LIBRARIES} + ${LIBXML2_LIBRARIES} + ${QSCINTILLA_LIBRARIES} + trotl +) + +IF (POSTGRESQL_LIBRARIES) + TARGET_LINK_LIBRARIES (${EXE_NAME} ${POSTGRESQL_LIBRARIES}) +ENDIF (POSTGRESQL_LIBRARIES) + +# static +TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LOKI_LIB}) +IF (WANT_INTERNAL_QSCINTILLA) + TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_QSCINTILLA_LIB} ${QT_LIBRARIES}) +ENDIF (WANT_INTERNAL_QSCINTILLA) +# prevent opening the cmd.exe window +IF (WIN32) + TARGET_LINK_LIBRARIES(${EXE_NAME} ${WINDOWS_LIB}) +ENDIF (WIN32) + + +IF (WIN32) + INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION .) +ELSE (WIN32) + IF (NOT WANT_BUNDLE) + INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib) + ELSE (NOT WANT_BUNDLE) + INSTALL(TARGETS ${EXE_NAME} BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}) + ENDIF (NOT WANT_BUNDLE) +ENDIF (WIN32) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2009-08-16 19:05:19
|
Revision: 3243 http://tora.svn.sourceforge.net/tora/?rev=3243&view=rev Author: ibre5041 Date: 2009-08-16 19:05:06 +0000 (Sun, 16 Aug 2009) Log Message: ----------- MSVC projects Added Paths: ----------- branches/tora-trotl/tora-trotl.vcproj branches/tora-trotl/tora-trotl_test0.vcproj branches/tora-trotl/tora-trotl_test1.vcproj branches/tora-trotl/tora-trotl_test2.vcproj Added: branches/tora-trotl/tora-trotl.vcproj =================================================================== --- branches/tora-trotl/tora-trotl.vcproj (rev 0) +++ branches/tora-trotl/tora-trotl.vcproj 2009-08-16 19:05:06 UTC (rev 3243) @@ -0,0 +1,2174 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="tora-trotl" + ProjectGUID="{6EF45E18-9627-4276-AEDC-87ACD796D215}" + RootNamespace="toratrotl" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UseUnicodeResponseFiles="false" + Optimization="0" + AdditionalIncludeDirectories="E:\oracle\Ora11g\xdk\include;E:\oracle\Ora11g\precomp\public;E:\oracle\Ora11g\oci\include;"C:\Program Files\boost\boost_1_38";E:\trotl\src;"E:\qt-win-opensource-src-4.4.3\include";"E:\qt-win-opensource-src-4.4.3\include\QtCore";"E:\qt-win-opensource-src-4.4.3\include\QtGui";"E:\qt-win-opensource-src-4.4.3\include\QtNetwork";"E:\qt-win-opensource-src-4.4.3\include\QtSql";"E:\tora-trotl\src";"E:\tora-trotl\src\loki\include";"E:\tora-trotl\src\windows";"E:\tora-trotl\src\qscintilla2\Qt4"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;_CRT_SECURE_NO_WARNINGS;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\"" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="precompiled.h" + BrowseInformation="1" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + ForcedIncludeFiles="precompiled.h" + ShowIncludes="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + UseUnicodeResponseFiles="false" + AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib tora_qscintilla2_lib.lib tora_loki_lib.lib trotld.lib wsock32.lib" + AdditionalLibraryDirectories="E:\trotl\Debug;"C:\Program Files\boost\boost_1_38\libs";E:\oracle\Ora11g\oci\lib\msvc\;E:\oracle\Ora11g\LIB\;"E:\qt-win-opensource-src-4.4.3\lib\";"E:\tora-trotl\src\qscintilla2";"E:\tora-trotl\src\loki";"E:\tora-trotl\src\windows"" + GenerateDebugInformation="true" + AssemblyDebug="1" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="2" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\windows\cregistry.cpp" + > + </File> + <File + RelativePath=".\src\main.cpp" + > + </File> + <File + RelativePath=".\src\shortcuteditor\moc_shortcuteditordialog.cxx" + > + </File> + <File + RelativePath=".\src\shortcuteditor\moc_shortcutmodel.cxx" + > + </File> + <File + RelativePath=".\src\moc_toabout.cxx" + > + </File> + <File + RelativePath=".\src\moc_toalert.cxx" + > + </File> + <File + RelativePath=".\src\moc_toanalyze.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobackgroundlabel.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobackup.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobarchart.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowser.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowseraccesswidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserbasewidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowsercodewidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserconstraint.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserdblinkswidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserindex.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserindexwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserschemawidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowsersequencewidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowsersynonymwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowsertable.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowsertablewidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowsertriggerwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserviewwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tochangeconnection.cxx" + > + </File> + <File + RelativePath=".\src\moc_tochartmanager.cxx" + > + </File> + <File + RelativePath=".\src\moc_tocodemodel.cxx" + > + </File> + <File + RelativePath=".\src\moc_toconnection.cxx" + > + </File> + <File + RelativePath=".\src\moc_toconnectionimport.cxx" + > + </File> + <File + RelativePath=".\src\moc_toconnectionmodel.cxx" + > + </File> + <File + RelativePath=".\src\moc_toconnectionpool.cxx" + > + </File> + <File + RelativePath=".\src\moc_tocurrent.cxx" + > + </File> + <File + RelativePath=".\src\moc_todatatype.cxx" + > + </File> + <File + RelativePath=".\src\moc_todebug.cxx" + > + </File> + <File + RelativePath=".\src\moc_todebugtext.cxx" + > + </File> + <File + RelativePath=".\src\moc_todescribe.cxx" + > + </File> + <File + RelativePath=".\src\moc_todockbar.cxx" + > + </File> + <File + RelativePath=".\src\moc_todocklet.cxx" + > + </File> + <File + RelativePath=".\src\moc_toeditablemenu.cxx" + > + </File> + <File + RelativePath=".\src\moc_toeditextensions.cxx" + > + </File> + <File + RelativePath=".\src\moc_toeventquery.cxx" + > + </File> + <File + RelativePath=".\src\moc_toeventquerytask.cxx" + > + </File> + <File + RelativePath=".\src\moc_tofilesize.cxx" + > + </File> + <File + RelativePath=".\src\moc_toglobalsetting.cxx" + > + </File> + <File + RelativePath=".\src\moc_tohelp.cxx" + > + </File> + <File + RelativePath=".\src\moc_tohelpsetup.cxx" + > + </File> + <File + RelativePath=".\src\moc_tohighlightedtext.cxx" + > + </File> + <File + RelativePath=".\src\moc_toinvalid.cxx" + > + </File> + <File + RelativePath=".\src\moc_tolegendchart.cxx" + > + </File> + <File + RelativePath=".\src\moc_tolinechart.cxx" + > + </File> + <File + RelativePath=".\src\moc_tomain.cxx" + > + </File> + <File + RelativePath=".\src\moc_tomainwindow.cxx" + > + </File> + <File + RelativePath=".\src\moc_tomarkedtext.cxx" + > + </File> + <File + RelativePath=".\src\moc_tomemoeditor.cxx" + > + </File> + <File + RelativePath=".\src\moc_tomessage.cxx" + > + </File> + <File + RelativePath=".\src\moc_tomodeleditor.cxx" + > + </File> + <File + RelativePath=".\src\moc_tonewconnection.cxx" + > + </File> + <File + RelativePath=".\src\moc_tonoblockquery.cxx" + > + </File> + <File + RelativePath=".\src\moc_tooraclesetting.cxx" + > + </File> + <File + RelativePath=".\src\moc_tooutput.cxx" + > + </File> + <File + RelativePath=".\src\moc_toparamget.cxx" + > + </File> + <File + RelativePath=".\src\moc_topiechart.cxx" + > + </File> + <File + RelativePath=".\src\moc_toplsqleditor.cxx" + > + </File> + <File + RelativePath=".\src\moc_toplsqltext.cxx" + > + </File> + <File + RelativePath=".\src\moc_topreferences.cxx" + > + </File> + <File + RelativePath=".\src\moc_toprofiler.cxx" + > + </File> + <File + RelativePath=".\src\moc_toproject.cxx" + > + </File> + <File + RelativePath=".\src\moc_topushbutton.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresult.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultbar.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultcols.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultcolscomment.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultcombo.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultdata.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultdatasingle.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultdepend.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultextract.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultfield.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultgrants.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultitem.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultlabel.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultline.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultlistformat.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultlock.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultlong.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultmodel.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultparam.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultpie.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultplan.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultschema.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultstats.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultstorage.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresulttableview.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresulttableviewedit.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultview.cxx" + > + </File> + <File + RelativePath=".\src\moc_torollback.cxx" + > + </File> + <File + RelativePath=".\src\moc_torunnable.cxx" + > + </File> + <File + RelativePath=".\src\moc_toscript.cxx" + > + </File> + <File + RelativePath=".\src\moc_toscriptschemawidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_toscripttreemodel.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosearchreplace.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosecurity.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosecuritytreemodel.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosession.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosgastatement.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosgatrace.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosmtp.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosqledit.cxx" + > + </File> + <File + RelativePath=".\src\moc_tostorage.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosyntaxsetup.cxx" + > + </File> + <File + RelativePath=".\src\moc_totableselect.cxx" + > + </File> + <File + RelativePath=".\src\moc_totabwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_totemplate.cxx" + > + </File> + <File + RelativePath=".\src\moc_totemporary.cxx" + > + </File> + <File + RelativePath=".\src\moc_tothread_p.cxx" + > + </File> + <File + RelativePath=".\src\moc_totool.cxx" + > + </File> + <File + RelativePath=".\src\moc_totreewidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_totuning.cxx" + > + </File> + <File + RelativePath=".\src\moc_tounittest.cxx" + > + </File> + <File + RelativePath=".\src\moc_tovisualize.cxx" + > + </File> + <File + RelativePath=".\src\moc_towaitevents.cxx" + > + </File> + <File + RelativePath=".\src\moc_toworkingwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_toworksheet.cxx" + > + </File> + <File + RelativePath=".\src\moc_toworksheetstatistic.cxx" + > + </File> + <File + RelativePath=".\src\moc_toworksheetwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_utils.cxx" + > + </File> + <File + RelativePath=".\src\qrc_tora.cxx" + > + </File> + <File + RelativePath=".\src\shortcuteditor\shortcuteditordialog.cpp" + > + </File> + <File + RelativePath=".\src\shortcuteditor\shortcutmodel.cpp" + > + </File> + <File + RelativePath=".\src\migratetool\sqldeveloper.cpp" + > + </File> + <File + RelativePath=".\src\migratetool\squirrelsql.cpp" + > + </File> + <File + RelativePath=".\src\toabout.cpp" + > + </File> + <File + RelativePath=".\src\toalert.cpp" + > + </File> + <File + RelativePath=".\src\toanalyze.cpp" + > + </File> + <File + RelativePath=".\src\tobackground.cpp" + > + </File> + <File + RelativePath=".\src\tobackgroundlabel.cpp" + > + </File> + <File + RelativePath=".\src\tobackup.cpp" + > + </File> + <File + RelativePath=".\src\tobackuptool.cpp" + > + </File> + <File + RelativePath=".\src\tobarchart.cpp" + > + </File> + <File + RelativePath=".\src\tobrowser.cpp" + > + </File> + <File + RelativePath=".\src\tobrowseraccesswidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserbasewidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowsercodewidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserconstraint.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserdblinkswidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserindex.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserindexwidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserschemawidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowsersequencewidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowsersynonymwidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowsertable.cpp" + > + </File> + <File + RelativePath=".\src\tobrowsertablewidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowsertriggerwidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserviewwidget.cpp" + > + </File> + <File + RelativePath=".\src\tochangeconnection.cpp" + > + </File> + <File + RelativePath=".\src\tochartmanager.cpp" + > + </File> + <File + RelativePath=".\src\tocodemodel.cpp" + > + </File> + <File + RelativePath=".\src\toconfiguration.cpp" + > + </File> + <File + RelativePath=".\src\toconnection.cpp" + > + </File> + <File + RelativePath=".\src\toconnectionimport.cpp" + > + </File> + <File + RelativePath=".\src\toconnectionmodel.cpp" + > + </File> + <File + RelativePath=".\src\toconnectionpool.cpp" + > + </File> + <File + RelativePath=".\src\tocurrent.cpp" + > + </File> + <File + RelativePath=".\src\todatatype.cpp" + > + </File> + <File + RelativePath=".\src\todebug.cpp" + > + </File> + <File + RelativePath=".\src\todebugtext.cpp" + > + </File> + <File + RelativePath=".\src\todescribe.cpp" + > + </File> + <File + RelativePath=".\src\todockbar.cpp" + > + </File> + <File + RelativePath=".\src\todocklet.cpp" + > + </File> + <File + RelativePath=".\src\toeditablemenu.cpp" + > + </File> + <File + RelativePath=".\src\toeditextensions.cpp" + > + </File> + <File + RelativePath=".\src\toeditwidget.cpp" + > + </File> + <File + RelativePath=".\src\toeventquery.cpp" + > + </File> + <File + RelativePath=".\src\toeventquerytask.cpp" + > + </File> + <File + RelativePath=".\src\toextract.cpp" + > + </File> + <File + RelativePath=".\src\toextratranslations.cpp" + > + </File> + <File + RelativePath=".\src\tofilesize.cpp" + > + </File> + <File + RelativePath=".\src\toglobalsetting.cpp" + > + </File> + <File + RelativePath=".\src\tohelp.cpp" + > + </File> + <File + RelativePath=".\src\tohighlightedtext.cpp" + > + </File> + <File + RelativePath=".\src\tohtml.cpp" + > + </File> + <File + RelativePath=".\src\toinvalid.cpp" + > + </File> + <File + RelativePath=".\src\tolegendchart.cpp" + > + </File> + <File + RelativePath=".\src\tolinechart.cpp" + > + </File> + <File + RelativePath=".\src\tolistviewformatter.cpp" + > + </File> + <File + RelativePath=".\src\tolistviewformattercsv.cpp" + > + </File> + <File + RelativePath=".\src\tolistviewformatterhtml.cpp" + > + </File> + <File + RelativePath=".\src\tolistviewformattersql.cpp" + > + </File> + <File + RelativePath=".\src\tolistviewformattertabdel.cpp" + > + </File> + <File + RelativePath=".\src\tolistviewformattertext.cpp" + > + </File> + <File + RelativePath=".\src\tomain.cpp" + > + </File> + <File + RelativePath=".\src\tomainwindow.cpp" + > + </File> + <File + RelativePath=".\src\tomarkedtext.cpp" + > + </File> + <File + RelativePath=".\src\tomemoeditor.cpp" + > + </File> + <File + RelativePath=".\src\tomessage.cpp" + > + </File> + <File + RelativePath=".\src\tomodeleditor.cpp" + > + </File> + <File + RelativePath=".\src\tonewconnection.cpp" + > + </File> + <File + RelativePath=".\src\tonoblockquery.cpp" + > + </File> + <File + RelativePath=".\src\tooracleconnection.cpp" + > + </File> + <File + RelativePath=".\src\tooracleextract.cpp" + > + </File> + <File + RelativePath=".\src\tooutput.cpp" + > + </File> + <File + RelativePath=".\src\toparamget.cpp" + > + </File> + <File + RelativePath=".\src\topassword.cpp" + > + </File> + <File + RelativePath=".\src\topiechart.cpp" + > + </File> + <File + RelativePath=".\src\toplsqleditor.cpp" + > + </File> + <File + RelativePath=".\src\toplsqltext.cpp" + > + </File> + <File + RelativePath=".\src\topreferences.cpp" + > + </File> + <File + RelativePath=".\src\toprofiler.cpp" + > + </File> + <File + RelativePath=".\src\toproject.cpp" + > + </File> + <File + RelativePath=".\src\topushbutton.cpp" + > + </File> + <File + RelativePath=".\src\toqsqlconnection.cpp" + > + </File> + <File + RelativePath=".\src\toqvalue.cpp" + > + </File> + <File + RelativePath=".\src\migratetool\tora3.cpp" + > + </File> + <File + RelativePath=".\src\toreport.cpp" + > + </File> + <File + RelativePath=".\src\toresult.cpp" + > + </File> + <File + RelativePath=".\src\toresultbar.cpp" + > + </File> + <File + RelativePath=".\src\toresultcols.cpp" + > + </File> + <File + RelativePath=".\src\toresultcolscomment.cpp" + > + </File> + <File + RelativePath=".\src\toresultcombo.cpp" + > + </File> + <File + RelativePath=".\src\toresultdata.cpp" + > + </File> + <File + RelativePath=".\src\toresultdatasingle.cpp" + > + </File> + <File + RelativePath=".\src\toresultdepend.cpp" + > + </File> + <File + RelativePath=".\src\toresultextract.cpp" + > + </File> + <File + RelativePath=".\src\toresultfield.cpp" + > + </File> + <File + RelativePath=".\src\toresultgrants.cpp" + > + </File> + <File + RelativePath=".\src\toresultitem.cpp" + > + </File> + <File + RelativePath=".\src\toresultlabel.cpp" + > + </File> + <File + RelativePath=".\src\toresultline.cpp" + > + </File> + <File + RelativePath=".\src\toresultlistformat.cpp" + > + </File> + <File + RelativePath=".\src\toresultlock.cpp" + > + </File> + <File + RelativePath=".\src\toresultlong.cpp" + > + </File> + <File + RelativePath=".\src\toresultmodel.cpp" + > + </File> + <File + RelativePath=".\src\toresultparam.cpp" + > + </File> + <File + RelativePath=".\src\toresultpie.cpp" + > + </File> + <File + RelativePath=".\src\toresultplan.cpp" + > + </File> + <File + RelativePath=".\src\toresultschema.cpp" + > + </File> + <File + RelativePath=".\src\toresultstats.cpp" + > + </File> + <File + RelativePath=".\src\toresultstorage.cpp" + > + </File> + <File + RelativePath=".\src\toresulttableview.cpp" + > + </File> + <File + RelativePath=".\src\toresulttableviewedit.cpp" + > + </File> + <File + RelativePath=".\src\toresultview.cpp" + > + </File> + <File + RelativePath=".\src\torollback.cpp" + > + </File> + <File + RelativePath=".\src\torunnable.cpp" + > + </File> + <File + RelativePath=".\src\toscript.cpp" + > + </File> + <File + RelativePath=".\src\toscriptschemawidget.cpp" + > + </File> + <File + RelativePath=".\src\toscripttreeitem.cpp" + > + </File> + <File + RelativePath=".\src\toscripttreemodel.cpp" + > + </File> + <File + RelativePath=".\src\tosearchreplace.cpp" + > + </File> + <File + RelativePath=".\src\tosecurity.cpp" + > + </File> + <File + RelativePath=".\src\tosecuritytreeitem.cpp" + > + </File> + <File + RelativePath=".\src\tosecuritytreemodel.cpp" + > + </File> + <File + RelativePath=".\src\tosession.cpp" + > + </File> + <File + RelativePath=".\src\tosgastatement.cpp" + > + </File> + <File + RelativePath=".\src\tosgatrace.cpp" + > + </File> + <File + RelativePath=".\src\tosmtp.cpp" + > + </File> + <File + RelativePath=".\src\tosplash.cpp" + > + </File> + <File + RelativePath=".\src\tosql.cpp" + > + </File> + <File + RelativePath=".\src\tosqledit.cpp" + > + </File> + <File + RelativePath=".\src\tosqlparse.cpp" + > + </File> + <File + RelativePath=".\src\tostorage.cpp" + > + </File> + <File + RelativePath=".\src\tostoragedefinition.cpp" + > + </File> + <File + RelativePath=".\src\tosyntaxsetup.cpp" + > + </File> + <File + RelativePath=".\src\totableselect.cpp" + > + </File> + <File + RelativePath=".\src\totabwidget.cpp" + > + </File> + <File + RelativePath=".\src\totemplate.cpp" + > + </File> + <File + RelativePath=".\src\totemplateprovider.cpp" + > + </File> + <File + RelativePath=".\src\totemporary.cpp" + > + </File> + <File + RelativePath=".\src\totextview.cpp" + > + </File> + <File + RelativePath=".\src\tothread.cpp" + > + </File> + <File + RelativePath=".\src\totimer.cpp" + > + </File> + <File + RelativePath=".\src\totool.cpp" + > + </File> + <File + RelativePath=".\src\totreewidget.cpp" + > + </File> + <File + RelativePath=".\src\totuning.cpp" + > + </File> + <File + RelativePath=".\src\tounittest.cpp" + > + </File> + <File + RelativePath=".\src\tovisualize.cpp" + > + </File> + <File + RelativePath=".\src\towaitevents.cpp" + > + </File> + <File + RelativePath=".\src\toworkingwidget.cpp" + > + </File> + <File + RelativePath=".\src\toworksheet.cpp" + > + </File> + <File + RelativePath=".\src\toworksheetstatistic.cpp" + > + </File> + <File + RelativePath=".\src\toworksheettext.cpp" + > + </File> + <File + RelativePath=".\src\toworksheetwidget.cpp" + > + </File> + <File + RelativePath=".\src\utils.cpp" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\src\windows\cregistry.h" + > + </File> + <File + RelativePath=".\src\windows\resource.h" + > + </File> + <File + RelativePath=".\src\shortcuteditor\shortcuteditordialog.h" + > + </File> + <File + RelativePath=".\src\shortcuteditor\shortcutmodel.h" + > + </File> + <File + RelativePath=".\src\migratetool\sqldeveloper.h" + > + </File> + <File + RelativePath=".\src\migratetool\squirrelsql.h" + > + </File> + <File + RelativePath=".\src\toabout.h" + > + </File> + <File + RelativePath=".\src\toalert.h" + > + </File> + <File + RelativePath=".\src\toanalyze.h" + > + </File> + <File + RelativePath=".\src\tobackground.h" + > + </File> + <File + RelativePath=".\src\tobackgroundlabel.h" + > + </File> + <File + RelativePath=".\src\tobackup.h" + > + </File> + <File + RelativePath=".\src\tobackuptool.h" + > + </File> + <File + RelativePath=".\src\tobarchart.h" + > + </File> + <File + RelativePath=".\src\tobrowser.h" + > + </File> + <File + RelativePath=".\src\tobrowseraccesswidget.h" + > + </File> + <File + RelativePath=".\src\tobrowserbasewidget.h" + > + </File> + <File + RelativePath=".\src\tobrowsercodewidget.h" + > + </File> + <File + RelativePath=".\src\tobrowserconstraint.h" + > + </File> + <File + RelativePath=".\src\tobrowserdblinkswidget.h" + > + </File> + <File + RelativePath=".\src\tobrowserindex.h" + > + </File> + <File + RelativePath=".\src\tobrowserindexwidget.h" + > + </File> + <File + RelativePath=".\src\tobrowserschemawidget.h" + > + </File> + <File + RelativePath=".\src\tobrowsersequencewidget.h" + > + </File> + <File + RelativePath=".\src\tobrowsersynonymwidget.h" + > + </File> + <File + RelativePath=".\src\tobrowsertable.h" + > + </File> + <File + RelativePath=".\src\tobrowsertablewidget.h" + > + </File> + <File + RelativePath=".\src\tobrowsertriggerwidget.h" + > + </File> + <File + RelativePath=".\src\tobrowserviewwidget.h" + > + </File> + <File + RelativePath=".\src\tochangeconnection.h" + > + </File> + <File + RelativePath=".\src\tochartmanager.h" + > + </File> + <File + RelativePath=".\src\tocodemodel.h" + > + </File> + <File + RelativePath=".\src\toconf.h" + > + </File> + <File + RelativePath=".\src\toconfiguration.h" + > + </File> + <File + RelativePath=".\src\toconnection.h" + > + </File> + <File + RelativePath=".\src\toconnectionimport.h" + > + </File> + <File + RelativePath=".\src\toconnectionmodel.h" + > + </File> + <File + RelativePath=".\src\toconnectionpool.h" + > + </File> + <File + RelativePath=".\src\tocurrent.h" + > + </File> + <File + RelativePath=".\src\todatatype.h" + > + </File> + <File + RelativePath=".\src\todebug.h" + > + </File> + <File + RelativePath=".\src\todebugtext.h" + > + </File> + <File + RelativePath=".\src\todefaultkeywords.h" + > + </File> + <File + RelativePath=".\src\todescribe.h" + > + </File> + <File + RelativePath=".\src\todockbar.h" + > + </File> + <File + RelativePath=".\src\todocklet.h" + > + </File> + <File + RelativePath=".\src\toeditablemenu.h" + > + </File> + <File + RelativePath=".\src\toeditextensions.h" + > + </File> + <File + RelativePath=".\src\toeditwidget.h" + > + </File> + <File + RelativePath=".\src\toeventquery.h" + > + </File> + <File + RelativePath=".\src\toeventquerytask.h" + > + </File> + <File + RelativePath=".\src\toextract.h" + > + </File> + <File + RelativePath=".\src\tofilesize.h" + > + </File> + <File + RelativePath=".\src\toglobalsetting.h" + > + </File> + <File + RelativePath=".\src\tohelp.h" + > + </File> + <File + RelativePath=".\src\tohelpsetup.h" + > + </File> + <File + RelativePath=".\src\tohighlightedtext.h" + > + </File> + <File + RelativePath=".\src\tohtml.h" + > + </File> + <File + RelativePath=".\src\toinvalid.h" + > + </File> + <File + RelativePath=".\src\tolegendchart.h" + > + </File> + <File + RelativePath=".\src\tolinechart.h" + > + </File> + <File + RelativePath=".\src\tolistviewformatter.h" + > + </File> + <File + RelativePath=".\src\tolistviewformattercsv.h" + > + </File> + <File + RelativePath=".\src\tolistviewformatterfactory.h" + > + </File> + <File + RelativePath=".\src\tolistviewformatterhtml.h" + > + </File> + <File + RelativePath=".\src\tolistviewformatteridentifier.h" + > + </File> + <File + RelativePath=".\src\tolistviewformattersql.h" + > + </File> + <File + RelativePath=".\src\tolistviewformattertabdel.h" + > + </File> + <File + RelativePath=".\src\tolistviewformattertext.h" + > + </File> + <File + RelativePath=".\src\tomain.h" + > + </File> + <File + RelativePath=".\src\tomainwindow.h" + > + </File> + <File + RelativePath=".\src\tomainwindow.kde.h" + > + </File> + <File + RelativePath=".\src\tomarkedtext.h" + > + </File> + <File + RelativePath=".\src\tomemoeditor.h" + > + </File> + <File + RelativePath=".\src\tomessage.h" + > + </File> + <File + RelativePath=".\src\tomodeleditor.h" + > + </File> + <File + RelativePath=".\src\tomysqlkeywords.h" + > + </File> + <File + RelativePath=".\src\tonewconnection.h" + > + </File> + <File + RelativePath=".\src\tonoblockquery.h" + > + </File> + <File + RelativePath=".\src\tooraclesetting.h" + > + </File> + <File + RelativePath=".\src\tooutput.h" + > + </File> + <File + RelativePath=".\src\toparamget.h" + > + </File> + <File + RelativePath=".\src\topiechart.h" + > + </File> + <File + RelativePath=".\src\toplsqleditor.h" + > + </File> + <File + RelativePath=".\src\toplsqltext.h" + > + </File> + <File + RelativePath=".\src\topreferences.h" + > + </File> + <File + RelativePath=".\src\toprofiler.h" + > + </File> + <File + RelativePath=".\src\toproject.h" + > + </File> + <File + RelativePath=".\src\topushbutton.h" + > + </File> + <File + RelativePath=".\src\toqvalue.h" + > + </File> + <File + RelativePath=".\src\migratetool\tora3.h" + > + </File> + <File + RelativePath=".\src\tora_logger.h" + > + </File> + <File + RelativePath=".\src\toreport.h" + > + </File> + <File + RelativePath=".\src\toresult.h" + > + </File> + <File + RelativePath=".\src\toresultbar.h" + > + </File> + <File + RelativePath=".\src\toresultcols.h" + > + </File> + <File + RelativePath=".\src\toresultcolscomment.h" + > + </File> + <File + RelativePath=".\src\toresultcombo.h" + > + </File> + <File + RelativePath=".\src\toresultdata.h" + > + </File> + <File + RelativePath=".\src\toresultdatasingle.h" + > + </File> + <File + RelativePath=".\src\toresultdepend.h" + > + </File> + <File + RelativePath=".\src\toresultextract.h" + > + </File> + <File + RelativePath=".\src\toresultfield.h" + > + </File> + <File + RelativePath=".\src\toresultgrants.h" + > + </File> + <File + RelativePath=".\src\toresultitem.h" + > + </File> + <File + RelativePath=".\src\toresultlabel.h" + > + </File> + <File + RelativePath=".\src\toresultline.h" + > + </File> + <File + RelativePath=".\src\toresultlistformat.h" + > + </File> + <File + RelativePath=".\src\toresultlock.h" + > + </File> + <File + RelativePath=".\src\toresultlong.h" + > + </File> + <File + RelativePath=".\src\toresultmodel.h" + > + </File> + <File + RelativePath=".\src\toresultparam.h" + > + </File> + <File + RelativePath=".\src\toresultpie.h" + > + </File> + <File + RelativePath=".\src\toresultplan.h" + > + </File> + <File + RelativePath=".\src\toresultresources.h" + > + </File> + <File + RelativePath=".\src\toresultschema.h" + > + </File> + <File + RelativePath=".\src\toresultstats.h" + > + </File> + <File + RelativePath=".\src\toresultstorage.h" + > + </File> + <File + RelativePath=".\src\toresulttableview.h" + > + </File> + <File + RelativePath=".\src\toresulttableviewedit.h" + > + </File> + <File + RelativePath=".\src\toresultview.h" + > + </File> + <File + RelativePath=".\src\torollback.h" + > + </File> + <File + RelativePath=".\src\torunnable.h" + > + </File> + <File + RelativePath=".\src\toscheduler.h" + > + </File> + <File + RelativePath=".\src\toscript.h" + > + </File> + <File + RelativePath=".\src\toscriptschemawidget.h" + > + </File> + <File + RelativePath=".\src\toscripttreeitem.h" + > + </File> + <File + RelativePath=".\src\toscripttreemodel.h" + > + </File> + <File + RelativePath=".\src\tosearchreplace.h" + > + </File> + <File + RelativePath=".\src\tosecurity.h" + > + </File> + <File + RelativePath=".\src\tosecuritytreeitem.h" + > + </File> + <File + RelativePath=".\src\tosecuritytreemodel.h" + > + </File> + <File + RelativePath=".\src\tosession.h" + > + </File> + <File + RelativePath=".\src\tosgastatement.h" + > + </File> + <File + RelativePath=".\src\tosgatrace.h" + > + </File> + <File + RelativePath=".\src\tosmtp.h" + > + </File> + <File + RelativePath=".\src\tosplash.h" + > + </File> + <File + RelativePath=".\src\tosql.h" + > + </File> + <File + RelativePath=".\src\tosqledit.h" + > + </File> + <File + RelativePath=".\src\tosqlparse.h" + > + </File> + <File + RelativePath=".\src\tostorage.h" + > + </File> + <File + RelativePath=".\src\tostoragedefinition.h" + > + </File> + <File + RelativePath=".\src\tosyntaxsetup.h" + > + </File> + <File + RelativePath=".\src\totableselect.h" + > + </File> + <File + RelativePath=".\src\totabwidget.h" + > + </File> + <File + RelativePath=".\src\totemplate.h" + > + </File> + <File + RelativePath=".\src\totemporary.h" + > + </File> + <File + RelativePath=".\src\totextview.h" + > + </File> + <File + RelativePath=".\src\tothread.h" + > + </File> + <File + RelativePath=".\src\tothread_p.h" + > + </File> + <File + RelativePath=".\src\totimer.h" + > + </File> + <File + RelativePath=".\src\totool.h" + > + </File> + <File + RelativePath=".\src\totreewidget.h" + > + </File> + <File + RelativePath=".\src\totuning.h" + > + </File> + <File + RelativePath=".\src\tounittest.h" + > + </File> + <File + RelativePath=".\src\tovisualize.h" + > + </File> + <File + RelativePath=".\src\towaitevents.h" + > + </File> + <File + RelativePath=".\src\toworkingwidget.h" + > + </File> + <File + RelativePath=".\src\toworksheet.h" + > + </File> + <File + RelativePath=".\src\toworksheetstatistic.h" + > + </File> + <File + RelativePath=".\src\toworksheettext.h" + > + </File> + <File + RelativePath=".\src\toworksheetwidget.h" + > + </File> + <File + RelativePath=".\src\ui_shortcuteditordialog.h" + > + </File> + <File + RelativePath=".\src\ui_toaboutui.h" + > + </File> + <File + RelativePath=".\src\ui_tobrowserconstraintui.h" + > + </File> + <File + RelativePath=".\src\ui_tobrowserfilterui.h" + > + </File> + <File + RelativePath=".\src\ui_tobrowserindexui.h" + > + </File> + <File + RelativePath=".\src\ui_tobrowsertableui.h" + > + </File> + <File + RelativePath=".\src\ui_tochartalarmui.h" + > + </File> + <File + RelativePath=".\src\ui_tochartsetupui.h" + > + </File> + <File + RelativePath=".\src\ui_toconnectionimportui.h" + > + </File> + <File + RelativePath=".\src\ui_todatabasesettingui.h" + > + </File> + <File + RelativePath=".\src\ui_todebugchangeui.h" + > + </File> + <File + RelativePath=".\src\ui_todebugwatch.h" + > + </File> + <File + RelativePath=".\src\ui_todescribeui.h" + > + </File> + <File + RelativePath=".\src\ui_todroptablespaceui.h" + > + </File> + <File + RelativePath=".\src\ui_toeditextensionsetupui.h" + > + </File> + <File + RelativePath=".\src\ui_toglobalsettingui.h" + > + </File> + <File + RelativePath=".\src\ui_tohelpaddfileui.h" + > + </File> + <File + RelativePath=".\src\ui_tohelpsetupui.h" + > + </File> + <File + RelativePath=".\src\ui_tohelpui.h" + > + </File> + <File + RelativePath=".\src\ui_tolinechartsetupui.h" + > + </File> + <File + RelativePath=".\src\ui_tomessageui.h" + > + </File> + <File + RelativePath=".\src\ui_tonewconnectionui.h" + > + </File> + <File + RelativePath=".\src\ui_tooraclesettingui.h" + > + </File> + <File + RelativePath=".\src\ui_topreferencesui.h" + > + </File> + <File + RelativePath=".\src\ui_toresultcontentfilterui.h" + > + </File> + <File + RelativePath=".\src\ui_toresultlistformatui.h" + > + </File> + <File + RelativePath=".\src\ui_torollbackdialogui.h" + > + </File> + <File + RelativePath=".\src\ui_toscriptschemawidgetui.h" + > + </File> + <File + RelativePath=".\src\ui_toscriptui.h" + > + </File> + <File + RelativePath=".\src\ui_tosearchreplaceui.h" + > + </File> + <File + RelativePath=".\src\ui_tosecurityquotaui.h" + > + </File> + <File + RelativePath=".\src\ui_tosecurityroleui.h" + > + </File> + <File + RelativePath=".\src\ui_tosecurityuserui.h" + > + </File> + <File + RelativePath=".\src\ui_tostoragedatafileui.h" + > + </File> + <File + RelativePath=".\src\ui_tostoragedefinitionui.h" + > + </File> + <File + RelativePath=".\src\ui_tostoragedialogui.h" + > + </File> + <File + RelativePath=".\src\ui_tostorageprefsui.h" + > + </File> + <File + RelativePath=".\src\ui_tostoragetablespaceui.h" + > + </File> + <File + RelativePath=".\src\ui_tosyntaxsetupui.h" + > + </File> + <File + RelativePath=".\src\ui_totemplateaddfileui.h" + > + </File> + <File + RelativePath=".\src\ui_totemplateeditui.h" + > + </File> + <File + RelativePath=".\src\ui_totemplatesetupui.h" + > + </File> + <File + RelativePath=".\src\ui_totoolsettingui.h" + > + </File> + <File + RelativePath=".\src\ui_totuningoverviewui.h" + > + </File> + <File + RelativePath=".\src\ui_totuningsettingui.h" + > + </File> + <File + RelativePath=".\src\ui_toworksheetsetupui.h" + > + </File> + <File + RelativePath=".\src\utils.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + <File + RelativePath=".\src\windows\tora.ico" + > + </File> + <File + RelativePath=".\src\windows\tora.rc" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: branches/tora-trotl/tora-trotl_test0.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test0.vcproj (rev 0) +++ branches/tora-trotl/tora-trotl_test0.vcproj 2009-08-16 19:05:06 UTC (rev 3243) @@ -0,0 +1,2173 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="tora-trotltest0" + ProjectGUID="{A1820739-019C-4E73-814E-91FC278E912C}" + RootNamespace="toratrotltest0" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UseUnicodeResponseFiles="false" + Optimization="0" + AdditionalIncludeDirectories="E:\oracle\Ora11g\xdk\include;E:\oracle\Ora11g\precomp\public;E:\oracle\Ora11g\oci\include;"C:\Program Files\boost\boost_1_38";E:\trotl\src;"E:\qt-win-opensource-src-4.4.3\include";"E:\qt-win-opensource-src-4.4.3\include\QtCore";"E:\qt-win-opensource-src-4.4.3\include\QtGui";"E:\qt-win-opensource-src-4.4.3\include\QtNetwork";"E:\qt-win-opensource-src-4.4.3\include\QtSql";"E:\tora-trotl\src\loki\include";"E:\tora-trotl\src\windows";"E:\tora-trotl\src\qscintilla2\Qt4";"E:\tora-trotl\src"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;_CRT_SECURE_NO_WARNINGS;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\"" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="precompiled.h" + BrowseInformation="1" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + ForcedIncludeFiles="precompiled.h" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + UseUnicodeResponseFiles="false" + AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib tora_qscintilla2_lib.lib tora_loki_lib.lib trotld.lib wsock32.lib" + AdditionalLibraryDirectories="E:\trotl\src;"C:\Program Files\boost\boost_1_38\libs";E:\oracle\Ora11g\oci\lib\msvc\;E:\oracle\Ora11g\LIB\;"E:\qt-win-opensource-src-4.4.3\lib\";"E:\tora-trotl\src\qscintilla2";"E:\tora-trotl\src\loki";"E:\tora-trotl\src\windows"" + GenerateDebugInformation="true" + AssemblyDebug="1" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="2" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\windows\cregistry.cpp" + > + </File> + <File + RelativePath=".\src\shortcuteditor\moc_shortcuteditordialog.cxx" + > + </File> + <File + RelativePath=".\src\shortcuteditor\moc_shortcutmodel.cxx" + > + </File> + <File + RelativePath=".\src\moc_toabout.cxx" + > + </File> + <File + RelativePath=".\src\moc_toalert.cxx" + > + </File> + <File + RelativePath=".\src\moc_toanalyze.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobackgroundlabel.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobackup.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobarchart.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowser.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowseraccesswidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserbasewidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowsercodewidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserconstraint.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserdblinkswidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserindex.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserindexwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserschemawidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowsersequencewidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowsersynonymwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowsertable.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowsertablewidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowsertriggerwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tobrowserviewwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_tochangeconnection.cxx" + > + </File> + <File + RelativePath=".\src\moc_tochartmanager.cxx" + > + </File> + <File + RelativePath=".\src\moc_tocodemodel.cxx" + > + </File> + <File + RelativePath=".\src\moc_toconnection.cxx" + > + </File> + <File + RelativePath=".\src\moc_toconnectionimport.cxx" + > + </File> + <File + RelativePath=".\src\moc_toconnectionmodel.cxx" + > + </File> + <File + RelativePath=".\src\moc_toconnectionpool.cxx" + > + </File> + <File + RelativePath=".\src\moc_tocurrent.cxx" + > + </File> + <File + RelativePath=".\src\moc_todatatype.cxx" + > + </File> + <File + RelativePath=".\src\moc_todebug.cxx" + > + </File> + <File + RelativePath=".\src\moc_todebugtext.cxx" + > + </File> + <File + RelativePath=".\src\moc_todescribe.cxx" + > + </File> + <File + RelativePath=".\src\moc_todockbar.cxx" + > + </File> + <File + RelativePath=".\src\moc_todocklet.cxx" + > + </File> + <File + RelativePath=".\src\moc_toeditablemenu.cxx" + > + </File> + <File + RelativePath=".\src\moc_toeditextensions.cxx" + > + </File> + <File + RelativePath=".\src\moc_toeventquery.cxx" + > + </File> + <File + RelativePath=".\src\moc_toeventquerytask.cxx" + > + </File> + <File + RelativePath=".\src\moc_tofilesize.cxx" + > + </File> + <File + RelativePath=".\src\moc_toglobalsetting.cxx" + > + </File> + <File + RelativePath=".\src\moc_tohelp.cxx" + > + </File> + <File + RelativePath=".\src\moc_tohelpsetup.cxx" + > + </File> + <File + RelativePath=".\src\moc_tohighlightedtext.cxx" + > + </File> + <File + RelativePath=".\src\moc_toinvalid.cxx" + > + </File> + <File + RelativePath=".\src\moc_tolegendchart.cxx" + > + </File> + <File + RelativePath=".\src\moc_tolinechart.cxx" + > + </File> + <File + RelativePath=".\src\moc_tomain.cxx" + > + </File> + <File + RelativePath=".\src\moc_tomainwindow.cxx" + > + </File> + <File + RelativePath=".\src\moc_tomarkedtext.cxx" + > + </File> + <File + RelativePath=".\src\moc_tomemoeditor.cxx" + > + </File> + <File + RelativePath=".\src\moc_tomessage.cxx" + > + </File> + <File + RelativePath=".\src\moc_tomodeleditor.cxx" + > + </File> + <File + RelativePath=".\src\moc_tonewconnection.cxx" + > + </File> + <File + RelativePath=".\src\moc_tonoblockquery.cxx" + > + </File> + <File + RelativePath=".\src\moc_tooraclesetting.cxx" + > + </File> + <File + RelativePath=".\src\moc_tooutput.cxx" + > + </File> + <File + RelativePath=".\src\moc_toparamget.cxx" + > + </File> + <File + RelativePath=".\src\moc_topiechart.cxx" + > + </File> + <File + RelativePath=".\src\moc_toplsqleditor.cxx" + > + </File> + <File + RelativePath=".\src\moc_toplsqltext.cxx" + > + </File> + <File + RelativePath=".\src\moc_topreferences.cxx" + > + </File> + <File + RelativePath=".\src\moc_toprofiler.cxx" + > + </File> + <File + RelativePath=".\src\moc_toproject.cxx" + > + </File> + <File + RelativePath=".\src\moc_topushbutton.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresult.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultbar.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultcols.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultcolscomment.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultcombo.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultdata.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultdatasingle.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultdepend.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultextract.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultfield.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultgrants.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultitem.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultlabel.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultline.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultlistformat.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultlock.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultlong.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultmodel.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultparam.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultpie.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultplan.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultschema.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultstats.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultstorage.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresulttableview.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresulttableviewedit.cxx" + > + </File> + <File + RelativePath=".\src\moc_toresultview.cxx" + > + </File> + <File + RelativePath=".\src\moc_torollback.cxx" + > + </File> + <File + RelativePath=".\src\moc_torunnable.cxx" + > + </File> + <File + RelativePath=".\src\moc_toscript.cxx" + > + </File> + <File + RelativePath=".\src\moc_toscriptschemawidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_toscripttreemodel.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosearchreplace.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosecurity.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosecuritytreemodel.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosession.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosgastatement.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosgatrace.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosmtp.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosqledit.cxx" + > + </File> + <File + RelativePath=".\src\moc_tostorage.cxx" + > + </File> + <File + RelativePath=".\src\moc_tosyntaxsetup.cxx" + > + </File> + <File + RelativePath=".\src\moc_totableselect.cxx" + > + </File> + <File + RelativePath=".\src\moc_totabwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_totemplate.cxx" + > + </File> + <File + RelativePath=".\src\moc_totemporary.cxx" + > + </File> + <File + RelativePath=".\src\moc_tothread_p.cxx" + > + </File> + <File + RelativePath=".\src\moc_totool.cxx" + > + </File> + <File + RelativePath=".\src\moc_totreewidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_totuning.cxx" + > + </File> + <File + RelativePath=".\src\moc_tounittest.cxx" + > + </File> + <File + RelativePath=".\src\moc_tovisualize.cxx" + > + </File> + <File + RelativePath=".\src\moc_towaitevents.cxx" + > + </File> + <File + RelativePath=".\src\moc_toworkingwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_toworksheet.cxx" + > + </File> + <File + RelativePath=".\src\moc_toworksheetstatistic.cxx" + > + </File> + <File + RelativePath=".\src\moc_toworksheetwidget.cxx" + > + </File> + <File + RelativePath=".\src\moc_utils.cxx" + > + </File> + <File + RelativePath=".\src\qrc_tora.cxx" + > + </File> + <File + RelativePath=".\src\shortcuteditor\shortcuteditordialog.cpp" + > + </File> + <File + RelativePath=".\src\shortcuteditor\shortcutmodel.cpp" + > + </File> + <File + RelativePath=".\src\migratetool\sqldeveloper.cpp" + > + </File> + <File + RelativePath=".\src\migratetool\squirrelsql.cpp" + > + </File> + <File + RelativePath=".\src\toabout.cpp" + > + </File> + <File + RelativePath=".\src\toalert.cpp" + > + </File> + <File + RelativePath=".\src\toanalyze.cpp" + > + </File> + <File + RelativePath=".\src\tobackground.cpp" + > + </File> + <File + RelativePath=".\src\tobackgroundlabel.cpp" + > + </File> + <File + RelativePath=".\src\tobackup.cpp" + > + </File> + <File + RelativePath=".\src\tobackuptool.cpp" + > + </File> + <File + RelativePath=".\src\tobarchart.cpp" + > + </File> + <File + RelativePath=".\src\tobrowser.cpp" + > + </File> + <File + RelativePath=".\src\tobrowseraccesswidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserbasewidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowsercodewidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserconstraint.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserdblinkswidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserindex.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserindexwidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserschemawidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowsersequencewidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowsersynonymwidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowsertable.cpp" + > + </File> + <File + RelativePath=".\src\tobrowsertablewidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowsertriggerwidget.cpp" + > + </File> + <File + RelativePath=".\src\tobrowserviewwidget.cpp" + > + </File> + <File + RelativePath=".\src\tochangeconnection.cpp" + > + </File> + <File + RelativePath=".\src\tochartmanager.cpp" + > + </File> + <File + RelativePath=".\src\tocodemodel.cpp" + > + </File> + <File + RelativePath=".\src\toconfiguration.cpp" + > + </File> + <File + RelativePath=".\src\toconnection.cpp" + > + </File> + <File + RelativePath=".\src\toconnectionimport.cpp" + > + </File> + <File + RelativePath=".\src\toconnectionmodel.cpp" + > + </File> + <File + RelativePath=".\src\toconnectionpool.cpp" + > + </File> + <File + RelativePath=".\src\tocurrent.cpp" + > + </File> + <File + RelativePath=".\src\todatatype.cpp" + > + </File> + <File + RelativePath=".\src\todebug.cpp" + > + </File> + <File + RelativePath=".\src\todebugtext.cpp" + > + </File... [truncated message content] |
From: <ibr...@us...> - 2009-08-23 18:35:31
|
Revision: 3249 http://tora.svn.sourceforge.net/tora/?rev=3249&view=rev Author: ibre5041 Date: 2009-08-23 18:35:20 +0000 (Sun, 23 Aug 2009) Log Message: ----------- Win. build process. Modified Paths: -------------- branches/tora-trotl/tora-trotl.vcproj branches/tora-trotl/tora-trotl_test0.vcproj branches/tora-trotl/tora-trotl_test1.vcproj branches/tora-trotl/tora-trotl_test2.vcproj Modified: branches/tora-trotl/tora-trotl.vcproj =================================================================== --- branches/tora-trotl/tora-trotl.vcproj 2009-08-20 06:17:13 UTC (rev 3248) +++ branches/tora-trotl/tora-trotl.vcproj 2009-08-23 18:35:20 UTC (rev 3249) @@ -22,6 +22,7 @@ IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="0" + BuildLogFile="$(IntDir)$(ProjectName)\BuildLog.htm" > <Tool Name="VCPreBuildEventTool" @@ -42,18 +43,22 @@ Name="VCCLCompilerTool" UseUnicodeResponseFiles="false" Optimization="0" - AdditionalIncludeDirectories="E:\oracle\Ora11g\xdk\include;E:\oracle\Ora11g\precomp\public;E:\oracle\Ora11g\oci\include;"C:\Program Files\boost\boost_1_38";E:\trotl\src;"E:\qt-win-opensource-src-4.4.3\include";"E:\qt-win-opensource-src-4.4.3\include\QtCore";"E:\qt-win-opensource-src-4.4.3\include\QtGui";"E:\qt-win-opensource-src-4.4.3\include\QtNetwork";"E:\qt-win-opensource-src-4.4.3\include\QtSql";"E:\tora-trotl\src";"E:\tora-trotl\src\loki\include";"E:\tora-trotl\src\windows";"E:\tora-trotl\src\qscintilla2\Qt4"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;_CRT_SECURE_NO_WARNINGS;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\"" + AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="1" PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" BrowseInformation="1" + BrowseInformationFile="$(IntDir)$(ProjectName)\" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" ForcedIncludeFiles="precompiled.h" - ShowIncludes="true" /> <Tool Name="VCManagedResourceCompilerTool" @@ -67,8 +72,9 @@ <Tool Name="VCLinkerTool" UseUnicodeResponseFiles="false" - AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib tora_qscintilla2_lib.lib tora_loki_lib.lib trotld.lib wsock32.lib" - AdditionalLibraryDirectories="E:\trotl\Debug;"C:\Program Files\boost\boost_1_38\libs";E:\oracle\Ora11g\oci\lib\msvc\;E:\oracle\Ora11g\LIB\;"E:\qt-win-opensource-src-4.4.3\lib\";"E:\tora-trotl\src\qscintilla2";"E:\tora-trotl\src\loki";"E:\tora-trotl\src\windows"" + AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib wsock32.lib" + AdditionalLibraryDirectories=""$(OutDir)";"C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" + ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" AssemblyDebug="1" SubSystem="1" @@ -101,7 +107,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" - CharacterSet="1" + CharacterSet="0" WholeProgramOptimization="1" > <Tool @@ -123,12 +129,16 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" RuntimeLibrary="2" EnableFunctionLevelLinking="true" - UsePrecompiledHeader="2" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" WarningLevel="3" DebugInformationFormat="3" + ForcedIncludeFiles="precompiled.h" /> <Tool Name="VCManagedResourceCompilerTool" @@ -141,7 +151,9 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtSql4.lib oci.lib oraxml11.lib wsock32.lib" LinkIncremental="1" + AdditionalLibraryDirectories=""$(OutDir)";"C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" GenerateDebugInformation="true" SubSystem="1" OptimizeReferences="2" @@ -180,10 +192,6 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath=".\src\windows\cregistry.cpp" - > - </File> - <File RelativePath=".\src\main.cpp" > </File> @@ -2159,14 +2167,6 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - <File - RelativePath=".\src\windows\tora.ico" - > - </File> - <File - RelativePath=".\src\windows\tora.rc" - > - </File> </Filter> </Files> <Globals> Modified: branches/tora-trotl/tora-trotl_test0.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test0.vcproj 2009-08-20 06:17:13 UTC (rev 3248) +++ branches/tora-trotl/tora-trotl_test0.vcproj 2009-08-23 18:35:20 UTC (rev 3249) @@ -22,6 +22,7 @@ IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="0" + BuildLogFile="$(IntDir)$(ProjectName)\BuildLog.htm" > <Tool Name="VCPreBuildEventTool" @@ -42,13 +43,18 @@ Name="VCCLCompilerTool" UseUnicodeResponseFiles="false" Optimization="0" - AdditionalIncludeDirectories="E:\oracle\Ora11g\xdk\include;E:\oracle\Ora11g\precomp\public;E:\oracle\Ora11g\oci\include;"C:\Program Files\boost\boost_1_38";E:\trotl\src;"E:\qt-win-opensource-src-4.4.3\include";"E:\qt-win-opensource-src-4.4.3\include\QtCore";"E:\qt-win-opensource-src-4.4.3\include\QtGui";"E:\qt-win-opensource-src-4.4.3\include\QtNetwork";"E:\qt-win-opensource-src-4.4.3\include\QtSql";"E:\tora-trotl\src\loki\include";"E:\tora-trotl\src\windows";"E:\tora-trotl\src\qscintilla2\Qt4";"E:\tora-trotl\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;_CRT_SECURE_NO_WARNINGS;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\"" + AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4";"$(ProjectDir)\src"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="1" PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" BrowseInformation="1" + BrowseInformationFile="$(IntDir)$(ProjectName)\" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" @@ -66,8 +72,9 @@ <Tool Name="VCLinkerTool" UseUnicodeResponseFiles="false" - AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib tora_qscintilla2_lib.lib tora_loki_lib.lib trotld.lib wsock32.lib" - AdditionalLibraryDirectories="E:\trotl\src;"C:\Program Files\boost\boost_1_38\libs";E:\oracle\Ora11g\oci\lib\msvc\;E:\oracle\Ora11g\LIB\;"E:\qt-win-opensource-src-4.4.3\lib\";"E:\tora-trotl\src\qscintilla2";"E:\tora-trotl\src\loki";"E:\tora-trotl\src\windows"" + AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib wsock32.lib" + AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" + ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" AssemblyDebug="1" SubSystem="1" @@ -122,7 +129,8 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4";"$(ProjectDir)\src"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" @@ -141,6 +149,7 @@ <Tool Name="VCLinkerTool" LinkIncremental="1" + AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -179,10 +188,6 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath=".\src\windows\cregistry.cpp" - > - </File> - <File RelativePath=".\src\shortcuteditor\moc_shortcuteditordialog.cxx" > </File> @@ -2158,14 +2163,6 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - <File - RelativePath=".\src\windows\tora.ico" - > - </File> - <File - RelativePath=".\src\windows\tora.rc" - > - </File> </Filter> </Files> <Globals> Modified: branches/tora-trotl/tora-trotl_test1.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test1.vcproj 2009-08-20 06:17:13 UTC (rev 3248) +++ branches/tora-trotl/tora-trotl_test1.vcproj 2009-08-23 18:35:20 UTC (rev 3249) @@ -42,13 +42,18 @@ Name="VCCLCompilerTool" UseUnicodeResponseFiles="false" Optimization="0" - AdditionalIncludeDirectories="E:\oracle\Ora11g\xdk\include;E:\oracle\Ora11g\precomp\public;E:\oracle\Ora11g\oci\include;"C:\Program Files\boost\boost_1_38";E:\trotl\src;"E:\qt-win-opensource-src-4.4.3\include";"E:\qt-win-opensource-src-4.4.3\include\QtCore";"E:\qt-win-opensource-src-4.4.3\include\QtGui";"E:\qt-win-opensource-src-4.4.3\include\QtNetwork";"E:\qt-win-opensource-src-4.4.3\include\QtSql";"E:\tora-trotl\src\loki\include";"E:\tora-trotl\src\windows";"E:\tora-trotl\src\qscintilla2\Qt4"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;_CRT_SECURE_NO_WARNINGS;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\"" + AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="1" PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" BrowseInformation="1" + BrowseInformationFile="$(IntDir)$(ProjectName)\" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" @@ -66,8 +71,9 @@ <Tool Name="VCLinkerTool" UseUnicodeResponseFiles="false" - AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib tora_qscintilla2_lib.lib tora_loki_lib.lib trotld.lib wsock32.lib" - AdditionalLibraryDirectories="E:\trotl\Debug;"C:\Program Files\boost\boost_1_38\libs";E:\oracle\Ora11g\oci\lib\msvc\;E:\oracle\Ora11g\LIB\;"E:\qt-win-opensource-src-4.4.3\lib\";"E:\tora-trotl\src\qscintilla2";"E:\tora-trotl\src\loki";"E:\tora-trotl\src\windows"" + AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib wsock32.lib" + AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" + ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" AssemblyDebug="1" SubSystem="1" @@ -122,6 +128,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -141,6 +148,7 @@ <Tool Name="VCLinkerTool" LinkIncremental="1" + AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -179,10 +187,6 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath=".\src\windows\cregistry.cpp" - > - </File> - <File RelativePath=".\src\shortcuteditor\moc_shortcuteditordialog.cxx" > </File> @@ -2158,14 +2162,6 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - <File - RelativePath=".\src\windows\tora.ico" - > - </File> - <File - RelativePath=".\src\windows\tora.rc" - > - </File> </Filter> </Files> <Globals> Modified: branches/tora-trotl/tora-trotl_test2.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test2.vcproj 2009-08-20 06:17:13 UTC (rev 3248) +++ branches/tora-trotl/tora-trotl_test2.vcproj 2009-08-23 18:35:20 UTC (rev 3249) @@ -42,13 +42,18 @@ Name="VCCLCompilerTool" UseUnicodeResponseFiles="false" Optimization="0" - AdditionalIncludeDirectories="E:\oracle\Ora11g\xdk\include;E:\oracle\Ora11g\precomp\public;E:\oracle\Ora11g\oci\include;"C:\Program Files\boost\boost_1_38";E:\trotl\src;"E:\qt-win-opensource-src-4.4.3\include";"E:\qt-win-opensource-src-4.4.3\include\QtCore";"E:\qt-win-opensource-src-4.4.3\include\QtGui";"E:\qt-win-opensource-src-4.4.3\include\QtNetwork";"E:\qt-win-opensource-src-4.4.3\include\QtSql";"E:\tora-trotl\src\loki\include";"E:\tora-trotl\src\windows";"E:\tora-trotl\src\qscintilla2\Qt4"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;_CRT_SECURE_NO_WARNINGS;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\"" + AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="1" PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" BrowseInformation="1" + BrowseInformationFile="$(IntDir)$(ProjectName)\" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" @@ -66,8 +71,9 @@ <Tool Name="VCLinkerTool" UseUnicodeResponseFiles="false" - AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib tora_qscintilla2_lib.lib tora_loki_lib.lib trotld.lib wsock32.lib" - AdditionalLibraryDirectories="E:\trotl\src;"C:\Program Files\boost\boost_1_38\libs";E:\oracle\Ora11g\oci\lib\msvc\;E:\oracle\Ora11g\LIB\;"E:\qt-win-opensource-src-4.4.3\lib\";"E:\tora-trotl\src\qscintilla2";"E:\tora-trotl\src\loki";"E:\tora-trotl\src\windows"" + AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib wsock32.lib" + AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" + ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" AssemblyDebug="1" SubSystem="1" @@ -141,6 +147,7 @@ <Tool Name="VCLinkerTool" LinkIncremental="1" + AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -179,10 +186,6 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath=".\src\windows\cregistry.cpp" - > - </File> - <File RelativePath=".\src\shortcuteditor\moc_shortcuteditordialog.cxx" > </File> @@ -2158,14 +2161,6 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - <File - RelativePath=".\src\windows\tora.ico" - > - </File> - <File - RelativePath=".\src\windows\tora.rc" - > - </File> </Filter> </Files> <Globals> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2009-09-03 15:22:22
|
Revision: 3266 http://tora.svn.sourceforge.net/tora/?rev=3266&view=rev Author: ibre5041 Date: 2009-09-03 15:21:44 +0000 (Thu, 03 Sep 2009) Log Message: ----------- sync with trunc Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/Makefile.OSX branches/tora-trotl/Makefile.mingw branches/tora-trotl/README branches/tora-trotl/README.WINDOWS branches/tora-trotl/copyright.txt branches/tora-trotl/osx_tools/CompleteBundle.cmake.in branches/tora-trotl/osx_tools/CreateBundle.sh.in branches/tora-trotl/refresh-copyright-and-license.pl branches/tora-trotl/src/COPYRIGHT.h branches/tora-trotl/src/docklets/toviewconnections.cpp branches/tora-trotl/src/docklets/toviewconnections.h branches/tora-trotl/src/docklets/toviewdirectory.cpp branches/tora-trotl/src/docklets/toviewdirectory.h branches/tora-trotl/src/main.cpp branches/tora-trotl/src/migratetool/sqldeveloper.cpp branches/tora-trotl/src/migratetool/sqldeveloper.h branches/tora-trotl/src/migratetool/squirrelsql.cpp branches/tora-trotl/src/migratetool/squirrelsql.h branches/tora-trotl/src/migratetool/tora3.cpp branches/tora-trotl/src/migratetool/tora3.h branches/tora-trotl/src/toabout.cpp branches/tora-trotl/src/toabout.h branches/tora-trotl/src/toalert.cpp branches/tora-trotl/src/toalert.h branches/tora-trotl/src/toanalyze.cpp branches/tora-trotl/src/toanalyze.h branches/tora-trotl/src/tobackup.cpp branches/tora-trotl/src/tobackup.h branches/tora-trotl/src/tobarchart.cpp branches/tora-trotl/src/tobarchart.h branches/tora-trotl/src/tobrowser.cpp branches/tora-trotl/src/tobrowser.h branches/tora-trotl/src/tobrowseraccesswidget.cpp branches/tora-trotl/src/tobrowseraccesswidget.h branches/tora-trotl/src/tobrowserbasewidget.cpp branches/tora-trotl/src/tobrowserbasewidget.h branches/tora-trotl/src/tobrowsercodewidget.cpp branches/tora-trotl/src/tobrowsercodewidget.h branches/tora-trotl/src/tobrowserconstraint.cpp branches/tora-trotl/src/tobrowserconstraint.h branches/tora-trotl/src/tobrowserdblinkswidget.cpp branches/tora-trotl/src/tobrowserdblinkswidget.h branches/tora-trotl/src/tobrowserindex.cpp branches/tora-trotl/src/tobrowserindex.h branches/tora-trotl/src/tobrowserindexwidget.cpp branches/tora-trotl/src/tobrowserindexwidget.h branches/tora-trotl/src/tobrowserschemawidget.cpp branches/tora-trotl/src/tobrowserschemawidget.h branches/tora-trotl/src/tobrowsersequencewidget.cpp branches/tora-trotl/src/tobrowsersequencewidget.h branches/tora-trotl/src/tobrowsersynonymwidget.cpp branches/tora-trotl/src/tobrowsersynonymwidget.h branches/tora-trotl/src/tobrowsertable.cpp branches/tora-trotl/src/tobrowsertable.h branches/tora-trotl/src/tobrowsertablewidget.cpp branches/tora-trotl/src/tobrowsertablewidget.h branches/tora-trotl/src/tobrowsertriggerwidget.cpp branches/tora-trotl/src/tobrowsertriggerwidget.h branches/tora-trotl/src/tobrowserviewwidget.cpp branches/tora-trotl/src/tobrowserviewwidget.h branches/tora-trotl/src/tochangeconnection.cpp branches/tora-trotl/src/tochangeconnection.h branches/tora-trotl/src/tochartmanager.cpp branches/tora-trotl/src/tochartmanager.h branches/tora-trotl/src/tocodemodel.cpp branches/tora-trotl/src/tocodemodel.h branches/tora-trotl/src/toconf.h branches/tora-trotl/src/toconnectionimport.cpp branches/tora-trotl/src/toconnectionimport.h branches/tora-trotl/src/toconnectionmodel.cpp branches/tora-trotl/src/toconnectionmodel.h branches/tora-trotl/src/tocurrent.cpp branches/tora-trotl/src/tocurrent.h branches/tora-trotl/src/todatatype.cpp branches/tora-trotl/src/todatatype.h branches/tora-trotl/src/todebug.h branches/tora-trotl/src/todebugtext.cpp branches/tora-trotl/src/todebugtext.h branches/tora-trotl/src/todefaultkeywords.h branches/tora-trotl/src/todescribe.cpp branches/tora-trotl/src/todescribe.h branches/tora-trotl/src/todockbar.cpp branches/tora-trotl/src/todockbar.h branches/tora-trotl/src/todocklet.cpp branches/tora-trotl/src/todocklet.h branches/tora-trotl/src/toeditablemenu.cpp branches/tora-trotl/src/toeditablemenu.h branches/tora-trotl/src/toeditextensions.cpp branches/tora-trotl/src/toeditextensions.h branches/tora-trotl/src/toeditwidget.cpp branches/tora-trotl/src/toeditwidget.h branches/tora-trotl/src/toeventquery.h branches/tora-trotl/src/toeventquerytask.cpp branches/tora-trotl/src/toeventquerytask.h branches/tora-trotl/src/toextract.cpp branches/tora-trotl/src/toextract.h branches/tora-trotl/src/toextratranslations.cpp branches/tora-trotl/src/tofilesize.cpp branches/tora-trotl/src/tofilesize.h branches/tora-trotl/src/toglobalsetting.cpp branches/tora-trotl/src/toglobalsetting.h branches/tora-trotl/src/tohelp.cpp branches/tora-trotl/src/tohelp.h branches/tora-trotl/src/tohelpsetup.h branches/tora-trotl/src/tohighlightedtext.cpp branches/tora-trotl/src/tohighlightedtext.h branches/tora-trotl/src/tohtml.cpp branches/tora-trotl/src/tohtml.h branches/tora-trotl/src/toinvalid.cpp branches/tora-trotl/src/toinvalid.h branches/tora-trotl/src/tolegendchart.cpp branches/tora-trotl/src/tolegendchart.h branches/tora-trotl/src/tolinechart.cpp branches/tora-trotl/src/tolinechart.h branches/tora-trotl/src/tolistviewformatter.cpp branches/tora-trotl/src/tolistviewformatter.h branches/tora-trotl/src/tolistviewformattercsv.cpp branches/tora-trotl/src/tolistviewformattercsv.h branches/tora-trotl/src/tolistviewformatterfactory.h branches/tora-trotl/src/tolistviewformatterhtml.cpp branches/tora-trotl/src/tolistviewformatterhtml.h branches/tora-trotl/src/tolistviewformatteridentifier.h branches/tora-trotl/src/tolistviewformattersql.cpp branches/tora-trotl/src/tolistviewformattersql.h branches/tora-trotl/src/tolistviewformattertabdel.cpp branches/tora-trotl/src/tolistviewformattertabdel.h branches/tora-trotl/src/tolistviewformattertext.cpp branches/tora-trotl/src/tolistviewformattertext.h branches/tora-trotl/src/tomain.h branches/tora-trotl/src/tomainwindow.cpp branches/tora-trotl/src/tomainwindow.h branches/tora-trotl/src/tomainwindow.kde.h branches/tora-trotl/src/tomarkedtext.cpp branches/tora-trotl/src/tomarkedtext.h branches/tora-trotl/src/tomemoeditor.cpp branches/tora-trotl/src/tomemoeditor.h branches/tora-trotl/src/tomessage.cpp branches/tora-trotl/src/tomessage.h branches/tora-trotl/src/tomodeleditor.h branches/tora-trotl/src/tomysqlkeywords.h branches/tora-trotl/src/tonewconnection.cpp branches/tora-trotl/src/tonewconnection.h branches/tora-trotl/src/tonoblockquery.h branches/tora-trotl/src/toocistub.cpp branches/tora-trotl/src/tooracleconnection.cpp branches/tora-trotl/src/tooracleextract.cpp branches/tora-trotl/src/tooraclepreload.cpp branches/tora-trotl/src/tooraclesetting.h branches/tora-trotl/src/tooutput.cpp branches/tora-trotl/src/tooutput.h branches/tora-trotl/src/toparamget.cpp branches/tora-trotl/src/toparamget.h branches/tora-trotl/src/topassword.cpp branches/tora-trotl/src/topiechart.cpp branches/tora-trotl/src/topiechart.h branches/tora-trotl/src/toplsqleditor.cpp branches/tora-trotl/src/toplsqleditor.h branches/tora-trotl/src/toplsqltext.cpp branches/tora-trotl/src/toplsqltext.h branches/tora-trotl/src/topreferences.cpp branches/tora-trotl/src/topreferences.h branches/tora-trotl/src/toprofiler.cpp branches/tora-trotl/src/toprofiler.h branches/tora-trotl/src/toproject.cpp branches/tora-trotl/src/toproject.h branches/tora-trotl/src/topushbutton.cpp branches/tora-trotl/src/topushbutton.h branches/tora-trotl/src/toqvalue.h branches/tora-trotl/src/toreport.cpp branches/tora-trotl/src/toreport.h branches/tora-trotl/src/toresult.cpp branches/tora-trotl/src/toresult.h branches/tora-trotl/src/toresultbar.cpp branches/tora-trotl/src/toresultbar.h branches/tora-trotl/src/toresultcols.cpp branches/tora-trotl/src/toresultcols.h branches/tora-trotl/src/toresultcolscomment.cpp branches/tora-trotl/src/toresultcolscomment.h branches/tora-trotl/src/toresultcombo.cpp branches/tora-trotl/src/toresultcombo.h branches/tora-trotl/src/toresultdata.cpp branches/tora-trotl/src/toresultdata.h branches/tora-trotl/src/toresultdatasingle.cpp branches/tora-trotl/src/toresultdatasingle.h branches/tora-trotl/src/toresultdepend.cpp branches/tora-trotl/src/toresultdepend.h branches/tora-trotl/src/toresultextract.cpp branches/tora-trotl/src/toresultextract.h branches/tora-trotl/src/toresultfield.cpp branches/tora-trotl/src/toresultfield.h branches/tora-trotl/src/toresultgrants.cpp branches/tora-trotl/src/toresultgrants.h branches/tora-trotl/src/toresultitem.cpp branches/tora-trotl/src/toresultitem.h branches/tora-trotl/src/toresultlabel.cpp branches/tora-trotl/src/toresultlabel.h branches/tora-trotl/src/toresultline.cpp branches/tora-trotl/src/toresultline.h branches/tora-trotl/src/toresultlistformat.cpp branches/tora-trotl/src/toresultlistformat.h branches/tora-trotl/src/toresultlistformatui.ui branches/tora-trotl/src/toresultlock.cpp branches/tora-trotl/src/toresultlock.h branches/tora-trotl/src/toresultlong.cpp branches/tora-trotl/src/toresultlong.h branches/tora-trotl/src/toresultmodel.cpp branches/tora-trotl/src/toresultmodel.h branches/tora-trotl/src/toresultparam.cpp branches/tora-trotl/src/toresultparam.h branches/tora-trotl/src/toresultpie.cpp branches/tora-trotl/src/toresultpie.h branches/tora-trotl/src/toresultplan.cpp branches/tora-trotl/src/toresultplan.h branches/tora-trotl/src/toresultresources.h branches/tora-trotl/src/toresultschema.cpp branches/tora-trotl/src/toresultschema.h branches/tora-trotl/src/toresultstats.cpp branches/tora-trotl/src/toresultstats.h branches/tora-trotl/src/toresultstorage.h branches/tora-trotl/src/toresulttableview.cpp branches/tora-trotl/src/toresulttableview.h branches/tora-trotl/src/toresulttableviewedit.cpp branches/tora-trotl/src/toresulttableviewedit.h branches/tora-trotl/src/toresultview.cpp branches/tora-trotl/src/toresultview.h branches/tora-trotl/src/torollback.cpp branches/tora-trotl/src/torollback.h branches/tora-trotl/src/torunnable.cpp branches/tora-trotl/src/torunnable.h branches/tora-trotl/src/toscheduler.cpp branches/tora-trotl/src/toscheduler.h branches/tora-trotl/src/toscript.cpp branches/tora-trotl/src/toscript.h branches/tora-trotl/src/toscriptschemawidget.cpp branches/tora-trotl/src/toscriptschemawidget.h branches/tora-trotl/src/toscripttreeitem.cpp branches/tora-trotl/src/toscripttreeitem.h branches/tora-trotl/src/toscripttreemodel.cpp branches/tora-trotl/src/toscripttreemodel.h branches/tora-trotl/src/tosearchreplace.cpp branches/tora-trotl/src/tosearchreplace.h branches/tora-trotl/src/tosecurity.cpp branches/tora-trotl/src/tosecurity.h branches/tora-trotl/src/tosecuritytreeitem.cpp branches/tora-trotl/src/tosecuritytreeitem.h branches/tora-trotl/src/tosecuritytreemodel.cpp branches/tora-trotl/src/tosecuritytreemodel.h branches/tora-trotl/src/tosession.cpp branches/tora-trotl/src/tosession.h branches/tora-trotl/src/tosgastatement.cpp branches/tora-trotl/src/tosgastatement.h branches/tora-trotl/src/tosgatrace.cpp branches/tora-trotl/src/tosgatrace.h branches/tora-trotl/src/tosmtp.cpp branches/tora-trotl/src/tosmtp.h branches/tora-trotl/src/tosplash.cpp branches/tora-trotl/src/tosplash.h branches/tora-trotl/src/tosql.cpp branches/tora-trotl/src/tosql.h branches/tora-trotl/src/tosqledit.cpp branches/tora-trotl/src/tosqledit.h branches/tora-trotl/src/tosqlparse.cpp branches/tora-trotl/src/tosqlparse.h branches/tora-trotl/src/tostorage.cpp branches/tora-trotl/src/tostorage.h branches/tora-trotl/src/tostoragedefinition.cpp branches/tora-trotl/src/tostoragedefinition.h branches/tora-trotl/src/tosyntaxsetup.cpp branches/tora-trotl/src/tosyntaxsetup.h branches/tora-trotl/src/totabwidget.cpp branches/tora-trotl/src/totabwidget.h branches/tora-trotl/src/totemplate.cpp branches/tora-trotl/src/totemplate.h branches/tora-trotl/src/totemplateprovider.cpp branches/tora-trotl/src/totemporary.cpp branches/tora-trotl/src/totemporary.h branches/tora-trotl/src/totextview.cpp branches/tora-trotl/src/totextview.h branches/tora-trotl/src/tothread.cpp branches/tora-trotl/src/tothread_p.h branches/tora-trotl/src/totool.h branches/tora-trotl/src/totreewidget.cpp branches/tora-trotl/src/totreewidget.h branches/tora-trotl/src/totuning.cpp branches/tora-trotl/src/totuning.h branches/tora-trotl/src/tounittest.cpp branches/tora-trotl/src/tounittest.h branches/tora-trotl/src/tovisualize.cpp branches/tora-trotl/src/tovisualize.h branches/tora-trotl/src/towaitevents.cpp branches/tora-trotl/src/towaitevents.h branches/tora-trotl/src/toworkingwidget.cpp branches/tora-trotl/src/toworkingwidget.h branches/tora-trotl/src/toworksheet.cpp branches/tora-trotl/src/toworksheet.h branches/tora-trotl/src/toworksheetstatistic.cpp branches/tora-trotl/src/toworksheetstatistic.h branches/tora-trotl/src/toworksheettext.cpp branches/tora-trotl/src/toworksheettext.h branches/tora-trotl/src/toworksheetwidget.cpp branches/tora-trotl/src/toworksheetwidget.h branches/tora-trotl/src/utils.cpp branches/tora-trotl/src/utils.h branches/tora-trotl/src/windows/Makefile Property Changed: ---------------- branches/tora-trotl/ Property changes on: branches/tora-trotl ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/tora:3192-3213 + /trunk/tora:3192-3213,3216-3265 Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/CMakeLists.txt 2009-09-03 15:21:44 UTC (rev 3266) @@ -1,348 +1,348 @@ -############################################################################################################## -########## CMake Setup ########## - -#Set our CMake minimum version -#Require 2.4.2 for Qt finding -#Require 2.4.3 for moc change detection and rpath updates for custom cairo install -CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR) -# FIXME: dont't forget to change CMP0005 policy to NEW after 2.6.0 minimum required! - -# handle new cmake versions correctly -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) - cmake_policy(SET CMP0005 OLD) # FIXME change it to new when there will be cmake 2.6.x in most distros -endif(COMMAND cmake_policy) - - -#Pretty colors -SET(CMAKE_COLOR_MAKEFILE ON) -#Dont force verbose -SET(CMAKE_VERBOSE_MAKEFILE OFF) -#Include current dir -SET(CMAKE_INCLUDE_CURRENT_DIR TRUE) - - -INCLUDE(CheckIncludeFile) -INCLUDE(CheckCCompilerFlag) -INCLUDE(CheckCXXCompilerFlag) -INCLUDE(CheckTypeSize) -INCLUDE(TestBigEndian) - -#Set the custom CMake module directory where our include/lib finders are -SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") - -#Project Setup -PROJECT(TOra) -#Set our version values -#Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX} -#where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level) -SET (VERSION_MAJOR "2") -SET (VERSION_MINOR "1") -SET (VERSION_PATCH "0") -SET (VERSION_SUFFIX "") -SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) -MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") - -SET (EXE_NAME "tora") - -ADD_DEFINITIONS("-DTOVERSION=\\\"${VERSION}\\\"") -# Allow using CMAKE-related ifdefs in the code. See e.g. toqsqlconnection.cpp. -ADD_DEFINITIONS("-DCMAKE_BUILD") - -ADD_DEFINITIONS("-DTROTL_DLL") - -#Set the permissions to be used when installing plugins -SET(PLUGIN_PERMISSIONS WORLD_EXECUTE GROUP_EXECUTE OWNER_EXECUTE WORLD_READ GROUP_READ OWNER_READ OWNER_WRITE) - -if (NOT TORA_PLUGIN_DIR) - SET (TORA_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/share/tora/") -endif (NOT TORA_PLUGIN_DIR) -ADD_DEFINITIONS("-DDEFAULT_PLUGIN_DIR=\\\"${TORA_PLUGIN_DIR}\\\"") - -if (NOT TORA_DOC_DIR) - IF (UNIX) - SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/tora/") # it would be pain for upgrade configs -${VERSION}/") - ELSE (UNIX) - SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/doc/") - ENDIF (UNIX) -endif (NOT TORA_DOC_DIR) - -#if (NOT TORA_HELP_DIR) -# SET (TORA_HELP_DIR "${TORA_PLUGIN_DIR}/help/") -#endif (NOT TORA_HELP_DIR) -#ADD_DEFINITIONS("-DTORA_HELP_DIR=\\\"${TORA_HELP_DIR}\\\"") - -############################################################################################################## -########## check for the CPU we build for ########## - -IF (GCC) - -EXECUTE_PROCESS( - COMMAND ${CMAKE_C_COMPILER} -dumpmachine - OUTPUT_VARIABLE MACHINE - OUTPUT_STRIP_TRAILING_WHITESPACE -) -MESSAGE(STATUS "Building for target ${MACHINE}") - -STRING(REGEX MATCH "(i?86-*)|(athlon-*)|(pentium-*)" _machine_x86 "${MACHINE}") -IF (_machine_x86) - MESSAGE(STATUS "Found target X86") - SET(ARCH_X86 1) -ENDIF (_machine_x86) - -STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _machine_x86_64 "${MACHINE}") -IF (_machine_x86_64) - MESSAGE(STATUS "Found target X86_64") - SET(ARCH_X86_64 1) -ENDIF (_machine_x86_64) - -STRING(REGEX MATCH "(ppc-*)" _machine_ppc "${MACHINE}") -IF (_machine_ppc) - MESSAGE(STATUS "Found target PPC") - SET(ARCH_PPC 1) -ENDIF (_machine_ppc) - -ENDIF (GCC) - -#Convert our simpler command line option to the CMake style -#None, Debug, Release, .. or custom ones -# SET(WANT_DEBUG 1) -IF(WANT_DEBUG) - SET(CMAKE_BUILD_TYPE Debug) -ELSE(WANT_DEBUG) - SET(CMAKE_BUILD_TYPE RELEASE) -ENDIF(WANT_DEBUG) - - -# Lets disable Wall warnings due the MSVC too much talkative -# output. Wall can slow down compiletion up to hours and -# my boxes can boil eggs too. -# MSVC, MSVC_IDE, MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005 -IF (MSVC) - SET (CXX_WARNINGS "") -ELSE (MSVC) - SET (CXX_WARNINGS "-Wall") -ENDIF (MSVC) - - -# --- If we are on OS X copy all the embedded libraries to the app bundle -IF (APPLE AND WANT_BUNDLE) - # -------- Function to build OS X Stand Alone Bundles ----------------- - function(MakeOSXBundleApp target binary_dir) - #-- Set some useful variables - SET (OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.cmake") - SET (OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.sh") - #-- Configure the cmake file and the shell script - CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CompleteBundle.cmake.in" - "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}" @ONLY IMMEDIATE) - CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CreateBundle.sh.in" - "${OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT}" @ONLY IMMEDIATE) - #-- Create the installation code - install(SCRIPT "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}") - - endfunction(MakeOSXBundleApp) - - MakeOSXBundleApp(TOra ${PROJECT_BINARY_DIR}) - -ENDIF (APPLE AND WANT_BUNDLE) - - -SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") -SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") -SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3") -SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -gbdb3") -# Required for win wjen there is used an external qscintilla lib -IF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) - SET(CMAKE_CXX_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_CXX_FLAGS_RELEASE}") - SET(CMAKE_C_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_C_FLAGS_RELEASE}") -ENDIF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) - - -############################################################################################################## -########## Find Dependencies ########## - -# wo don't want to plugin build -ADD_DEFINITIONS(-DTOMONOLITHIC) - - -SET (QT_MT_REQUIRED true) -SET (QT_MIN_VERSION "4.3.0") -SET (QT_USE_QTSQL TRUE) -SET (QT_USE_QTNETWORK TRUE) -SET (QT_USE_QTXML TRUE) -FIND_PACKAGE(Qt4 REQUIRED) -INCLUDE( ${QT_USE_FILE} ) -IF (QT_FOUND) - MESSAGE("Qt4 Found OK") - #Add our Qt definitions - ADD_DEFINITIONS( - ${QT_DEFINITIONS} - -DQT_CORE_LIB - -DQT_GUI_LIB - -DQT_THREAD_LIB - ) -ELSE(QT_FOUND) - MESSAGE(FATAL_ERROR "No Qt4 found") -ENDIF(QT_FOUND) - - -IF (WANT_INTERNAL_QSCINTILLA) - MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.") - MESSAGE(STATUS "QSci: It's recomended to use external library for it") -ELSE (WANT_INTERNAL_QSCINTILLA) - - FIND_PACKAGE(QScintilla REQUIRED) - IF (QSCINTILLA_FOUND) - MESSAGE("QScintilla2 Found OK") - ADD_DEFINITIONS("-DQT -DSCI_LEXER") - ELSE (QSCINTILLA_FOUND) - MESSAGE(STATUS "QSci: No QScintilla2 libraries found") - MESSAGE(STATUS "QSci: You can use -DWANT_INTERNAL_QSCINTILLA=1 to build included copy of it.") - MESSAGE(FATAL_ERROR "No QScintilla2 found") - ENDIF (QSCINTILLA_FOUND) - -ENDIF (WANT_INTERNAL_QSCINTILLA) - - -FIND_PACKAGE(Oracle) -IF(ORACLE_FOUND) - MESSAGE("Oracle OCI Library Found OK") - # what else is hidden in the ifdef hell?! - ADD_DEFINITIONS("-DDBLINK") -ELSE(ORACLE_FOUND) - MESSAGE(STATUS "No Oracle OCI found. TOra will be build without Oracle support") - ADD_DEFINITIONS("-DTO_NO_ORACLE") -ENDIF(ORACLE_FOUND) - - -FIND_PACKAGE(PostgreSQL) -IF (POSTGRESQL_FOUND) - ADD_DEFINITIONS(-DLIBPQ_DECL_CANCEL) - ADD_DEFINITIONS(-DHAVE_POSTGRESQL_LIBPQ_FE_H) - MESSAGE(STATUS "PostgreSQL environment found: ${POSTGRESQL_INCLUDE_DIR} ${POSTGRESQL_LIBRARIES}") -ELSE (POSTGRESQL_FOUND) - MESSAGE(" ") - MESSAGE(WARNING " No PostgreSQL environment has been found.") - MESSAGE(WARNING " Specify -DPOSTGRESQL_PATH_INCLUDES=path") - MESSAGE(WARNING " and -DPOSTGRESQL_PATH_LIB manually") - #MESSAGE (STATUS "PostgreSQL includes: ${POSTGRESQL_INCLUDE_DIR} vs. ${POSTGRESQL_PATH_INCLUDES}") - #MESSAGE (STATUS "PostgreSQL libs: ${POSTGRESQL_LIBRARIES} vs. ${POSTGRESQL_PATH_LIB}") - MESSAGE(" ") -ENDIF (POSTGRESQL_FOUND) - - - -############################################################################################################## -########## Include Setup ########## - -TEST_BIG_ENDIAN(WORDS_BIGENDIAN) - -CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) -IF(HAVE_DLFCN_H) - ADD_DEFINITIONS(-DHAVE_DLFCN_H) -ENDIF(HAVE_DLFCN_H) - -CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) -IF(HAVE_UNISTD_H) - ADD_DEFINITIONS(-DHAVE_UNISTD_H) -ENDIF(HAVE_UNISTD_H) - -CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) -# IF(HAVE_SYS_TYPES_H) -# ADD_DEFINITIONS(-DHAVE_SYS_TYPES_H) -# ENDIF(HAVE_SYS_TYPES_H) - -CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H) -# IF(HAVE_SYS_STAT_H) -# ADD_DEFINITIONS(-DHAVE_SYS_STAT_H) -# ENDIF(HAVE_SYS_STAT_H) -#>>Test for existing include files - - -#Create configure files.. config.h and uninstall -#config.h -# INCLUDE (ConfigureChecks.cmake) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) -ADD_DEFINITIONS("-DHAVE_CONFIG_H") - - - -############################################################################################################## -########## Uninstall Setup ########## - -CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY -) - -ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - -#Add our source subdirs -ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(doc) - -IF (NOT WANT_BUNDLE) -#Install our READMEs etc. -INSTALL(FILES - AUTHORS - BUGS - ChangeLog - COPYING - INSTALL - NEWS - README - README.BINARIES - README.CMAKE - README.CODESTYLE - README.LAYOUT - README.LICENSE - README.OSX - README.RELEASE - README.SVN - README.WINDOWS - TODO - DESTINATION ${TORA_DOC_DIR} -) -ENDIF (NOT WANT_BUNDLE) - -# packaging related stuff -#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") -SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) -#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") -#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") -SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -SET(CPACK_SOURCE_GENERATOR "TGZ") -#SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") -SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") -SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt") -SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) -INCLUDE(CPack) - -# Check for SVN -FIND_PACKAGE(Subversion) -IF(NOT Subversion_FOUND) - SET(Subversion_SVN_EXECUTABLE true) -ENDIF(NOT Subversion_FOUND) - -# get svn revision in rpmbuild time (and not in Makefile generation time) -SET(SVN_REVISION - "\"$$(" ${Subversion_SVN_EXECUTABLE} info ${CMAKE_SOURCE_DIR} | awk '/Revision:/ {print \$\$2 }' ")\"" - ) -SET(RPM_DEFINES - --define "_sourcedir ${CMAKE_SOURCE_DIR}" - ) -SET(SPEC_IN_SUBST - "\"" - "s/(%define\\s+_version) .*/\\\\1 ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/\;" - "s/(%define\\s+_release) .*/\\\\1 0.${SVN_REVISION}svn/\;" - "\"" - ) -SET(RPM_SPEC "rpm/tora.spec") -ADD_CUSTOM_TARGET(package-rpm - COMMAND sed -r ${SPEC_IN_SUBST} "${RPM_SPEC}.in" >"${RPM_SPEC}" - COMMAND make package_source - COMMAND rpmbuild -ba ${RPM_DEFINES} "${RPM_SPEC}" - ) - +############################################################################################################## +########## CMake Setup ########## + +#Set our CMake minimum version +#Require 2.4.2 for Qt finding +#Require 2.4.3 for moc change detection and rpath updates for custom cairo install +CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR) +# FIXME: dont't forget to change CMP0005 policy to NEW after 2.6.0 minimum required! + +# handle new cmake versions correctly +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) + cmake_policy(SET CMP0005 OLD) # FIXME change it to new when there will be cmake 2.6.x in most distros +endif(COMMAND cmake_policy) + + +#Pretty colors +SET(CMAKE_COLOR_MAKEFILE ON) +#Dont force verbose +SET(CMAKE_VERBOSE_MAKEFILE OFF) +#Include current dir +SET(CMAKE_INCLUDE_CURRENT_DIR TRUE) + + +INCLUDE(CheckIncludeFile) +INCLUDE(CheckCCompilerFlag) +INCLUDE(CheckCXXCompilerFlag) +INCLUDE(CheckTypeSize) +INCLUDE(TestBigEndian) + +#Set the custom CMake module directory where our include/lib finders are +SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") + +#Project Setup +PROJECT(TOra) +#Set our version values +#Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX} +#where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level) +SET (VERSION_MAJOR "2") +SET (VERSION_MINOR "1") +SET (VERSION_PATCH "0") +SET (VERSION_SUFFIX "") +SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) +MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") + +SET (EXE_NAME "tora") + +ADD_DEFINITIONS("-DTOVERSION=\\\"${VERSION}\\\"") +# Allow using CMAKE-related ifdefs in the code. See e.g. toqsqlconnection.cpp. +ADD_DEFINITIONS("-DCMAKE_BUILD") + +ADD_DEFINITIONS("-DTROTL_DLL") + +#Set the permissions to be used when installing plugins +SET(PLUGIN_PERMISSIONS WORLD_EXECUTE GROUP_EXECUTE OWNER_EXECUTE WORLD_READ GROUP_READ OWNER_READ OWNER_WRITE) + +if (NOT TORA_PLUGIN_DIR) + SET (TORA_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/share/tora/") +endif (NOT TORA_PLUGIN_DIR) +ADD_DEFINITIONS("-DDEFAULT_PLUGIN_DIR=\\\"${TORA_PLUGIN_DIR}\\\"") + +if (NOT TORA_DOC_DIR) + IF (UNIX) + SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/tora/") # it would be pain for upgrade configs -${VERSION}/") + ELSE (UNIX) + SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/doc/") + ENDIF (UNIX) +endif (NOT TORA_DOC_DIR) + +#if (NOT TORA_HELP_DIR) +# SET (TORA_HELP_DIR "${TORA_PLUGIN_DIR}/help/") +#endif (NOT TORA_HELP_DIR) +#ADD_DEFINITIONS("-DTORA_HELP_DIR=\\\"${TORA_HELP_DIR}\\\"") + +############################################################################################################## +########## check for the CPU we build for ########## + +IF (GCC) + +EXECUTE_PROCESS( + COMMAND ${CMAKE_C_COMPILER} -dumpmachine + OUTPUT_VARIABLE MACHINE + OUTPUT_STRIP_TRAILING_WHITESPACE +) +MESSAGE(STATUS "Building for target ${MACHINE}") + +STRING(REGEX MATCH "(i?86-*)|(athlon-*)|(pentium-*)" _machine_x86 "${MACHINE}") +IF (_machine_x86) + MESSAGE(STATUS "Found target X86") + SET(ARCH_X86 1) +ENDIF (_machine_x86) + +STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _machine_x86_64 "${MACHINE}") +IF (_machine_x86_64) + MESSAGE(STATUS "Found target X86_64") + SET(ARCH_X86_64 1) +ENDIF (_machine_x86_64) + +STRING(REGEX MATCH "(ppc-*)" _machine_ppc "${MACHINE}") +IF (_machine_ppc) + MESSAGE(STATUS "Found target PPC") + SET(ARCH_PPC 1) +ENDIF (_machine_ppc) + +ENDIF (GCC) + +#Convert our simpler command line option to the CMake style +#None, Debug, Release, .. or custom ones +# SET(WANT_DEBUG 1) +IF(WANT_DEBUG) + SET(CMAKE_BUILD_TYPE Debug) +ELSE(WANT_DEBUG) + SET(CMAKE_BUILD_TYPE RELEASE) +ENDIF(WANT_DEBUG) + + +# Lets disable Wall warnings due the MSVC too much talkative +# output. Wall can slow down compiletion up to hours and +# my boxes can boil eggs too. +# MSVC, MSVC_IDE, MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005 +IF (MSVC) + SET (CXX_WARNINGS "") +ELSE (MSVC) + SET (CXX_WARNINGS "-Wall") +ENDIF (MSVC) + + +# --- If we are on OS X copy all the embedded libraries to the app bundle +IF (APPLE AND WANT_BUNDLE) + # -------- Function to build OS X Stand Alone Bundles ----------------- + function(MakeOSXBundleApp target binary_dir) + #-- Set some useful variables + SET (OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.cmake") + SET (OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.sh") + #-- Configure the cmake file and the shell script + CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CompleteBundle.cmake.in" + "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}" @ONLY IMMEDIATE) + CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CreateBundle.sh.in" + "${OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT}" @ONLY IMMEDIATE) + #-- Create the installation code + install(SCRIPT "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}") + + endfunction(MakeOSXBundleApp) + + MakeOSXBundleApp(TOra ${PROJECT_BINARY_DIR}) + +ENDIF (APPLE AND WANT_BUNDLE) + + +SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") +SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") +SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3") +SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -gbdb3") +# Required for win wjen there is used an external qscintilla lib +IF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) + SET(CMAKE_CXX_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_CXX_FLAGS_RELEASE}") + SET(CMAKE_C_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_C_FLAGS_RELEASE}") +ENDIF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) + + +############################################################################################################## +########## Find Dependencies ########## + +# wo don't want to plugin build +ADD_DEFINITIONS(-DTOMONOLITHIC) + + +SET (QT_MT_REQUIRED true) +SET (QT_MIN_VERSION "4.3.0") +SET (QT_USE_QTSQL TRUE) +SET (QT_USE_QTNETWORK TRUE) +SET (QT_USE_QTXML TRUE) +FIND_PACKAGE(Qt4 REQUIRED) +INCLUDE( ${QT_USE_FILE} ) +IF (QT_FOUND) + MESSAGE("Qt4 Found OK") + #Add our Qt definitions + ADD_DEFINITIONS( + ${QT_DEFINITIONS} + -DQT_CORE_LIB + -DQT_GUI_LIB + -DQT_THREAD_LIB + ) +ELSE(QT_FOUND) + MESSAGE(FATAL_ERROR "No Qt4 found") +ENDIF(QT_FOUND) + + +IF (WANT_INTERNAL_QSCINTILLA) + MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.") + MESSAGE(STATUS "QSci: It's recomended to use external library for it") +ELSE (WANT_INTERNAL_QSCINTILLA) + + FIND_PACKAGE(QScintilla REQUIRED) + IF (QSCINTILLA_FOUND) + MESSAGE("QScintilla2 Found OK") + ADD_DEFINITIONS("-DQT -DSCI_LEXER") + ELSE (QSCINTILLA_FOUND) + MESSAGE(STATUS "QSci: No QScintilla2 libraries found") + MESSAGE(STATUS "QSci: You can use -DWANT_INTERNAL_QSCINTILLA=1 to build included copy of it.") + MESSAGE(FATAL_ERROR "No QScintilla2 found") + ENDIF (QSCINTILLA_FOUND) + +ENDIF (WANT_INTERNAL_QSCINTILLA) + + +FIND_PACKAGE(Oracle) +IF(ORACLE_FOUND) + MESSAGE("Oracle OCI Library Found OK") + # what else is hidden in the ifdef hell?! + ADD_DEFINITIONS("-DDBLINK") +ELSE(ORACLE_FOUND) + MESSAGE(STATUS "No Oracle OCI found. TOra will be build without Oracle support") + ADD_DEFINITIONS("-DTO_NO_ORACLE") +ENDIF(ORACLE_FOUND) + + +FIND_PACKAGE(PostgreSQL) +IF (POSTGRESQL_FOUND) + ADD_DEFINITIONS(-DLIBPQ_DECL_CANCEL) + ADD_DEFINITIONS(-DHAVE_POSTGRESQL_LIBPQ_FE_H) + MESSAGE(STATUS "PostgreSQL environment found: ${POSTGRESQL_INCLUDE_DIR} ${POSTGRESQL_LIBRARIES}") +ELSE (POSTGRESQL_FOUND) + MESSAGE(" ") + MESSAGE(WARNING " No PostgreSQL environment has been found.") + MESSAGE(WARNING " Specify -DPOSTGRESQL_PATH_INCLUDES=path") + MESSAGE(WARNING " and -DPOSTGRESQL_PATH_LIB manually") + #MESSAGE (STATUS "PostgreSQL includes: ${POSTGRESQL_INCLUDE_DIR} vs. ${POSTGRESQL_PATH_INCLUDES}") + #MESSAGE (STATUS "PostgreSQL libs: ${POSTGRESQL_LIBRARIES} vs. ${POSTGRESQL_PATH_LIB}") + MESSAGE(" ") +ENDIF (POSTGRESQL_FOUND) + + + +############################################################################################################## +########## Include Setup ########## + +TEST_BIG_ENDIAN(WORDS_BIGENDIAN) + +CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) +IF(HAVE_DLFCN_H) + ADD_DEFINITIONS(-DHAVE_DLFCN_H) +ENDIF(HAVE_DLFCN_H) + +CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) +IF(HAVE_UNISTD_H) + ADD_DEFINITIONS(-DHAVE_UNISTD_H) +ENDIF(HAVE_UNISTD_H) + +CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) +# IF(HAVE_SYS_TYPES_H) +# ADD_DEFINITIONS(-DHAVE_SYS_TYPES_H) +# ENDIF(HAVE_SYS_TYPES_H) + +CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H) +# IF(HAVE_SYS_STAT_H) +# ADD_DEFINITIONS(-DHAVE_SYS_STAT_H) +# ENDIF(HAVE_SYS_STAT_H) +#>>Test for existing include files + + +#Create configure files.. config.h and uninstall +#config.h +# INCLUDE (ConfigureChecks.cmake) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) +ADD_DEFINITIONS("-DHAVE_CONFIG_H") + + + +############################################################################################################## +########## Uninstall Setup ########## + +CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY +) + +ADD_CUSTOM_TARGET(uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") + +#Add our source subdirs +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(doc) + +IF (NOT WANT_BUNDLE) +#Install our READMEs etc. +INSTALL(FILES + AUTHORS + BUGS + ChangeLog + COPYING + INSTALL + NEWS + README + README.BINARIES + README.CMAKE + README.CODESTYLE + README.LAYOUT + README.LICENSE + README.OSX + README.RELEASE + README.SVN + README.WINDOWS + TODO + DESTINATION ${TORA_DOC_DIR} +) +ENDIF (NOT WANT_BUNDLE) + +# packaging related stuff +#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") +SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) +#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") +#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") +SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") +SET(CPACK_SOURCE_GENERATOR "TGZ") +#SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt") +SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) +INCLUDE(CPack) + +# Check for SVN +FIND_PACKAGE(Subversion) +IF(NOT Subversion_FOUND) + SET(Subversion_SVN_EXECUTABLE true) +ENDIF(NOT Subversion_FOUND) + +# get svn revision in rpmbuild time (and not in Makefile generation time) +SET(SVN_REVISION + "\"$$(" ${Subversion_SVN_EXECUTABLE} info ${CMAKE_SOURCE_DIR} | awk '/Revision:/ {print \$\$2 }' ")\"" + ) +SET(RPM_DEFINES + --define "_sourcedir ${CMAKE_SOURCE_DIR}" + ) +SET(SPEC_IN_SUBST + "\"" + "s/(%define\\s+_version) .*/\\\\1 ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/\;" + "s/(%define\\s+_release) .*/\\\\1 0.${SVN_REVISION}svn/\;" + "\"" + ) +SET(RPM_SPEC "rpm/tora.spec") +ADD_CUSTOM_TARGET(package-rpm + COMMAND sed -r ${SPEC_IN_SUBST} "${RPM_SPEC}.in" >"${RPM_SPEC}" + COMMAND make package_source + COMMAND rpmbuild -ba ${RPM_DEFINES} "${RPM_SPEC}" + ) + Modified: branches/tora-trotl/Makefile.OSX =================================================================== --- branches/tora-trotl/Makefile.OSX 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/Makefile.OSX 2009-09-03 15:21:44 UTC (rev 3266) @@ -8,7 +8,7 @@ # # Portions Copyright (C) 2000-2001 Underscore AB # Portions Copyright (C) 2003-2005 Quest Software, Inc. -# Portions Copyright (C) 2004-2008 Numerous Other Contributors +# Portions Copyright (C) 2004-2009 Numerous Other Contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/Makefile.mingw =================================================================== --- branches/tora-trotl/Makefile.mingw 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/Makefile.mingw 2009-09-03 15:21:44 UTC (rev 3266) @@ -8,7 +8,7 @@ # # Portions Copyright (C) 2000-2001 Underscore AB # Portions Copyright (C) 2003-2005 Quest Software, Inc. -# Portions Copyright (C) 2004-2008 Numerous Other Contributors +# Portions Copyright (C) 2004-2009 Numerous Other Contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/README =================================================================== --- branches/tora-trotl/README 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/README 2009-09-03 15:21:44 UTC (rev 3266) @@ -9,7 +9,7 @@ Portions Copyright (C) 2000-2001 Underscore AB Portions Copyright (C) 2003-2005 Quest Software, Inc. -Portions Copyright (C) 2004-2008 Numerous Other Contributors +Portions Copyright (C) 2004-2009 Numerous Other Contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/README.WINDOWS =================================================================== --- branches/tora-trotl/README.WINDOWS 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/README.WINDOWS 2009-09-03 15:21:44 UTC (rev 3266) @@ -1,9 +1,83 @@ Content: -- Building with MINGW (autotools). +- Building with MSVC - CMake - Building Windows installer. -- Building with MSVC - CMake +- Building with MINGW (autotools). (OUT OF DATE) +# +# Building with MSVC - CMake (+ See README.CMAKE) +# + + 0. All related steps are done in the "Visual Studio Command Prompt" + I have MS Visual Studio 2008 Express (aka version 9). It contains + all basic tools propably so there is no more stuff from Microsoft + required. + + 1. Downaload Qt4 source version for Windows - Trolltech doesn't provide + MSVC binaries at all. + + 2. Install Oracle client - instant or standard one. + + 3. Download and install Postgresql development packages. It's a part + of default installer - just check its component. + NOTE: Install it to the path *without* space in its name - Qt has + problems with compilation in the case of space. + + 4. Download and install Mysql development packages. It's a part + of default installer - just check its component. + NOTE: Install it to the path *without* space in its name - Qt has + problems with compilation in the case of space. + + 5. Update system environment paths in variables: INCLUDE and LIB to + fit Postgresql and Mysql includes and libraries. + Note: Mysql uses subdirectories in its lib directory. + Example: +set INCLUDE=%INCLUDE%;d:\Qt\sqlite\;D:\Qt\pgsql\include\;d:\Qt\mysql\include\ +set LIB=%LIB%;d:\Qt\sqlite\;d:\Qt\pgsql\lib\;d:\Qt\mysql\lib\opt\ + + 6. Compile Qt4 with MSVC. Don't forget to specify -qt-sql-mysql + -qt-sql-psql -qt-sql-odbc -plugin-sql-mysql -plugin-sql-psql + -plugin-sql-odbc parameters for configure script. + Example: +configure.exe -plugin-sql-sqlite -system-sqlite -plugin-sql-mysql -plugin-sql-psql -plugin-sql-odbc + but it dependes on your system mood. I mean it's not deterministic. + Sometimes you will need to hack more paths etc. But building DB + plugins is described in the Qt documentation. + + 7. Compile Tora - read README.CMAKE + Example: +set ORACLE_HOME=d:\oracle-xe\... +set LIB=%LIB%;d:\Qt\pgsql\lib +cmake -G "NMake Makefiles" -DWANT_INTERNAL_QSCINTILLA=1 -DCMAKE_INSTALL_PREFIX=d:\oss\tora\RELEASE -DORACLE_OCI_VERSION=10G_R2 -DPOSTGRESQL_PATH_INCLUDES=d:\Qt\pgsql\include -DPOSTGRESQL_PATH_LIB=d:\Qt\pgsql\lib\ ..\tora + Misc notes: seting ORACLE_HOME is a good thing (TM) + building with internal qscintilla is easier for beginners ;) + prepare for longer headache (if you're a windows devel newbie) + +# +# Building Windows installer. +# + + 1. Obtain and install NSIS installer software from + http://nsis.sourceforge.net + + 2. Copy all the distribution files with desired directory structure + to the src/windows/installer/files directory within your TOra directory + structure (or use it as INSTALLDIR when building TOra and use step 9 + of above build instrucstions). + + 3. Run NSIS compiler GUI and then drag and drop the tora.nsi file from + src/windows/installer directory in TOra to the compiler GUI window and + wait till installer will finish the build. + +Please report any bugs should you find them as this port is still in the +experimental stage. + + + +# +# BELOW DOCS ARE OUT OF DATE, STANDARD BUILD METHOD IS ABOVE +# + Building with MINGW (autotools). At the moment this only works with QT3/Windows Free Edition port @@ -50,69 +124,3 @@ and copy the necessary files (not yet all of them) to the install directory (INSTALLDIR) - -Building Windows installer. - - 1. Obtain and install NSIS installer software from - http://nsis.sourceforge.net - - 2. Copy all the distribution files with desired directory structure - to the src/windows/installer/files directory within your TOra directory - structure (or use it as INSTALLDIR when building TOra and use step 9 - of above build instrucstions). - - 3. Run NSIS compiler GUI and then drag and drop the tora.nsi file from - src/windows/installer directory in TOra to the compiler GUI window and - wait till installer will finish the build. - -Please report any bugs should you find them as this port is still in the -experimental stage. - - - -Building with MSVC - CMake (+ See README.CMAKE) - - 0. All related steps are done in the "Visual Studio Command Prompt" - I have MS Visual Studio 2008 Express (aka version 9). It contains - all basic tools propably so there is no more stuff from Microsoft - required. - - 1. Downaload Qt4 source version for Windows - Trolltech doesn't provide - MSVC binaries at all. - - 2. Install Oracle client - instant or standard one. - - 3. Download and install Postgresql development packages. It's a part - of default installer - just check its component. - NOTE: Install it to the path *without* space in its name - Qt has - problems with compilation in the case of space. - - 4. Download and install Mysql development packages. It's a part - of default installer - just check its component. - NOTE: Install it to the path *without* space in its name - Qt has - problems with compilation in the case of space. - - 5. Update system environment paths in variables: INCLUDE and LIB to - fit Postgresql and Mysql includes and libraries. - Note: Mysql uses subdirectories in its lib directory. - Example: -set INCLUDE=%INCLUDE%;d:\Qt\sqlite\;D:\Qt\pgsql\include\;d:\Qt\mysql\include\ -set LIB=%LIB%;d:\Qt\sqlite\;d:\Qt\pgsql\lib\;d:\Qt\mysql\lib\opt\ - - 6. Compile Qt4 with MSVC. Don't forget to specify -qt-sql-mysql - -qt-sql-psql -qt-sql-odbc -plugin-sql-mysql -plugin-sql-psql - -plugin-sql-odbc parameters for configure script. - Example: -configure.exe -plugin-sql-sqlite -system-sqlite -plugin-sql-mysql -plugin-sql-psql -plugin-sql-odbc - but it dependes on your system mood. I mean it's not deterministic. - Sometimes you will need to hack more paths etc. But building DB - plugins is described in the Qt documentation. - - 7. Compile Tora - read README.CMAKE - Example: -set ORACLE_HOME=d:\oracle-xe\... -set LIB=%LIB%;d:\Qt\pgsql\lib -cmake -G "NMake Makefiles" -DWANT_INTERNAL_QSCINTILLA=1 -DCMAKE_INSTALL_PREFIX=d:\oss\tora\RELEASE -DORACLE_OCI_VERSION=10G_R2 -DPOSTGRESQL_PATH_INCLUDES=d:\Qt\pgsql\include -DPOSTGRESQL_PATH_LIB=d:\Qt\pgsql\lib\ ..\tora - Misc notes: seting ORACLE_HOME is a good thing (TM) - building with internal qscintilla is easier for beginners ;) - prepare for longer headache (if you're a windows devel newbie) Modified: branches/tora-trotl/copyright.txt =================================================================== --- branches/tora-trotl/copyright.txt 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/copyright.txt 2009-09-03 15:21:44 UTC (rev 3266) @@ -4,7 +4,7 @@ Portions Copyright (C) 2000-2001 Underscore AB Portions Copyright (C) 2003-2005 Quest Software, Inc. -Portions Copyright (C) 2004-2008 Numerous Other Contributors +Portions Copyright (C) 2004-2009 Numerous Other Contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/osx_tools/CompleteBundle.cmake.in =================================================================== --- branches/tora-trotl/osx_tools/CompleteBundle.cmake.in 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/osx_tools/CompleteBundle.cmake.in 2009-09-03 15:21:44 UTC (rev 3266) @@ -64,6 +64,14 @@ # -- Copy the App bundle to the installation location first EXECUTE_PROCESS( COMMAND "@OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT@" ) + +# HACK: some libraries (libcrypt, libssl, libz) aren't writable by default. +# But we have to "relink" it, so it must be chmod-ed. +#EXECUTE_PROCESS( COMMAND echo "Chmodding libs" ) +#EXECUTE_PROCESS( COMMAND "find $CMAKE_INSTALL_PREFIX/TOra.app -name \"*.dylib\" | xargs chmod 755" ) + + # -- Run the BundleUtilities cmake code include(BundleUtilities) fixup_bundle("@CMAKE_INSTALL_PREFIX@/@target@.app" "${PluginList}" "Plugins") + Modified: branches/tora-trotl/osx_tools/CreateBundle.sh.in =================================================================== --- branches/tora-trotl/osx_tools/CreateBundle.sh.in 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/osx_tools/CreateBundle.sh.in 2009-09-03 15:21:44 UTC (rev 3266) @@ -15,7 +15,8 @@ fi OSX_App="@EXECUTABLE_OUTPUT_PATH@/$BUILD_STYLE/$OSX_App_Name.app" else - OSX_App="@EXECUTABLE_OUTPUT_PATH@/$OSX_App_Name.app" + #OSX_App="@EXECUTABLE_OUTPUT_PATH@/$OSX_App_Name.app" + OSX_App="@CMAKE_BINARY_DIR@/src/$OSX_App_Name.app" fi Modified: branches/tora-trotl/refresh-copyright-and-license.pl =================================================================== --- branches/tora-trotl/refresh-copyright-and-license.pl 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/refresh-copyright-and-license.pl 2009-09-03 15:21:44 UTC (rev 3266) @@ -14,6 +14,7 @@ open( OUT, ">", $file ); print OUT $filetext; close(OUT); + print "\n"; } else { print "Skipping $file, no changes.\n"; Modified: branches/tora-trotl/src/COPYRIGHT.h =================================================================== --- branches/tora-trotl/src/COPYRIGHT.h 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/COPYRIGHT.h 2009-09-03 15:21:44 UTC (rev 3266) @@ -5,7 +5,7 @@ "\n" "Portions Copyright (C) 2000-2001 Underscore AB\n" "Portions Copyright (C) 2003-2005 Quest Software, Inc.\n" - "Portions Copyright (C) 2004-2008 Numerous Other Contributors\n" + "Portions Copyright (C) 2004-2009 Numerous Other Contributors\n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" Modified: branches/tora-trotl/src/docklets/toviewconnections.cpp =================================================================== --- branches/tora-trotl/src/docklets/toviewconnections.cpp 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/docklets/toviewconnections.cpp 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -39,7 +39,6 @@ * * END_COMMON_COPYRIGHT_HEADER */ - #include "utils.h" #include "toviewconnections.h" #include "tomain.h" Modified: branches/tora-trotl/src/docklets/toviewconnections.h =================================================================== --- branches/tora-trotl/src/docklets/toviewconnections.h 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/docklets/toviewconnections.h 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/src/docklets/toviewdirectory.cpp =================================================================== --- branches/tora-trotl/src/docklets/toviewdirectory.cpp 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/docklets/toviewdirectory.cpp 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -39,7 +39,6 @@ * * END_COMMON_COPYRIGHT_HEADER */ - #include "utils.h" #include "toviewdirectory.h" #include "tomain.h" Modified: branches/tora-trotl/src/docklets/toviewdirectory.h =================================================================== --- branches/tora-trotl/src/docklets/toviewdirectory.h 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/docklets/toviewdirectory.h 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/src/main.cpp =================================================================== --- branches/tora-trotl/src/main.cpp 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/main.cpp 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/src/migratetool/sqldeveloper.cpp =================================================================== --- branches/tora-trotl/src/migratetool/sqldeveloper.cpp 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/migratetool/sqldeveloper.cpp 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/src/migratetool/sqldeveloper.h =================================================================== --- branches/tora-trotl/src/migratetool/sqldeveloper.h 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/migratetool/sqldeveloper.h 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/src/migratetool/squirrelsql.cpp =================================================================== --- branches/tora-trotl/src/migratetool/squirrelsql.cpp 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/migratetool/squirrelsql.cpp 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/src/migratetool/squirrelsql.h =================================================================== --- branches/tora-trotl/src/migratetool/squirrelsql.h 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/migratetool/squirrelsql.h 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/src/migratetool/tora3.cpp =================================================================== --- branches/tora-trotl/src/migratetool/tora3.cpp 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/migratetool/tora3.cpp 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/src/migratetool/tora3.h =================================================================== --- branches/tora-trotl/src/migratetool/tora3.h 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/migratetool/tora3.h 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/src/toabout.cpp =================================================================== --- branches/tora-trotl/src/toabout.cpp 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/toabout.cpp 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/src/toabout.h =================================================================== --- branches/tora-trotl/src/toabout.h 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/toabout.h 2009-09-03 15:21:44 UTC (rev 3266) @@ -7,7 +7,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: branches/tora-trotl/src/toalert.cpp =================================================================== --- branches/tora-trotl/src/toalert.cpp 2009-09-01 18:54:17 UTC (rev 3265) +++ branches/tora-trotl/src/toalert.cpp 2009-09-03 15:21:44 UTC (rev 3266) @@ -12,7 +12,7 @@ * * Portions Copyright (C) 2000-2001 Underscore AB * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * Portions Copyright (C) 2004-2009 Numerous Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the term... [truncated message content] |
From: <ibr...@us...> - 2009-09-03 18:48:20
|
Revision: 3267 http://tora.svn.sourceforge.net/tora/?rev=3267&view=rev Author: ibre5041 Date: 2009-09-03 18:48:10 +0000 (Thu, 03 Sep 2009) Log Message: ----------- windows build fix Modified Paths: -------------- branches/tora-trotl/tora-trotl.vcproj branches/tora-trotl/tora-trotl_test0.vcproj branches/tora-trotl/tora-trotl_test1.vcproj branches/tora-trotl/tora-trotl_test2.vcproj Modified: branches/tora-trotl/tora-trotl.vcproj =================================================================== --- branches/tora-trotl/tora-trotl.vcproj 2009-09-03 15:21:44 UTC (rev 3266) +++ branches/tora-trotl/tora-trotl.vcproj 2009-09-03 18:48:10 UTC (rev 3267) @@ -44,7 +44,7 @@ UseUnicodeResponseFiles="false" Optimization="0" AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"C:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="1" @@ -127,15 +127,18 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" + Optimization="0" AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"c:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="1" + UsePrecompiledHeader="0" PrecompiledHeaderThrough="precompiled.h" PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)$(ProjectName)\" WarningLevel="3" DebugInformationFormat="3" ForcedIncludeFiles="precompiled.h" @@ -154,6 +157,7 @@ AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtSql4.lib oci.lib oraxml11.lib wsock32.lib" LinkIncremental="1" AdditionalLibraryDirectories=""$(OutDir)";"C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" + ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" SubSystem="1" OptimizeReferences="2" @@ -1330,6 +1334,10 @@ > </File> <File + RelativePath=".\src\ts_log\critical_section.h" + > + </File> + <File RelativePath=".\src\windows\resource.h" > </File> @@ -1974,6 +1982,14 @@ > </File> <File + RelativePath=".\src\ts_log\ts_log.h" + > + </File> + <File + RelativePath=".\src\ts_log\ts_log_utils.h" + > + </File> + <File RelativePath=".\src\ui_shortcuteditordialog.h" > </File> Modified: branches/tora-trotl/tora-trotl_test0.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test0.vcproj 2009-09-03 15:21:44 UTC (rev 3266) +++ branches/tora-trotl/tora-trotl_test0.vcproj 2009-09-03 18:48:10 UTC (rev 3267) @@ -107,7 +107,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" - CharacterSet="1" + CharacterSet="0" WholeProgramOptimization="1" > <Tool @@ -127,13 +127,16 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" + Optimization="0" AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4";"$(ProjectDir)\src"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" WarningLevel="3" DebugInformationFormat="3" /> @@ -148,10 +151,12 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtSql4.lib oci.lib oraxml11.lib wsock32.lib" LinkIncremental="1" AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" + ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" - SubSystem="2" + SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" Modified: branches/tora-trotl/tora-trotl_test1.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test1.vcproj 2009-09-03 15:21:44 UTC (rev 3266) +++ branches/tora-trotl/tora-trotl_test1.vcproj 2009-09-03 18:48:10 UTC (rev 3267) @@ -106,7 +106,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" - CharacterSet="1" + CharacterSet="0" WholeProgramOptimization="1" > <Tool @@ -126,13 +126,16 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" + Optimization="0" AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" WarningLevel="3" DebugInformationFormat="3" /> @@ -147,10 +150,12 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtSql4.lib oci.lib oraxml11.lib wsock32.lib" LinkIncremental="1" AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" + ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" - SubSystem="2" + SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" Modified: branches/tora-trotl/tora-trotl_test2.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test2.vcproj 2009-09-03 15:21:44 UTC (rev 3266) +++ branches/tora-trotl/tora-trotl_test2.vcproj 2009-09-03 18:48:10 UTC (rev 3267) @@ -106,7 +106,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" - CharacterSet="1" + CharacterSet="0" WholeProgramOptimization="1" > <Tool @@ -126,12 +126,16 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + Optimization="0" + AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" WarningLevel="3" DebugInformationFormat="3" /> @@ -146,10 +150,12 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtSql4.lib oci.lib oraxml11.lib wsock32.lib" LinkIncremental="1" AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" + ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" - SubSystem="2" + SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2009-09-10 13:45:01
|
Revision: 3301 http://tora.svn.sourceforge.net/tora/?rev=3301&view=rev Author: ibre5041 Date: 2009-09-10 13:44:54 +0000 (Thu, 10 Sep 2009) Log Message: ----------- trotl library merged Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/cmake/modules/FindOracle.cmake branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/main.cpp branches/tora-trotl/src/totuning.cpp Added Paths: ----------- branches/tora-trotl/src/trotl/ branches/tora-trotl/src/trotl/CMakeLists.txt branches/tora-trotl/src/trotl/DOCUMENTATION.txt branches/tora-trotl/src/trotl/cmake/ branches/tora-trotl/src/trotl/cmake/modules/ branches/tora-trotl/src/trotl/cmake/modules/FindOracle.cmake branches/tora-trotl/src/trotl/src/ branches/tora-trotl/src/trotl/src/CMakeLists.txt branches/tora-trotl/src/trotl/src/Loki/ branches/tora-trotl/src/trotl/src/Loki/AssocVector.h branches/tora-trotl/src/trotl/src/Loki/EmptyType.h branches/tora-trotl/src/trotl/src/Loki/Factory_alt.h branches/tora-trotl/src/trotl/src/Loki/Functor.h branches/tora-trotl/src/trotl/src/Loki/LokiExport.h branches/tora-trotl/src/trotl/src/Loki/LokiTypeInfo.h branches/tora-trotl/src/trotl/src/Loki/MultiMethods.h branches/tora-trotl/src/trotl/src/Loki/NullType.h branches/tora-trotl/src/trotl/src/Loki/Sequence.h branches/tora-trotl/src/trotl/src/Loki/Singleton.h branches/tora-trotl/src/trotl/src/Loki/SmallObj.h branches/tora-trotl/src/trotl/src/Loki/Threads.h branches/tora-trotl/src/trotl/src/Loki/TypeManip.h branches/tora-trotl/src/trotl/src/Loki/TypeTraits.h branches/tora-trotl/src/trotl/src/Loki/Typelist.h branches/tora-trotl/src/trotl/src/Loki/TypelistMacros.h branches/tora-trotl/src/trotl/src/Loki/static_check.h branches/tora-trotl/src/trotl/src/README branches/tora-trotl/src/trotl/src/stack/ branches/tora-trotl/src/trotl/src/stack/CMakeLists.txt branches/tora-trotl/src/trotl/src/stack/LICENSE_1_0.txt branches/tora-trotl/src/trotl/src/stack/stack.cpp branches/tora-trotl/src/trotl/src/stack/stack.hpp branches/tora-trotl/src/trotl/src/trotl.h branches/tora-trotl/src/trotl/src/trotl_aq.cpp branches/tora-trotl/src/trotl/src/trotl_aq.h branches/tora-trotl/src/trotl/src/trotl_base.h branches/tora-trotl/src/trotl/src/trotl_common.h branches/tora-trotl/src/trotl/src/trotl_conn.cpp branches/tora-trotl/src/trotl/src/trotl_conn.h branches/tora-trotl/src/trotl/src/trotl_convertor.cpp branches/tora-trotl/src/trotl/src/trotl_convertor.cpp.bak branches/tora-trotl/src/trotl/src/trotl_convertor.h branches/tora-trotl/src/trotl/src/trotl_convertor.h.bak branches/tora-trotl/src/trotl/src/trotl_date.cpp branches/tora-trotl/src/trotl/src/trotl_date.h branches/tora-trotl/src/trotl/src/trotl_exc.cpp branches/tora-trotl/src/trotl/src/trotl_export.h branches/tora-trotl/src/trotl/src/trotl_extended_parser.cpp branches/tora-trotl/src/trotl/src/trotl_extended_parser.h branches/tora-trotl/src/trotl/src/trotl_int.cpp branches/tora-trotl/src/trotl/src/trotl_int.h branches/tora-trotl/src/trotl/src/trotl_lob.cpp branches/tora-trotl/src/trotl/src/trotl_lob.h branches/tora-trotl/src/trotl/src/trotl_mfile.h branches/tora-trotl/src/trotl/src/trotl_parser.cpp branches/tora-trotl/src/trotl/src/trotl_parser.h branches/tora-trotl/src/trotl/src/trotl_stat.cpp branches/tora-trotl/src/trotl/src/trotl_stat.h branches/tora-trotl/src/trotl/src/trotl_string.cpp branches/tora-trotl/src/trotl/src/trotl_string.h branches/tora-trotl/src/trotl/src/trotl_var.cpp branches/tora-trotl/src/trotl/src/trotl_var.h branches/tora-trotl/src/trotl/src/trotl_xml.cpp branches/tora-trotl/src/trotl/src/trotl_xml.h branches/tora-trotl/src/trotl/src/ts_log/ branches/tora-trotl/src/trotl/src/ts_log/critical_section.h branches/tora-trotl/src/trotl/src/ts_log/ts_log.h branches/tora-trotl/src/trotl/src/ts_log/ts_log_utils.h Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2009-09-10 02:48:44 UTC (rev 3300) +++ branches/tora-trotl/CMakeLists.txt 2009-09-10 13:44:54 UTC (rev 3301) @@ -49,8 +49,6 @@ # Allow using CMAKE-related ifdefs in the code. See e.g. toqsqlconnection.cpp. ADD_DEFINITIONS("-DCMAKE_BUILD") -ADD_DEFINITIONS("-DTROTL_DLL") - #Set the permissions to be used when installing plugins SET(PLUGIN_PERMISSIONS WORLD_EXECUTE GROUP_EXECUTE OWNER_EXECUTE WORLD_READ GROUP_READ OWNER_READ OWNER_WRITE) @@ -147,10 +145,10 @@ ENDIF (APPLE AND WANT_BUNDLE) -SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") -SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}") -SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3") -SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -gbdb3") +SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic") +SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic") +SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic") +SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -gbdb3 -fno-inline -rdynamic") # Required for win wjen there is used an external qscintilla lib IF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) SET(CMAKE_CXX_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_CXX_FLAGS_RELEASE}") Modified: branches/tora-trotl/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora-trotl/cmake/modules/FindOracle.cmake 2009-09-10 02:48:44 UTC (rev 3300) +++ branches/tora-trotl/cmake/modules/FindOracle.cmake 2009-09-10 13:44:54 UTC (rev 3301) @@ -1,124 +1,146 @@ # TOra: Configure Oracle libraries # # ORACLE_FOUND - system has Oracle OCI +# ORACLE_HAS_XML - Oracle has XDK support(full client installed) # ORACLE_INCLUDES - where to find oci.h # ORACLE_LIBRARIES - the libraries to link against to use Oracle OCI -# +# # copyright (c) 2007 Petr Vanek <pe...@sc...> +# copyright (c) 2009 Ivan Brezina <ibr...@ib...> # Redistribution and use is allowed according to the terms of the GPLv2 license. # SET(ORACLE_FOUND "NO") - +SET(ORACLE_HAS_XML "NO") SET(ORACLE_HOME $ENV{ORACLE_HOME}) IF (ORACLE_PATH_INCLUDES) SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) ELSE (ORACLE_PATH_INCLUDES) - SET (ORACLE_INCLUDES_LOCATION - ${ORACLE_HOME}/rdbms/public - ${ORACLE_HOME}/include - # sdk - ${ORACLE_HOME}/sdk/include - # xe on windows - ${ORACLE_HOME}/OCI/include - ) + SET (ORACLE_INCLUDES_LOCATION + ${ORACLE_HOME}/rdbms/public + ${ORACLE_HOME}/include + # xdk + ${ORACLE_HOME}/xdk/include + # sdk + ${ORACLE_HOME}/sdk/include + # xe on windows + ${ORACLE_HOME}/OCI/include + ) ENDIF (ORACLE_PATH_INCLUDES) IF (ORACLE_PATH_LIB) - SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) + SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) ELSE (ORACLE_PATH_LIB) - SET (ORACLE_LIB_LOCATION - ${ORACLE_HOME}/lib - # xe on windows - ${ORACLE_HOME}/OCI/lib/MSVC - ) + SET (ORACLE_LIB_LOCATION + # TODO add 32/64bit version here + ${ORACLE_HOME}/lib + # xe on windows + ${ORACLE_HOME}/OCI/lib/MSVC + ${ORACLE_HOME} + ) ENDIF (ORACLE_PATH_LIB) FIND_PATH( - ORACLE_INCLUDES - oci.h - ${ORACLE_INCLUDES_LOCATION} - ) + ORACLE_INCLUDES + oci.h + ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) +FIND_PATH( + ORACLE_INCLUDES_XML + xml.h + ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) + FIND_LIBRARY( - ORACLE_LIBRARY_OCCI - NAMES libocci occi oraocci10 oraocci11 - PATHS ${ORACLE_LIB_LOCATION} - ) + ORACLE_LIBRARY_CLNTSH + NAMES libclntsh clntsh oci + PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) + FIND_LIBRARY( - ORACLE_LIBRARY_CLNTSH - NAMES libclntsh clntsh oci - PATHS ${ORACLE_LIB_LOCATION} - ) -#FIND_LIBRARY( -# ORACLE_LIBRARY_LNNZ -# NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32 -# PATHS ${ORACLE_LIB_LOCATION} -#) + ORACLE_LIBRARY_XML + NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11 + PATHS ${ORACLE_LIB_LOCATION} +) -SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_LNNZ}) -IF (ORACLE_LIBRARY AND ORACLE_INCLUDES) - SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY}) - SET(ORACLE_FOUND "YES") -ENDIF (ORACLE_LIBRARY AND ORACLE_INCLUDES) +SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_CLNTSH}) +IF (ORACLE_LIBRARY_XML) + LIST(APPEND ORACLE_LIBRARY ${ORACLE_LIBRARY_XML}) +ENDIF (ORACLE_LIBRARY_XML) +IF (ORACLE_INCLUDES AND ORACLE_LIBRARY) + SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY}) + SET(ORACLE_FOUND "YES") +ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARY) +IF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) + ADD_DEFINITIONS(-DORACLE_HAS_XML) + SET(ORACLE_HAS_XML "YES") + LIST(APPEND ORACLE_INCLUDES ${ORACLE_INCLUDES_XML}) +ENDIF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) + # guess OCI version IF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) - FIND_PROGRAM(AWK awk) - FIND_PROGRAM(SQLPLUS sqlplus PATHS ENV ORACLE_HOME NO_DEFAULT_PATH) - FIND_PROGRAM(SQLPLUS sqlplus) - SET (sqlplus_version "${SQLPLUS} -version | ${AWK} '/Release/ {print $3}'") - EXEC_PROGRAM(${sqlplus_version} OUTPUT_VARIABLE sqlplus_out) - MESSAGE(STATUS "found sqlplus version: ${sqlplus_out}") - - # WARNING! - # MATCHES operator is using Cmake regular expression. - # so the e.g. 9.* does not expand like shell file mask - # but as "9 and then any sequence of characters" - IF (${sqlplus_out} MATCHES "8.*") - SET(ORACLE_OCI_VERSION "8I") - ELSEIF (${sqlplus_out} MATCHES "9.*") - SET(ORACLE_OCI_VERSION "9") - # do not change the order of the ora10 checking! - ELSEIF (${sqlplus_out} MATCHES "10.2.*") - SET(ORACLE_OCI_VERSION "10G_R2") - ELSEIF (${sqlplus_out} MATCHES "10.*") - SET(ORACLE_OCI_VERSION "10G") - ELSEIF (${sqlplus_out} MATCHES "11.*") - SET(ORACLE_OCI_VERSION "11G") - ELSE (${sqlplus_out} MATCHES "8.*") - SET(ORACLE_OCI_VERSION "10G_R2") - ENDIF (${sqlplus_out} MATCHES "8.*") + FIND_PROGRAM(AWK awk) + FIND_PROGRAM(SQLPLUS sqlplus PATHS ENV ORACLE_HOME NO_DEFAULT_PATH) + FIND_PROGRAM(SQLPLUS sqlplus) + SET (sqlplus_version "${SQLPLUS} -version | ${AWK} '/Release/ {print $3}'") + EXEC_PROGRAM(${sqlplus_version} OUTPUT_VARIABLE sqlplus_out) + MESSAGE(STATUS "found sqlplus version: ${sqlplus_out}") - MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION}") + # WARNING! + # MATCHES operator is using Cmake regular expression. + # so the e.g. 9.* does not expand like shell file mask + # but as "9 and then any sequence of characters" + IF (${sqlplus_out} MATCHES "8.*") + SET(ORACLE_OCI_VERSION "8I") + ELSEIF (${sqlplus_out} MATCHES "9.*") + SET(ORACLE_OCI_VERSION "9") +# do not change the order of the ora10 checking! + ELSEIF (${sqlplus_out} MATCHES "10.2.*") + SET(ORACLE_OCI_VERSION "10G_R2") + ELSEIF (${sqlplus_out} MATCHES "10.*") + SET(ORACLE_OCI_VERSION "10G") + ELSEIF (${sqlplus_out} MATCHES "11.*") + SET(ORACLE_OCI_VERSION "11G") + ELSE (${sqlplus_out} MATCHES "8.*") + SET(ORACLE_OCI_VERSION "10G_R2") + ENDIF (${sqlplus_out} MATCHES "8.*") + + MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION}") ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) - +MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") +MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}") IF (ORACLE_FOUND) - IF (NOT ORACLE_FIND_QUIETLY) - MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") - ENDIF (NOT ORACLE_FIND_QUIETLY) - # there *must* be OCI version defined for internal libraries - IF (ORACLE_OCI_VERSION) - ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) - ELSE (ORACLE_OCI_VERSION) - MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") - ENDIF (ORACLE_OCI_VERSION) + IF (NOT ORACLE_FIND_QUIETLY) + MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") + MESSAGE(STATUS " ${ORACLE_INCLUDES}") + ENDIF (NOT ORACLE_FIND_QUIETLY) + # there *must* be OCI version defined for internal libraries + #IF (ORACLE_OCI_VERSION) + # ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) + #ELSE (ORACLE_OCI_VERSION) + # MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") + #ENDIF (ORACLE_OCI_VERSION) ELSE (ORACLE_FOUND) - MESSAGE(STATUS "Oracle not found.") - MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") - MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") - MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") - MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARY}") - IF (ORACLE_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Oracle library") - ELSE (ORACLE_FIND_REQUIRED) - # setup the variables for silent continue - SET (ORACLE_INCLUDES "") - ENDIF (ORACLE_FIND_REQUIRED) + MESSAGE(STATUS "Oracle not found.") + MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") + MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") + MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") + MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARY}") + IF (ORACLE_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find Oracle library") + ELSE (ORACLE_FIND_REQUIRED) + # setup the variables for silent continue + SET (ORACLE_INCLUDES "") + ENDIF (ORACLE_FIND_REQUIRED) ENDIF (ORACLE_FOUND) Modified: branches/tora-trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/CMakeLists.txt 2009-09-10 02:48:44 UTC (rev 3300) +++ branches/tora-trotl/src/CMakeLists.txt 2009-09-10 13:44:54 UTC (rev 3301) @@ -4,9 +4,10 @@ # ADD_SUBDIRECTORY(i18n) ADD_SUBDIRECTORY(loki) IF (WIN32) - ADD_SUBDIRECTORY(windows) + ADD_SUBDIRECTORY(windows) ENDIF (WIN32) +ADD_SUBDIRECTORY(trotl) # Default: qsci2 as 3rd party lib! IF (WANT_INTERNAL_QSCINTILLA) @@ -440,8 +441,8 @@ IF (WANT_INTERNAL_QSCINTILLA) LINK_DIRECTORIES(./qscintilla2) ENDIF (WANT_INTERNAL_QSCINTILLA) +LINK_DIRECTORIES(./trotl) - SET(TORA_LOKI_LIB "tora_loki_lib") IF (WANT_INTERNAL_QSCINTILLA) SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib) @@ -452,6 +453,7 @@ SET (WINDOWS_LIB "windows_lib") ENDIF (WIN32) +SET (TROTL_LIB "trotl") INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} @@ -527,8 +529,8 @@ LIST(APPEND TORA_LIBS ${WINDOWS_LIB}) ENDIF (WIN32) +LIST(APPEND TORA_LIBS ${TROTL_LIB}) - ADD_EXECUTABLE(${EXE_NAME} ${GUI_TYPE} ${TORA_I18N_QM} ${TORA_MOC_SOURCES} @@ -538,7 +540,7 @@ ${TORA_RCC_SRCS} ${APPLE_BUNDLE_SOURCES} ) - +SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LIBS}) # Test programs @@ -551,6 +553,8 @@ ${TORA_RCC_SRCS} ${APPLE_BUNDLE_SOURCES} ) +SET_TARGET_PROPERTIES(trotl_test0 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") +TARGET_LINK_LIBRARIES(trotl_test0 ${TORA_LIBS}) ADD_EXECUTABLE(trotl_test1 ${GUI_TYPE} trotl_test1.cpp @@ -561,6 +565,8 @@ ${TORA_RCC_SRCS} ${APPLE_BUNDLE_SOURCES} ) +SET_TARGET_PROPERTIES(trotl_test1 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") +TARGET_LINK_LIBRARIES(trotl_test1 ${TORA_LIBS}) ADD_EXECUTABLE(trotl_test2 ${GUI_TYPE} trotl_test2.cpp @@ -571,9 +577,7 @@ ${TORA_RCC_SRCS} ${APPLE_BUNDLE_SOURCES} ) - -TARGET_LINK_LIBRARIES(trotl_test0 ${TORA_LIBS}) -TARGET_LINK_LIBRARIES(trotl_test1 ${TORA_LIBS}) +SET_TARGET_PROPERTIES(trotl_test2 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") TARGET_LINK_LIBRARIES(trotl_test2 ${TORA_LIBS}) Modified: branches/tora-trotl/src/main.cpp =================================================================== --- branches/tora-trotl/src/main.cpp 2009-09-10 02:48:44 UTC (rev 3300) +++ branches/tora-trotl/src/main.cpp 2009-09-10 13:44:54 UTC (rev 3301) @@ -61,6 +61,7 @@ #include <QDateTime> #include <memory> +#include <iostream> #include <qapplication.h> #include <qmessagebox.h> @@ -97,9 +98,12 @@ thread_safe_log get_log() { +#ifdef Q_OS_WIN32 static std::ofstream out( "c:\\out.txt"); static internal_thread_safe_log log(out); - //static internal_thread_safe_log log( std::cerr); +#else + static internal_thread_safe_log log( std::cerr); +#endif return thread_safe_log( log); } Modified: branches/tora-trotl/src/totuning.cpp =================================================================== --- branches/tora-trotl/src/totuning.cpp 2009-09-10 02:48:44 UTC (rev 3300) +++ branches/tora-trotl/src/totuning.cpp 2009-09-10 13:44:54 UTC (rev 3301) @@ -1569,8 +1569,7 @@ QString t = unitStr; t += QString::fromLatin1("/s"); chart->setYPostfix(t); - } - else if (parts[3].mid(2, 1) == QString::fromLatin1("P")) + } else if (parts[3].mid(2, 1) == QString::fromLatin1("P")) { chart->setYPostfix(QString::fromLatin1(" %")); chart->setMinValue(0); Added: branches/tora-trotl/src/trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/trotl/CMakeLists.txt (rev 0) +++ branches/tora-trotl/src/trotl/CMakeLists.txt 2009-09-10 13:44:54 UTC (rev 3301) @@ -0,0 +1,175 @@ +############################################################################################################## +########## CMake Setup ########## +# +# Mostly copied from Tora +# +#Set our CMake minimum version +#Require 2.4.2 for Qt finding +#Require 2.4.3 for moc change detection and rpath updates for custom cairo install +CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR) +# FIXME: dont't forget to change CMP0005 policy to NEW after 2.6.0 minimum required! + +# handle new cmake versions correctly +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) + cmake_policy(SET CMP0005 NEW) # FIXME change it to new when there will be cmake 2.6.x in most distros +endif(COMMAND cmake_policy) + + +#Pretty colors +SET(CMAKE_COLOR_MAKEFILE ON) +#Dont force verbose +SET(CMAKE_VERBOSE_MAKEFILE ON) +##SET(CMAKE_VERBOSE_MAKEFILE OFF) +#Include current dir +SET(CMAKE_INCLUDE_CURRENT_DIR TRUE) + + +INCLUDE(CheckIncludeFile) +INCLUDE(CheckCCompilerFlag) +INCLUDE(CheckCXXCompilerFlag) +INCLUDE(CheckTypeSize) +INCLUDE(TestBigEndian) + +#Set the custom CMake module directory where our include/lib finders are +SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") + +#Project Setup +PROJECT(trotl) +#Set our version values +#Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX} +#where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level) +SET (VERSION_MAJOR "0") +SET (VERSION_MINOR "1") +SET (VERSION_PATCH "0") +SET (VERSION_SUFFIX "") +SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) + +SET (LIB_NAME "trotl") + +#Convert our simpler command line option to the CMake style +#None, Debug, Release, .. or custom ones +SET(WANT_DEBUG 1) +IF(WANT_DEBUG) + SET(CMAKE_BUILD_TYPE Debug) +ELSE(WANT_DEBUG) + SET(CMAKE_BUILD_TYPE RELEASE) +ENDIF(WANT_DEBUG) + +MESSAGE(STATUS "Trotl ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") + +############################################################################################################## +########## check for the arch we build for ########## + +IF (GCC) +EXECUTE_PROCESS( + COMMAND ${CMAKE_C_COMPILER} -dumpmachine + OUTPUT_VARIABLE MACHINE + OUTPUT_STRIP_TRAILING_WHITESPACE +) +MESSAGE(STATUS "Building for target ${MACHINE}") + +STRING(REGEX MATCH "(i?86-*)|(athlon-*)|(pentium-*)" _machine_x86 "${MACHINE}") +IF (_machine_x86) + MESSAGE(STATUS "Found target X86") + SET(ARCH_X86 1) +ENDIF (_machine_x86) + +STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _machine_x86_64 "${MACHINE}") +IF (_machine_x86_64) + MESSAGE(STATUS "Found target X86_64") + SET(ARCH_X86_64 1) +ENDIF (_machine_x86_64) + +STRING(REGEX MATCH "(ppc-*)" _machine_ppc "${MACHINE}") +IF (_machine_ppc) + MESSAGE(STATUS "Found target PPC") + SET(ARCH_PPC 1) +ENDIF (_machine_ppc) + +SET(CXX_WARNINGS "-Wall") +SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS} -fstrict-aliasing -rdynamic") +SET(CMAKE_C_FLAGS_DEBUG "-O0 -ggbb3 -fno-inline ${CXX_WARNINGS} -fstrict-aliasing -rdynamic") +ENDIF (GCC) + +# Lets disable Wall warnings due the MSVC too much talkative +# output. +# MSVC, MSVC_IDE, MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005 +IF (MSVC) + SET (CXX_WARNINGS "/wd4251") + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS ) + SET (CMAKE_CXX_FLAGS_DEBUG ${CXX_WARNINGS}) + +# SET (CMAKE_SHARED_LINKER_FLAGS "/INCREMENTAL:NO") +# SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG "/INCREMENTAL:NO") +# SET (CMAKE_EXE_LINKER_FLAGS "/INCREMENTAL:NO") +# SET (CMAKE_EXE_LINKER_FLAGS_DEBUG "/MANIFEST /MANIFESTUAC:\"level='asInvoker' uiAccess='false'\" ") +# SET (CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG /SUBSYSTEM:CONSOLE ") +# SET (CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DYNAMICBASE /NXCOMPAT /MACHINE:X86 ") +# SET (CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /ERRORREPORT:PROMPT ") +# SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG "/DLL /MANIFEST /MANIFESTFILE:trotl.dll.manifest ") +# SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /MANIFESTUAC:\"level='asInvoker' uiAccess='false'\" ") +# SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEBUG /PDB:trotl.pdb /DYNAMICBASE:NO ") +# SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /ERRORREPORT:PROMPT ") +# SET (CMAKE_MODULE_LINKER_FLAGS "/INCREMENTAL:NO") +# SET (CMAKE_MODULE_LINKER_FLAGS_DEBUG "/INCREMENTAL:NO") +ENDIF (MSVC) + + +#Based on our build type, setup our build options +IF(APPLE) + SET( ENV{MACOSX_DEPLOYMENT_TARGET} 10.3 ) + SET( ENV{LD_PREBIND} 1 ) + SET( ENV{LD_PREBIND_ALLOW_OVERLAP} 1 ) + SET(CMAKE_CXX_FLAGS_DEBUG "") + SET(CMAKE_C_FLAGS_DEBUG "") +ENDIF(APPLE) + + +FIND_PACKAGE(Oracle) +IF(ORACLE_FOUND) + MESSAGE("Oracle OCI Library Found OK") +ELSE(ORACLE_FOUND) + MESSAGE(FATAL_ERROR "No Oracle client found") +ENDIF(ORACLE_FOUND) + +IF(ORACLE_HAS_XML) + MESSAGE("Oracle XDK Library Found OK") +ELSE(ORACLE_HAS_XML) + MESSAGE(STATUS "No Oracle XDK found") +ENDIF(ORACLE_HAS_XML) + + +SET (QT_MT_REQUIRED true) +SET (QT_MIN_VERSION "4.4.0") +####SET (QT_USE_QTSQL TRUE) +####SET (QT_USE_QTNETWORK TRUE) +####SET (QT_USE_QTXML TRUE) +FIND_PACKAGE(Qt4 REQUIRED) +INCLUDE( ${QT_USE_FILE} ) +IF (QT_FOUND) + MESSAGE("Qt4 Found OK") + #Add our Qt definitions + ADD_DEFINITIONS( + ${QT_DEFINITIONS} + -DQT_CORE_LIB +# -DQT_GUI_LIB + -DQT_THREAD_LIB + ) +ELSE(QT_FOUND) + MESSAGE(STATUS "No Qt4 found") +ENDIF(QT_FOUND) + +############################################################################################################## +########## Include Setup ########## + +#TEST_BIG_ENDIAN(WORDS_BIGENDIAN) + +#Create configure files.. config.h and uninstall +#config.h +# INCLUDE (ConfigureChecks.cmake) +##CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) +##ADD_DEFINITIONS("-DHAVE_CONFIG_H") + +#Add our source subdirs +ADD_SUBDIRECTORY(src) Added: branches/tora-trotl/src/trotl/DOCUMENTATION.txt =================================================================== --- branches/tora-trotl/src/trotl/DOCUMENTATION.txt (rev 0) +++ branches/tora-trotl/src/trotl/DOCUMENTATION.txt 2009-09-10 13:44:54 UTC (rev 3301) @@ -0,0 +1,55 @@ +Dependencies: +Boost - only spirit headers are needed +Loki - Necessary Loki headers are included with the source +Oracle client libs - Oracle client 11G is recomended. Build with InstantClient +and is supported but XMLTYPE support should be disabled. InstantClient does not +containt XDK libs. Oracle client 10G contains buggy XDK. + +Whole library can be divided into several parts: +1. Handles, Attributes, DB Connections, Sessions. + This part was copied from OCIPL(http://www.foxplanet.de/ocipl/), + all credits belong to Martin Fuchs <mar...@gm...> + Trotl library is based on OCIPL. OCIPL is clear, readable piece of source + code. + +2. SimplePlsqlParser - I was too lazy to write my own parser for PL/SQL. + I use boost::spirit for that. The parser is the only reason why this + library depend on Boost. + Current parser is as simple as possible. + I supports Sergei Kuchin's OTL syntax. I the future there should + be a posibility to indent PL/SQL source using this parser. + +3. SqlStatement - each SQL or PL/SQL statement is represented by this class. + This class is responsible for parsing statements, declaring bindvars, ... + +3. BindPar class and its' descendents. + Instances of BindPar's descendents are used for all OCI Bind/Define + operations. All descendents should support scalar and even vector binds. + BindPar's instances are created by calling three different factories: + - BindParFactTwoParmSing::Instance() - takes string argument describing + Oracle datatype("int", "clob"). Other arguments(possition, connection + handler). Connection handler is need only for complex datatypes like BLOBs. + - DefineParFactTwoParmSing::Instance() - takes numeric argument describing + oracle datatype. This number is returned from describe select call. + - CustDefineParFactTwoParmSing::Instance() - takes string argument + describing complex datatype(SQLT_NTY) This factory is used for + SYS.XMLTYPE, but can be used for other custom datatype. + + Each BindPar descendent should register own create method with each factory. + See trotl_int.cpp. + +4. SqlValue class and its' descendent. + While BindPar classes represent Oracle datatypes and are used internally by + trotl library. SqlValue clasess represent C++ datatypes. These classes are + used by clients for reading/writting data from/to Sql statements. + +5. Convertor. + There are two convertor classes: ConvertorForRead a ConvertorForWrite. + These classes implement Loki multimethod for assigning(converting) data + from BindPar class descendent into SqlValue class descendent. + Resp. SqlValue -> BindPar, in case of ConvertorForWrite. + + There are some conversion missing. For example assigning string value into + BindParDate. + + Added: branches/tora-trotl/src/trotl/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora-trotl/src/trotl/cmake/modules/FindOracle.cmake (rev 0) +++ branches/tora-trotl/src/trotl/cmake/modules/FindOracle.cmake 2009-09-10 13:44:54 UTC (rev 3301) @@ -0,0 +1,146 @@ +# TOra: Configure Oracle libraries +# +# ORACLE_FOUND - system has Oracle OCI +# ORACLE_HAS_XML - Oracle has XDK support(full client installed) +# ORACLE_INCLUDES - where to find oci.h +# ORACLE_LIBRARIES - the libraries to link against to use Oracle OCI +# +# copyright (c) 2007 Petr Vanek <pe...@sc...> +# copyright (c) 2009 Ivan Brezina <ibr...@ib...> +# Redistribution and use is allowed according to the terms of the GPLv2 license. +# + +SET(ORACLE_FOUND "NO") +SET(ORACLE_HAS_XML "NO") +SET(ORACLE_HOME $ENV{ORACLE_HOME}) + + +IF (ORACLE_PATH_INCLUDES) + SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) +ELSE (ORACLE_PATH_INCLUDES) + SET (ORACLE_INCLUDES_LOCATION + ${ORACLE_HOME}/rdbms/public + ${ORACLE_HOME}/include + # xdk + ${ORACLE_HOME}/xdk/include + # sdk + ${ORACLE_HOME}/sdk/include + # xe on windows + ${ORACLE_HOME}/OCI/include + ) +ENDIF (ORACLE_PATH_INCLUDES) + +IF (ORACLE_PATH_LIB) + SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) +ELSE (ORACLE_PATH_LIB) + SET (ORACLE_LIB_LOCATION + # TODO add 32/64bit version here + ${ORACLE_HOME}/lib + # xe on windows + ${ORACLE_HOME}/OCI/lib/MSVC + ${ORACLE_HOME} + ) +ENDIF (ORACLE_PATH_LIB) + +FIND_PATH( + ORACLE_INCLUDES + oci.h + ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) + +FIND_PATH( + ORACLE_INCLUDES_XML + xml.h + ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) + +FIND_LIBRARY( + ORACLE_LIBRARY_CLNTSH + NAMES libclntsh clntsh oci + PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) + +FIND_LIBRARY( + ORACLE_LIBRARY_XML + NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11 + PATHS ${ORACLE_LIB_LOCATION} +) + + +SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_CLNTSH}) +IF (ORACLE_LIBRARY_XML) + LIST(APPEND ORACLE_LIBRARY ${ORACLE_LIBRARY_XML}) +ENDIF (ORACLE_LIBRARY_XML) + +IF (ORACLE_INCLUDES AND ORACLE_LIBRARY) + SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY}) + SET(ORACLE_FOUND "YES") +ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARY) + +IF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) + ADD_DEFINITIONS(-DORACLE_HAS_XML) + SET(ORACLE_HAS_XML "YES") + LIST(APPEND ORACLE_INCLUDES ${ORACLE_INCLUDES_XML}) +ENDIF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) + +# guess OCI version +IF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) + FIND_PROGRAM(AWK awk) + FIND_PROGRAM(SQLPLUS sqlplus PATHS ENV ORACLE_HOME NO_DEFAULT_PATH) + FIND_PROGRAM(SQLPLUS sqlplus) + SET (sqlplus_version "${SQLPLUS} -version | ${AWK} '/Release/ {print $3}'") + EXEC_PROGRAM(${sqlplus_version} OUTPUT_VARIABLE sqlplus_out) + MESSAGE(STATUS "found sqlplus version: ${sqlplus_out}") + + # WARNING! + # MATCHES operator is using Cmake regular expression. + # so the e.g. 9.* does not expand like shell file mask + # but as "9 and then any sequence of characters" + IF (${sqlplus_out} MATCHES "8.*") + SET(ORACLE_OCI_VERSION "8I") + ELSEIF (${sqlplus_out} MATCHES "9.*") + SET(ORACLE_OCI_VERSION "9") +# do not change the order of the ora10 checking! + ELSEIF (${sqlplus_out} MATCHES "10.2.*") + SET(ORACLE_OCI_VERSION "10G_R2") + ELSEIF (${sqlplus_out} MATCHES "10.*") + SET(ORACLE_OCI_VERSION "10G") + ELSEIF (${sqlplus_out} MATCHES "11.*") + SET(ORACLE_OCI_VERSION "11G") + ELSE (${sqlplus_out} MATCHES "8.*") + SET(ORACLE_OCI_VERSION "10G_R2") + ENDIF (${sqlplus_out} MATCHES "8.*") + + MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION}") +ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) + +MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") +MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}") +IF (ORACLE_FOUND) + IF (NOT ORACLE_FIND_QUIETLY) + MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") + MESSAGE(STATUS " ${ORACLE_INCLUDES}") + ENDIF (NOT ORACLE_FIND_QUIETLY) + # there *must* be OCI version defined for internal libraries + #IF (ORACLE_OCI_VERSION) + # ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) + #ELSE (ORACLE_OCI_VERSION) + # MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") + #ENDIF (ORACLE_OCI_VERSION) + +ELSE (ORACLE_FOUND) + MESSAGE(STATUS "Oracle not found.") + MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") + MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") + MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") + MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARY}") + IF (ORACLE_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find Oracle library") + ELSE (ORACLE_FIND_REQUIRED) + # setup the variables for silent continue + SET (ORACLE_INCLUDES "") + ENDIF (ORACLE_FIND_REQUIRED) +ENDIF (ORACLE_FOUND) Added: branches/tora-trotl/src/trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/trotl/src/CMakeLists.txt (rev 0) +++ branches/tora-trotl/src/trotl/src/CMakeLists.txt 2009-09-10 13:44:54 UTC (rev 3301) @@ -0,0 +1,171 @@ + +## TODO if want debug? +ADD_SUBDIRECTORY(stack) +SET (STACK_LIB "stack_lib") +LINK_DIRECTORIES(./stack) + +SET(TROTL_DLL_DEFINES "-DLOKI_STATIC -DEXPLICIT_EXPORT -DTROTL_MAKE_DLL") +SET(TROTL_CLIENT_DEFINES "-DLOKI_STATIC -DEXPLICIT_EXPORT -DTROTL_DLL") + +ADD_DEFINITIONS(-DORACLE_CS=DEVEL) + +INCLUDE_DIRECTORIES( +# ${CMAKE_SOURCE_DIR} +# ${CMAKE_CURRENT_SOURCE_DIR} +# ${CMAKE_BINARY_DIR} +# ${QT_INCLUDES} + ${ORACLE_INCLUDES} +# ${CMAKE_CURRENT_SOURCE_DIR}/loki/include +# ${CMAKE_CURRENT_SOURCE_DIR}/otl +# "/home/oracle/product/11.0.6/xdk/include/" +# "c:/Program Files/boost/boost_1_38" +) + +SET(TROTL_SOURCES + trotl_aq.cpp + trotl_conn.cpp + trotl_convertor.cpp + trotl_date.cpp + trotl_exc.cpp + trotl_extended_parser.cpp + trotl_int.cpp + trotl_string.cpp + trotl_lob.cpp + trotl_parser.cpp + trotl_stat.cpp + trotl_var.cpp +# trotl_xml.cpp +) + +IF(ORACLE_HAS_XML) + LIST(APPEND TROTL_SOURCES trotl_xml.cpp) +ENDIF (ORACLE_HAS_XML) + + +#IF(WIN32) +# IF (MSVC) +# # this is a must to switch off subsystem:console (console window poping up) +# # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified +# LINK_LIBRARIES(${QT_QTMAIN_LIBRARY}) +# SET (WIN32_SUBSYSTEM WIN32) +# IF (WANT_DEBUG) +# SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") +# ELSE (WANT_DEBUG) +# SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") +# ENDIF (WANT_DEBUG) +# ENDIF (MSVC) +#ENDIF(WIN32) + +SET_SOURCE_FILES_PROPERTIES(${TROTL_SOURCES} COMPILE_FLAGS ${TROTL_DLL_DEFINES}) +ADD_LIBRARY(${LIB_NAME} SHARED ${TROTL_SOURCES}) +TARGET_LINK_LIBRARIES(${LIB_NAME} ${ORACLE_LIBRARIES} ${STACK_LIB}) +#TARGET_LINK_LIBRARIES(${LIB_NAME} ${STACK_LIB} ) +#TARGET_LINK_LIBRARIES(${LIB_NAME} -lboost_thread-mt ) + +# ADD_EXECUTABLE(test_10 test_10.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_10.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_10 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_11 test_11.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_11.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_11 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_12 test_12.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_12.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_12 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_13 test_13.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_13.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_13 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_14 test_14.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_14.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_14 ${LIB_NAME}) + +#ADD_EXECUTABLE(test_15 test_15.cpp) +#SET_SOURCE_FILES_PROPERTIES(test_15.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +#TARGET_LINK_LIBRARIES(test_15 ${LIB_NAME}) + +#ADD_EXECUTABLE(test_16 test_16.cpp) +#SET_SOURCE_FILES_PROPERTIES(test_16.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +#TARGET_LINK_LIBRARIES(test_16 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_17 test_17.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_17.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_17 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_20 test_20.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_20.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_20 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_21 test_21.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_21.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_21 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_22 test_22.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_22.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_22 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_23 test_23.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_23.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_23 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_24 test_24.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_24.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_24 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_25 test_25.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_25.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_25 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_26 test_26.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_26.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_26 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_27 test_27.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_27.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_27 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_28 test_28.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_28.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_28 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_29 test_29.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_29.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_29 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_31 test_31.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_31.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_31 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_35 test_35.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_35.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_35 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_36 test_36.cpp ) +# SET_SOURCE_FILES_PROPERTIES(test_36.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_36 ${LIB_NAME}) + +# IF(ORACLE_HAS_XML) +# ADD_EXECUTABLE(test_37 test_37.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_37.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_37 ${LIB_NAME}) + +# ADD_EXECUTABLE(test_38 test_38.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_38.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_38 ${LIB_NAME}) +# ENDIF(ORACLE_HAS_XML) + +#ADD_EXECUTABLE(test_40 test_40.cpp) +#SET_SOURCE_FILES_PROPERTIES(test_40.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +#TARGET_LINK_LIBRARIES(test_40 ${LIB_NAME} ${QT_LIBRARIES} ) + +# ADD_EXECUTABLE(test_41 test_41.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_41.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_41 ${LIB_NAME} ${QT_LIBRARIES} boost_thread-mt ) + +# ADD_EXECUTABLE(test_42 test_42.cpp) +# SET_SOURCE_FILES_PROPERTIES(test_42.cpp COMPILE_FLAGS ${TROTL_CLIENT_DEFINES}) +# TARGET_LINK_LIBRARIES(test_42 ${LIB_NAME} ${QT_LIBRARIES} boost_thread-mt ) + + Added: branches/tora-trotl/src/trotl/src/Loki/AssocVector.h =================================================================== --- branches/tora-trotl/src/trotl/src/Loki/AssocVector.h (rev 0) +++ branches/tora-trotl/src/trotl/src/Loki/AssocVector.h 2009-09-10 13:44:54 UTC (rev 3301) @@ -0,0 +1,358 @@ +//////////////////////////////////////////////////////////////////////////////// +// The Loki Library +// Copyright (c) 2001 by Andrei Alexandrescu +// This code accompanies the book: +// Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design +// Patterns Applied". Copyright (c) 2001. Addison-Wesley. +// Permission to use, copy, modify, distribute and sell this software for any +// purpose is hereby granted without fee, provided that the above copyright +// notice appear in all copies and that both that copyright notice and this +// permission notice appear in supporting documentation. +// The author or Addison-Wesley Longman make no representations about the +// suitability of this software for any purpose. It is provided "as is" +// without express or implied warranty. +//////////////////////////////////////////////////////////////////////////////// +#ifndef LOKI_ASSOCVECTOR_INC_ +#define LOKI_ASSOCVECTOR_INC_ + +// $Id: AssocVector.h 765 2006-10-18 13:55:32Z syntheticpp $ + + +#include <algorithm> +#include <functional> +#include <vector> +#include <utility> + +namespace Loki +{ +//////////////////////////////////////////////////////////////////////////////// +// class template AssocVectorCompare +// Used by AssocVector +//////////////////////////////////////////////////////////////////////////////// + + namespace Private + { + template <class Value, class C> + class AssocVectorCompare : public C + { + typedef std::pair<typename C::first_argument_type, Value> + Data; + typedef typename C::first_argument_type first_argument_type; + + public: + AssocVectorCompare() + {} + + AssocVectorCompare(const C& src) : C(src) + {} + + bool operator()(const first_argument_type& lhs, + const first_argument_type& rhs) const + { return C::operator()(lhs, rhs); } + + bool operator()(const Data& lhs, const Data& rhs) const + { return operator()(lhs.first, rhs.first); } + + bool operator()(const Data& lhs, + const first_argument_type& rhs) const + { return operator()(lhs.first, rhs); } + + bool operator()(const first_argument_type& lhs, + const Data& rhs) const + { return operator()(lhs, rhs.first); } + }; + } + +//////////////////////////////////////////////////////////////////////////////// +// class template AssocVector +// An associative vector built as a syntactic drop-in replacement for std::map +// BEWARE: AssocVector doesn't respect all map's guarantees, the most important +// being: +// * iterators are invalidated by insert and erase operations +// * the complexity of insert/erase is O(N) not O(log N) +// * value_type is std::pair<K, V> not std::pair<const K, V> +// * iterators are random +//////////////////////////////////////////////////////////////////////////////// + + + template + < + class K, + class V, + class C = std::less<K>, + class A = std::allocator< std::pair<K, V> > + > + class AssocVector + : private std::vector< std::pair<K, V>, A > + , private Private::AssocVectorCompare<V, C> + { + typedef std::vector<std::pair<K, V>, A> Base; + typedef Private::AssocVectorCompare<V, C> MyCompare; + + public: + typedef K key_type; + typedef V mapped_type; + typedef typename Base::value_type value_type; + + typedef C key_compare; + typedef A allocator_type; + typedef typename A::reference reference; + typedef typename A::const_reference const_reference; + typedef typename Base::iterator iterator; + typedef typename Base::const_iterator const_iterator; + typedef typename Base::size_type size_type; + typedef typename Base::difference_type difference_type; + typedef typename A::pointer pointer; + typedef typename A::const_pointer const_pointer; + typedef typename Base::reverse_iterator reverse_iterator; + typedef typename Base::const_reverse_iterator const_reverse_iterator; + + class value_compare + : public std::binary_function<value_type, value_type, bool> + , private key_compare + { + friend class AssocVector; + + protected: + value_compare(key_compare pred) : key_compare(pred) + {} + + public: + bool operator()(const value_type& lhs, const value_type& rhs) const + { return key_compare::operator()(lhs.first, rhs.first); } + }; + + // 23.3.1.1 construct/copy/destroy + + explicit AssocVector(const key_compare& comp = key_compare(), + const A& alloc = A()) + : Base(alloc), MyCompare(comp) + {} + + template <class InputIterator> + AssocVector(InputIterator first, InputIterator last, + const key_compare& comp = key_compare(), + const A& alloc = A()) + : Base(first, last, alloc), MyCompare(comp) + { + MyCompare& me = *this; + std::sort(begin(), end(), me); + } + + AssocVector& operator=(const AssocVector& rhs) + { + AssocVector(rhs).swap(*this); + return *this; + } + + // iterators: + // The following are here because MWCW gets 'using' wrong + iterator begin() { return Base::begin(); } + const_iterator begin() const { return Base::begin(); } + iterator end() { return Base::end(); } + const_iterator end() const { return Base::end(); } + reverse_iterator rbegin() { return Base::rbegin(); } + const_reverse_iterator rbegin() const { return Base::rbegin(); } + reverse_iterator rend() { return Base::rend(); } + const_reverse_iterator rend() const { return Base::rend(); } + + // capacity: + bool empty() const { return Base::empty(); } + size_type size() const { return Base::size(); } + size_type max_size() { return Base::max_size(); } + + // 23.3.1.2 element access: + mapped_type& operator[](const key_type& key) + { return insert(value_type(key, mapped_type())).first->second; } + + // modifiers: + std::pair<iterator, bool> insert(const value_type& val) + { + bool found(true); + iterator i(lower_bound(val.first)); + + if (i == end() || this->operator()(val.first, i->first)) + { + i = Base::insert(i, val); + found = false; + } + return std::make_pair(i, !found); + } + //Section [23.1.2], Table 69 + //http://developer.apple.com/documentation/DeveloperTools/gcc-3.3/libstdc++/23_containers/howto.html#4 + iterator insert(iterator pos, const value_type& val) + { + if( (pos == begin() || this->operator()(*(pos-1),val)) && + (pos == end() || this->operator()(val, *pos)) ) + { + return Base::insert(pos, val); + } + return insert(val).first; + } + + template <class InputIterator> + void insert(InputIterator first, InputIterator last) + { for (; first != last; ++first) insert(*first); } + + void erase(iterator pos) + { Base::erase(pos); } + + size_type erase(const key_type& k) + { + iterator i(find(k)); + if (i == end()) return 0; + erase(i); + return 1; + } + + void erase(iterator first, iterator last) + { Base::erase(first, last); } + + void swap(AssocVector& other) + { + Base::swap(other); + MyCompare& me = *this; + MyCompare& rhs = other; + std::swap(me, rhs); + } + + void clear() + { Base::clear(); } + + // observers: + key_compare key_comp() const + { return *this; } + + value_compare value_comp() const + { + const key_compare& comp = *this; + return value_compare(comp); + } + + // 23.3.1.3 map operations: + iterator find(const key_type& k) + { + iterator i(lower_bound(k)); + if (i != end() && this->operator()(k, i->first)) + { + i = end(); + } + return i; + } + + const_iterator find(const key_type& k) const + { + const_iterator i(lower_bound(k)); + if (i != end() && this->operator()(k, i->first)) + { + i = end(); + } + return i; + } + + size_type count(const key_type& k) const + { return find(k) != end(); } + + iterator lower_bound(const key_type& k) + { + MyCompare& me = *this; + return std::lower_bound(begin(), end(), k, me); + } + + const_iterator lower_bound(const key_type& k) const + { + const MyCompare& me = *this; + return std::lower_bound(begin(), end(), k, me); + } + + iterator upper_bound(const key_type& k) + { + MyCompare& me = *this; + return std::upper_bound(begin(), end(), k, me); + } + + const_iterator upper_bound(const key_type& k) const + { + const MyCompare& me = *this; + return std::upper_bound(begin(), end(), k, me); + } + + std::pair<iterator, iterator> equal_range(const key_type& k) + { + MyCompare& me = *this; + return std::equal_range(begin(), end(), k, me); + } + + std::pair<const_iterator, const_iterator> equal_range( + const key_type& k) const + { + const MyCompare& me = *this; + return std::equal_range(begin(), end(), k, me); + } + + template <class K1, class V1, class C1, class A1> + friend bool operator==(const AssocVector<K1, V1, C1, A1>& lhs, + const AssocVector<K1, V1, C1, A1>& rhs); + + bool operator<(const AssocVector& rhs) const + { + const Base& me = *this; + const Base& yo = rhs; + return me < yo; + } + + template <class K1, class V1, class C1, class A1> + friend bool operator!=(const AssocVector<K1, V1, C1, A1>& lhs, + const AssocVector<K1, V1, C1, A1>& rhs); + + template <class K1, class V1, class C1, class A1> + friend bool operator>(const AssocVector<K1, V1, C1, A1>& lhs, + const AssocVector<K1, V1, C1, A1>& rhs); + + template <class K1, class V1, class C1, class A1> + friend bool operator>=(const AssocVector<K1, V1, C1, A1>& lhs, + const AssocVector<K1, V1, C1, A1>& rhs); + + template <class K1, class V1, class C1, class A1> + friend bool operator<=(const AssocVector<K1, V1, C1, A1>& lhs, + const AssocVector<K1, V1, C1, A1>& rhs); + }; + + template <class K, class V, class C, class A> + inline bool operator==(const AssocVector<K, V, C, A>& lhs, + const AssocVector<K, V, C, A>& rhs) + { + const std::vector<std::pair<K, V>, A>& me = lhs; + return me == rhs; + } + + template <class K, class V, class C, class A> + inline bool operator!=(const AssocVector<K, V, C, A>& lhs, + const AssocVector<K, V, C, A>& rhs) + { return !(lhs == rhs); } + + template <class K, class V, class C, class A> + inline bool operator>(const AssocVector<K, V, C, A>& lhs, + const AssocVector<K, V, C, A>& rhs) + { return rhs < lhs; } + + template <class K, class V, class C, class A> + inline bool operator>=(const AssocVector<K, V, C, A>& lhs, + const AssocVector<K, V, C, A>& rhs) + { return !(lhs < rhs); } + + template <class K, class V, class C, class A> + inline bool operator<=(const AssocVector<K, V, C, A>& lhs, + const AssocVector<K, V, C, A>& rhs) + { return !(rhs < lhs); } + + + // specialized algorithms: + template <class K, class V, class C, class A> + void swap(AssocVector<K, V, C, A>& lhs, AssocVector<K, V, C, A>& rhs) + { lhs.swap(rhs); } + +} // namespace Loki + +#endif // end file guardian + Added: branches/tora-trotl/src/trotl/src/Loki/EmptyType.h =================================================================== --- branches/tora-trotl/src/trotl/src/Loki/EmptyType.h (rev 0) +++ branches/tora-trotl/src/trotl/src/Loki/EmptyType.h 2009-09-10 13:44:54 UTC (rev 3301) @@ -0,0 +1,49 @@ +//////////////////////////////////////////////////////////////////////////////// +// The Loki Library +// Copyright (c) 2001 by Andrei Alexandrescu +// This code accompanies the book: +// Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design +// Patterns Applied". Copyright (c) 2001. Addison-Wesley. +// Permission to use, copy, modify, distribute and sell this software for any +// purpose is hereby granted without fee, provided that the above copyright +// notice appear in all copies and that both that copyright notice and this +// permission notice appear in supporting documentation. +// The author or Addison-Wesley Longman make no representations about the +// suitability of this software for any purpose. It is provided "as is" +// without express or implied warranty. +//////////////////////////////////////////////////////////////////////////////// +#ifndef LOKI_EMPTYTYPE_INC_ +#define LOKI_EMPTYTYPE_INC_ + +// $Id: EmptyType.h 751 2006-10-17 19:50:37Z syntheticpp $ + + +namespace Loki +{ +//////////////////////////////////////////////////////////////////////////////// +// class EmptyType +// Used as a class type that doesn't hold anything +// Useful as a strawman class +//////////////////////////////////////////////////////////////////////////////// + + class EmptyType {}; + + + inline bool operator==(const EmptyType&, const EmptyType&) + { + return true; + } + + inline bool operator<(const EmptyType&, const EmptyType&) + { + return false; + } + + inline bool operator>(const EmptyType&, const EmptyType&) + { + return false; + } +} + +#endif // end file guardian + Added: branches/tora-trotl/src/trotl/src/Loki/Factory_alt.h =================================================================== --- branches/tora-trotl/src/trotl/src/Loki/Factory_alt.h (rev 0) +++ branches/tora-trotl/src/trotl/src/Loki/Factory_alt.h 2009-09-10 13:44:54 UTC (rev 3301) @@ -0,0 +1,500 @@ +/* + * This file was download from: + * http://codewrangler.home.comcast.net/~codewrangler/utility/factory.h + * and refreshed a little bit by ibre5041 + * + * Copyright (c) 2001 by Cliff Green. All rights reserved. Individual files + * may be covered by other copyrights (as noted in the file itself). + * + * Redistribution and use in source and binary forms are permitted + * provided that this entire copyright notice is duplicated in all such + * copies. + * + * This software is provided "as is" and without any expressed or implied + * warranties, including, without limitation, the implied warranties of + * merchantibility and fitness for any particular purpose. + */ +//---------------------------------------------------------------------- +// Source file: factory.h +// Written by: Jim Hyslop, Cliff Green, 2001 +// Compiler: Metrowerks CodeWarrior Pro 6 +// History: +// Modified: 8/28/2001 +// By: Cliff Green +// Comments: Modified to use typelist and typetraits facilities from +// Andrei Alexandrescu's Loki library. +//---------------------------------------------------------------------- +// Although significantly modified from the original, this code was +// inspired by Herb Sutter and Jim Hyslop's object factory template, +// and the original copyright notice from Jim appears here: +//---------------------------------------------------------------------- +// +// Copyright 2001, Jim Hyslop. +// This file may be freely used, modified and distributed, provided that +// the accompanying copyright notice remains intact. +// +//---------------------------------------------------------------------- +// This commentheader supports documentation tools such as Doc++ and +// Doxygen: http://www.doxygen.org/ +//---------------------------------------------------------------------- +/// Generic object factory template classes. +/** + * This generic object factory template is a utility used in creating + * objects of related (by inheritance) types. It can be used as a building + * block in Abstract Factory patterns, or "as is" without attempting to + * relate sets of derived types together. + * + * The Abstract Class Factory pattern is discussed in "Design Patterns: + * Elements of Reusable Object-Oriented Software", E. Gamma, R. Helm, + * R. Johnson, J. Vlissides, Addison Wesley [1995] + * + * This utility requires the Loki library: + * http://www.moderncppdesign.com/ + * + * This utility is based on code provided by Herb Sutter and Jim Hyslop + * from the June edition of the Experts Forum, C/C++ Users Journal + * (http://www.cuj.com/). Quite a bit of the original code from Herb and Jim + * is still present, but has been substantially added to and expanded (with + * the typelist and typetraits facilities from Andrei Alexandrescu). Note + * that Andrei has a similar templatized Object and Abstract Factory in his + * Loki library that is more flexible (except for the constructor parameters) + * but I wanted to develop my own version based on the foundation from + * Herb and Jim (mostly as a learning exercise). + * + * There are two main differences from the original code from Hyslop: + * 1. Constructor parameter possibilities have been expanded from + * no parameters to up to four parameters. + * 2. The GenericFactory class is expected to be wrapped in a Loki + * SingletonHolder (the RegisterInFactory template expects it, or + * a similar interface). + * + * The additional constructor parameters are implemented by using Andrei's + * typelist facilities, and partially specializing on 0 to 4 parameters + * (resulting in five versions of the template classes). All of the + * function parameters are enhanced using Loki TypeTraits<T>::ParameterType + * facilities (for efficient passing of function arguments). + * + * There are two template class utilities: + * 1. The RegisterInFactory class, which simplifies registering a creation + * function in GenericFactory. In particular, this allows registering + * creation functions in appropriate implementation files (e.g. .cpp + * files corresponding to each derived class) in an unnamed namespace. + * This separates registration of derived classes from a centralized + * point (e.g. 'main' function) into a more specific area (where the + * derived classes are implemented). + * 2. A GenericFactory class, which has an implementation class that is + * specialized five times (for up to four constructor parameters). + * + * To use the GenericFactory template, you need to provide a base class type, + * a list of constructor parameter types (defaults to empty, which means a + * constructor taking no parameters) and an optional key type. The key class + * must be able to be used as a key in a std::map, i.e. it must + * 1. implement copy and assignment semantics + * 2. provide bool operator< () const; + * The default for the key class is std::string. + * + * Steps to using the factory: + * 1. Create the base class and its derivatives. + * 2. Register each class in th... [truncated message content] |
From: <ibr...@us...> - 2010-02-10 01:26:03
|
Revision: 3397 http://tora.svn.sourceforge.net/tora/?rev=3397&view=rev Author: ibre5041 Date: 2010-02-10 00:37:31 +0000 (Wed, 10 Feb 2010) Log Message: ----------- sync with trunk + new logging Modified Paths: -------------- branches/tora-trotl/NEWS branches/tora-trotl/README.LAYOUT branches/tora-trotl/README.WINDOWS branches/tora-trotl/cmake/modules/FindOracle.cmake branches/tora-trotl/configure.ac branches/tora-trotl/debian/changelog branches/tora-trotl/doc/help/Index_002dlist.html branches/tora-trotl/doc/help/Makefile.am branches/tora-trotl/doc/help/additionalhelp.html branches/tora-trotl/doc/help/additionalhelp.texi branches/tora-trotl/doc/help/alert.html branches/tora-trotl/doc/help/alert.texi branches/tora-trotl/doc/help/analyze.html branches/tora-trotl/doc/help/analyze.texi branches/tora-trotl/doc/help/api.html branches/tora-trotl/doc/help/browser.html branches/tora-trotl/doc/help/browser.texi branches/tora-trotl/doc/help/charts.html branches/tora-trotl/doc/help/charts.texi branches/tora-trotl/doc/help/common.html branches/tora-trotl/doc/help/common.texi branches/tora-trotl/doc/help/current.html branches/tora-trotl/doc/help/current.texi branches/tora-trotl/doc/help/database.html branches/tora-trotl/doc/help/database.texi branches/tora-trotl/doc/help/debugger.html branches/tora-trotl/doc/help/debugger.texi branches/tora-trotl/doc/help/editors.html branches/tora-trotl/doc/help/extendingtora.html branches/tora-trotl/doc/help/externalapi.html branches/tora-trotl/doc/help/globalsettings.html branches/tora-trotl/doc/help/help.html branches/tora-trotl/doc/help/help.texi branches/tora-trotl/doc/help/history.html branches/tora-trotl/doc/help/images/additionalhelp.png branches/tora-trotl/doc/help/images/analyze.png branches/tora-trotl/doc/help/images/browser.png branches/tora-trotl/doc/help/images/browserfilter.png branches/tora-trotl/doc/help/images/charts.png branches/tora-trotl/doc/help/images/chartsetup.png branches/tora-trotl/doc/help/images/contentfilter.png branches/tora-trotl/doc/help/images/current.png branches/tora-trotl/doc/help/images/database.png branches/tora-trotl/doc/help/images/difference.png branches/tora-trotl/doc/help/images/editmenu.png branches/tora-trotl/doc/help/images/filemenu.png branches/tora-trotl/doc/help/images/getparam.png branches/tora-trotl/doc/help/images/help.png branches/tora-trotl/doc/help/images/helpmenu.png branches/tora-trotl/doc/help/images/invalid.png branches/tora-trotl/doc/help/images/lists.png branches/tora-trotl/doc/help/images/memo.png branches/tora-trotl/doc/help/images/newconnection.png branches/tora-trotl/doc/help/images/oracle.png branches/tora-trotl/doc/help/images/output.png branches/tora-trotl/doc/help/images/preferences.png branches/tora-trotl/doc/help/images/priviledges.png branches/tora-trotl/doc/help/images/quota.png branches/tora-trotl/doc/help/images/resize.png branches/tora-trotl/doc/help/images/rollback.png branches/tora-trotl/doc/help/images/rollbacksetup.png branches/tora-trotl/doc/help/images/script.png branches/tora-trotl/doc/help/images/searchreplace.png branches/tora-trotl/doc/help/images/security.png branches/tora-trotl/doc/help/images/session.png branches/tora-trotl/doc/help/images/sgastatement.png branches/tora-trotl/doc/help/images/sgatrace.png branches/tora-trotl/doc/help/images/sqledit.png branches/tora-trotl/doc/help/images/storage.png branches/tora-trotl/doc/help/images/tools.png branches/tora-trotl/doc/help/images/toolsmenu.png branches/tora-trotl/doc/help/images/tuning.png branches/tora-trotl/doc/help/images/visualize.png branches/tora-trotl/doc/help/images/windowsmenu.png branches/tora-trotl/doc/help/images/worksheet.png branches/tora-trotl/doc/help/images/worksheetsetup.png branches/tora-trotl/doc/help/images/workspace.png branches/tora-trotl/doc/help/index.html branches/tora-trotl/doc/help/invalid.html branches/tora-trotl/doc/help/invalid.texi branches/tora-trotl/doc/help/lists.html branches/tora-trotl/doc/help/lists.texi branches/tora-trotl/doc/help/newconnection.html branches/tora-trotl/doc/help/newconnection.texi branches/tora-trotl/doc/help/output.html branches/tora-trotl/doc/help/output.texi branches/tora-trotl/doc/help/plsqleditor.html branches/tora-trotl/doc/help/plsqleditor.texi branches/tora-trotl/doc/help/preferences.html branches/tora-trotl/doc/help/preferences.texi branches/tora-trotl/doc/help/rollback.html branches/tora-trotl/doc/help/rollback.texi branches/tora-trotl/doc/help/script.html branches/tora-trotl/doc/help/script.texi branches/tora-trotl/doc/help/searchreplace.html branches/tora-trotl/doc/help/searchreplace.texi branches/tora-trotl/doc/help/security.html branches/tora-trotl/doc/help/security.texi branches/tora-trotl/doc/help/session.html branches/tora-trotl/doc/help/session.texi branches/tora-trotl/doc/help/sqledit.html branches/tora-trotl/doc/help/sqledit.texi branches/tora-trotl/doc/help/storage.html branches/tora-trotl/doc/help/storage.texi branches/tora-trotl/doc/help/template.html branches/tora-trotl/doc/help/template.texi branches/tora-trotl/doc/help/toc.html branches/tora-trotl/doc/help/tools.html branches/tora-trotl/doc/help/toolsetting.html branches/tora-trotl/doc/help/toolsetting.texi branches/tora-trotl/doc/help/tora.texi branches/tora-trotl/doc/help/trace.html branches/tora-trotl/doc/help/trace.texi branches/tora-trotl/doc/help/tuning.html branches/tora-trotl/doc/help/tuning.texi branches/tora-trotl/doc/help/unittest.html branches/tora-trotl/doc/help/window.html branches/tora-trotl/doc/help/window.texi branches/tora-trotl/doc/help/worksheet.html branches/tora-trotl/doc/help/worksheet.texi branches/tora-trotl/doc/help/workspace.html branches/tora-trotl/doc/help/workspace.texi branches/tora-trotl/rpm/tora.spec.in branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/Makefile.am branches/tora-trotl/src/main.cpp branches/tora-trotl/src/toabout.cpp branches/tora-trotl/src/toawr.cpp branches/tora-trotl/src/tobrowsertable.cpp branches/tora-trotl/src/tobrowsertable.h branches/tora-trotl/src/tobrowsertableui.ui branches/tora-trotl/src/tobrowsertablewidget.cpp branches/tora-trotl/src/tobrowserviewwidget.cpp branches/tora-trotl/src/tobrowserviewwidget.h branches/tora-trotl/src/toconf.h branches/tora-trotl/src/toconfiguration.cpp branches/tora-trotl/src/toconfiguration.h branches/tora-trotl/src/toconnection.cpp branches/tora-trotl/src/toconnectionpool.cpp branches/tora-trotl/src/todatatype.cpp branches/tora-trotl/src/todatatype.h branches/tora-trotl/src/toeditextensions.cpp branches/tora-trotl/src/toeditextensions.h branches/tora-trotl/src/toeventquery.cpp branches/tora-trotl/src/toextract.cpp branches/tora-trotl/src/toextract.h branches/tora-trotl/src/tohighlightedtext.cpp branches/tora-trotl/src/tohighlightedtext.h branches/tora-trotl/src/tomarkedtext.cpp branches/tora-trotl/src/tonoblockquery.cpp branches/tora-trotl/src/tooracleconnection.cpp branches/tora-trotl/src/tooracleextract.cpp branches/tora-trotl/src/toplsqleditor.cpp branches/tora-trotl/src/toplsqleditor.h branches/tora-trotl/src/toplsqltext.cpp branches/tora-trotl/src/toplsqltext.h branches/tora-trotl/src/tora.qrc branches/tora-trotl/src/tora_logger.h branches/tora-trotl/src/toreport.cpp branches/tora-trotl/src/toresultstorage.cpp branches/tora-trotl/src/toresulttableview.cpp branches/tora-trotl/src/tosession.cpp branches/tora-trotl/src/tosql.cpp branches/tora-trotl/src/tosyntaxsetup.cpp branches/tora-trotl/src/tosyntaxsetupui.ui branches/tora-trotl/src/tothread.cpp branches/tora-trotl/src/toworksheet.cpp branches/tora-trotl/src/toworksheet.h branches/tora-trotl/src/trotl/src/stack/stack.cpp branches/tora-trotl/src/trotl/src/ts_log/ts_log_utils.h branches/tora-trotl/src/trotl_test2.cpp branches/tora-trotl/src/ts_log/critical_section.h branches/tora-trotl/src/ts_log/ts_log_utils.h branches/tora-trotl/src/utils.cpp branches/tora-trotl/src/utils.h Added Paths: ----------- branches/tora-trotl/doc/help/editor.html branches/tora-trotl/doc/help/editor.texi branches/tora-trotl/doc/help/explainplan.html branches/tora-trotl/doc/help/explainplan.texi branches/tora-trotl/doc/help/gettingbindparameters.html branches/tora-trotl/doc/help/gettingbindparameters.texi branches/tora-trotl/doc/help/images/editor.png branches/tora-trotl/doc/help/images/mysql.png branches/tora-trotl/doc/help/make-pdf.sh branches/tora-trotl/doc/help/memoeditor.html branches/tora-trotl/doc/help/memoeditor.texi branches/tora-trotl/doc/help/objectdescription.html branches/tora-trotl/doc/help/objectdescription.texi branches/tora-trotl/doc/help/sgastatement.html branches/tora-trotl/doc/help/sgastatement.texi branches/tora-trotl/doc/help/whatprivileges.html branches/tora-trotl/doc/help/whatprivileges.texi branches/tora-trotl/osx_tools/Info.plist.in branches/tora-trotl/osx_tools/dmg/ branches/tora-trotl/osx_tools/dmg/background-page001.png branches/tora-trotl/osx_tools/dmg/background.sla branches/tora-trotl/osx_tools/dmg/readme.html branches/tora-trotl/osx_tools/dmg/tora.dmgCanvas branches/tora-trotl/src/help/Index_002dlist.html branches/tora-trotl/src/help/additionalhelp.html branches/tora-trotl/src/help/alert.html branches/tora-trotl/src/help/analyze.html branches/tora-trotl/src/help/api.html branches/tora-trotl/src/help/browser.html branches/tora-trotl/src/help/charts.html branches/tora-trotl/src/help/common.html branches/tora-trotl/src/help/current.html branches/tora-trotl/src/help/database.html branches/tora-trotl/src/help/debugger.html branches/tora-trotl/src/help/editor.html branches/tora-trotl/src/help/editors.html branches/tora-trotl/src/help/explainplan.html branches/tora-trotl/src/help/extendingtora.html branches/tora-trotl/src/help/externalapi.html branches/tora-trotl/src/help/gettingbindparameters.html branches/tora-trotl/src/help/globalsettings.html branches/tora-trotl/src/help/help.html branches/tora-trotl/src/help/history.html branches/tora-trotl/src/help/images/additionalhelp.png branches/tora-trotl/src/help/images/addwatch.png branches/tora-trotl/src/help/images/alert.png branches/tora-trotl/src/help/images/analyze.png branches/tora-trotl/src/help/images/browser.png branches/tora-trotl/src/help/images/browserfilter.png branches/tora-trotl/src/help/images/changewatch.png branches/tora-trotl/src/help/images/charts.png branches/tora-trotl/src/help/images/chartsetup.png branches/tora-trotl/src/help/images/contentfilter.png branches/tora-trotl/src/help/images/current.png branches/tora-trotl/src/help/images/database.png branches/tora-trotl/src/help/images/debugger.png branches/tora-trotl/src/help/images/describe.png branches/tora-trotl/src/help/images/difference.png branches/tora-trotl/src/help/images/editmenu.png branches/tora-trotl/src/help/images/editor.png branches/tora-trotl/src/help/images/filemenu.png branches/tora-trotl/src/help/images/fonts.png branches/tora-trotl/src/help/images/getparam.png branches/tora-trotl/src/help/images/help.png branches/tora-trotl/src/help/images/helpmenu.png branches/tora-trotl/src/help/images/invalid.png branches/tora-trotl/src/help/images/largelogo.png branches/tora-trotl/src/help/images/lists.png branches/tora-trotl/src/help/images/memo.png branches/tora-trotl/src/help/images/mysql.png branches/tora-trotl/src/help/images/newconnection.png branches/tora-trotl/src/help/images/oracle.png branches/tora-trotl/src/help/images/output.png branches/tora-trotl/src/help/images/pfileeditor.png branches/tora-trotl/src/help/images/preferences.png branches/tora-trotl/src/help/images/priviledges.png branches/tora-trotl/src/help/images/quota.png branches/tora-trotl/src/help/images/resize.png branches/tora-trotl/src/help/images/rollback.png branches/tora-trotl/src/help/images/rollbacksetup.png branches/tora-trotl/src/help/images/script.png branches/tora-trotl/src/help/images/searchreplace.png branches/tora-trotl/src/help/images/security.png branches/tora-trotl/src/help/images/session.png branches/tora-trotl/src/help/images/sgastatement.png branches/tora-trotl/src/help/images/sgatrace.png branches/tora-trotl/src/help/images/sqledit.png branches/tora-trotl/src/help/images/storage.png branches/tora-trotl/src/help/images/template.png branches/tora-trotl/src/help/images/templateeditor.png branches/tora-trotl/src/help/images/templatesetup.png branches/tora-trotl/src/help/images/toolbar.png branches/tora-trotl/src/help/images/tools.png branches/tora-trotl/src/help/images/toolsmenu.png branches/tora-trotl/src/help/images/tuning.png branches/tora-trotl/src/help/images/visualize.png branches/tora-trotl/src/help/images/windowsmenu.png branches/tora-trotl/src/help/images/worksheet.png branches/tora-trotl/src/help/images/worksheetsetup.png branches/tora-trotl/src/help/images/workspace.png branches/tora-trotl/src/help/index.html branches/tora-trotl/src/help/invalid.html branches/tora-trotl/src/help/lists.html branches/tora-trotl/src/help/memoeditor.html branches/tora-trotl/src/help/newconnection.html branches/tora-trotl/src/help/objectdescription.html branches/tora-trotl/src/help/output.html branches/tora-trotl/src/help/plsqleditor.html branches/tora-trotl/src/help/preferences.html branches/tora-trotl/src/help/rollback.html branches/tora-trotl/src/help/script.html branches/tora-trotl/src/help/searchreplace.html branches/tora-trotl/src/help/security.html branches/tora-trotl/src/help/session.html branches/tora-trotl/src/help/sgastatement.html branches/tora-trotl/src/help/sqledit.html branches/tora-trotl/src/help/storage.html branches/tora-trotl/src/help/template.html branches/tora-trotl/src/help/toc.html branches/tora-trotl/src/help/tools.html branches/tora-trotl/src/help/toolsetting.html branches/tora-trotl/src/help/trace.html branches/tora-trotl/src/help/tuning.html branches/tora-trotl/src/help/unittest.html branches/tora-trotl/src/help/whatprivileges.html branches/tora-trotl/src/help/window.html branches/tora-trotl/src/help/worksheet.html branches/tora-trotl/src/help/workspace.html branches/tora-trotl/src/icons/checkcode.xpm branches/tora-trotl/src/icons/simplequery.xpm branches/tora-trotl/src/tooracleextract.h branches/tora-trotl/src/tooracletable.cpp branches/tora-trotl/src/trotl/src/ts_log/decorator.h branches/tora-trotl/src/trotl/src/ts_log/message_handler_log.h branches/tora-trotl/src/trotl/src/ts_log/thread_safe_log.h branches/tora-trotl/src/ts_log/decorator.h branches/tora-trotl/src/ts_log/message_handler_log.h branches/tora-trotl/src/ts_log/thread_safe_log.h branches/tora-trotl/tora-trotl.config branches/tora-trotl/tora-trotl.creator branches/tora-trotl/tora-trotl.files branches/tora-trotl/tora-trotl.includes branches/tora-trotl/win32-cross/ branches/tora-trotl/win32-cross/Makefile.am.patch branches/tora-trotl/win32-cross/README branches/tora-trotl/win32-cross/build-tora-w32.sh branches/tora-trotl/win32-cross/make-install-tora.sh branches/tora-trotl/win32-cross/oracle.m4.patch branches/tora-trotl/win32-cross/prepare-libs.sh branches/tora-trotl/win32-cross/tora.bat Removed Paths: ------------- branches/tora-trotl/doc/help/Explain-plan.html branches/tora-trotl/doc/help/Getting-bind-parameters.html branches/tora-trotl/doc/help/Memo-editor.html branches/tora-trotl/doc/help/Object-description.html branches/tora-trotl/doc/help/SGA-Statement.html branches/tora-trotl/doc/help/What-privileges-do-you-need-to-run-TOra.html branches/tora-trotl/doc/help/fonts.html branches/tora-trotl/doc/help/fonts.texi branches/tora-trotl/osx_tools/dmg/background-page001.png branches/tora-trotl/osx_tools/dmg/background.sla branches/tora-trotl/osx_tools/dmg/readme.html branches/tora-trotl/osx_tools/dmg/tora.dmgCanvas branches/tora-trotl/src/help/Explain-plan.html branches/tora-trotl/src/help/Getting-bind-parameters.html branches/tora-trotl/src/help/Index_002dlist.html branches/tora-trotl/src/help/Memo-editor.html branches/tora-trotl/src/help/Object-description.html branches/tora-trotl/src/help/SGA-Statement.html branches/tora-trotl/src/help/What-privileges-do-you-need-to-run-TOra.html branches/tora-trotl/src/help/additionalhelp.html branches/tora-trotl/src/help/alert.html branches/tora-trotl/src/help/analyze.html branches/tora-trotl/src/help/api.html branches/tora-trotl/src/help/browser.html branches/tora-trotl/src/help/charts.html branches/tora-trotl/src/help/common.html branches/tora-trotl/src/help/current.html branches/tora-trotl/src/help/database.html branches/tora-trotl/src/help/debugger.html branches/tora-trotl/src/help/editors.html branches/tora-trotl/src/help/extendingtora.html branches/tora-trotl/src/help/externalapi.html branches/tora-trotl/src/help/fonts.html branches/tora-trotl/src/help/globalsettings.html branches/tora-trotl/src/help/help.html branches/tora-trotl/src/help/history.html branches/tora-trotl/src/help/images/additionalhelp.png branches/tora-trotl/src/help/images/addwatch.png branches/tora-trotl/src/help/images/alert.png branches/tora-trotl/src/help/images/analyze.png branches/tora-trotl/src/help/images/browser.png branches/tora-trotl/src/help/images/browserfilter.png branches/tora-trotl/src/help/images/changewatch.png branches/tora-trotl/src/help/images/charts.png branches/tora-trotl/src/help/images/chartsetup.png branches/tora-trotl/src/help/images/contentfilter.png branches/tora-trotl/src/help/images/current.png branches/tora-trotl/src/help/images/database.png branches/tora-trotl/src/help/images/debugger.png branches/tora-trotl/src/help/images/describe.png branches/tora-trotl/src/help/images/difference.png branches/tora-trotl/src/help/images/editmenu.png branches/tora-trotl/src/help/images/filemenu.png branches/tora-trotl/src/help/images/fonts.png branches/tora-trotl/src/help/images/getparam.png branches/tora-trotl/src/help/images/help.png branches/tora-trotl/src/help/images/helpmenu.png branches/tora-trotl/src/help/images/invalid.png branches/tora-trotl/src/help/images/largelogo.png branches/tora-trotl/src/help/images/lists.png branches/tora-trotl/src/help/images/memo.png branches/tora-trotl/src/help/images/newconnection.png branches/tora-trotl/src/help/images/oracle.png branches/tora-trotl/src/help/images/output.png branches/tora-trotl/src/help/images/pfileeditor.png branches/tora-trotl/src/help/images/preferences.png branches/tora-trotl/src/help/images/priviledges.png branches/tora-trotl/src/help/images/quota.png branches/tora-trotl/src/help/images/resize.png branches/tora-trotl/src/help/images/rollback.png branches/tora-trotl/src/help/images/rollbacksetup.png branches/tora-trotl/src/help/images/script.png branches/tora-trotl/src/help/images/searchreplace.png branches/tora-trotl/src/help/images/security.png branches/tora-trotl/src/help/images/session.png branches/tora-trotl/src/help/images/sgastatement.png branches/tora-trotl/src/help/images/sgatrace.png branches/tora-trotl/src/help/images/sqledit.png branches/tora-trotl/src/help/images/storage.png branches/tora-trotl/src/help/images/template.png branches/tora-trotl/src/help/images/templateeditor.png branches/tora-trotl/src/help/images/templatesetup.png branches/tora-trotl/src/help/images/toolbar.png branches/tora-trotl/src/help/images/tools.png branches/tora-trotl/src/help/images/toolsmenu.png branches/tora-trotl/src/help/images/tuning.png branches/tora-trotl/src/help/images/visualize.png branches/tora-trotl/src/help/images/windowsmenu.png branches/tora-trotl/src/help/images/worksheet.png branches/tora-trotl/src/help/images/worksheetsetup.png branches/tora-trotl/src/help/images/workspace.png branches/tora-trotl/src/help/index.html branches/tora-trotl/src/help/invalid.html branches/tora-trotl/src/help/lists.html branches/tora-trotl/src/help/newconnection.html branches/tora-trotl/src/help/output.html branches/tora-trotl/src/help/plsqleditor.html branches/tora-trotl/src/help/preferences.html branches/tora-trotl/src/help/rollback.html branches/tora-trotl/src/help/script.html branches/tora-trotl/src/help/searchreplace.html branches/tora-trotl/src/help/security.html branches/tora-trotl/src/help/session.html branches/tora-trotl/src/help/sqledit.html branches/tora-trotl/src/help/storage.html branches/tora-trotl/src/help/template.html branches/tora-trotl/src/help/toc.html branches/tora-trotl/src/help/tools.html branches/tora-trotl/src/help/toolsetting.html branches/tora-trotl/src/help/trace.html branches/tora-trotl/src/help/tuning.html branches/tora-trotl/src/help/unittest.html branches/tora-trotl/src/help/window.html branches/tora-trotl/src/help/worksheet.html branches/tora-trotl/src/help/workspace.html branches/tora-trotl/src/trotl/src/ts_log/ts_log.h branches/tora-trotl/src/ts_log/ts_log.h branches/tora-trotl/win32-cross/Makefile.am.patch branches/tora-trotl/win32-cross/README branches/tora-trotl/win32-cross/build-tora-w32.sh branches/tora-trotl/win32-cross/make-install-tora.sh branches/tora-trotl/win32-cross/oracle.m4.patch branches/tora-trotl/win32-cross/prepare-libs.sh branches/tora-trotl/win32-cross/tora.bat Property Changed: ---------------- branches/tora-trotl/ Property changes on: branches/tora-trotl ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/tora:3192-3213,3216-3265 + /trunk/tora:3192-3213,3216-3265,3330-3388 Modified: branches/tora-trotl/NEWS =================================================================== --- branches/tora-trotl/NEWS 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/NEWS 2010-02-10 00:37:31 UTC (rev 3397) @@ -1,3 +1,8 @@ +2.1.2: +2009-10-14: Added win32 cross compile scripts/patches/notes from ZippyDufus <zip...@ya...> + +# lots of notes missing for 2.x series + 1.4: *: Updates for QT4 build support Modified: branches/tora-trotl/README.LAYOUT =================================================================== --- branches/tora-trotl/README.LAYOUT 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/README.LAYOUT 2010-02-10 00:37:31 UTC (rev 3397) @@ -19,6 +19,7 @@ +--rpm/ | +--src/ + | +--help/ <--- symlinks to doc/help | +--i18n/ | +--icons/ | +--templates/ @@ -50,6 +51,7 @@ doc: - for documentation + note that there is a symlink to this folder from src/help ext: - directory for external libraries which are part of the Modified: branches/tora-trotl/README.WINDOWS =================================================================== --- branches/tora-trotl/README.WINDOWS 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/README.WINDOWS 2010-02-10 00:37:31 UTC (rev 3397) @@ -1,3 +1,6 @@ +There is also a Mingw32 Fedora 11 Cross Compile build - see the README file +in the win32-cross directory, which also contains utility scripts for that build. + Content: - Building with MSVC - CMake - Building Windows installer. @@ -7,15 +10,21 @@ # # Building with MSVC - CMake (+ See README.CMAKE) # + All information below assumes C:\build as the base directory, and + C:\build\tora as tora checkout and C:\build\tora-build as tora build dir + 0. All related steps are done in the "Visual Studio Command Prompt" I have MS Visual Studio 2008 Express (aka version 9). It contains all basic tools propably so there is no more stuff from Microsoft required. 1. Downaload Qt4 source version for Windows - Trolltech doesn't provide - MSVC binaries at all. + MSVC binaries at all. I didn't find a nice download link for this, but + it was available from the FTP server: + URL: ftp://ftp.qtsoftware.com/qt/source/qt-all-opensource-src-4.5.2.zip + 2. Install Oracle client - instant or standard one. 3. Download and install Postgresql development packages. It's a part @@ -23,37 +32,66 @@ NOTE: Install it to the path *without* space in its name - Qt has problems with compilation in the case of space. + URL: http://www.enterprisedb.com/products/pgdownload.do#windows + Testing with version 8.4.0 + Seems that this installer doesn't prompt for any paths/etc. + Be sure and disable postgres service after install if you won't be running the server itself + 4. Download and install Mysql development packages. It's a part of default installer - just check its component. NOTE: Install it to the path *without* space in its name - Qt has problems with compilation in the case of space. + URL: http://dev.mysql.com/downloads/mysql/5.1.html#win32 + I am testing with the 5.1.37 MSI installer, not the 'Essentials' one + 5. Update system environment paths in variables: INCLUDE and LIB to fit Postgresql and Mysql includes and libraries. Note: Mysql uses subdirectories in its lib directory. Example: -set INCLUDE=%INCLUDE%;d:\Qt\sqlite\;D:\Qt\pgsql\include\;d:\Qt\mysql\include\ -set LIB=%LIB%;d:\Qt\sqlite\;d:\Qt\pgsql\lib\;d:\Qt\mysql\lib\opt\ - 6. Compile Qt4 with MSVC. Don't forget to specify -qt-sql-mysql - -qt-sql-psql -qt-sql-odbc -plugin-sql-mysql -plugin-sql-psql - -plugin-sql-odbc parameters for configure script. +set INCLUDE=%INCLUDE%;c:\build\postgres\include\;c:\build\mysql\include\ +set LIB=%LIB%;c:\build\postgres\lib\;c:\build\mysql\lib\opt\ +set ORACLE_HOME=c:\build\oracle + + 6. Compile Qt4 with MSVC. Run with MS VS 2008 command prompt: + + configure.exe -opensource -plugin-sql-sqlite -plugin-sql-mysql -plugin-sql-psql -plugin-sql-odbc + + Might want to consider building with '-release' to only build the release code + + 7. Download and install cmake from www.cmake.org. + + 8. Compile Tora - read README.CMAKE and dont forget to check environment is in 5. Example: -configure.exe -plugin-sql-sqlite -system-sqlite -plugin-sql-mysql -plugin-sql-psql -plugin-sql-odbc - but it dependes on your system mood. I mean it's not deterministic. - Sometimes you will need to hack more paths etc. But building DB - plugins is described in the Qt documentation. +c: +cd \build\tora-build +set PATH=%PATH%;c:\build\qt\bin - 7. Compile Tora - read README.CMAKE - Example: -set ORACLE_HOME=d:\oracle-xe\... -set LIB=%LIB%;d:\Qt\pgsql\lib -cmake -G "NMake Makefiles" -DWANT_INTERNAL_QSCINTILLA=1 -DCMAKE_INSTALL_PREFIX=d:\oss\tora\RELEASE -DORACLE_OCI_VERSION=10G_R2 -DPOSTGRESQL_PATH_INCLUDES=d:\Qt\pgsql\include -DPOSTGRESQL_PATH_LIB=d:\Qt\pgsql\lib\ ..\tora +# If you need to refresh from cmake, otherwise skip this step +cmake -G "NMake Makefiles" -DWANT_INTERNAL_QSCINTILLA=1 -DCMAKE_INSTALL_PREFIX=c:\build\tora-build\RELEASE -DORACLE_OCI_VERSION=10G_R2 ..\tora + Misc notes: seting ORACLE_HOME is a good thing (TM) building with internal qscintilla is easier for beginners ;) prepare for longer headache (if you're a windows devel newbie) +nmake + Issuing nmake will actually run the build process itself. + # +# Testing +# +Above build will generate into the tora-build\RELEASE dir. Copy the various dll files from Qt, Postgres, MySQL +installs into that dir as well: + comerr32.dll gssapi32.dll k5sprt32.dll krb5_32.dll libeay32.dll libiconv-2.dll libintl-8.dll libpq.dll ssleay32.dll + libmysql.dll qsqlmysqld4.dll + oci.dll + QtCore4.dll QtGui4.dll QtNetwork4.dll QtSql4.dll QtXml4.dll +Then you should be able to run tora.exe from that dir. This can be used to test prior to packaging. + +(NOTE- Above is ghastly, surely there is a better way of doing this?!?!) + +# # Building Windows installer. # Modified: branches/tora-trotl/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora-trotl/cmake/modules/FindOracle.cmake 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/cmake/modules/FindOracle.cmake 2010-02-10 00:37:31 UTC (rev 3397) @@ -1,146 +1,146 @@ -# TOra: Configure Oracle libraries -# -# ORACLE_FOUND - system has Oracle OCI -# ORACLE_HAS_XML - Oracle has XDK support(full client installed) -# ORACLE_INCLUDES - where to find oci.h -# ORACLE_LIBRARIES - the libraries to link against to use Oracle OCI -# -# copyright (c) 2007 Petr Vanek <pe...@sc...> -# copyright (c) 2009 Ivan Brezina <ibr...@ib...> -# Redistribution and use is allowed according to the terms of the GPLv2 license. -# - -SET(ORACLE_FOUND "NO") -SET(ORACLE_HAS_XML "NO") -SET(ORACLE_HOME $ENV{ORACLE_HOME}) - - -IF (ORACLE_PATH_INCLUDES) - SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) -ELSE (ORACLE_PATH_INCLUDES) - SET (ORACLE_INCLUDES_LOCATION - ${ORACLE_HOME}/rdbms/public - ${ORACLE_HOME}/include - # xdk - ${ORACLE_HOME}/xdk/include - # sdk - ${ORACLE_HOME}/sdk/include - # xe on windows - ${ORACLE_HOME}/OCI/include - ) -ENDIF (ORACLE_PATH_INCLUDES) - -IF (ORACLE_PATH_LIB) - SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) -ELSE (ORACLE_PATH_LIB) - SET (ORACLE_LIB_LOCATION - # TODO add 32/64bit version here - ${ORACLE_HOME}/lib - # xe on windows - ${ORACLE_HOME}/OCI/lib/MSVC - ${ORACLE_HOME} - ) -ENDIF (ORACLE_PATH_LIB) - -FIND_PATH( - ORACLE_INCLUDES - oci.h - ${ORACLE_INCLUDES_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH -) - -FIND_PATH( - ORACLE_INCLUDES_XML - xml.h - ${ORACLE_INCLUDES_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH -) - -FIND_LIBRARY( - ORACLE_LIBRARY_CLNTSH - NAMES libclntsh clntsh oci - PATHS ${ORACLE_LIB_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH -) - -FIND_LIBRARY( - ORACLE_LIBRARY_XML - NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11 - PATHS ${ORACLE_LIB_LOCATION} -) - - -SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_CLNTSH}) -IF (ORACLE_LIBRARY_XML) - LIST(APPEND ORACLE_LIBRARY ${ORACLE_LIBRARY_XML}) -ENDIF (ORACLE_LIBRARY_XML) - -IF (ORACLE_INCLUDES AND ORACLE_LIBRARY) - SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY}) - SET(ORACLE_FOUND "YES") -ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARY) - -IF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) - ADD_DEFINITIONS(-DORACLE_HAS_XML) - SET(ORACLE_HAS_XML "YES") - LIST(APPEND ORACLE_INCLUDES ${ORACLE_INCLUDES_XML}) -ENDIF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) - -# guess OCI version -IF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) - FIND_PROGRAM(AWK awk) - FIND_PROGRAM(SQLPLUS sqlplus PATHS ENV ORACLE_HOME NO_DEFAULT_PATH) - FIND_PROGRAM(SQLPLUS sqlplus) - SET (sqlplus_version "${SQLPLUS} -version | ${AWK} '/Release/ {print $3}'") - EXEC_PROGRAM(${sqlplus_version} OUTPUT_VARIABLE sqlplus_out) - MESSAGE(STATUS "found sqlplus version: ${sqlplus_out}") - - # WARNING! - # MATCHES operator is using Cmake regular expression. - # so the e.g. 9.* does not expand like shell file mask - # but as "9 and then any sequence of characters" - IF (${sqlplus_out} MATCHES "8.*") - SET(ORACLE_OCI_VERSION "8I") - ELSEIF (${sqlplus_out} MATCHES "9.*") - SET(ORACLE_OCI_VERSION "9") -# do not change the order of the ora10 checking! - ELSEIF (${sqlplus_out} MATCHES "10.2.*") - SET(ORACLE_OCI_VERSION "10G_R2") - ELSEIF (${sqlplus_out} MATCHES "10.*") - SET(ORACLE_OCI_VERSION "10G") - ELSEIF (${sqlplus_out} MATCHES "11.*") - SET(ORACLE_OCI_VERSION "11G") - ELSE (${sqlplus_out} MATCHES "8.*") - SET(ORACLE_OCI_VERSION "10G_R2") - ENDIF (${sqlplus_out} MATCHES "8.*") - - MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION}") -ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) - -MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") -MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}") -IF (ORACLE_FOUND) - IF (NOT ORACLE_FIND_QUIETLY) - MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") - MESSAGE(STATUS " ${ORACLE_INCLUDES}") - ENDIF (NOT ORACLE_FIND_QUIETLY) - # there *must* be OCI version defined for internal libraries - #IF (ORACLE_OCI_VERSION) - # ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) - #ELSE (ORACLE_OCI_VERSION) - # MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") - #ENDIF (ORACLE_OCI_VERSION) - -ELSE (ORACLE_FOUND) - MESSAGE(STATUS "Oracle not found.") - MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") - MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") - MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") - MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARY}") - IF (ORACLE_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Oracle library") - ELSE (ORACLE_FIND_REQUIRED) - # setup the variables for silent continue - SET (ORACLE_INCLUDES "") - ENDIF (ORACLE_FIND_REQUIRED) -ENDIF (ORACLE_FOUND) +# TOra: Configure Oracle libraries +# +# ORACLE_FOUND - system has Oracle OCI +# ORACLE_HAS_XML - Oracle has XDK support(full client installed) +# ORACLE_INCLUDES - where to find oci.h +# ORACLE_LIBRARIES - the libraries to link against to use Oracle OCI +# +# copyright (c) 2007 Petr Vanek <pe...@sc...> +# copyright (c) 2009 Ivan Brezina <ibr...@ib...> +# Redistribution and use is allowed according to the terms of the GPLv2 license. +# + +SET(ORACLE_FOUND "NO") +SET(ORACLE_HAS_XML "NO") +SET(ORACLE_HOME $ENV{ORACLE_HOME}) + + +IF (ORACLE_PATH_INCLUDES) + SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) +ELSE (ORACLE_PATH_INCLUDES) + SET (ORACLE_INCLUDES_LOCATION + ${ORACLE_HOME}/rdbms/public + ${ORACLE_HOME}/include + # xdk + ${ORACLE_HOME}/xdk/include + # sdk + ${ORACLE_HOME}/sdk/include + # xe on windows + ${ORACLE_HOME}/OCI/include + ) +ENDIF (ORACLE_PATH_INCLUDES) + +IF (ORACLE_PATH_LIB) + SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) +ELSE (ORACLE_PATH_LIB) + SET (ORACLE_LIB_LOCATION + # TODO add 32/64bit version here + ${ORACLE_HOME}/lib + # xe on windows + ${ORACLE_HOME}/OCI/lib/MSVC + ${ORACLE_HOME} + ) +ENDIF (ORACLE_PATH_LIB) + +FIND_PATH( + ORACLE_INCLUDES + oci.h + ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) + +FIND_PATH( + ORACLE_INCLUDES_XML + xml.h + ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) + +FIND_LIBRARY( + ORACLE_LIBRARY_CLNTSH + NAMES libclntsh clntsh oci + PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH +) + +FIND_LIBRARY( + ORACLE_LIBRARY_XML + NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11 + PATHS ${ORACLE_LIB_LOCATION} +) + + +SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_CLNTSH}) +IF (ORACLE_LIBRARY_XML) + LIST(APPEND ORACLE_LIBRARY ${ORACLE_LIBRARY_XML}) +ENDIF (ORACLE_LIBRARY_XML) + +IF (ORACLE_INCLUDES AND ORACLE_LIBRARY) + SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY}) + SET(ORACLE_FOUND "YES") +ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARY) + +IF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) + ADD_DEFINITIONS(-DORACLE_HAS_XML) + SET(ORACLE_HAS_XML "YES") + LIST(APPEND ORACLE_INCLUDES ${ORACLE_INCLUDES_XML}) +ENDIF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) + +# guess OCI version +IF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) + FIND_PROGRAM(AWK awk) + FIND_PROGRAM(SQLPLUS sqlplus PATHS ENV ORACLE_HOME NO_DEFAULT_PATH) + FIND_PROGRAM(SQLPLUS sqlplus) + SET (sqlplus_version "${SQLPLUS} -version | ${AWK} '/Release/ {print $3}'") + EXEC_PROGRAM(${sqlplus_version} OUTPUT_VARIABLE sqlplus_out) + MESSAGE(STATUS "found sqlplus version: ${sqlplus_out}") + + # WARNING! + # MATCHES operator is using Cmake regular expression. + # so the e.g. 9.* does not expand like shell file mask + # but as "9 and then any sequence of characters" + IF (${sqlplus_out} MATCHES "8.*") + SET(ORACLE_OCI_VERSION "8I") + ELSEIF (${sqlplus_out} MATCHES "9.*") + SET(ORACLE_OCI_VERSION "9") +# do not change the order of the ora10 checking! + ELSEIF (${sqlplus_out} MATCHES "10.2.*") + SET(ORACLE_OCI_VERSION "10G_R2") + ELSEIF (${sqlplus_out} MATCHES "10.*") + SET(ORACLE_OCI_VERSION "10G") + ELSEIF (${sqlplus_out} MATCHES "11.*") + SET(ORACLE_OCI_VERSION "11G") + ELSE (${sqlplus_out} MATCHES "8.*") + SET(ORACLE_OCI_VERSION "10G_R2") + ENDIF (${sqlplus_out} MATCHES "8.*") + + MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION}") +ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) + +MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") +MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}") +IF (ORACLE_FOUND) + IF (NOT ORACLE_FIND_QUIETLY) + MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") + MESSAGE(STATUS " ${ORACLE_INCLUDES}") + ENDIF (NOT ORACLE_FIND_QUIETLY) + # there *must* be OCI version defined for internal libraries + #IF (ORACLE_OCI_VERSION) + # ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) + #ELSE (ORACLE_OCI_VERSION) + # MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") + #ENDIF (ORACLE_OCI_VERSION) + +ELSE (ORACLE_FOUND) + MESSAGE(STATUS "Oracle not found.") + MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") + MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") + MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") + MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARY}") + IF (ORACLE_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find Oracle library") + ELSE (ORACLE_FIND_REQUIRED) + # setup the variables for silent continue + SET (ORACLE_INCLUDES "") + ENDIF (ORACLE_FIND_REQUIRED) +ENDIF (ORACLE_FOUND) Modified: branches/tora-trotl/configure.ac =================================================================== --- branches/tora-trotl/configure.ac 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/configure.ac 2010-02-10 00:37:31 UTC (rev 3397) @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([tora],[2.1.0],[tor...@li...]) +AC_INIT([tora],[2.1.1],[tor...@li...]) AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(config) # Every other copy of the package version number gets its value from here Modified: branches/tora-trotl/debian/changelog =================================================================== --- branches/tora-trotl/debian/changelog 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/debian/changelog 2010-02-10 00:37:31 UTC (rev 3397) @@ -1,3 +1,20 @@ +tora (2.1.1-1) unstable; urgency=low + + * New upstream version + + -- Nathan Neulinger <nn...@ne...> Tue, 13 Oct 2009 13:44:40 -0600 + +tora (2.1.0-1) unstable; urgency=low + + * New upstream version, the rebuild closes: #540046. + * Bumped Standards-Version to 3.8.3, no changes needed. + * New project homepage. + * Removed no longer needed 01_missing_includes.dpatch. + * Removed no longer used dh_desktop call. + * Added README.source file. + + -- Michael Meskes <me...@de...> Fri, 11 Sep 2009 12:37:52 +0200 + tora (2.0.0-4) unstable; urgency=low * Added patch to add missing include directives, closes: #526166 Deleted: branches/tora-trotl/doc/help/Explain-plan.html =================================================================== --- branches/tora-trotl/doc/help/Explain-plan.html 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/doc/help/Explain-plan.html 2010-02-10 00:37:31 UTC (rev 3397) @@ -1,53 +0,0 @@ -<html lang="en"> -<head> -<title>Explain plan - TOra</title> -<meta http-equiv="Content-Type" content="text/html"> -<meta name="description" content="TOra"> -<meta name="generator" content="makeinfo 4.11"> -<link title="Top" rel="start" href="index.html#Top"> -<link rel="up" href="common.html#common" title="common"> -<link rel="prev" href="SGA-Statement.html#SGA-Statement" title="SGA Statement"> -<link rel="next" href="Getting-bind-parameters.html#Getting-bind-parameters" title="Getting bind parameters"> -<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> -<!-- -This manual is for TOra, version 1.4.0.--> -<meta http-equiv="Content-Style-Type" content="text/css"> -<style type="text/css"><!-- - pre.display { font-family:inherit } - pre.format { font-family:inherit } - pre.smalldisplay { font-family:inherit; font-size:smaller } - pre.smallformat { font-family:inherit; font-size:smaller } - pre.smallexample { font-size:smaller } - pre.smalllisp { font-size:smaller } - span.sc { font-variant:small-caps } - span.roman { font-family:serif; font-weight:normal; } - span.sansserif { font-family:sans-serif; font-weight:normal; } ---></style> -</head> -<body> -<div class="node"> -<p> -<a name="Explain-plan"></a> -Next: <a rel="next" accesskey="n" href="Getting-bind-parameters.html#Getting-bind-parameters">Getting bind parameters</a>, -Previous: <a rel="previous" accesskey="p" href="SGA-Statement.html#SGA-Statement">SGA Statement</a>, -Up: <a rel="up" accesskey="u" href="common.html#common">common</a> -<hr> -</div> - -<h4 class="subsection">3.9.2 Explain plan</h4> - -<p>This element can be either part of an SGA statement or by itself in some cases (See above for a screenshot). For more information about execution paths check the Oracle manual Designing and Tuning for Performance, chapter 5 in the 8i release. - - <p>A few notes here is that the execution plan displayed here is not necessarily the same as when run depending on one of these reasons. - - <ul> -<li>It is run as a different user which doesn't access the same database objects as the user you are logged in as now. -<li>The session running the query can have changed some optimizer parameters compared to your session. -</ul> - - <p>What you see in this window is the execution you would get if you ran the statement like the one you are logged in as now and in your session. One example of this problem is if a user executes SQL which accesses his own objects which doesn't have public synonyms, then another person can simply not execute the SQL without modifying it to add owner specifier to the tables which TOra will not do automatically. - - <p>Explain plan requires a table to store the result in. The name of this table can be configured in the options(see <a href="preferences.html#preferences">Options</a>). If the table doesn't exist TOra will ask you if it should try to create it. Without this table you can not display execution plans in TOra. - - </body></html> - Deleted: branches/tora-trotl/doc/help/Getting-bind-parameters.html =================================================================== --- branches/tora-trotl/doc/help/Getting-bind-parameters.html 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/doc/help/Getting-bind-parameters.html 2010-02-10 00:37:31 UTC (rev 3397) @@ -1,54 +0,0 @@ -<html lang="en"> -<head> -<title>Getting bind parameters - TOra</title> -<meta http-equiv="Content-Type" content="text/html"> -<meta name="description" content="TOra"> -<meta name="generator" content="makeinfo 4.11"> -<link title="Top" rel="start" href="index.html#Top"> -<link rel="up" href="common.html#common" title="common"> -<link rel="prev" href="Explain-plan.html#Explain-plan" title="Explain plan"> -<link rel="next" href="Object-description.html#Object-description" title="Object description"> -<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> -<!-- -This manual is for TOra, version 1.4.0.--> -<meta http-equiv="Content-Style-Type" content="text/css"> -<style type="text/css"><!-- - pre.display { font-family:inherit } - pre.format { font-family:inherit } - pre.smalldisplay { font-family:inherit; font-size:smaller } - pre.smallformat { font-family:inherit; font-size:smaller } - pre.smallexample { font-size:smaller } - pre.smalllisp { font-size:smaller } - span.sc { font-variant:small-caps } - span.roman { font-family:serif; font-weight:normal; } - span.sansserif { font-family:sans-serif; font-weight:normal; } ---></style> -</head> -<body> -<div class="node"> -<p> -<a name="Getting-bind-parameters"></a> -Next: <a rel="next" accesskey="n" href="Object-description.html#Object-description">Object description</a>, -Previous: <a rel="previous" accesskey="p" href="Explain-plan.html#Explain-plan">Explain plan</a>, -Up: <a rel="up" accesskey="u" href="common.html#common">common</a> -<hr> -</div> - -<h4 class="subsection">3.9.3 Getting bind parameters</h4> - -<p>This dialog is displayed when input parameters are required to run the SQL. For instance the example dialog is the dialog displayed when running the following SQL in the worksheet. - -<pre class="example"><pre class="verbatim"> - - select * from essprc where prcid > :prcid and begrdt > :begrdt; - -</pre> -</pre> - <div class="block-image"><img src="images/getparam.png" alt="images/getparam.png"></div> - - <p>As you can see the field name as specified after the : character is presented as a title. If the same field name is used at several parts of the query you only get to specify it once. You specify the value in the editor line just to the right of the field name label. If you want to specify a NULL value check the <strong>NULL</strong> checkbox to the right of the editor. You can also edit the value in a memo editor(see <a href="Memo-editor.html#Memo-editor">Memo editor</a>) pressing the <strong>Edit</strong> button to the right on the value. - - <p>The parameter editor will cache it's value so it will remember the last parameters you fed to it when you run the query again. - - </body></html> - Modified: branches/tora-trotl/doc/help/Index_002dlist.html =================================================================== --- branches/tora-trotl/doc/help/Index_002dlist.html 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/doc/help/Index_002dlist.html 2010-02-10 00:37:31 UTC (rev 3397) @@ -3,12 +3,12 @@ <title>Index-list - TOra</title> <meta http-equiv="Content-Type" content="text/html"> <meta name="description" content="TOra"> -<meta name="generator" content="makeinfo 4.11"> +<meta name="generator" content="makeinfo 4.13"> <link title="Top" rel="start" href="index.html#Top"> <link rel="prev" href="extendingtora.html#extendingtora" title="extendingtora"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 1.4.0.--> +This manual is for TOra, version 2.1.1.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } @@ -24,9 +24,9 @@ </head> <body> <div class="node"> -<p> <a name="Index-list"></a> <a name="Index_002dlist"></a> +<p> Previous: <a rel="previous" accesskey="p" href="extendingtora.html#extendingtora">extendingtora</a>, Up: <a rel="up" accesskey="u" href="index.html#Top">Top</a> <hr> @@ -40,21 +40,21 @@ <li><a href="tools.html#index-Available-tools-16">Available tools</a>: <a href="tools.html#tools">tools</a></li> <li><a href="newconnection.html#index-Connecting-to-a-database-5">Connecting to a database</a>: <a href="newconnection.html#newconnection">newconnection</a></li> <li><a href="current.html#index-Current-Session-28">Current Session</a>: <a href="current.html#current">current</a></li> -<li><a href="browser.html#index-Database-Browser-18">Database Browser</a>: <a href="browser.html#browser">browser</a></li> -<li><a href="database.html#index-Database-Settings-11">Database Settings</a>: <a href="database.html#database">database</a></li> +<li><a href="database.html#index-Database-Settings-12">Database Settings</a>: <a href="database.html#database">database</a></li> +<li><a href="editor.html#index-Editor-Settings-11">Editor Settings</a>: <a href="editor.html#editor">editor</a></li> <li><a href="window.html#index-Elements-of-the-main-window-4">Elements of the main window</a>: <a href="window.html#window">window</a></li> <li><a href="extendingtora.html#index-Extending-TOra-36">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li> -<li><a href="fonts.html#index-Font-Settings-12">Font Settings</a>: <a href="fonts.html#fonts">fonts</a></li> <li><a href="workspace.html#index-Getting-to-know-your-workspace-3">Getting to know your workspace</a>: <a href="workspace.html#workspace">workspace</a></li> <li><a href="history.html#index-History-and-future-of-TOra-2">History and future of TOra</a>: <a href="history.html#history">history</a></li> <li><a href="invalid.html#index-Invalid-Objects-32">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li> <li><a href="lists.html#index-lists-7">lists</a>: <a href="lists.html#lists">lists</a></li> -<li><a href="preferences.html#index-Options-10">Options</a>: <a href="preferences.html#preferences">preferences</a></li> <li><a href="common.html#index-Other-common-elements-15">Other common elements</a>: <a href="common.html#common">common</a></li> <li><a href="debugger.html#index-PL_002fSQL-Debugger-20">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li> <li><a href="plsqleditor.html#index-PL_002fSQL-Editor-19">PL/SQL Editor</a>: <a href="plsqleditor.html#plsqleditor">plsqleditor</a></li> <li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-21">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li> +<li><a href="preferences.html#index-Preferences-10">Preferences</a>: <a href="preferences.html#preferences">preferences</a></li> <li><a href="rollback.html#index-Rollback-Segments-26">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li> +<li><a href="browser.html#index-Schema-Browser-18">Schema Browser</a>: <a href="browser.html#browser">browser</a></li> <li><a href="script.html#index-Schema-extraction_002c-compare-and-search-29">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li> <li><a href="searchreplace.html#index-Search-_0026-Replace-9">Search & Replace</a>: <a href="searchreplace.html#searchreplace">searchreplace</a></li> <li><a href="security.html#index-Security-Manager-23">Security Manager</a>: <a href="security.html#security">security</a></li> @@ -62,8 +62,8 @@ <li><a href="session.html#index-Session-Manager-25">Session Manager</a>: <a href="session.html#session">session</a></li> <li><a href="trace.html#index-SGA-Trace-27">SGA Trace</a>: <a href="trace.html#trace">trace</a></li> <li><a href="sqledit.html#index-SQL-Editor-35">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li> +<li><a href="worksheet.html#index-SQL-Editor-17">SQL Editor</a>: <a href="worksheet.html#worksheet">worksheet</a></li> <li><a href="output.html#index-SQL-Output-33">SQL Output</a>: <a href="output.html#output">output</a></li> -<li><a href="worksheet.html#index-SQL-Worksheet-17">SQL Worksheet</a>: <a href="worksheet.html#worksheet">worksheet</a></li> <li><a href="analyze.html#index-Statistics-manager-30">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li> <li><a href="storage.html#index-Storage-Manager-24">Storage Manager</a>: <a href="storage.html#storage">storage</a></li> <li><a href="template.html#index-Template-Help-34">Template Help</a>: <a href="template.html#template">template</a></li> Modified: branches/tora-trotl/doc/help/Makefile.am =================================================================== --- branches/tora-trotl/doc/help/Makefile.am 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/doc/help/Makefile.am 2010-02-10 00:37:31 UTC (rev 3397) @@ -12,12 +12,12 @@ charts.texi \ common.texi \ current.texi \ + editor.texi \ database.texi \ debugger.texi \ editors.texi \ extendingtora.texi \ externalapi.texi \ - fonts.texi \ help.texi \ history.texi \ invalid.texi \ Deleted: branches/tora-trotl/doc/help/Memo-editor.html =================================================================== --- branches/tora-trotl/doc/help/Memo-editor.html 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/doc/help/Memo-editor.html 2010-02-10 00:37:31 UTC (rev 3397) @@ -1,43 +0,0 @@ -<html lang="en"> -<head> -<title>Memo editor - TOra</title> -<meta http-equiv="Content-Type" content="text/html"> -<meta name="description" content="TOra"> -<meta name="generator" content="makeinfo 4.11"> -<link title="Top" rel="start" href="index.html#Top"> -<link rel="up" href="common.html#common" title="common"> -<link rel="prev" href="Object-description.html#Object-description" title="Object description"> -<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> -<!-- -This manual is for TOra, version 1.4.0.--> -<meta http-equiv="Content-Style-Type" content="text/css"> -<style type="text/css"><!-- - pre.display { font-family:inherit } - pre.format { font-family:inherit } - pre.smalldisplay { font-family:inherit; font-size:smaller } - pre.smallformat { font-family:inherit; font-size:smaller } - pre.smallexample { font-size:smaller } - pre.smalllisp { font-size:smaller } - span.sc { font-variant:small-caps } - span.roman { font-family:serif; font-weight:normal; } - span.sansserif { font-family:sans-serif; font-weight:normal; } ---></style> -</head> -<body> -<div class="node"> -<p> -<a name="Memo-editor"></a> -Previous: <a rel="previous" accesskey="p" href="Object-description.html#Object-description">Object description</a>, -Up: <a rel="up" accesskey="u" href="common.html#common">common</a> -<hr> -</div> - -<h4 class="subsection">3.9.5 Memo editor</h4> - -<div class="block-image"><img src="images/memo.png" alt="images/memo.png"></div> - - <p>This is used to display or edit larger text than is easily entered in a oneline editor or list. To the top is a toolbar with some editing buttons. Specifically you have the save changes button to the left. You can also do this using the key <strong>CTRL+Return</strong>. -You can remove the editor without saving changes using the <strong>Escape</strong> key or closing the window. - - </body></html> - Deleted: branches/tora-trotl/doc/help/Object-description.html =================================================================== --- branches/tora-trotl/doc/help/Object-description.html 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/doc/help/Object-description.html 2010-02-10 00:37:31 UTC (rev 3397) @@ -1,44 +0,0 @@ -<html lang="en"> -<head> -<title>Object description - TOra</title> -<meta http-equiv="Content-Type" content="text/html"> -<meta name="description" content="TOra"> -<meta name="generator" content="makeinfo 4.11"> -<link title="Top" rel="start" href="index.html#Top"> -<link rel="up" href="common.html#common" title="common"> -<link rel="prev" href="Getting-bind-parameters.html#Getting-bind-parameters" title="Getting bind parameters"> -<link rel="next" href="Memo-editor.html#Memo-editor" title="Memo editor"> -<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> -<!-- -This manual is for TOra, version 1.4.0.--> -<meta http-equiv="Content-Style-Type" content="text/css"> -<style type="text/css"><!-- - pre.display { font-family:inherit } - pre.format { font-family:inherit } - pre.smalldisplay { font-family:inherit; font-size:smaller } - pre.smallformat { font-family:inherit; font-size:smaller } - pre.smallexample { font-size:smaller } - pre.smalllisp { font-size:smaller } - span.sc { font-variant:small-caps } - span.roman { font-family:serif; font-weight:normal; } - span.sansserif { font-family:sans-serif; font-weight:normal; } ---></style> -</head> -<body> -<div class="node"> -<p> -<a name="Object-description"></a> -Next: <a rel="next" accesskey="n" href="Memo-editor.html#Memo-editor">Memo editor</a>, -Previous: <a rel="previous" accesskey="p" href="Getting-bind-parameters.html#Getting-bind-parameters">Getting bind parameters</a>, -Up: <a rel="up" accesskey="u" href="common.html#common">common</a> -<hr> -</div> - -<h4 class="subsection">3.9.4 Object description</h4> - -<div class="block-image"><img src="images/describe.png" alt="images/describe.png"></div> - - <p>This is a list that describes the columns of a table or view. There is nothing much special about this view except that you can check the collected analyze statistics for the column by placing the cursor over it and reading the tooltip that will be displayed. If no tooltip is displayed there is no analyzed statistics available. Also notable is that this list is read completely from the object cache if it available. This will mean that if you are modifying the object you are modifying you need to reread the object cache before you can see the changes. - - </body></html> - Deleted: branches/tora-trotl/doc/help/SGA-Statement.html =================================================================== --- branches/tora-trotl/doc/help/SGA-Statement.html 2010-02-02 20:01:38 UTC (rev 3396) +++ branches/tora-trotl/doc/help/SGA-Statement.html 2010-02-10 00:37:31 UTC (rev 3397) @@ -1,44 +0,0 @@ -<html lang="en"> -<head> -<title>SGA Statement - TOra</title> -<meta http-equiv="Content-Type" content="text/html"> -<meta name="description" content="TOra"> -<meta name="generator" content="makeinfo 4.11"> -<link title="Top" rel="start" href="index.html#Top"> -<link rel="up" href="common.html#common" title="common"> -<link rel="next" href="Explain-plan.html#Explain-plan" title="Explain plan"> -<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> -<!-- -This manual is for TOra, version 1.4.0.--> -<meta http-equiv="Content-Style-Type" content="text/css"> -<style type="text/css"><!-- - pre.display { font-family:inherit } - pre.format { font-family:inherit } - pre.smalldisplay { font-family:inherit; font-size:smaller } - pre.smallformat { font-family:inherit; font-size:smaller } - pre.smallexample { font-size:smaller } - pre.smalllisp { font-size:smaller } - span.sc { font-variant:small-caps } - span.roman { font-family:serif; font-weight:normal; } ... [truncated message content] |
From: <ibr...@us...> - 2010-02-11 14:13:16
|
Revision: 3400 http://tora.svn.sourceforge.net/tora/?rev=3400&view=rev Author: ibre5041 Date: 2010-02-11 14:13:03 +0000 (Thu, 11 Feb 2010) Log Message: ----------- sync with tora trunk Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/INSTALL branches/tora-trotl/Makefile.am branches/tora-trotl/README.BINARIES branches/tora-trotl/README.CMAKE branches/tora-trotl/README.OSX branches/tora-trotl/README.RELEASE branches/tora-trotl/README.WINDOWS branches/tora-trotl/debian/control branches/tora-trotl/debian/copyright branches/tora-trotl/debian/rules branches/tora-trotl/doc/help/Index_002dlist.html branches/tora-trotl/doc/help/debugger.html branches/tora-trotl/doc/help/debugger.texi branches/tora-trotl/doc/help/invalid.html branches/tora-trotl/doc/help/invalid.texi branches/tora-trotl/osx_tools/CompleteBundle.cmake.in branches/tora-trotl/rpm/tora.spec.in branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/Makefile.am branches/tora-trotl/src/docklets/toviewconnections.cpp branches/tora-trotl/src/migratetool/tora3.cpp branches/tora-trotl/src/precompiled.h branches/tora-trotl/src/toabout.cpp branches/tora-trotl/src/toawr.cpp branches/tora-trotl/src/tobrowser.cpp branches/tora-trotl/src/tobrowser.h branches/tora-trotl/src/toconfiguration.cpp branches/tora-trotl/src/toconfiguration.h branches/tora-trotl/src/toconnection.cpp branches/tora-trotl/src/toconnection.h branches/tora-trotl/src/toconnectionmodel.cpp branches/tora-trotl/src/toconnectionpool.cpp branches/tora-trotl/src/todebug.cpp branches/tora-trotl/src/todebug.h branches/tora-trotl/src/toeventquery.cpp branches/tora-trotl/src/toextract.cpp branches/tora-trotl/src/toextract.h branches/tora-trotl/src/toglobalsetting.cpp branches/tora-trotl/src/toglobalsetting.h branches/tora-trotl/src/toglobalsettingui.ui branches/tora-trotl/src/tohelp.cpp branches/tora-trotl/src/toinvalid.cpp branches/tora-trotl/src/tomain.cpp branches/tora-trotl/src/tomain.h branches/tora-trotl/src/tonewconnection.cpp branches/tora-trotl/src/tonewconnection.h branches/tora-trotl/src/tonewconnectionui.ui branches/tora-trotl/src/tonoblockquery.cpp branches/tora-trotl/src/tooracleconnection.cpp branches/tora-trotl/src/tooracleextract.cpp branches/tora-trotl/src/toplsqltext.cpp branches/tora-trotl/src/toplsqltext.h branches/tora-trotl/src/toqsqlconnection.cpp branches/tora-trotl/src/toresultextract.cpp branches/tora-trotl/src/toresultplan.cpp branches/tora-trotl/src/toresultstorage.cpp branches/tora-trotl/src/tothread.cpp branches/tora-trotl/src/toworksheet.cpp branches/tora-trotl/src/trotl_test1.cpp branches/tora-trotl/src/trotl_test2.cpp branches/tora-trotl/src/utils.cpp branches/tora-trotl/src/utils.h Added Paths: ----------- branches/tora-trotl/README.EC2 branches/tora-trotl/debian/README.source branches/tora-trotl/debian/patches/00list branches/tora-trotl/debian/patches/03_README.LAYOUT.dpatch branches/tora-trotl/debian/tora.install branches/tora-trotl/osx_tools/qt.conf.in branches/tora-trotl/src/connectioncolorsdialogui.ui branches/tora-trotl/src/windows/dummyoci/ branches/tora-trotl/src/windows/dummyoci/Makefile branches/tora-trotl/src/windows/dummyoci/oci_nonstub.c branches/tora-trotl/src/windows/dummyoci/oci_stub.c Removed Paths: ------------- branches/tora-trotl/Makefile.OSX branches/tora-trotl/src/trotl/src/ts_log/ branches/tora-trotl/src/windows/dummyoci/Makefile branches/tora-trotl/src/windows/dummyoci/oci_nonstub.c branches/tora-trotl/src/windows/dummyoci/oci_stub.c Property Changed: ---------------- branches/tora-trotl/ Property changes on: branches/tora-trotl ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/tora:3192-3213,3216-3265,3330-3388 + /trunk/tora:3191-3398 Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/CMakeLists.txt 2010-02-11 14:13:03 UTC (rev 3400) @@ -1,6 +1,15 @@ ############################################################################################################## ########## CMake Setup ########## +# options available for user's input +OPTION(WANT_DEBUG "Set the debug build and possible additional outputs" OFF) +OPTION(WANT_INTERNAL_QSCINTILLA "Use internal/bundled QScintilla2 source" OFF) +OPTION(ENABLE_ORACLE "Disable Oracle support at all. Including detection" ON) +OPTION(ENABLE_PGSQL "Disable PostgreSQL support. Including detection" ON) +OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" ON) +OPTION(WANT_BUNDLE "Enable Mac OS X bundle build" OFF) +OPTION(WANT_BUNDLE_STANDALONE "Do not copy required libs and tools into bundle (WANT_BUNDLE)" ON) + #Set our CMake minimum version #Require 2.4.2 for Qt finding #Require 2.4.3 for moc change detection and rpath updates for custom cairo install @@ -11,6 +20,7 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0005 OLD) # FIXME change it to new when there will be cmake 2.6.x in most distros + cmake_policy(SET CMP0011 NEW) endif(COMMAND cmake_policy) @@ -38,12 +48,15 @@ #where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level) SET (VERSION_MAJOR "2") SET (VERSION_MINOR "1") -SET (VERSION_PATCH "0") +SET (VERSION_PATCH "1") SET (VERSION_SUFFIX "") SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") SET (EXE_NAME "tora") +if (WANT_BUNDLE) + SET(EXE_NAME "TOra") +endif(WANT_BUNDLE) ADD_DEFINITIONS("-DTOVERSION=\\\"${VERSION}\\\"") # Allow using CMAKE-related ifdefs in the code. See e.g. toqsqlconnection.cpp. @@ -104,9 +117,9 @@ #Convert our simpler command line option to the CMake style #None, Debug, Release, .. or custom ones -# SET(WANT_DEBUG 1) IF(WANT_DEBUG) SET(CMAKE_BUILD_TYPE Debug) + ADD_DEFINITIONS("-DDEBUG") ELSE(WANT_DEBUG) SET(CMAKE_BUILD_TYPE RELEASE) ENDIF(WANT_DEBUG) @@ -123,28 +136,6 @@ ENDIF (MSVC) -# --- If we are on OS X copy all the embedded libraries to the app bundle -IF (APPLE AND WANT_BUNDLE) - # -------- Function to build OS X Stand Alone Bundles ----------------- - function(MakeOSXBundleApp target binary_dir) - #-- Set some useful variables - SET (OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.cmake") - SET (OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.sh") - #-- Configure the cmake file and the shell script - CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CompleteBundle.cmake.in" - "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}" @ONLY IMMEDIATE) - CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CreateBundle.sh.in" - "${OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT}" @ONLY IMMEDIATE) - #-- Create the installation code - install(SCRIPT "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}") - - endfunction(MakeOSXBundleApp) - - MakeOSXBundleApp(TOra ${PROJECT_BINARY_DIR}) - -ENDIF (APPLE AND WANT_BUNDLE) - - SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic") SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic") SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic") @@ -202,23 +193,34 @@ ENDIF (WANT_INTERNAL_QSCINTILLA) -FIND_PACKAGE(Oracle) -IF(ORACLE_FOUND) - MESSAGE("Oracle OCI Library Found OK") - # what else is hidden in the ifdef hell?! - ADD_DEFINITIONS("-DDBLINK") -ELSE(ORACLE_FOUND) - MESSAGE(STATUS "No Oracle OCI found. TOra will be build without Oracle support") +IF (NOT ENABLE_ORACLE) + MESSAGE(STATUS "Oracle support is disabled by user choice") ADD_DEFINITIONS("-DTO_NO_ORACLE") -ENDIF(ORACLE_FOUND) +ELSE (NOT ENABLE_ORACLE) + FIND_PACKAGE(Oracle) + IF(ORACLE_FOUND) + MESSAGE("Oracle OCI Library Found OK") + # what else is hidden in the ifdef hell?! + ADD_DEFINITIONS("-DDBLINK") + ELSE(ORACLE_FOUND) + MESSAGE(STATUS "No Oracle OCI found. TOra will be build without Oracle support") + ADD_DEFINITIONS("-DTO_NO_ORACLE") + ENDIF(ORACLE_FOUND) -FIND_PACKAGE(PostgreSQL) -IF (POSTGRESQL_FOUND) +ENDIF (NOT ENABLE_ORACLE) + + +IF (NOT ENABLE_PGSQL) + MESSAGE(STATUS "PostgreSQL support is disabled by user choice") +ELSE (NOT ENABLE_PGSQL) + + FIND_PACKAGE(PostgreSQL) + IF (POSTGRESQL_FOUND) ADD_DEFINITIONS(-DLIBPQ_DECL_CANCEL) ADD_DEFINITIONS(-DHAVE_POSTGRESQL_LIBPQ_FE_H) MESSAGE(STATUS "PostgreSQL environment found: ${POSTGRESQL_INCLUDE_DIR} ${POSTGRESQL_LIBRARIES}") -ELSE (POSTGRESQL_FOUND) + ELSE (POSTGRESQL_FOUND) MESSAGE(" ") MESSAGE(WARNING " No PostgreSQL environment has been found.") MESSAGE(WARNING " Specify -DPOSTGRESQL_PATH_INCLUDES=path") @@ -226,8 +228,9 @@ #MESSAGE (STATUS "PostgreSQL includes: ${POSTGRESQL_INCLUDE_DIR} vs. ${POSTGRESQL_PATH_INCLUDES}") #MESSAGE (STATUS "PostgreSQL libs: ${POSTGRESQL_LIBRARIES} vs. ${POSTGRESQL_PATH_LIB}") MESSAGE(" ") -ENDIF (POSTGRESQL_FOUND) + ENDIF (POSTGRESQL_FOUND) +ENDIF (NOT ENABLE_PGSQL) ############################################################################################################## @@ -305,42 +308,44 @@ ) ENDIF (NOT WANT_BUNDLE) -# packaging related stuff -#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") -SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) -#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") -#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") -SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -SET(CPACK_SOURCE_GENERATOR "TGZ") -#SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") -SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") -SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt") -SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) -INCLUDE(CPack) -# Check for SVN -FIND_PACKAGE(Subversion) -IF(NOT Subversion_FOUND) - SET(Subversion_SVN_EXECUTABLE true) -ENDIF(NOT Subversion_FOUND) - -# get svn revision in rpmbuild time (and not in Makefile generation time) -SET(SVN_REVISION - "\"$$(" ${Subversion_SVN_EXECUTABLE} info ${CMAKE_SOURCE_DIR} | awk '/Revision:/ {print \$\$2 }' ")\"" - ) -SET(RPM_DEFINES - --define "_sourcedir ${CMAKE_SOURCE_DIR}" - ) -SET(SPEC_IN_SUBST - "\"" - "s/(%define\\s+_version) .*/\\\\1 ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/\;" - "s/(%define\\s+_release) .*/\\\\1 0.${SVN_REVISION}svn/\;" - "\"" - ) -SET(RPM_SPEC "rpm/tora.spec") -ADD_CUSTOM_TARGET(package-rpm - COMMAND sed -r ${SPEC_IN_SUBST} "${RPM_SPEC}.in" >"${RPM_SPEC}" - COMMAND make package_source - COMMAND rpmbuild -ba ${RPM_DEFINES} "${RPM_SPEC}" +IF (WANT_RPM) + # packaging related stuff + #SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") + SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) + #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") + #SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") + SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") + SET(CPACK_SOURCE_GENERATOR "TGZ") + #SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") + SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") + SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt") + SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) + INCLUDE(CPack) + + # Check for SVN + FIND_PACKAGE(Subversion) + IF(NOT Subversion_FOUND) + SET(Subversion_SVN_EXECUTABLE true) + ENDIF(NOT Subversion_FOUND) + + # get svn revision in rpmbuild time (and not in Makefile generation time) + SET(SVN_REVISION + "\"$$(" ${Subversion_SVN_EXECUTABLE} info ${CMAKE_SOURCE_DIR} | awk '/Revision:/ {print \$\$2 }' ")\"" ) - + SET(RPM_DEFINES + --define "_sourcedir ${CMAKE_SOURCE_DIR}" + ) + SET(SPEC_IN_SUBST + "\"" + "s/(%define\\s+_version) .*/\\\\1 ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/\;" + "s/(%define\\s+_release) .*/\\\\1 0.${SVN_REVISION}svn/\;" + "\"" + ) + SET(RPM_SPEC "rpm/tora.spec") + ADD_CUSTOM_TARGET(package-rpm + COMMAND sed -r ${SPEC_IN_SUBST} "${RPM_SPEC}.in" >"${RPM_SPEC}" + COMMAND make package_source + COMMAND rpmbuild -ba ${RPM_DEFINES} "${RPM_SPEC}" + ) +ENDIF (WANT_RPM) Modified: branches/tora-trotl/INSTALL =================================================================== --- branches/tora-trotl/INSTALL 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/INSTALL 2010-02-11 14:13:03 UTC (rev 3400) @@ -2,20 +2,15 @@ ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. +2006, 2007, 2008, 2009 Free Software Foundation, Inc. -This file is free documentation; the Free Software Foundation gives + This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== -MS Windows - see README.CMAKE -Mac OS X - see README.OSX, README.CMAKE -Linux/Unix - read text below (autotools) or use README.CMAKE - - -Briefly, the shell commands `./configure; make; make install' should + Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. @@ -78,9 +73,9 @@ Compilers and Options ===================== -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -93,7 +88,7 @@ Compiling For Multiple Architectures ==================================== -You can compile the package for more than one kind of computer at the + You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run @@ -105,10 +100,24 @@ installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + Installation Names ================== -By default, `make install' installs the package's commands under + By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PREFIX'. @@ -131,7 +140,7 @@ Optional Features ================= -Some packages pay attention to `--enable-FEATURE' options to + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -143,14 +152,46 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -158,7 +199,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -176,9 +218,9 @@ Sharing Defaults ================ -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -187,7 +229,7 @@ Defining Variables ================== -Variables not defined in a site shell script can be set in the + Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -206,12 +248,20 @@ `configure' Invocation ====================== -`configure' recognizes the following options to control how it operates. + `configure' recognizes the following options to control how it +operates. `--help' `-h' - Print a summary of the options to `configure', and exit. + Print a summary of all of the options to `configure', and exit. +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + `--version' `-V' Print the version of Autoconf used to generate the `configure' @@ -237,6 +287,16 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. Deleted: branches/tora-trotl/Makefile.OSX =================================================================== --- branches/tora-trotl/Makefile.OSX 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/Makefile.OSX 2010-02-11 14:13:03 UTC (rev 3400) @@ -1,477 +0,0 @@ - - -# BEGIN_COMMON_COPYRIGHT_HEADER -# -# TOra - An Oracle Toolkit for DBA's and developers -# -# Shared/mixed copyright is held throughout files in this product -# -# Portions Copyright (C) 2000-2001 Underscore AB -# Portions Copyright (C) 2003-2005 Quest Software, Inc. -# Portions Copyright (C) 2004-2009 Numerous Other Contributors -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; only version 2 of -# the License is valid for this program. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception, you have permission to link this program -# with the Oracle Client libraries and distribute executables, as long -# as you follow the requirements of the GNU GPL in regard to all of the -# software in the executable aside from Oracle client libraries. -# -# Specifically you are not permitted to link this program with the -# Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. -# And you are not permitted to distribute binaries compiled against -# these libraries. -# -# You may link this product with any GPL'd Qt library. -# -# All trademarks belong to their respective owners. -# -# END_COMMON_COPYRIGHT_HEADER - -# Sample Makefile for static MacOS X builds - -# Mac application directory -MAC_APP_DIR = tora.app - -# Mac application contents directory -CONTENTS_DIR = $(MAC_APP_DIR)/Contents - -# Mac binary location -DESTDIR = $(CONTENTS_DIR)/MacOS - -# Mac resources location -RSCSDIR = $(CONTENTS_DIR)/Resources - -# Directory for Qt-based help (as opposed to native MacOS help) -HELPDIR = $(RSCSDIR)/help - -# Additional includes needed to compile program -INCLUDES="-I$(QTDIR)/mkspecs/macx-g++" "-I$(ORACLE_HOME)/rdbms/demo" "-I$(ORACLE_HOME)/plsql/public" "-I$(ORACLE_HOME)/rdbms/public" "-I$(ORACLE_HOME)/network/public" "-I$(QTDIR)/include" - -# C++ Compiler to use -GCC="/usr/bin/g++3" - -# Additional libraries to link with -LIBS_GLOB=-framework Carbon -framework QuickTime -lz -framework OpenGL -framework AGL - -# Standard C++ library -STDCPP_SHARED= - -# Static version of C++ library (Only needed when linking statically -STDCPP_STATIC= - -# Qt library -QT_SHARED= - -# Static Qt library -QT_STATIC= -lqt-mt - -# Path to Qt meta compiler -MOC="$(QTDIR)/bin/moc" - -# Path to Qt interface compiler -UIC="$(QTDIR)/bin/uic" - -# Path to Qt translation compiler -LRELEASE="$(QTDIR)/bin/lrelease" - -# Path to Qt translation update -LUPDATE="$(QTDIR)/bin/lupdate" - -# Additional paths to find libraries -LFLAGS="-L$(ORACLE_HOME)/rdbms/lib" "-L$(QTDIR)/lib" - -# Oracle library -ORACLE_SHARED= - -# Static Oracle libraries -ORACLE_STATIC=-lclntst9 - -# Oracle home path -#ORACLE_HOME= - -# What to compile, can be tora for plugin version, tora-mono for monolithic, tora-static for static version -TARGET=tora-static -MAC_TARGET = $(DESTDIR)/$(TARGET) - -# MySQL found -MYSQL_FOUND=0 - -# MySQL library -MYSQL_SHARED= - -# Static MySQL libraries -MYSQL_STATIC= - -# Base directory of KDE installation -KDE_BASE= - -# Additional defines to use while compiling, except for the normal these are available -# OTL_ORA9I - Compile for Oracle 9.x -# OTL_ORA8I - Compile for Oracle 8.1.x -# OTL_ORA8 - Compile for Oracle 8.0.x -# OTL_ORA_TIMESTAMP - Include support for timestamps -# TO_NEW_CHECK - Disable new version check globally -# TO_KDE - Compile as KDE application -DEFINES+=-DOTL_ORA9I -DOTL_ORA_TIMESTAMP -DOTL_ANSI_CPP -DEFINES+=-D_REENTRANT -DDEFAULT_PLUGIN_DIR=\"$(INSTALLLIB)/tora\" -DEFINES+=-DTOMONOLITHIC -DEFINES+=-DQT_THREAD_SUPPORT -DEFINES+=-DQT_NO_DEBUG - -# Where to find perl on your system -PERL=/usr/bin/perl - -# Comment out this line if you want more output from compile -.SILENT: - -# Additional flags set when using only the precompiler. -CPPFLAGS_GLOB= - -# Additional flags to set when linking. -LFLAGS_GLOB=-O3 - -# Additional flags set when compiling. -CFLAGS_GLOB=-g -O3 -W -Wall - -############################################################################ -# -# End of configuration part of Makefile -# -############################################################################ - -TITLE=TOra - -API= \ - tochangeconnection.h \ - tobackground.h \ - tobarchart.h \ - toconf.h \ - toconnection.h \ - todefaultkeywords.h \ - toeditwidget.h \ - toextract.h \ - tofilesize.h \ - tohelp.h \ - tohelpbrowser.h \ - tohighlightedtext.h \ - tohtml.h \ - tolegendchart.h \ - tolinechart.h \ - tomain.h \ - tomainwindow.kde.h \ - tomarkedtext.2.h \ - tomarkedtext.h \ - tomemoeditor.h \ - tonoblockquery.h \ - toparamget.h \ - topiechart.h \ - toqvalue.h \ - toreport.h \ - toresult.h \ - toresultbar.h \ - toresultcols.h \ - toresultcombo.h \ - toresultconstraint.h \ - toresultcontent.h \ - toresultdepend.h \ - toresultfield.h \ - toresultindexes.h \ - toresultitem.h \ - toresultlabel.h \ - toresultline.h \ - toresultlong.h \ - toresultpie.h \ - toresultplan.h \ - toresultreferences.h \ - toresultresources.h \ - toresultstats.h \ - toresultview.h \ - tosgastatement.h \ - tosmtp.h \ - tosql.h \ - tosqlparse.h \ - totabwidget.h \ - totemplate.h \ - totextview.h \ - tothread.h \ - totool.h \ - tovisualize.h \ - utils.h - -SOURCES=\ - toabout.cpp \ - toaboutui.cpp \ - toalert.cpp \ - toanalyze.cpp \ - tobackground.cpp \ - tobackup.cpp \ - tobarchart.cpp \ - tobrowser.cpp \ - tobrowserconstraintui.cpp \ - tobrowserfilterui.cpp \ - tobrowserindexui.cpp \ - tobrowsertableui.cpp \ - tochangeconnection.cpp \ - tochartalarmui.cpp \ - tochartmanager.cpp \ - tochartsetupui.cpp \ - toconnection.cpp \ - tocurrent.cpp \ - todatabasesettingui.cpp \ - todebug.cpp \ - todebugchangeui.cpp \ - todebugtext.cpp \ - todebugwatch.cpp \ - toeditextensiongotoui.cpp \ - toeditextensions.cpp \ - toeditextensionsetupui.cpp \ - toeditwidget.cpp \ - toextract.cpp \ - tofilesize.cpp \ - toglobalsetting.cpp \ - toglobalsettingui.cpp \ - tohelp.cpp \ - tohelpaddfileui.cpp \ - tohelpsetupui.cpp \ - tohighlightedtext.cpp \ - tohtml.cpp \ - toinvalid.cpp \ - tolegendchart.cpp \ - tolinechart.cpp \ - tolinechartsetupui.cpp \ - tomain.cpp \ - tomarkedtext.cpp \ - tomemoeditor.cpp \ - tomessageui.cpp \ - tonewconnection.cpp \ - tonewconnectionui.cpp \ - tonoblockquery.cpp \ - tooracleconnection.cpp \ - tooracleextract.cpp \ - tooraclepreload.cpp \ - tooraclesettingui.cpp \ - tooutput.cpp \ - toparamget.cpp \ - topassword.cpp \ - topiechart.cpp \ - topreferences.cpp \ - topreferencesui.cpp \ - toprofiler.cpp \ - toproject.cpp \ - toqsqlconnection.cpp \ - toreport.cpp \ - toresult.cpp \ - toresultbar.cpp \ - toresultcols.cpp \ - toresultcombo.cpp \ - toresultconstraint.cpp \ - toresultcontent.cpp \ - toresultcontentfilterui.cpp \ - toresultdepend.cpp \ - toresultextract.cpp \ - toresultfield.cpp \ - toresultindexes.cpp \ - toresultitem.cpp \ - toresultlabel.cpp \ - toresultline.cpp \ - toresultlistformatui.cpp \ - toresultlock.cpp \ - toresultlong.cpp \ - toresultparam.cpp \ - toresultpie.cpp \ - toresultplan.cpp \ - toresultreferences.cpp \ - toresultstats.cpp \ - toresultstorage.cpp \ - toresultview.cpp \ - torollback.cpp \ - torollbackdialogui.cpp \ - toscript.cpp \ - toscriptui.cpp \ - tosearchreplace.cpp \ - tosearchreplaceui.cpp \ - tosecurity.cpp \ - tosecurityquotaui.cpp \ - tosecurityroleui.cpp \ - tosecurityuserui.cpp \ - tosession.cpp \ - tosgastatement.cpp \ - tosgatrace.cpp \ - tosmtp.cpp \ - tosql.cpp \ - tosqledit.cpp \ - tosqlparse.cpp \ - tostorage.cpp \ - tostoragedatafileui.cpp \ - tostoragedefinition.cpp \ - tostoragedefinitionui.cpp \ - tostoragedialogui.cpp \ - tostorageprefsui.cpp \ - tostoragetablespaceui.cpp \ - tosyntaxsetup.cpp \ - tosyntaxsetupui.cpp \ - totabwidget.cpp \ - totemplate.cpp \ - totemplateaddfileui.cpp \ - totemplateeditui.cpp \ - totemplateprovider.cpp \ - totemplatesetupui.cpp \ - totemporary.cpp \ - totextview.cpp \ - tothread.cpp \ - totool.cpp \ - totoolsettingui.cpp \ - totuning.cpp \ - totuningoverviewui.cpp \ - totuningsettingui.cpp \ - tovisualize.cpp \ - towaitevents.cpp \ - toworksheet.cpp \ - toworksheetsetupui.cpp \ - toworksheetstatistic.cpp \ - utils.cpp - -default: all -include $(ORACLE_HOME)/rdbms/lib/env_rdbms.mk - -TRANSLATIONS=\ - tora_se.ts\ - tora_fr.ts\ - tora_it.ts\ - -CPPFLAGS=$(CPPFLAGS_GLOB) $(DEFINES) $(INCLUDES) -CFLAGS=$(CFLAGS_GLOB) $(INCLUDES) $(DEFINES) - -OBJECTS=$(filter %.o,$(SOURCES:%.cpp=objs/%.o)) -TRANSOBJ=$(filter %.qm,$(TRANSLATIONS:%.ts=%.qm)) - -DEPENDS=$(filter %.d,$(SOURCES:%.cpp=.depends/%.d)) .depends/main.d - -vpath %.h $(INCLUDE) - -.PHONY: all clean fixmod install distclean - -all: $(MAC_TARGET) lrelease - -#$(OBJECTS): Makefile Makefile.common - -.depends/%.d: %.cpp - @echo Making dependencies for $< - if [ ! -d .depends ] ; then mkdir -p .depends ; fi - $(GCC) -MM $(CPPFLAGS) $< > $@.tmp && \ - ( sed "s/^\(.*\.\)o\([ :]*\)/objs\/\1o \ - $(subst /,\\/,$@)\2/g" < $@.tmp > $@ ; rm -f $@.tmp ) - -include $(DEPENDS) - -%.moc: %.h - @echo Metacompiling $< - $(MOC) -o $@ $< - -%.cpp %.h: %.ui - echo Generating $(<:%.ui=%.cpp) \& $(<:%.ui=%.h) - $(UIC) -o $(<:%.ui=%.h) $< - $(UIC) -i $(<:%.ui=%.h) -o $(<:%.ui=%.cpp) $< - -objs/%.o: %.cpp - @echo Compiling $< - if [ ! -d objs ] ; then mkdir -p objs ; fi - $(GCC) $(CFLAGS) -o $@ -c $< - -%.o : objs/%.o - @echo Faulty dependency, forgot the objs/ part - -$(MAC_TARGET): $(TARGET) \ - $(CONTENTS_DIR)/Info.plist \ - $(CONTENTS_DIR)/PkgInfo \ - $(HELPDIR) \ - install-common - test -d $(DESTDIR)/ || mkdir -p $(DESTDIR)/ - -cp -p $(TARGET) $(DESTDIR)/tora - -$(CONTENTS_DIR)/PkgInfo: - @test -d $(CONTENTS_DIR)/ || mkdir -p $(CONTENTS_DIR)/ - -rm -fr $(CONTENTS_DIR)/PkgInfo >/dev/null 2>&1 - @echo "APPL????" > $(CONTENTS_DIR)/PkgInfo - -$(CONTENTS_DIR)/Info.plist: - @test -d $(CONTENTS_DIR)/ || mkdir -p $(CONTENTS_DIR)/ - -rm -fr $(CONTENTS_DIR)/Info.plist >/dev/null 2>&1 - @sed -e "s,@ICON@,application.icns,g" -e "s,@EXECUTABLE@,tora,g" $(QTDIR)/mkspecs/macx-g++/Info.plist.app > $(CONTENTS_DIR)/Info.plist - -$(HELPDIR): - @test -d $(RSCSDIR)/ || mkdir -p $(RSCSDIR)/ - -cp -pr help $(RSCSDIR)/ - -install-common: lrelease - @test -d $(RSCSDIR)/ || mkdir -p $(RSCSDIR)/ - -cp icons/tora.xpm $(RSCSDIR)/ >/dev/null 2>&1 - -cp templates/*.tpl $(RSCSDIR)/ >/dev/null 2>&1 - -cp *.qm $(RSCSDIR)/ >/dev/null 2>&1 - -clean: - @echo Cleaning $(TITLE) - -rm -rf objs tora tora-static tora-mono >/dev/null 2>&1 - -rm -f *~ >/dev/null 2>&1 - -rm -f *~ */*~ >/dev/null 2>&1 - -rm -f *.bak >/dev/null 2>&1 - -rm -rf plugins >/dev/null 2>&1 - -rm -rf $(MAC_APP_DIR) - -for a in *.ui ; \ - do rm -f `$(PERL) -e '$$_=shift(@ARGV); s/\.[^\.]*$$//; print "$$_.h\n$$_.cpp";' $$a`; \ - done - -distclean: clean - -rm -rf .depends >/dev/null 2>&1 - -rm -rf .xvpics >/dev/null 2>&1 - -rm -rf icons/.xvpics >/dev/null 2>&1 - -rm -f *.moc >/dev/null 2>&1 - -rm -f rpmcommon rpmoracle rpmmysql >/dev/null 2>&1 - -rm -f \#*\# >/dev/null 2>&1 - -rm -f configure.setup >/dev/null 2>&1 - -# Keyboard shortcuts - -main.cpp: tora_toad.h - -tora_toad.h: tora_toad.qm - $(PERL) chex.pl < $< > $@ - -tora_toad.qm: tora_toad.ts - $(LRELEASE) $< - -# Static target, easier to distribute - -tora-static: $(OBJECTS) main.cpp - @echo Linking $@ - $(GCC) $(LFLAGS) $(CFLAGS) $(LFLAGS_GLOB) -DTOMONOLITHIC -o $@ \ - $(OBJECTS) main.cpp $(QT_STATIC) $(STDCPP_STATIC) \ - $(ORACLE_STATIC) $(LIBS_GLOB) $(MYSQL_STATIC) - -tora.pro: Makefile - echo "# Not indended to be used for anything except lupdate" > tora.pro - echo 'SOURCES= \' >> tora.pro - echo ' main.cpp\' >> tora.pro - echo ' toextratranslations.cpp\' >> tora.pro - echo " $(SOURCES)" >> tora.pro - echo 'TRANSLATIONS=$(TRANSLATIONS)' >> tora.pro - -lupdate: tora.pro - $(LUPDATE) tora.pro - -lrelease: tora.pro $(TRANSLATIONS) - $(LRELEASE) tora.pro - Modified: branches/tora-trotl/Makefile.am =================================================================== --- branches/tora-trotl/Makefile.am 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/Makefile.am 2010-02-11 14:13:03 UTC (rev 3400) @@ -44,9 +44,9 @@ READMES = README\ README.CODESTYLE \ README.LICENSE \ - README.OSX \ README.LAYOUT \ README.CMAKE \ + README.OSX \ README.SVN \ README.BINARIES \ README.RELEASE \ @@ -56,7 +56,6 @@ rpm \ BUGS \ COPYING \ - Makefile.OSX \ Makefile.mingw \ $(READMES) \ config/m4 \ @@ -66,9 +65,13 @@ utils/chex/CMakeLists.txt \ cmake_uninstall.cmake.in \ config.h.cmake \ - cmake + cmake \ + osx_tools dist-hook: rm -rf `find $(distdir) -name .svn` + rm -rf `find $(distdir) -name moc_*.cpp` + rm -rf `find $(distdir) -name ui_*.h` + rm -rf `find $(distdir) -name qrc_tora.cpp` SUBDIRS = utils src test doc Modified: branches/tora-trotl/README.BINARIES =================================================================== --- branches/tora-trotl/README.BINARIES 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/README.BINARIES 2010-02-11 14:13:03 UTC (rev 3400) @@ -3,10 +3,11 @@ take over building binaries for a listed platform), please send a note to tora-develop list after subscribing to it. +With autoconf builds, it is best to specify "CXXFLAGS=-O2" to avoid +adding the debug symbols to the code by default. + Current Binary Maintainers: --------------------------- -Mandrake Cooker - Nathan Neulinger <nn...@ne...> - Windows - Alexey Danilchenko <al...@da...> Gentoo - Don Seiler <do...@se...> Modified: branches/tora-trotl/README.CMAKE =================================================================== --- branches/tora-trotl/README.CMAKE 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/README.CMAKE 2010-02-11 14:13:03 UTC (rev 3400) @@ -45,7 +45,10 @@ [8, 8I, 9I, 10G, 10G_R2]. Example: -DORACLE_OCI_VERSION=10G_R2 +You can switch off Oracle support with: +-DENABLE_ORACLE=0 + TOra requires PostgreSQL development environment to enable full PgSQL support (native cancel etc.). This environment shoud be found automatically on UNIXes. But you can @@ -56,11 +59,17 @@ Windows note: Sometimes (dunno why) it doesn't find pgsql libs. You can use "set LIB=%LIB%;pathtopgsqllibs" then. etc. +Native PostgreSQL support can be disabled with: +-DENABLE_PGSQL=0 TOra allows to be built as "bundle" application on Mac OS X. -DWANT_BUNDLE=1 -The bundle will be created in the CMAKE_INSTALL_PREFIX. +The bundle will be created in the CMAKE_INSTALL_PREFIX. The bundle +will contain all dependencies (Qt libs, DB clients libs etc.). +If there is WANT_BUNDLE specified, it can be set not to pack +all required libraries into the bundle location with: +-DWANT_BUNDLE_STANDALONE=1 Search following for more info: Added: branches/tora-trotl/README.EC2 =================================================================== --- branches/tora-trotl/README.EC2 (rev 0) +++ branches/tora-trotl/README.EC2 2010-02-11 14:13:03 UTC (rev 3400) @@ -0,0 +1,79 @@ +INITIAL INSTANCE SETUP +====================== + +Deploy a windows 2003 basic AMI, small, without auth services 10:03 + Seems like this sometimes takes 10 minutes or more to deploy. + Based on several build runs, I recommend the High-CPU Medium instance instead, windows + compiles are glacially slow. + +Wait for windows to be available, and get the default admin pw. 10:16 + +Change pw to one I know. + +Add/Remove Programs - remove windows components that aren't needed +(accessories, comms, IE advanced security, etc.) + +Connect to windows update and apply all security updates and IE8. + +Disable screen saver and password lock on resume + +Create a 15GB EBS volume in same availability zone as the VM. +Attach the EBS volume to path C:\build, basic disk, label as 'Build' + +Reboot to allow all security updates to take effect. + +Set classic start menu + +Properties on my computer, optimize for performance. + +Download and install Visual C++ 2008 Express + Do not install silverlight or SQL Server express + Install to default C: directory + +Run microsoft update to get any updates for VC and any additional server +updates. + +Download and install TortoiseSVN + +Download and install Postgres 8.4.1-1, disable postgres server service +after installation. C:\build\postgres + +Download and install MySQL 5.1.38 to C:\build\mysql - JUST the development +components, deselect everything else to save space. + +Download and extract oracle instant client 10.2.0.4 to C:\build\oracle + +Download and extract QT 4.5.2 sources to c:\build\qt + +Download and install CCleaner utility. + +Download and install CMake from cmake.org, add to system path for all users. + +Download and install NSIS from nsis.sourceforge.net + +Check out tora trunk to C:\build\tora + +Computer / Environment +set INCLUDE=%INCLUDE%;c:\build\postgres\include\;c:\build\mysql\include\ +set LIB=%LIB%;c:\build\postgres\lib\;c:\build\mysql\lib\opt\ + +Restart to apply any pending patches/updates. + +Run CCleaner utility - clean as much as possible, and also run the wipe free space function. + +Using elasticfox, bundle the running system into an AMI for re-use later. Be sure +and clean up old versions of the AMI when you bundle a new one. Ideally all "read write" +stuff should be on the EBS volume, so the AMI should only need to be regenerated if +new software gets installed or system updates need to be applied. + + +PER-USE INSTANCE DEPLOYMENT +=========================== + +Launch instance (I suggest using Medium-HighCPU) from the torabuild-X AMI. + +Attach the build EBS volume and make sure it is mounted solely as C:\build. + +Run builds/etc. as needed. + +Shut down instance when done. Modified: branches/tora-trotl/README.OSX =================================================================== --- branches/tora-trotl/README.OSX 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/README.OSX 2010-02-11 14:13:03 UTC (rev 3400) @@ -1,7 +1,8 @@ TOra is reported to build on Mac OS X (10.4 Tiger and later). Only Cmake build method is tested. See README.CMAKE. -Mac OS X bundle can be created with WANT_BUNDLE. See README.CMAKE. +Mac OS X bundle can be created with WANT_BUNDLE and optionaly WANT_BUNDLE_STANDALONE. +See README.CMAKE. Notes on Oracle Instantclient: Modified: branches/tora-trotl/README.RELEASE =================================================================== --- branches/tora-trotl/README.RELEASE 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/README.RELEASE 2010-02-11 14:13:03 UTC (rev 3400) @@ -3,18 +3,23 @@ Source tarball: --------------- -Check out the tora module from CVS +Check out the tora module from SVN Edit the configure.in file to set the version number Edit the NEWS file to set a release date -Commit, and then tag the release "cvs tag TORA_1_3_XX" +Commit, and then copy trunk to an appropriately named tag, such as: +svn copy -m "tag before starting 2.1.0 release process" https://tora.svn.sourceforge.net/svnroot/tora/trunk/tora https://tora.svn.sourceforge.net/svnroot/tora/tags/tora-2-1-0 + configure make dist -upload to upload.sf.net:/incoming/ +sftp nneul,to...@fr... +cd /home/pfs/project/t/to/tora/tora/2.1.0 +put tora-2.1.0.tar.gz - curl -T tora-1.3.xx.tar.gz ftp://upload.sf.net/incoming/ +scp tora-2.1.0.tar.gz nneul,to...@fr...:/home/frs/project/t/to/tora/tora/2.1.0/ + add new release to the 'tora' package RPM binaries: Modified: branches/tora-trotl/README.WINDOWS =================================================================== --- branches/tora-trotl/README.WINDOWS 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/README.WINDOWS 2010-02-11 14:13:03 UTC (rev 3400) @@ -1,6 +1,3 @@ -There is also a Mingw32 Fedora 11 Cross Compile build - see the README file -in the win32-cross directory, which also contains utility scripts for that build. - Content: - Building with MSVC - CMake - Building Windows installer. @@ -64,34 +61,15 @@ 8. Compile Tora - read README.CMAKE and dont forget to check environment is in 5. Example: -c: +c:\ cd \build\tora-build set PATH=%PATH%;c:\build\qt\bin - -# If you need to refresh from cmake, otherwise skip this step cmake -G "NMake Makefiles" -DWANT_INTERNAL_QSCINTILLA=1 -DCMAKE_INSTALL_PREFIX=c:\build\tora-build\RELEASE -DORACLE_OCI_VERSION=10G_R2 ..\tora - Misc notes: seting ORACLE_HOME is a good thing (TM) building with internal qscintilla is easier for beginners ;) prepare for longer headache (if you're a windows devel newbie) -nmake - Issuing nmake will actually run the build process itself. - # -# Testing -# -Above build will generate into the tora-build\RELEASE dir. Copy the various dll files from Qt, Postgres, MySQL -installs into that dir as well: - comerr32.dll gssapi32.dll k5sprt32.dll krb5_32.dll libeay32.dll libiconv-2.dll libintl-8.dll libpq.dll ssleay32.dll - libmysql.dll qsqlmysqld4.dll - oci.dll - QtCore4.dll QtGui4.dll QtNetwork4.dll QtSql4.dll QtXml4.dll -Then you should be able to run tora.exe from that dir. This can be used to test prior to packaging. - -(NOTE- Above is ghastly, surely there is a better way of doing this?!?!) - -# # Building Windows installer. # Copied: branches/tora-trotl/debian/README.source (from rev 3329, trunk/tora/debian/README.source) =================================================================== --- branches/tora-trotl/debian/README.source (rev 0) +++ branches/tora-trotl/debian/README.source 2010-02-11 14:13:03 UTC (rev 3400) @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new <patch> + +where <patch> is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add <file> + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P <patch> /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). <patch> as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete <patch> + +You may need to run quilt pop -a to unapply patches first before running +this command. Modified: branches/tora-trotl/debian/control =================================================================== --- branches/tora-trotl/debian/control 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/debian/control 2010-02-11 14:13:03 UTC (rev 3400) @@ -4,8 +4,8 @@ Maintainer: Debian KDE Extras Team <pkg...@li...> Uploaders: Michael Meskes <me...@de...> Build-Depends: debhelper (>= 5), kdelibs5-dev, kdebase-bin, dpatch, libqscintilla2-dev, cdbs, libpq-dev -Standards-Version: 3.8.1 -Homepage: http://sourceforge.net/projects/tora/ +Standards-Version: 3.8.3 +Homepage: http://www.torasql.com Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/tora.git Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/tora.git Modified: branches/tora-trotl/debian/copyright =================================================================== --- branches/tora-trotl/debian/copyright 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/debian/copyright 2010-02-11 14:13:03 UTC (rev 3400) @@ -23,4 +23,4 @@ GNU General Public License version 2. On Debian GNU/Linux systems, a copy of the GNU GPL can be found in -/usr/share/common-licenses/GPL. +/usr/share/common-licenses/GPL-2. Copied: branches/tora-trotl/debian/patches/00list (from rev 3329, trunk/tora/debian/patches/00list) =================================================================== --- branches/tora-trotl/debian/patches/00list (rev 0) +++ branches/tora-trotl/debian/patches/00list 2010-02-11 14:13:03 UTC (rev 3400) @@ -0,0 +1 @@ +03_README.LAYOUT Copied: branches/tora-trotl/debian/patches/03_README.LAYOUT.dpatch (from rev 3329, trunk/tora/debian/patches/03_README.LAYOUT.dpatch) =================================================================== --- branches/tora-trotl/debian/patches/03_README.LAYOUT.dpatch (rev 0) +++ branches/tora-trotl/debian/patches/03_README.LAYOUT.dpatch 2010-02-11 14:13:03 UTC (rev 3400) @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_README.LAYOUT.dpatch by Michael Meskes <me...@de...> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No such file README.LAYOUT + +@DPATCH@ + +diff -ruN tora-2.0.0.orig/CMakeLists.txt tora-2.0.0/CMakeLists.txt +--- tora-2.0.0.orig/CMakeLists.txt 2008-11-03 21:32:20.000000000 +0100 ++++ tora-2.0.0/CMakeLists.txt 2009-01-03 21:29:48.000000000 +0100 +@@ -282,7 +282,6 @@ + README.BINARIES + README.CMAKE + README.CODESTYLE +- README.LAYOUT + README.LICENSE + README.OSX + README.RELEASE Modified: branches/tora-trotl/debian/rules =================================================================== --- branches/tora-trotl/debian/rules 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/debian/rules 2010-02-11 14:13:03 UTC (rev 3400) @@ -28,4 +28,3 @@ -install --owner root --group root --mode=644 $(CURDIR)/src/icons/toramini.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/16x16/apps/tora.xpm # we have a desktop file -install --owner root --group root --mode=644 $(CURDIR)/debian/tora.desktop $(CURDIR)/debian/tora/usr/share/applications - dh_desktop Copied: branches/tora-trotl/debian/tora.install (from rev 3329, trunk/tora/debian/tora.install) =================================================================== --- branches/tora-trotl/debian/tora.install (rev 0) +++ branches/tora-trotl/debian/tora.install 2010-02-11 14:13:03 UTC (rev 3400) @@ -0,0 +1,4 @@ +doc/help/*.html /usr/share/tora/help +doc/help/images/*.png /usr/share/tora/help/images + +src/icons/tora.xpm /usr/share/icons/hicolor/32x32/apps Modified: branches/tora-trotl/doc/help/Index_002dlist.html =================================================================== --- branches/tora-trotl/doc/help/Index_002dlist.html 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/doc/help/Index_002dlist.html 2010-02-11 14:13:03 UTC (rev 3400) @@ -8,7 +8,7 @@ <link rel="prev" href="extendingtora.html#extendingtora" title="extendingtora"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1.--> +This manual is for TOra, version 2.1.1+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } @@ -35,42 +35,44 @@ <h2 class="unnumbered">Index-list</h2> <ul class="index-cp" compact> -<li><a href="additionalhelp.html#index-Additional-Help-Settings-13">Additional Help Settings</a>: <a href="additionalhelp.html#additionalhelp">additionalhelp</a></li> -<li><a href="alert.html#index-Alert-Tool-31">Alert Tool</a>: <a href="alert.html#alert">alert</a></li> -<li><a href="tools.html#index-Available-tools-16">Available tools</a>: <a href="tools.html#tools">tools</a></li> +<li><a href="additionalhelp.html#index-Additional-Help-Settings-14">Additional Help Settings</a>: <a href="additionalhelp.html#additionalhelp">additionalhelp</a></li> +<li><a href="alert.html#index-Alert-Tool-33">Alert Tool</a>: <a href="alert.html#alert">alert</a></li> +<li><a href="tools.html#index-Available-tools-18">Available tools</a>: <a href="tools.html#tools">tools</a></li> <li><a href="newconnection.html#index-Connecting-to-a-database-5">Connecting to a database</a>: <a href="newconnection.html#newconnection">newconnection</a></li> -<li><a href="current.html#index-Current-Session-28">Current Session</a>: <a href="current.html#current">current</a></li> -<li><a href="database.html#index-Database-Settings-12">Database Settings</a>: <a href="database.html#database">database</a></li> -<li><a href="editor.html#index-Editor-Settings-11">Editor Settings</a>: <a href="editor.html#editor">editor</a></li> +<li><a href="current.html#index-Current-Session-30">Current Session</a>: <a href="current.html#current">current</a></li> +<li><a href="database.html#index-Database-Settings-13">Database Settings</a>: <a href="database.html#database">database</a></li> +<li><a href="editor.html#index-Editor-Settings-12">Editor Settings</a>: <a href="editor.html#editor">editor</a></li> <li><a href="window.html#index-Elements-of-the-main-window-4">Elements of the main window</a>: <a href="window.html#window">window</a></li> -<li><a href="extendingtora.html#index-Extending-TOra-36">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li> +<li><a href="extendingtora.html#index-Extending-TOra-38">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li> <li><a href="workspace.html#index-Getting-to-know-your-workspace-3">Getting to know your workspace</a>: <a href="workspace.html#workspace">workspace</a></li> <li><a href="history.html#index-History-and-future-of-TOra-2">History and future of TOra</a>: <a href="history.html#history">history</a></li> -<li><a href="invalid.html#index-Invalid-Objects-32">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li> -<li><a href="lists.html#index-lists-7">lists</a>: <a href="lists.html#lists">lists</a></li> -<li><a href="common.html#index-Other-common-elements-15">Other common elements</a>: <a href="common.html#common">common</a></li> -<li><a href="debugger.html#index-PL_002fSQL-Debugger-20">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li> -<li><a href="plsqleditor.html#index-PL_002fSQL-Editor-19">PL/SQL Editor</a>: <a href="plsqleditor.html#plsqleditor">plsqleditor</a></li> -<li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-21">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li> -<li><a href="preferences.html#index-Preferences-10">Preferences</a>: <a href="preferences.html#preferences">preferences</a></li> -<li><a href="rollback.html#index-Rollback-Segments-26">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li> -<li><a href="browser.html#index-Schema-Browser-18">Schema Browser</a>: <a href="browser.html#browser">browser</a></li> -<li><a href="script.html#index-Schema-extraction_002c-compare-and-search-29">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li> -<li><a href="searchreplace.html#index-Search-_0026-Replace-9">Search & Replace</a>: <a href="searchreplace.html#searchreplace">searchreplace</a></li> -<li><a href="security.html#index-Security-Manager-23">Security Manager</a>: <a href="security.html#security">security</a></li> -<li><a href="tuning.html#index-Server-Tuning-22">Server Tuning</a>: <a href="tuning.html#tuning">tuning</a></li> -<li><a href="session.html#index-Session-Manager-25">Session Manager</a>: <a href="session.html#session">session</a></li> -<li><a href="trace.html#index-SGA-Trace-27">SGA Trace</a>: <a href="trace.html#trace">trace</a></li> -<li><a href="sqledit.html#index-SQL-Editor-35">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li> -<li><a href="worksheet.html#index-SQL-Editor-17">SQL Editor</a>: <a href="worksheet.html#worksheet">worksheet</a></li> -<li><a href="output.html#index-SQL-Output-33">SQL Output</a>: <a href="output.html#output">output</a></li> -<li><a href="analyze.html#index-Statistics-manager-30">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li> -<li><a href="storage.html#index-Storage-Manager-24">Storage Manager</a>: <a href="storage.html#storage">storage</a></li> -<li><a href="template.html#index-Template-Help-34">Template Help</a>: <a href="template.html#template">template</a></li> -<li><a href="toolsetting.html#index-Tool-Settings-14">Tool Settings</a>: <a href="toolsetting.html#toolsetting">toolsetting</a></li> -<li><a href="api.html#index-TOra-Tool-Tutorial-37">TOra Tool Tutorial</a>: <a href="api.html#api">api</a></li> -<li><a href="charts.html#index-Using-charts-8">Using charts</a>: <a href="charts.html#charts">charts</a></li> -<li><a href="editors.html#index-Using-editors-6">Using editors</a>: <a href="editors.html#editors">editors</a></li> +<li><a href="invalid.html#index-Invalid-Objects-34">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li> +<li><a href="lists.html#index-lists-8">lists</a>: <a href="lists.html#lists">lists</a></li> +<li><a href="common.html#index-Other-common-elements-16">Other common elements</a>: <a href="common.html#common">common</a></li> +<li><a href="debugger.html#index-PL_002fSQL-Debugger-22">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li> +<li><a href="plsqleditor.html#index-PL_002fSQL-Editor-21">PL/SQL Editor</a>: <a href="plsqleditor.html#plsqleditor">plsqleditor</a></li> +<li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-23">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li> +<li><a href="preferences.html#index-Preferences-11">Preferences</a>: <a href="preferences.html#preferences">preferences</a></li> +<li><a href="rollback.html#index-Rollback-Segments-28">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li> +<li><a href="browser.html#index-Schema-Browser-20">Schema Browser</a>: <a href="browser.html#browser">browser</a></li> +<li><a href="script.html#index-Schema-extraction_002c-compare-and-search-31">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li> +<li><a href="searchreplace.html#index-Search-_0026-Replace-10">Search & Replace</a>: <a href="searchreplace.html#searchreplace">searchreplace</a></li> +<li><a href="security.html#index-Security-Manager-25">Security Manager</a>: <a href="security.html#security">security</a></li> +<li><a href="tuning.html#index-Server-Tuning-24">Server Tuning</a>: <a href="tuning.html#tuning">tuning</a></li> +<li><a href="session.html#index-Session-Manager-27">Session Manager</a>: <a href="session.html#session">session</a></li> +<li><a href="sgastatement.html#index-SGA-Statement-17">SGA Statement</a>: <a href="sgastatement.html#sgastatement">sgastatement</a></li> +<li><a href="trace.html#index-SGA-Trace-29">SGA Trace</a>: <a href="trace.html#trace">trace</a></li> +<li><a href="sqledit.html#index-SQL-Editor-37">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li> +<li><a href="worksheet.html#index-SQL-Editor-19">SQL Editor</a>: <a href="worksheet.html#worksheet">worksheet</a></li> +<li><a href="output.html#index-SQL-Output-35">SQL Output</a>: <a href="output.html#output">output</a></li> +<li><a href="analyze.html#index-Statistics-manager-32">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li> +<li><a href="storage.html#index-Storage-Manager-26">Storage Manager</a>: <a href="storage.html#storage">storage</a></li> +<li><a href="template.html#index-Template-Help-36">Template Help</a>: <a href="template.html#template">template</a></li> +<li><a href="toolsetting.html#index-Tool-Settings-15">Tool Settings</a>: <a href="toolsetting.html#toolsetting">toolsetting</a></li> +<li><a href="api.html#index-TOra-Tool-Tutorial-39">TOra Tool Tutorial</a>: <a href="api.html#api">api</a></li> +<li><a href="charts.html#index-Using-charts-9">Using charts</a>: <a href="charts.html#charts">charts</a></li> +<li><a href="editors.html#index-Using-editors-7">Using editors</a>: <a href="editors.html#editors">editors</a></li> <li><a href="help.html#index-Using-the-help-browser-1">Using the help browser</a>: <a href="help.html#help">help</a></li> +<li><a href="whatprivileges.html#index-What-privileges-do-you-need-to-run-TOra-6">What privileges do you need to run TOra</a>: <a href="whatprivileges.html#whatprivileges">whatprivileges</a></li> </ul></body></html> Modified: branches/tora-trotl/doc/help/debugger.html =================================================================== --- branches/tora-trotl/doc/help/debugger.html 2010-02-11 14:05:08 UTC (rev 3399) +++ branches/tora-trotl/doc/help/debugger.html 2010-02-11 14:13:03 UTC (rev 3400) @@ -49,9 +49,9 @@ <p>The lower pane Contents contains the structure of the selected object. Here you can find declared methods of packages and also variables or even anonymous blocks in your code. Selecting a line in this pane will move the cursor to where the element is in your code, for instance where a variable or method is declared. - <p>To the right is a large editor area where you can edit the current object. The editor is describe more later. + <p>To the right is a large editor area where you can edit the current object. The editor is described in more detail later. - <p>The last part of the screen is not always visible and contain information about the currently running debugging session. + <p>The last part of the... [truncated message content] |
From: <ibr...@us...> - 2010-02-11 15:13:45
|
Revision: 3405 http://tora.svn.sourceforge.net/tora/?rev=3405&view=rev Author: ibre5041 Date: 2010-02-11 15:13:38 +0000 (Thu, 11 Feb 2010) Log Message: ----------- Rename file for precompiled headers It it impossible to have same file for gcc and MSVC. On MSVC precompiled header MUST not contain any preprocessor macros. The header file will not be included using #include but rather through compiler option ForcedIncludeFiles. Modified Paths: -------------- branches/tora-trotl/tora-trotl.vcproj branches/tora-trotl/tora-trotl_test0.vcproj branches/tora-trotl/tora-trotl_test1.vcproj branches/tora-trotl/tora-trotl_test2.vcproj Removed Paths: ------------- branches/tora-trotl/src/precompiled.h Deleted: branches/tora-trotl/src/precompiled.h =================================================================== --- branches/tora-trotl/src/precompiled.h 2010-02-11 15:05:49 UTC (rev 3404) +++ branches/tora-trotl/src/precompiled.h 2010-02-11 15:13:38 UTC (rev 3405) @@ -1,196 +0,0 @@ - -#pragma once - -// QT headers first -#include <qapplication.h> -#include <qcheckbox.h> -#include <qclipboard.h> -#include <qcolordialog.h> -#include <qcombobox.h> -#include <qcursor.h> -#include <qdatetime.h> -#include <qdialog.h> -#include <qdir.h> -#include <qevent.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qfontdialog.h> -#include <qfont.h> -#include <qglobal.h> -#include <qinputdialog.h> -#include <qkeysequence.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qmainwindow.h> -#include <qmenubar.h> -#include <qmessagebox.h> -#include <qmime.h> -#include <qmovie.h> -#include <qnamespace.h> -#include <qobject.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qpoint.h> -#include <qprinter.h> -#include <qprogressdialog.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qregexp.h> -#include <qsizepolicy.h> -#include <qspinbox.h> -#include <qsplitter.h> -#include <qsqldatabase.h> -#include <qsqlerror.h> -#include <qsqlfield.h> -#include <qsqlrecord.h> -#include <qsqlresult.h> -#include <qstatusbar.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qstyle.h> -#include <qtabwidget.h> -#include <qtextcodec.h> -#include <qtimer.h> -#include <qtoolbar.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qvalidator.h> -#include <qvariant.h> -#include <qwidget.h> - -#include <QAbstractItemModel> -#include <QAbstractTableModel> -#include <QAction> -#include <QApplication> -#include <QBrush> -#include <QButtonGroup> -#include <QByteArray> -#include <QChar> -#include <QCheckBox> -#include <QClipboard> -#include <QCloseEvent> -#include <QColor> -#include <QColorGroup> -#include <QContextMenuEvent> -#include <QCoreApplication> -#include <QDataStream> -#include <QDateTime> -// #include <QDebug> -#include <QDesktopWidget> -#include <QDialog> -#include <QDialogButtonBox> -#include <QDir> -#include <QDockWidget> -#include <QDropEvent> -#include <QEvent> -#include <QFile> -#include <QFileDialog> -#include <QFileInfo> -#include <QFocusEvent> -#include <QFont> -#include <QFontMetrics> -#include <QFrame> -#include <QGridLayout> -#include <QGroupBox> -#include <QHBoxLayout> -#include <QHeaderView> -#include <QHideEvent> -#include <QIcon> -#include <QInputDialog> -#include <QItemDelegate> -#include <QKeyEvent> -#include <QLabel> -#include <QLineEdit> -#include <QList> -#include <QListWidget> -#include <QLocale> -#include <QMainWindow> -#include <QMap> -#include <QMdiArea> -#include <QMdiSubWindow> -#include <QMenu> -#include <QMessageBox> -#include <QMetaType> -#include <QMimeData> -#include <QModelIndex> -#include <QModelIndexList> -#include <QMouseEvent> -#include <QMutex> -#include <QMutexLocker> -#include <QObject> -#include <QPainter> -#include <QPaintEvent> -#include <QPalette> -#include <QPixmap> -#include <QPoint> -#include <QPointer> -#include <QPolygon> -#include <QPrintDialog> -#include <QProgressBar> -#include <QProgressDialog> -#include <QPushButton> -#include <QRect> -#include <QRegExp> -#include <QResizeEvent> -#include <QScrollArea> -#include <QScrollBar> -#include <QSettings> -#include <QShowEvent> -#include <QSize> -#include <QSortFilterProxyModel> -#include <QSpacerItem> -#include <QSplitter> -#include <QStackedWidget> -#include <QStatusBar> -#include <QString> -#include <QStringList> -#include <QStyle> -#include <QStyleFactory> -#include <QStyleOptionButton> -#include <QStylePainter> -#include <QTableView> -#include <QTabWidget> -#include <QTcpSocket> -#include <QtDebug> -#include <QTextBrowser> -#include <QTextCodec> -#include <QTextEdit> -#include <QTextStream> -#include <QtGlobal> -#include <QThread> -#include <QThreadStorage> -#include <QTimer> -#include <QTimerEvent> -#include <QToolBar> -#include <QToolButton> -#include <QTranslator> -#include <QTreeView> -#include <QTreeWidget> -#include <QTreeWidgetItem> -#include <QTreeWidgetItemIterator> -#include <QtSql> -#include <QVariant> -#include <QVBoxLayout> -#include <QVector> -#include <QWaitCondition> -#include <QWidget> - -// STL headers -#include <algorithm> -#include <iostream> -#include <map> -#include <list> - -// TOra headers -#include "toresultview.h" -#include "tomain.h" -#include "tosql.h" -#include "toconf.h" -#include "totool.h" -#include "toconnection.h" -#include "utils.h" -#include "config.h" -#include "tologger.h" - Modified: branches/tora-trotl/tora-trotl.vcproj =================================================================== --- branches/tora-trotl/tora-trotl.vcproj 2010-02-11 15:05:49 UTC (rev 3404) +++ branches/tora-trotl/tora-trotl.vcproj 2010-02-11 15:13:38 UTC (rev 3405) @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="1" - PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderThrough="precompiled_msvc.h" PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" ObjectFile="$(IntDir)$(ProjectName)\" ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" @@ -58,7 +58,7 @@ WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" - ForcedIncludeFiles="precompiled.h" + ForcedIncludeFiles="precompiled_msvc.h" /> <Tool Name="VCManagedResourceCompilerTool" @@ -132,7 +132,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"c:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" RuntimeLibrary="2" UsePrecompiledHeader="0" - PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderThrough="precompiled_msvc.h" PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" ObjectFile="$(IntDir)$(ProjectName)\" ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" @@ -141,7 +141,7 @@ BrowseInformationFile="$(IntDir)$(ProjectName)\" WarningLevel="3" DebugInformationFormat="3" - ForcedIncludeFiles="precompiled.h" + ForcedIncludeFiles="precompiled_msvc.h" /> <Tool Name="VCManagedResourceCompilerTool" Modified: branches/tora-trotl/tora-trotl_test0.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test0.vcproj 2010-02-11 15:05:49 UTC (rev 3404) +++ branches/tora-trotl/tora-trotl_test0.vcproj 2010-02-11 15:13:38 UTC (rev 3405) @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="1" - PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderThrough="precompiled_msvc.h" PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" ObjectFile="$(IntDir)$(ProjectName)\" ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" @@ -58,7 +58,7 @@ WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" - ForcedIncludeFiles="precompiled.h" + ForcedIncludeFiles="precompiled_msvc.h" /> <Tool Name="VCManagedResourceCompilerTool" @@ -132,7 +132,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" RuntimeLibrary="2" UsePrecompiledHeader="0" - PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderThrough="precompiled_msvc.h" PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" ObjectFile="$(IntDir)$(ProjectName)\" ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" Modified: branches/tora-trotl/tora-trotl_test1.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test1.vcproj 2010-02-11 15:05:49 UTC (rev 3404) +++ branches/tora-trotl/tora-trotl_test1.vcproj 2010-02-11 15:13:38 UTC (rev 3405) @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="1" - PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderThrough="precompiled_msvc.h" PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" ObjectFile="$(IntDir)$(ProjectName)\" ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" @@ -57,7 +57,7 @@ WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" - ForcedIncludeFiles="precompiled.h" + ForcedIncludeFiles="precompiled_msvc.h" /> <Tool Name="VCManagedResourceCompilerTool" @@ -131,7 +131,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" RuntimeLibrary="2" UsePrecompiledHeader="0" - PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderThrough="precompiled_msvc.h" PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" ObjectFile="$(IntDir)$(ProjectName)\" ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" Modified: branches/tora-trotl/tora-trotl_test2.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test2.vcproj 2010-02-11 15:05:49 UTC (rev 3404) +++ branches/tora-trotl/tora-trotl_test2.vcproj 2010-02-11 15:13:38 UTC (rev 3405) @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="1" - PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderThrough="precompiled_msvc.h" PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" ObjectFile="$(IntDir)$(ProjectName)\" ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" @@ -57,7 +57,7 @@ WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" - ForcedIncludeFiles="precompiled.h" + ForcedIncludeFiles="precompiled_msvc.h" /> <Tool Name="VCManagedResourceCompilerTool" @@ -131,7 +131,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" RuntimeLibrary="2" UsePrecompiledHeader="0" - PrecompiledHeaderThrough="precompiled.h" + PrecompiledHeaderThrough="precompiled_msvc.h" PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch" ObjectFile="$(IntDir)$(ProjectName)\" ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2010-02-14 11:40:43
|
Revision: 3417 http://tora.svn.sourceforge.net/tora/?rev=3417&view=rev Author: ibre5041 Date: 2010-02-14 11:40:36 +0000 (Sun, 14 Feb 2010) Log Message: ----------- add missing files Modified Paths: -------------- branches/tora-trotl/tora-trotl.vcproj branches/tora-trotl/tora-trotl_test0.vcproj branches/tora-trotl/tora-trotl_test1.vcproj branches/tora-trotl/tora-trotl_test2.vcproj Modified: branches/tora-trotl/tora-trotl.vcproj =================================================================== --- branches/tora-trotl/tora-trotl.vcproj 2010-02-14 09:50:39 UTC (rev 3416) +++ branches/tora-trotl/tora-trotl.vcproj 2010-02-14 11:40:36 UTC (rev 3417) @@ -736,6 +736,10 @@ > </File> <File + RelativePath=".\src\toawr.cpp" + > + </File> + <File RelativePath=".\src\tobackground.cpp" > </File> @@ -1000,6 +1004,14 @@ > </File> <File + RelativePath=".\src\tooraclepreload.cpp" + > + </File> + <File + RelativePath=".\src\tooracletable.cpp" + > + </File> + <File RelativePath=".\src\tooutput.cpp" > </File> @@ -1654,6 +1666,10 @@ > </File> <File + RelativePath=".\src\tooracleextract.h" + > + </File> + <File RelativePath=".\src\tooraclesetting.h" > </File> Modified: branches/tora-trotl/tora-trotl_test0.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test0.vcproj 2010-02-14 09:50:39 UTC (rev 3416) +++ branches/tora-trotl/tora-trotl_test0.vcproj 2010-02-14 11:40:36 UTC (rev 3417) @@ -213,6 +213,10 @@ > </File> <File + RelativePath=".\src\moc_toawr.cxx" + > + </File> + <File RelativePath=".\src\moc_tobackgroundlabel.cxx" > </File> @@ -725,6 +729,10 @@ > </File> <File + RelativePath=".\src\toawr.cpp" + > + </File> + <File RelativePath=".\src\tobackground.cpp" > </File> @@ -989,6 +997,10 @@ > </File> <File + RelativePath=".\src\tooracletable.cpp" + > + </File> + <File RelativePath=".\src\tooutput.cpp" > </File> @@ -1363,6 +1375,10 @@ > </File> <File + RelativePath=".\src\toawr.h" + > + </File> + <File RelativePath=".\src\tobackground.h" > </File> @@ -1643,6 +1659,10 @@ > </File> <File + RelativePath=".\src\tooracleextract.h" + > + </File> + <File RelativePath=".\src\tooraclesetting.h" > </File> Modified: branches/tora-trotl/tora-trotl_test1.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test1.vcproj 2010-02-14 09:50:39 UTC (rev 3416) +++ branches/tora-trotl/tora-trotl_test1.vcproj 2010-02-14 11:40:36 UTC (rev 3417) @@ -212,6 +212,10 @@ > </File> <File + RelativePath=".\src\moc_toawr.cxx" + > + </File> + <File RelativePath=".\src\moc_tobackgroundlabel.cxx" > </File> @@ -724,6 +728,10 @@ > </File> <File + RelativePath=".\src\toawr.cpp" + > + </File> + <File RelativePath=".\src\tobackground.cpp" > </File> @@ -988,6 +996,10 @@ > </File> <File + RelativePath=".\src\tooracletable.cpp" + > + </File> + <File RelativePath=".\src\tooutput.cpp" > </File> @@ -1362,6 +1374,10 @@ > </File> <File + RelativePath=".\src\toawr.h" + > + </File> + <File RelativePath=".\src\tobackground.h" > </File> Modified: branches/tora-trotl/tora-trotl_test2.vcproj =================================================================== --- branches/tora-trotl/tora-trotl_test2.vcproj 2010-02-14 09:50:39 UTC (rev 3416) +++ branches/tora-trotl/tora-trotl_test2.vcproj 2010-02-14 11:40:36 UTC (rev 3417) @@ -212,6 +212,10 @@ > </File> <File + RelativePath=".\src\moc_toawr.cxx" + > + </File> + <File RelativePath=".\src\moc_tobackgroundlabel.cxx" > </File> @@ -724,6 +728,10 @@ > </File> <File + RelativePath=".\src\toawr.cpp" + > + </File> + <File RelativePath=".\src\tobackground.cpp" > </File> @@ -988,6 +996,10 @@ > </File> <File + RelativePath=".\src\tooracletable.cpp" + > + </File> + <File RelativePath=".\src\tooutput.cpp" > </File> @@ -1362,6 +1374,10 @@ > </File> <File + RelativePath=".\src\toawr.h" + > + </File> + <File RelativePath=".\src\tobackground.h" > </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2010-02-14 14:15:47
|
Revision: 3420 http://tora.svn.sourceforge.net/tora/?rev=3420&view=rev Author: ibre5041 Date: 2010-02-14 14:15:38 +0000 (Sun, 14 Feb 2010) Log Message: ----------- sync with tora trunk Modified Paths: -------------- branches/tora-trotl/cmake/modules/FindOracle.cmake branches/tora-trotl/src/Makefile.am branches/tora-trotl/src/qscintilla2/CMakeLists.txt branches/tora-trotl/src/qscintilla2/ChangeLog branches/tora-trotl/src/qscintilla2/Qt4/ListBoxQt.cpp branches/tora-trotl/src/qscintilla2/Qt4/ListBoxQt.h branches/tora-trotl/src/qscintilla2/Qt4/PlatQt.cpp branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciabstractapis.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciapis.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscicommand.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscicommandset.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscidocument.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciglobal.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexer.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerbash.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerbatch.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercmake.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercpp.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercsharp.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercss.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerd.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerdiff.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerfortran.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerfortran77.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerhtml.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexeridl.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerjava.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerjavascript.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerlua.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexermakefile.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerpascal.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerperl.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerpostscript.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerpov.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerproperties.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerpython.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerruby.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexersql.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexertcl.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexertex.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexervhdl.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerxml.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexeryaml.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscimacro.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciprinter.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciscintilla.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciscintillabase.h branches/tora-trotl/src/qscintilla2/Qt4/SciClasses.cpp branches/tora-trotl/src/qscintilla2/Qt4/SciClasses.h branches/tora-trotl/src/qscintilla2/Qt4/ScintillaQt.cpp branches/tora-trotl/src/qscintilla2/Qt4/ScintillaQt.h branches/tora-trotl/src/qscintilla2/Qt4/qsciabstractapis.cpp branches/tora-trotl/src/qscintilla2/Qt4/qsciapis.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscicommand.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscicommandset.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscidocument.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexer.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerbash.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerbatch.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexercmake.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexercpp.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexercsharp.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexercss.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerd.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerdiff.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerfortran.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerfortran77.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerhtml.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexeridl.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerjava.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerjavascript.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerlua.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexermakefile.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerpascal.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerperl.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerpostscript.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerpov.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerproperties.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerpython.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerruby.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexersql.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexertcl.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexertex.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexervhdl.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerxml.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexeryaml.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscimacro.cpp branches/tora-trotl/src/qscintilla2/Qt4/qsciprinter.cpp branches/tora-trotl/src/qscintilla2/Qt4/qsciscintilla.cpp branches/tora-trotl/src/qscintilla2/Qt4/qsciscintillabase.cpp branches/tora-trotl/src/qscintilla2/include/Face.py branches/tora-trotl/src/qscintilla2/include/HFacer.py branches/tora-trotl/src/qscintilla2/include/SciLexer.h branches/tora-trotl/src/qscintilla2/include/Scintilla.h branches/tora-trotl/src/qscintilla2/include/Scintilla.iface branches/tora-trotl/src/qscintilla2/include/ScintillaWidget.h branches/tora-trotl/src/qscintilla2/src/CellBuffer.cpp branches/tora-trotl/src/qscintilla2/src/CellBuffer.h branches/tora-trotl/src/qscintilla2/src/Document.cpp branches/tora-trotl/src/qscintilla2/src/Document.h branches/tora-trotl/src/qscintilla2/src/Editor.cpp branches/tora-trotl/src/qscintilla2/src/Editor.h branches/tora-trotl/src/qscintilla2/src/Indicator.cpp branches/tora-trotl/src/qscintilla2/src/Indicator.h branches/tora-trotl/src/qscintilla2/src/KeyWords.cpp branches/tora-trotl/src/qscintilla2/src/LexAU3.cpp branches/tora-trotl/src/qscintilla2/src/LexBash.cpp branches/tora-trotl/src/qscintilla2/src/LexCPP.cpp branches/tora-trotl/src/qscintilla2/src/LexD.cpp branches/tora-trotl/src/qscintilla2/src/LexFortran.cpp branches/tora-trotl/src/qscintilla2/src/LexGen.py branches/tora-trotl/src/qscintilla2/src/LexHTML.cpp branches/tora-trotl/src/qscintilla2/src/LexInno.cpp branches/tora-trotl/src/qscintilla2/src/LexOthers.cpp branches/tora-trotl/src/qscintilla2/src/LexPascal.cpp branches/tora-trotl/src/qscintilla2/src/LexPerl.cpp branches/tora-trotl/src/qscintilla2/src/LexProgress.cpp branches/tora-trotl/src/qscintilla2/src/LexPython.cpp branches/tora-trotl/src/qscintilla2/src/LexRuby.cpp branches/tora-trotl/src/qscintilla2/src/LexSQL.cpp branches/tora-trotl/src/qscintilla2/src/LexTADS3.cpp branches/tora-trotl/src/qscintilla2/src/LexTeX.cpp branches/tora-trotl/src/qscintilla2/src/LexVerilog.cpp branches/tora-trotl/src/qscintilla2/src/LexYAML.cpp branches/tora-trotl/src/qscintilla2/src/PositionCache.cpp branches/tora-trotl/src/qscintilla2/src/RESearch.cpp branches/tora-trotl/src/qscintilla2/src/SciTE.properties branches/tora-trotl/src/qscintilla2/src/ScintillaBase.cpp branches/tora-trotl/src/qscintilla2/src/SplitVector.h branches/tora-trotl/src/qscintilla2/src/UniConversion.cpp branches/tora-trotl/src/qscintilla2/src/ViewStyle.cpp branches/tora-trotl/src/qscintilla2/src/ViewStyle.h branches/tora-trotl/src/tobrowsertable.cpp branches/tora-trotl/src/toconnection.cpp branches/tora-trotl/src/toconnection.h branches/tora-trotl/src/todefaultkeywords.h branches/tora-trotl/src/tooracleconnection.cpp branches/tora-trotl/src/tooracletable.cpp branches/tora-trotl/src/toplsqltext.cpp branches/tora-trotl/src/toresulttableviewedit.cpp branches/tora-trotl/src/tosqlparse.cpp branches/tora-trotl/src/totableselect.cpp branches/tora-trotl/src/toworksheet.cpp Added Paths: ----------- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercustom.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerspice.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerverilog.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscistyle.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscistyledtext.h branches/tora-trotl/src/qscintilla2/Qt4/qscilexercustom.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerspice.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscilexerverilog.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscistyle.cpp branches/tora-trotl/src/qscintilla2/Qt4/qscistyledtext.cpp branches/tora-trotl/src/qscintilla2/src/LexCOBOL.cpp branches/tora-trotl/src/qscintilla2/src/LexNimrod.cpp branches/tora-trotl/src/qscintilla2/src/LexPowerPro.cpp branches/tora-trotl/src/qscintilla2/src/LexSML.cpp branches/tora-trotl/src/qscintilla2/src/LexSorcus.cpp branches/tora-trotl/src/qscintilla2/src/LexTACL.cpp branches/tora-trotl/src/qscintilla2/src/LexTAL.cpp branches/tora-trotl/src/qscintilla2/src/PerLine.cpp branches/tora-trotl/src/qscintilla2/src/PerLine.h Property Changed: ---------------- branches/tora-trotl/ Property changes on: branches/tora-trotl ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/tora:3191-3398 + /trunk/tora:3191-3418 Modified: branches/tora-trotl/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora-trotl/cmake/modules/FindOracle.cmake 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/cmake/modules/FindOracle.cmake 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,7 +1,7 @@ # TOra: Configure Oracle libraries # # ORACLE_FOUND - system has Oracle OCI -# ORACLE_HAS_XML - Oracle has XDK support(full client installed) +# ORACLE_HAS_XML - Oracle has XDK support(thick client installed) # ORACLE_INCLUDES - where to find oci.h # ORACLE_LIBRARIES - the libraries to link against to use Oracle OCI # @@ -34,7 +34,7 @@ SET (ORACLE_LIB_LOCATION ${ORACLE_PATH_LIB}) ELSE (ORACLE_PATH_LIB) SET (ORACLE_LIB_LOCATION - # TODO add 32/64bit version here + # TODO add 32/64bit version here (lib32/lib64 on some platforms) ${ORACLE_HOME}/lib # xe on windows ${ORACLE_HOME}/OCI/lib/MSVC @@ -67,10 +67,24 @@ ORACLE_LIBRARY_XML NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11 PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH ) +SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_CLNTSH}) -SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_CLNTSH}) +IF (APPLE) + FIND_LIBRARY(ORACLE_LIBRARY_OCIEI + NAMES libociei ociei + PATHS ${ORACLE_LIB_LOCATION} + ) + MESSAGE(STATUS "Searching for libociei: ${ORACLE_LIBRARY_OCIEI} in ${ORACLE_LIB_LOCATION}") + IF (ORACLE_LIBRARY_OCIEI) + LIST(APPEND ORACLE_LIBRARY ${ORACLE_LIBRARY_OCIEI}) + ELSE (ORACLE_LIBRARY_OCIEI) + MESSAGE(STATUS "libociei.dylib is not found. Maybe it will cause crashes if you are building BUNDLE") + ENDIF (ORACLE_LIBRARY_OCIEI) +ENDIF (APPLE) + IF (ORACLE_LIBRARY_XML) LIST(APPEND ORACLE_LIBRARY ${ORACLE_LIBRARY_XML}) ENDIF (ORACLE_LIBRARY_XML) Modified: branches/tora-trotl/src/Makefile.am =================================================================== --- branches/tora-trotl/src/Makefile.am 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/Makefile.am 2010-02-14 14:15:38 UTC (rev 3420) @@ -469,6 +469,7 @@ ui_toworksheetsetupui.h \ ui_tohelpui.h \ ui_toscriptschemawidgetui.h \ + ui_connectioncolorsdialogui.h \ shortcuteditor/ui_shortcuteditordialog.h \ $(EXTRA_ORACLE_MONO_SOURCE_MOC) \ $(filter %.qm,$(TRANSLATIONS:%.ts=%.qm)) \ Modified: branches/tora-trotl/src/qscintilla2/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/qscintilla2/CMakeLists.txt 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/CMakeLists.txt 2010-02-14 14:15:38 UTC (rev 3420) @@ -23,6 +23,7 @@ Qt4/Qsci/qscilexercpp.h Qt4/Qsci/qscilexercsharp.h Qt4/Qsci/qscilexercss.h +Qt4/Qsci/qscilexercustom.h Qt4/Qsci/qscilexerd.h Qt4/Qsci/qscilexerdiff.h Qt4/Qsci/qscilexerhtml.h @@ -36,13 +37,17 @@ Qt4/Qsci/qscilexerproperties.h Qt4/Qsci/qscilexerpython.h Qt4/Qsci/qscilexerruby.h +Qt4/Qsci/qscilexerspice.h Qt4/Qsci/qscilexersql.h Qt4/Qsci/qscilexertex.h +Qt4/Qsci/qscilexerverilog.h Qt4/Qsci/qscilexervhdl.h Qt4/Qsci/qscimacro.h #Qt4/Qsci/qsciprinter.h Qt4/Qsci/qsciscintilla.h Qt4/Qsci/qsciscintillabase.h +Qt4/Qsci/qscistyle.h +Qt4/Qsci/qscistyledtext.h #Qt4/ListBoxQt.h Qt4/SciClasses.h #Qt4/ScintillaQt.h @@ -79,6 +84,7 @@ Qt4/SciClasses.h Qt4/ScintillaQt.cpp Qt4/ScintillaQt.h +Qt4/qsciabstractapis.cpp Qt4/qsciapis.cpp Qt4/qscicommand.cpp Qt4/qscicommandset.cpp @@ -90,35 +96,38 @@ Qt4/qscilexercpp.cpp Qt4/qscilexercsharp.cpp Qt4/qscilexercss.cpp +Qt4/qscilexercustom.cpp Qt4/qscilexerd.cpp Qt4/qscilexerdiff.cpp +Qt4/qscilexerfortran.cpp +Qt4/qscilexerfortran77.cpp Qt4/qscilexerhtml.cpp Qt4/qscilexeridl.cpp Qt4/qscilexerjava.cpp Qt4/qscilexerjavascript.cpp Qt4/qscilexerlua.cpp Qt4/qscilexermakefile.cpp +Qt4/qscilexerpascal.cpp Qt4/qscilexerperl.cpp +Qt4/qscilexerpostscript.cpp Qt4/qscilexerpov.cpp Qt4/qscilexerproperties.cpp Qt4/qscilexerpython.cpp Qt4/qscilexerruby.cpp +Qt4/qscilexerspice.cpp Qt4/qscilexersql.cpp +Qt4/qscilexertcl.cpp Qt4/qscilexertex.cpp +Qt4/qscilexerverilog.cpp Qt4/qscilexervhdl.cpp +Qt4/qscilexerxml.cpp +Qt4/qscilexeryaml.cpp Qt4/qscimacro.cpp Qt4/qsciprinter.cpp Qt4/qsciscintilla.cpp Qt4/qsciscintillabase.cpp -Qt4/qscilexeryaml.cpp -Qt4/qscilexerxml.cpp -Qt4/qscilexertcl.cpp -Qt4/qscilexerpostscript.cpp -Qt4/qscilexerpascal.cpp -Qt4/qscilexerfortran77.cpp -Qt4/qscilexerfortran.cpp -Qt4/qsciabstractapis.cpp - +Qt4/qscistyle.cpp +Qt4/qscistyledtext.cpp src/AutoComplete.cpp src/AutoComplete.h src/CallTip.cpp @@ -160,6 +169,7 @@ src/LexCSS.cpp src/LexCaml.cpp src/LexCmake.cpp +src/LexCOBOL.cpp src/LexConf.cpp src/LexCrontab.cpp src/LexCsound.cpp @@ -180,17 +190,22 @@ src/LexLisp.cpp src/LexLout.cpp src/LexLua.cpp +src/LexMagik.cpp +src/LexMatlab.cpp +src/LexMetapost.cpp src/LexMMIXAL.cpp src/LexMPT.cpp src/LexMSSQL.cpp -src/LexMatlab.cpp -src/LexMetapost.cpp +src/LexMySQL.cpp +src/LexNimrod.cpp src/LexNsis.cpp src/LexOpal.cpp src/LexOthers.cpp src/LexPB.cpp src/LexPLM.cpp src/LexPOV.cpp +src/LexPowerPro.cpp +src/LexPowerShell.cpp src/LexPS.cpp src/LexPascal.cpp src/LexPerl.cpp @@ -198,12 +213,16 @@ src/LexPython.cpp src/LexRebol.cpp src/LexRuby.cpp -src/LexSQL.cpp src/LexScriptol.cpp src/LexSmalltalk.cpp +src/LexSML.cpp +src/LexSorcus.cpp src/LexSpecman.cpp src/LexSpice.cpp +src/LexSQL.cpp +src/LexTACL.cpp src/LexTADS3.cpp +src/LexTAL.cpp src/LexTCL.cpp src/LexTeX.cpp src/LexVB.cpp @@ -214,6 +233,8 @@ src/LineMarker.cpp src/LineMarker.h src/Partitioning.h +src/PerLine.cpp +src/PerLine.h src/PositionCache.cpp src/PositionCache.h src/PropSet.cpp @@ -240,9 +261,6 @@ src/LexAbaqus.cpp src/LexASY.cpp src/LexR.cpp -src/LexPowerShell.cpp -src/LexMySQL.cpp -src/LexMagik.cpp ) QT4_WRAP_CPP(TORA_QSCINTILLA2_MOC_SOURCES ${TORA_QSCINTILLA2_MOC_CLASSES}) Modified: branches/tora-trotl/src/qscintilla2/ChangeLog =================================================================== --- branches/tora-trotl/src/qscintilla2/ChangeLog 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/ChangeLog 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,3 +1,202 @@ +2010/01/20 19:55:56 phil +Updated the build system to Qt v4.6.1. +Released as v2.4.2. + + +2010/01/18 13:04:46 phil +Updated Spanish translations from Jaime Seuma. + + +2010/01/15 23:20:14 phil +The Python bindings now check for SIP v4.10. + + +2010/01/15 18:38:13 phil +Updated the .ts files. + + +2010/01/15 18:32:53 phil +Fixed the build system for Qt v3 and v4 prior to v4.5. + + +2010/01/14 14:29:23 phil +Released as v2.4.1. + + +2009/12/22 16:48:28 phil +Added the API file for Python v3.1. + + +2009/12/22 11:37:56 phil +Added support for automatically generated docstrings. + + +2009/12/11 15:10:24 phil +Fixed a performance problem when displaying very long lines. + + +2009/11/01 17:08:30 phil +Fixed a possible crash in the handling of call tips. + + +2009/11/01 17:03:09 phil +Applied the workaround for the autocomplete focus bug under Gnome's window +manager which (appears) to work with current versions of Qt across all +platforms. + + +2009/11/01 16:13:12 phil +Make sure a lexer is fully detached when a QScintilla instance is destroyed. + + +2009/08/19 22:04:28 phil +Updated German translations from Detlev. + + +2009/08/09 15:46:59 phil +Added the QsciLexerVerilog class. + + +2009/08/09 12:43:29 phil +Added the QsciLexerSpice class. + + +2009/06/05 9:37:02 phil +Released as v2.4. + + +2009/06/03 10:28:54 phil +Fixed a bug building on Qt v3. + + +2009/05/30 11:32:50 phil +Applied a fix for copying UTF-8 text to the X clipboard from Lars Reichelt. + + +2009/05/27 11:33:27 phil +Fixed a missing forward declaration in qscilexercustom.h. + + +2009/05/25 22:13:01 phil +Don't ask the custom lexer to style zero characters. + + +2009/05/19 18:37:58 phil +Added Spanish translations from Jaime Seuma. + + +2009/05/19 10:13:56 phil +A minor fix for ancient C++ compilers. + + +2009/05/18 20:21:50 phil +Added QsciScintilla::annotation(). +Added QsciLexerCustom (completely untested) and supporting changes to +QsciLexer. + + +2009/05/17 15:25:11 phil +Updated translations from Detlev. + + +2009/05/09 18:09:11 phil +Added support for text margins. + + +2009/05/09 15:40:27 phil +Debugged the support for annotations. +Tidied up the QString to Scintilla string conversions. + + +2009/05/08 19:11:13 phil +Implemented the rest of the annotation API - still needs debugging. + + +2009/05/07 23:53:20 phil +Added the QsciStyle class. + + +2009/05/06 21:23:15 phil +Fixed the key event handling when the text() is empty and the key() should be +used - only seems to happen with OS/X. + + +2009/05/03 17:48:29 phil +Merged the v2.3 branch onto the trunk. + + +2009/05/03 17:24:43 phil +Added QsciLexer::lexerId() and provided a default implementation of +QsciLexer::lexer() so that special lexers (ie. with a SCLEX_* value, but no +name - specifically SCLEX_CONTAINER) can be implemented. + + +2009/05/03 16:03:39 phil +Improved the names of the new script styling methods in the XML lexer. + + +2009/05/03 15:50:51 phil +Updated the signature of QsciScintillaBase::SCN_MODIFIED() to allow for the +extra notification fields. + + +2009/05/03 15:28:03 phil +Added setSmartHighlighting() and smartHighlighting() to QsciLexerPascal. +Updated the styles for the new Scintilla Pascal lexer. + + +2009/05/03 12:28:45 phil +Added setFoldScriptComments(), foldScriptComments(), setFoldScriptHeredocs() +and foldScriptHeredocs() to QsciLexerHTML. + + +2009/05/03 11:58:07 phil +Added setScriptsAllowed() and scriptsAllowed() to QsciLexerXML. + + +2009/05/02 19:06:54 phil +Added setDollarsAllowed() and dollarsAllowed() to QsciLexerCPP. + + +2009/05/02 18:29:49 phil +Added setFoldPackages(), foldPackages(), setFoldPODBlocks() and foldPODBlocks() +to QsciLexerPerl. + + +2009/05/02 17:20:48 phil +Added setV2UnicodeAllowed(), v2UnicodeAllowed(), setV3BinaryOctalAllowed(), +v3BinaryOctalAllowed(), setV3BytesAllowed and v3BytesAllowed() to +QsciLexerPython. + + +2009/05/02 15:58:29 phil +Completed the integration of the low-level API of Scintilla v1.78. + + +2009/05/02 14:03:23 phil +Initial merge of Scintilla v1.78. + + +2009/04/14 11:39:50 phil +Updated German translations from Detlev. + + +2009/04/03 11:05:13 phil +Added support for Python v3. + + +2009/03/05 10:25:18 phil +Fixed the previous fix for Qt3. + + +2009/03/04 20:51:43 phil +Fixed a problem with using API entries with images as call tips. + + +2009/02/26 8:39:23 phil +Added the missing support for UUID in QsciLexerCPP.description(). + + 2008/11/17 13:52:19 phil Released as v2.3.2. Modified: branches/tora-trotl/src/qscintilla2/Qt4/ListBoxQt.cpp =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/ListBoxQt.cpp 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/ListBoxQt.cpp 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,7 +1,7 @@ // This module implements the specialisation of QListBox that handles the // Scintilla double-click callback. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -25,11 +25,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/ListBoxQt.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/ListBoxQt.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/ListBoxQt.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,7 +1,7 @@ // This defines the specialisation of QListBox that handles the Scintilla // double-click callback. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -25,11 +25,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/PlatQt.cpp =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/PlatQt.cpp 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/PlatQt.cpp 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This module implements the portability layer for the Qt port of Scintilla. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -211,6 +206,8 @@ void DrawXPM(PRectangle rc, const XPM *xpm); private: + void drawText(PRectangle rc, Font &font_, int ybase, const char *s, + int len, ColourAllocated fore); QFontMetrics metrics(Font &font_); QString convertText(const char *s, int len); static QRgb convertQRgb(const ColourAllocated &col, unsigned alpha); @@ -436,7 +433,7 @@ Q_ASSERT(painter); FillRectangle(rc, back); - DrawTextTransparent(rc, font_, ybase, s, len, fore); + drawText(rc, font_, ybase, s, len, fore); } void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font_, int ybase, @@ -452,8 +449,18 @@ void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore) { - Q_ASSERT(painter); + // Only draw if there is a non-space. + for (int i = 0; i < len; ++i) + if (s[i] != ' ') + { + drawText(rc, font_, ybase, s, len, fore); + return; + } +} +void SurfaceImpl::drawText(PRectangle rc, Font &font_, int ybase, + const char *s, int len, ColourAllocated fore) +{ QString qs = convertText(s, len); QFont *f = PFont(font_.GetID()); @@ -486,11 +493,11 @@ // The position for each byte of a character is the offset from the start // where the following character should be drawn. - int i_byte = 0; + int i_byte = 0, width = 0; for (int i_char = 0; i_char < qs.length(); ++i_char) { - int width = fm.width(qs, i_char + 1); + width += fm.width(qs.at(i_char)); if (unicodeMode) { Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciabstractapis.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciabstractapis.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciabstractapis.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This module defines interface to the QsciAbstractAPIs class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciapis.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciapis.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciapis.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This module defines interface to the QsciAPIs class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscicommand.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscicommand.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscicommand.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciCommand class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -42,8 +37,6 @@ #include <qstring.h> -#include <qlist.h> - #include <Qsci/qsciglobal.h> Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscicommandset.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscicommandset.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscicommandset.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciCommandSet class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscidocument.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscidocument.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscidocument.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciDocument class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciglobal.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciglobal.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciglobal.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This module defines various things common to all of the Scintilla Qt port. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -43,8 +38,8 @@ #include <qglobal.h> -#define QSCINTILLA_VERSION 0x020302 -#define QSCINTILLA_VERSION_STR "2.3.2" +#define QSCINTILLA_VERSION 0x020402 +#define QSCINTILLA_VERSION_STR "2.4.2" // Under Windows, define QSCINTILLA_MAKE_DLL to create a Scintilla DLL, or Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexer.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexer.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexer.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexer class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -52,27 +47,30 @@ class QSettings; class QsciAbstractAPIs; +class QsciScintilla; -//! \brief The QsciLexer class is an abstract class used as a base for specific -//! existing Scintilla language lexers. +//! \brief The QsciLexer class is an abstract class used as a base for language +//! lexers. //! -//! A Scintilla lexer scans the text breaking it up into separate language -//! objects, e.g. keywords, strings, operators. The lexer then uses a -//! different style to draw each object. A style is identified by a style -//! number and has a number of attributes, including colour and font. A -//! specific language lexer will implement appropriate default styles which can -//! be overriden by an application by further sub-classing the specific -//! language lexer. +//! A lexer scans the text breaking it up into separate language objects, e.g. +//! keywords, strings, operators. The lexer then uses a different style to +//! draw each object. A style is identified by a style number and has a number +//! of attributes, including colour and font. A specific language lexer will +//! implement appropriate default styles which can be overriden by an +//! application by further sub-classing the specific language lexer. //! -//! A specific language lexer may provide one or more sets of words to be -//! recognised as keywords. Most lexers only provide one set, but some may -//! support languages embedded in other languages and provide several sets. +//! A lexer may provide one or more sets of words to be recognised as keywords. +//! Most lexers only provide one set, but some may support languages embedded +//! in other languages and provide several sets. //! //! QsciLexer provides convenience methods for saving and restoring user -//! preferences for fonts and colours. Note that QSciLexer is not a means to -//! writing new lexers - you must do that by adding a new lexer to the -//! underlying Scintilla code. +//! preferences for fonts and colours. +//! +//! If you want to write a lexer for a new language then you can add it to the +//! underlying Scintilla code and implement a corresponding QsciLexer sub-class +//! to manage the different styles used. Alternatively you can implement a +//! sub-class of QsciLexerCustom. class QSCINTILLA_EXPORT QsciLexer : public QObject { Q_OBJECT @@ -89,10 +87,19 @@ //! sub-class. virtual const char *language() const = 0; - //! Returns the name of the lexer. Some lexers support a number of - //! languages. It must be re-implemented by a sub-class. - virtual const char *lexer() const = 0; + //! Returns the name of the lexer. If 0 is returned then the lexer's + //! numeric identifier is used. The default implementation returns 0. + //! + //! \sa lexerId() + virtual const char *lexer() const; + //! Returns the identifier (i.e. a QsciScintillaBase::SCLEX_* value) of the + //! lexer. This is only used if lexer() returns 0. The default + //! implementation returns QsciScintillaBase::SCLEX_CONTAINER. + //! + //! \sa lexer() + virtual int lexerId() const; + //! Returns the current API set or 0 if there isn't one. //! //! \sa setAPIs() @@ -207,6 +214,10 @@ //! Returns the default paper colour for style number \a style. virtual QColor defaultPaper(int style) const; + //! Returns the QsciScintilla instance that the lexer is currently attached + //! to or 0 if it is unattached. + QsciScintilla *editor() const {return attached_editor;} + //! The current set of APIs is set to \a apis. If \a apis is 0 then any //! existing APIs for this lexer are removed. //! @@ -228,6 +239,9 @@ //! \sa defaultPaper(), paper() void setDefaultPaper(const QColor &c); + //! \internal Set the QsciScintilla instance that the lexer is attached to. + virtual void setEditor(QsciScintilla *editor); + //! The colour, paper, font and end-of-line for each style number, and //! all lexer specific properties are read from the settings \a qs. //! \a prefix is prepended to the key of each entry. true is returned @@ -240,6 +254,10 @@ //! propertyChanged() signal as required. virtual void refreshProperties(); + //! Returns the number of style bits needed by the lexer. Normally this + //! should only be re-implemented by custom lexers. + virtual int styleBitsNeeded() const; + //! \internal Returns the string of characters that comprise a word. //! The default is 0 which implies the upper and lower case alphabetic //! characters and underscore. @@ -331,6 +349,7 @@ QColor defColor; QColor defPaper; QsciAbstractAPIs *apiSet; + QsciScintilla *attached_editor; void setStyleDefaults() const; StyleData &styleData(int style) const; Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerbash.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerbash.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerbash.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexerBash class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerbatch.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerbatch.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerbatch.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexerBatch class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercmake.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercmake.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercmake.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexerCMake class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercpp.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercpp.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercpp.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexerCPP class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -216,6 +211,17 @@ //! \sa setStylePreprocessor() bool stylePreprocessor() const; + //! If \a allowed is true then '$' characters are allowed in identifier + //! names. The default is true. + //! + //! \sa dollarsAllowed() + void setDollarsAllowed(bool allowed); + + //! Returns true if '$' characters are allowed in identifier names. + //! + //! \sa setDollarsAllowed() + bool dollarsAllowed() const; + public slots: //! If \a fold is true then "} else {" lines can be folded. The //! default is false. @@ -268,12 +274,14 @@ void setCompactProp(); void setPreprocProp(); void setStylePreprocProp(); + void setDollarsProp(); bool fold_atelse; bool fold_comments; bool fold_compact; bool fold_preproc; bool style_preproc; + bool dollars; bool nocase; Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercsharp.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercsharp.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercsharp.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexerCSharp class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercss.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercss.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercss.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexerCSS class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Copied: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercustom.h (from rev 3418, trunk/tora/src/qscintilla2/Qt4/Qsci/qscilexercustom.h) =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercustom.h (rev 0) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexercustom.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -0,0 +1,121 @@ +// This defines the interface to the QsciLexerCustom class. +// +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> +// +// This file is part of QScintilla. +// +// This file may be used under the terms of the GNU General Public +// License versions 2.0 or 3.0 as published by the Free Software +// Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3 +// included in the packaging of this file. Alternatively you may (at +// your option) use any later version of the GNU General Public +// License if such license has been publicly approved by Riverbank +// Computing Limited (or its successors, if any) and the KDE Free Qt +// Foundation. In addition, as a special exception, Riverbank gives you +// certain additional rights. These rights are described in the Riverbank +// GPL Exception version 1.1, which can be found in the file +// GPL_EXCEPTION.txt in this package. +// +// Please review the following information to ensure GNU General +// Public Licensing requirements will be met: +// http://trolltech.com/products/qt/licenses/licensing/opensource/. If +// you are unsure which license is appropriate for your use, please +// review the following information: +// http://trolltech.com/products/qt/licenses/licensing/licensingoverview +// or contact the sales department at sa...@ri.... +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + +#ifndef QSCILEXERCUSTOM_H +#define QSCILEXERCUSTOM_H + +#ifdef __APPLE__ +extern "C++" { +#endif + +#include <Qsci/qsciglobal.h> +#include <Qsci/qscilexer.h> + + +class QsciScintilla; +class QsciStyle; + + +//! \brief The QsciLexerCustom class is an abstract class used as a base for +//! new language lexers. +//! +//! The advantage of implementing a new lexer this way (as opposed to adding +//! the lexer to the underlying Scintilla code) is that it does not require the +//! QScintilla library to be re-compiled. It also makes it possible to +//! integrate external lexers. +//! +//! All that is necessary to implement a new lexer is to define appropriate +//! styles and to re-implement the styleText() method. +class QSCINTILLA_EXPORT QsciLexerCustom : public QsciLexer +{ + Q_OBJECT + +public: + //! Construct a QsciLexerCustom with parent \a parent. \a parent is + //! typically the QsciScintilla instance. + QsciLexerCustom(QObject *parent = 0); + + //! Destroy the QSciLexerCustom. + virtual ~QsciLexerCustom(); + + //! The next \a length characters starting from the current styling + //! position have their style set to style number \a style. The current + //! styling position is moved. The styling position is initially set by + //! calling startStyling(). + //! + //! \sa startStyling(), styleText() + void setStyling(int length, int style); + + //! The next \a length characters starting from the current styling + //! position have their style set to style \a style. The current styling + //! position is moved. The styling position is initially set by calling + //! startStyling(). + //! + //! \sa startStyling(), styleText() + void setStyling(int length, const QsciStyle &style); + + //! The styling position is set to \a start and the mask of style bits that + //! can be set is set to \a style_bits. \a style_bits allows the styling + //! of text to be done over several passes by setting different style bits + //! on each pass. If \a style_bits is 0 then all style bits (as returned + //! by styleBitsNeeded()) are set. + //! + //! \sa setStyling(), styleBitsNeeded(), styleText() + void startStyling(int pos, int style_bits = 0); + + //! This is called when the section of text beginning at position \a start + //! and up to position \a end needs to be styled. \a start will always be + //! at the start of a line. The text is styled by calling startStyling() + //! followed by one or more calls to setStyling(). It must be + //! re-implemented by a sub-class. + //! + //! \sa setStyling(), startStyling() + virtual void styleText(int start, int end) = 0; + + //! \reimp + virtual void setEditor(QsciScintilla *editor); + + //! \reimp This re-implementation returns 5 as the number of style bits + //! needed. + virtual int styleBitsNeeded() const; + +private slots: + void handleStyleNeeded(int pos); + +private: + QsciLexerCustom(const QsciLexerCustom &); + QsciLexerCustom &operator=(const QsciLexerCustom &); +}; + +#ifdef __APPLE__ +} +#endif + +#endif Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerd.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerd.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerd.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexerD class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerdiff.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerdiff.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerdiff.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexerDiff class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerfortran.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerfortran.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerfortran.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexerFortran class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerfortran77.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerfortran77.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerfortran77.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexerFortran77 class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerhtml.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerhtml.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexerhtml.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexerHTML class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://trolltech.com/products/qt/licenses/licensing/licensingoverview // or contact the sales department at sa...@ri.... // -// This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly -// granted herein. -// // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -449,6 +444,28 @@ //! \sa setCaseSensitiveTags() bool caseSensitiveTags() const; + //! If \a fold is true then script comments can be folded. The default is + //! false. + //! + //! \sa foldScriptComments() + void setFoldScriptComments(bool fold); + + //! Returns true if script comments can be folded. + //! + //! \sa setFoldScriptComments() + bool foldScriptComments() const; + + //! If \a fold is true then script heredocs can be folded. The default is + //! false. + //! + //! \sa foldScriptHeredocs() + void setFoldScriptHeredocs(bool fold); + + //! Returns true if script heredocs can be folded. + //! + //! \sa setFoldScriptHeredocs() + bool foldScriptHeredocs() const; + public slots: //! If \a fold is true then trailing blank lines are included in a fold //! block. The default is true. @@ -484,10 +501,14 @@ void setCompactProp(); void setPreprocProp(); void setCaseSensTagsProp(); + void setScriptCommentsProp(); + void setScriptHeredocsProp(); bool fold_compact; bool fold_preproc; bool case_sens_tags; + bool fold_script_comments; + bool fold_script_heredocs; QsciLexerHTML(const QsciLexerHTML &); QsciLexerHTML &operator=(const QsciLexerHTML &); Modified: branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexeridl.h =================================================================== --- branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexeridl.h 2010-02-14 13:25:46 UTC (rev 3419) +++ branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qscilexeridl.h 2010-02-14 14:15:38 UTC (rev 3420) @@ -1,6 +1,6 @@ // This defines the interface to the QsciLexerIDL class. // -// Copyright (c) 2008 Riverbank Computing Limited <in...@ri...> +// Copyright (c) 2010 Riverbank Computing Limited <in...@ri...> // // This file is part of QScintilla. // @@ -24,11 +24,6 @@ // http://troll... [truncated message content] |
From: <ibr...@us...> - 2010-02-23 22:16:17
|
Revision: 3435 http://tora.svn.sourceforge.net/tora/?rev=3435&view=rev Author: ibre5041 Date: 2010-02-23 22:15:23 +0000 (Tue, 23 Feb 2010) Log Message: ----------- port to cmake 2.6 - GCC variable is deprecated Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/trotl/CMakeLists.txt Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2010-02-23 20:40:13 UTC (rev 3434) +++ branches/tora-trotl/CMakeLists.txt 2010-02-23 22:15:23 UTC (rev 3435) @@ -27,7 +27,7 @@ #Pretty colors SET(CMAKE_COLOR_MAKEFILE ON) #Dont force verbose -SET(CMAKE_VERBOSE_MAKEFILE OFF) +SET(CMAKE_VERBOSE_MAKEFILE ON) #Include current dir SET(CMAKE_INCLUDE_CURRENT_DIR TRUE) @@ -86,7 +86,7 @@ ############################################################################################################## ########## check for the CPU we build for ########## -IF (GCC) +IF (CMAKE_COMPILER_IS_GNUCC) EXECUTE_PROCESS( COMMAND ${CMAKE_C_COMPILER} -dumpmachine @@ -113,8 +113,13 @@ SET(ARCH_PPC 1) ENDIF (_machine_ppc) -ENDIF (GCC) +SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic") +SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic") +SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic") +SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -gbdb3 -fno-inline -rdynamic") +ENDIF (CMAKE_COMPILER_IS_GNUCC) + #Convert our simpler command line option to the CMake style #None, Debug, Release, .. or custom ones IF(WANT_DEBUG) @@ -136,10 +141,6 @@ ENDIF (MSVC) -SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic") -SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic") -SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic") -SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -gbdb3 -fno-inline -rdynamic") # Required for win wjen there is used an external qscintilla lib IF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) SET(CMAKE_CXX_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_CXX_FLAGS_RELEASE}") Modified: branches/tora-trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/CMakeLists.txt 2010-02-23 20:40:13 UTC (rev 3434) +++ branches/tora-trotl/src/CMakeLists.txt 2010-02-23 22:15:23 UTC (rev 3435) @@ -523,7 +523,6 @@ ${ORACLE_LIBRARIES} ${LIBXML2_LIBRARIES} ${QSCINTILLA_LIBRARIES} - -L/usr/local/trotl/lib -Wl,-rpath=/usr/local/trotl/lib trotl ) #IF (ORACLE_LIBRARIES) Modified: branches/tora-trotl/src/trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/trotl/CMakeLists.txt 2010-02-23 20:40:13 UTC (rev 3434) +++ branches/tora-trotl/src/trotl/CMakeLists.txt 2010-02-23 22:15:23 UTC (rev 3435) @@ -153,7 +153,6 @@ ADD_DEFINITIONS( ${QT_DEFINITIONS} -DQT_CORE_LIB -# -DQT_GUI_LIB -DQT_THREAD_LIB ) ELSE(QT_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2010-02-24 10:49:51
|
Revision: 3437 http://tora.svn.sourceforge.net/tora/?rev=3437&view=rev Author: ibre5041 Date: 2010-02-24 10:49:41 +0000 (Wed, 24 Feb 2010) Log Message: ----------- build cleanup Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/trotl/CMakeLists.txt branches/tora-trotl/src/trotl/src/CMakeLists.txt branches/tora-trotl/src/trotl/src/trotl_exc.cpp Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2010-02-24 09:29:49 UTC (rev 3436) +++ branches/tora-trotl/CMakeLists.txt 2010-02-24 10:49:41 UTC (rev 3437) @@ -9,6 +9,7 @@ OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" ON) OPTION(WANT_BUNDLE "Enable Mac OS X bundle build" OFF) OPTION(WANT_BUNDLE_STANDALONE "Do not copy required libs and tools into bundle (WANT_BUNDLE)" ON) +OPTION(USE_PCH "Use percompiled headers" OFF) #Set our CMake minimum version #Require 2.4.2 for Qt finding Modified: branches/tora-trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/CMakeLists.txt 2010-02-24 09:29:49 UTC (rev 3436) +++ branches/tora-trotl/src/CMakeLists.txt 2010-02-24 10:49:41 UTC (rev 3437) @@ -562,14 +562,11 @@ SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LIBS} ${TORA_MOC_LIB}) -#GET_NATIVE_PRECOMPILED_HEADER(TOra precompiled_msvc.h) -#ADD_EXECUTABLE("test" "test.cpp" ${TOra_pch}) -#MESSAGE(STATUS "PCH: ${TOra_pch}") -#ADD_PRECOMPILED_HEADER("test" "precompiled_msvc.h") +IF(USE_PCH) ADD_PRECOMPILED_HEADER(${EXE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/precompiled_msvc.h) ADD_PRECOMPILED_HEADER(${TORA_MOC_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/precompiled_msvc.h) +ENDIF(USE_PCH) - # Test programs ADD_EXECUTABLE(trotl_test0 ${GUI_TYPE} trotl_test0.cpp Modified: branches/tora-trotl/src/trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/trotl/CMakeLists.txt 2010-02-24 09:29:49 UTC (rev 3436) +++ branches/tora-trotl/src/trotl/CMakeLists.txt 2010-02-24 10:49:41 UTC (rev 3437) @@ -55,8 +55,6 @@ SET(CMAKE_BUILD_TYPE RELEASE) ENDIF(WANT_DEBUG) -MESSAGE(STATUS "Trotl ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") - ############################################################################################################## ########## check for the arch we build for ########## @@ -124,30 +122,25 @@ SET(CMAKE_C_FLAGS_DEBUG "") ENDIF(APPLE) - -FIND_PACKAGE(Oracle) IF(ORACLE_FOUND) - MESSAGE("Oracle OCI Library Found OK") + MESSAGE("-- Oracle OCI Library Found OK") ELSE(ORACLE_FOUND) MESSAGE(FATAL_ERROR "No Oracle client found") ENDIF(ORACLE_FOUND) IF(ORACLE_HAS_XML) - MESSAGE("Oracle XDK Library Found OK") + MESSAGE("-- Oracle XDK Library Found OK") ELSE(ORACLE_HAS_XML) - MESSAGE(STATUS "No Oracle XDK found") + MESSAGE(STATUS "-- No Oracle XDK found: ignoring") ENDIF(ORACLE_HAS_XML) SET (QT_MT_REQUIRED true) SET (QT_MIN_VERSION "4.4.0") -####SET (QT_USE_QTSQL TRUE) -####SET (QT_USE_QTNETWORK TRUE) -####SET (QT_USE_QTXML TRUE) FIND_PACKAGE(Qt4 REQUIRED) INCLUDE( ${QT_USE_FILE} ) IF (QT_FOUND) - MESSAGE("Qt4 Found OK") + MESSAGE("-- Qt4 Found OK") #Add our Qt definitions ADD_DEFINITIONS( ${QT_DEFINITIONS} @@ -155,7 +148,7 @@ -DQT_THREAD_LIB ) ELSE(QT_FOUND) - MESSAGE(STATUS "No Qt4 found") + MESSAGE(STATUS "-- No Qt4 found") ENDIF(QT_FOUND) ############################################################################################################## Modified: branches/tora-trotl/src/trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/trotl/src/CMakeLists.txt 2010-02-24 09:29:49 UTC (rev 3436) +++ branches/tora-trotl/src/trotl/src/CMakeLists.txt 2010-02-24 10:49:41 UTC (rev 3437) @@ -1,9 +1,9 @@ ## TODO if want debug? -IF(DEBUG) +IF(CMAKE_BUILD_TYPE STREQUAL "Debug") ADD_SUBDIRECTORY(stack) SET (STACK_LIB "stack_lib") LINK_DIRECTORIES(./stack) -ENDIF(DEBUG) +ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug") SET(TROTL_DLL_DEFINES "-DLOKI_STATIC -DEXPLICIT_EXPORT -DTROTL_MAKE_DLL") SET(TROTL_CLIENT_DEFINES "-DLOKI_STATIC -DEXPLICIT_EXPORT -DTROTL_DLL") Modified: branches/tora-trotl/src/trotl/src/trotl_exc.cpp =================================================================== --- branches/tora-trotl/src/trotl/src/trotl_exc.cpp 2010-02-24 09:29:49 UTC (rev 3436) +++ branches/tora-trotl/src/trotl/src/trotl_exc.cpp 2010-02-24 10:49:41 UTC (rev 3437) @@ -40,17 +40,20 @@ #include "trotl_common.h" #include "trotl_stat.h" +#ifdef DEBUG #include "stack/stack.hpp" +#endif namespace trotl { OciException::OciException(tstring where, OCIEnv* envh) : _where(where), _mess(where) -{ +{ +#ifdef DEBUG dbg::stack s; std::copy(s.begin(), s.end(), std::ostream_iterator<dbg::stack_frame>(_stack, "\n")); _mess += "\n" + _stack.str(); - +#endif OraText buffer[1024]; sb4 errorcode; @@ -77,10 +80,11 @@ OciException::OciException(tstring where, OCIError* errh) : _where(where), _mess(where) { +#ifdef DEBUG dbg::stack s; std::copy(s.begin(), s.end(), std::ostream_iterator<dbg::stack_frame>(_stack, "\n")); _mess += "\n" + _stack.str(); - +#endif char buffer[1024]; sb4 errorcode; @@ -112,10 +116,11 @@ OciException::OciException(tstring where, SqlStatement& stmt) : _where(where), _mess(where) { +#ifdef DEBUG dbg::stack s; std::copy(s.begin(), s.end(), std::ostream_iterator<dbg::stack_frame>(_stack, "\n")); _mess += "\n" + _stack.str(); - +#endif ub4 size = sizeof(_parse_offset); sword res2 = OCICALL(OCIAttrGet(stmt, OCI_HTYPE_STMT, &_parse_offset, &size, OCI_ATTR_PARSE_ERROR_OFFSET, stmt._errh)); if (res2 != OCI_SUCCESS) @@ -220,9 +225,11 @@ OciException::OciException(tstring where, const char* msg) : _where(where), _mess(where), _parse_offset(0), _last_sql("") { +#ifdef DEBUG dbg::stack s; std::copy(s.begin(), s.end(), std::ostream_iterator<dbg::stack_frame>(_stack, "\n")); _mess += "\n" + _stack.str() + msg; +#endif } OciException::OciException(const OciException& other): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2010-03-14 19:37:40
|
Revision: 3465 http://tora.svn.sourceforge.net/tora/?rev=3465&view=rev Author: ibre5041 Date: 2010-03-14 19:37:30 +0000 (Sun, 14 Mar 2010) Log Message: ----------- sync with trunk, logging Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/cmake/modules/FindOracle.cmake branches/tora-trotl/cmake/modules/PCHSupport_26.cmake branches/tora-trotl/doc/help/database.html branches/tora-trotl/doc/help/database.texi branches/tora-trotl/doc/help/debugger.texi branches/tora-trotl/doc/help/images/addwatch.png branches/tora-trotl/doc/help/images/changewatch.png branches/tora-trotl/doc/help/images/database.png branches/tora-trotl/doc/help/images/debugger.png branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/qscintilla2/Qt4/PlatQt.cpp branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciglobal.h branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciscintilla.h branches/tora-trotl/src/qscintilla2/Qt4/qscidocument.cpp branches/tora-trotl/src/qscintilla2/Qt4/qsciscintilla.cpp branches/tora-trotl/src/tobrowser.cpp branches/tora-trotl/src/tobrowserbasewidget.cpp branches/tora-trotl/src/tobrowsertable.cpp branches/tora-trotl/src/toconf.h branches/tora-trotl/src/toconfiguration.cpp branches/tora-trotl/src/toconfiguration.h branches/tora-trotl/src/toconnectionpool.cpp branches/tora-trotl/src/toconnectionpool.h branches/tora-trotl/src/todatabasesettingui.ui branches/tora-trotl/src/todebug.cpp branches/tora-trotl/src/todebugtext.cpp branches/tora-trotl/src/toglobalsetting.cpp branches/tora-trotl/src/tohighlightedtext.cpp branches/tora-trotl/src/tohighlightedtext.h branches/tora-trotl/src/toinvalid.cpp branches/tora-trotl/src/tolinechart.h branches/tora-trotl/src/tomain.cpp branches/tora-trotl/src/tomarkedtext.cpp branches/tora-trotl/src/tonoblockquery.cpp branches/tora-trotl/src/tooracleconnection.cpp branches/tora-trotl/src/toplsqleditor.cpp branches/tora-trotl/src/toplsqltext.cpp branches/tora-trotl/src/toqsqlconnection.cpp branches/tora-trotl/src/toresult.cpp branches/tora-trotl/src/toscheduler.cpp branches/tora-trotl/src/toscript.cpp branches/tora-trotl/src/toscriptschemawidget.cpp branches/tora-trotl/src/toscripttreemodel.cpp branches/tora-trotl/src/tosearchreplace.cpp branches/tora-trotl/src/tosqlparse.cpp branches/tora-trotl/src/tosqlparse.h branches/tora-trotl/src/tothread.cpp branches/tora-trotl/src/toworksheet.cpp branches/tora-trotl/src/toworksheet.h branches/tora-trotl/src/trotl/src/trotl_stat.cpp branches/tora-trotl/src/trotl_test3.cpp Added Paths: ----------- branches/tora-trotl/cmake/modules/FindDB2.cmake branches/tora-trotl/src/db2/ branches/tora-trotl/src/db2/db2connectionsub.cpp branches/tora-trotl/src/db2/db2connectionsub.h branches/tora-trotl/src/db2/db2provider.cpp branches/tora-trotl/src/db2/db2provider.h branches/tora-trotl/src/db2/db2query.cpp branches/tora-trotl/src/db2/db2query.h branches/tora-trotl/src/db2/todb2connection.cpp branches/tora-trotl/src/db2/todb2connection.h branches/tora-trotl/src/precompiled.h branches/tora-trotl/src/tosqlparsetest.cpp Removed Paths: ------------- branches/tora-trotl/src/db2/db2connectionsub.cpp branches/tora-trotl/src/db2/db2connectionsub.h branches/tora-trotl/src/db2/db2provider.cpp branches/tora-trotl/src/db2/db2provider.h branches/tora-trotl/src/db2/db2query.cpp branches/tora-trotl/src/db2/db2query.h branches/tora-trotl/src/db2/todb2connection.cpp branches/tora-trotl/src/db2/todb2connection.h Property Changed: ---------------- branches/tora-trotl/ Property changes on: branches/tora-trotl ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/tora:3191-3418 + /trunk/tora:3191-3464 Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2010-03-14 11:24:22 UTC (rev 3464) +++ branches/tora-trotl/CMakeLists.txt 2010-03-14 19:37:30 UTC (rev 3465) @@ -4,8 +4,9 @@ # options available for user's input OPTION(WANT_DEBUG "Set the debug build and possible additional outputs" OFF) OPTION(WANT_INTERNAL_QSCINTILLA "Use internal/bundled QScintilla2 source" OFF) -OPTION(ENABLE_ORACLE "Disable Oracle support at all. Including detection" ON) -OPTION(ENABLE_PGSQL "Disable PostgreSQL support. Including detection" ON) +OPTION(ENABLE_ORACLE "Enable/Disable Oracle support at all. Including detection" ON) +OPTION(ENABLE_PGSQL "Enable/Disable PostgreSQL support. Including detection" ON) +OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON) OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" ON) OPTION(WANT_BUNDLE "Enable Mac OS X bundle build" OFF) OPTION(WANT_BUNDLE_STANDALONE "Do not copy required libs and tools into bundle (WANT_BUNDLE)" ON) @@ -226,7 +227,7 @@ MESSAGE(" ") MESSAGE(WARNING " No PostgreSQL environment has been found.") MESSAGE(WARNING " Specify -DPOSTGRESQL_PATH_INCLUDES=path") - MESSAGE(WARNING " and -DPOSTGRESQL_PATH_LIB manually") + MESSAGE(WARNING " and -DPOSTGRESQL_PATH_LIB=path manually") #MESSAGE (STATUS "PostgreSQL includes: ${POSTGRESQL_INCLUDE_DIR} vs. ${POSTGRESQL_PATH_INCLUDES}") #MESSAGE (STATUS "PostgreSQL libs: ${POSTGRESQL_LIBRARIES} vs. ${POSTGRESQL_PATH_LIB}") MESSAGE(" ") @@ -235,6 +236,24 @@ ENDIF (NOT ENABLE_PGSQL) +IF (NOT ENABLE_DB2) + MESSAGE(STATUS "DB2 support is disabled by user choice") +ELSE (NOT ENABLE_DB2) + + FIND_PACKAGE(DB2) + IF (DB2_FOUND) + ADD_DEFINITIONS(-DHAVE_DB2) + ELSE (DB2_FOUND) + MESSAGE(" ") + MESSAGE(WARNING " No DB2 client libraries have been found.") + MESSAGE(WARNING " TOra can be build without it - without DB2 support.") + MESSAGE(WARNING " Specify -DDB2_PATH_INCLUDES=path") + MESSAGE(WARNING " and -DDB2_PATH_LIB=path manually") + MESSAGE(" ") + ENDIF (DB2_FOUND) + +ENDIF (NOT ENABLE_DB2) + ############################################################################################################## ########## Include Setup ########## Copied: branches/tora-trotl/cmake/modules/FindDB2.cmake (from rev 3463, trunk/tora/cmake/modules/FindDB2.cmake) =================================================================== --- branches/tora-trotl/cmake/modules/FindDB2.cmake (rev 0) +++ branches/tora-trotl/cmake/modules/FindDB2.cmake 2010-03-14 19:37:30 UTC (rev 3465) @@ -0,0 +1,69 @@ +# TOra: Configure DB2 libraries +# +# DB2_FOUND - system has a DB2 client +# DB2_INCLUDES - where to find header files +# DB2_LIBRARIES - the libraries to link against to use Oracle OCI +# +# copyright (c) 2009 Petr Vanek <pe...@sc...> +# Redistribution and use is allowed according to the terms of the BSD license. +# + +SET(DB2_FOUND "NO") + + +IF (DB2_PATH_INCLUDES) + SET (DB2_INCLUDES_LOCATION ${DB2_PATH_INCLUDES}) +ELSE (DB2_PATH_INCLUDES) + SET (DB2_INCLUDES_LOCATION + $ENV{HOME}/sqllib/include/ + ) +ENDIF (DB2_PATH_INCLUDES) + + +# DB2 has really strange lib32/lib64 directories +IF (LIB_SUFFIX STREQUAL "64") + SET(DB2_LIB_SUFFIX 64) +ELSE () + SET(DB2_LIB_SUFFIX 32) +ENDIF () + +IF (DB2_PATH_LIB) + SET (DB2_LIB_LOCATION ${DB2_PATH_LIB}) +ELSE (DB2_PATH_LIB) + SET (DB2_LIB_LOCATION + $ENV{HOME}/sqllib/lib${DB2_LIB_SUFFIX} + ) +ENDIF (DB2_PATH_LIB) + +FIND_PATH( + DB2_INCLUDES + sqlcli1.h + ${DB2_INCLUDES_LOCATION} +) + +FIND_LIBRARY( + DB2_LIBRARY_LIBDB2 + NAMES libdb2 db2 + PATHS ${DB2_LIB_LOCATION} +) + +SET (DB2_LIBRARIES ${DB2_LIBRARY_LIBDB2}) + + +IF (DB2_LIBRARIES AND DB2_INCLUDES) + SET(DB2_FOUND "YES") +ENDIF (DB2_LIBRARIES AND DB2_INCLUDES) + +IF (DB2_FOUND) + MESSAGE(STATUS "Found DB2: ${DB2_LIBRARIES}") +ELSE (DB2_FOUND) + MESSAGE(STATUS "DB2 not found.") + MESSAGE(STATUS "DB2: You can specify includes: -DDB2_PATH_INCLUDES=/opt/db2/V9.5/includes") + MESSAGE(STATUS " currently found includes: ${DB2_INCLUDES}") + MESSAGE(STATUS "DB2: You can specify libs: -DDB2_PATH_LIB=/opt/db2/V9.5/lib64") + MESSAGE(STATUS " currently found libs: ${DB2_LIBRARIES}") + IF (DB2_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find DB2 library") + ENDIF (DB2_FIND_REQUIRED) +ENDIF (DB2_FOUND) + Modified: branches/tora-trotl/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora-trotl/cmake/modules/FindOracle.cmake 2010-03-14 11:24:22 UTC (rev 3464) +++ branches/tora-trotl/cmake/modules/FindOracle.cmake 2010-03-14 19:37:30 UTC (rev 3465) @@ -107,7 +107,6 @@ ${CMAKE_SOURCE_DIR}/cmake/modules/OCIVersion.c CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${ORACLE_INCLUDES}" OUTPUT_VARIABLE OCIVER) - MESSAGE(STATUS "-- OCI Client version: ${OCIVER}") IF (${OCIVER_TYPE} GREATER "110") SET(ORACLE_OCI_VERSION "11G") Modified: branches/tora-trotl/cmake/modules/PCHSupport_26.cmake =================================================================== --- branches/tora-trotl/cmake/modules/PCHSupport_26.cmake 2010-03-14 11:24:22 UTC (rev 3464) +++ branches/tora-trotl/cmake/modules/PCHSupport_26.cmake 2010-03-14 19:37:30 UTC (rev 3465) @@ -1,331 +1,331 @@ -# - Try to find precompiled headers support for GCC 3.4 and 4.x -# Once done this will define: -# -# Variable: -# PCHSupport_FOUND -# -# Macro: -# ADD_PRECOMPILED_HEADER _targetName _input _dowarn -# ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use _dowarn -# ADD_NATIVE_PRECOMPILED_HEADER _targetName _input _dowarn -# GET_NATIVE_PRECOMPILED_HEADER _targetName _input - -IF(CMAKE_COMPILER_IS_GNUCXX) - - EXEC_PROGRAM( - ${CMAKE_CXX_COMPILER} - ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion - OUTPUT_VARIABLE gcc_compiler_version) - #MESSAGE("GCC Version: ${gcc_compiler_version}") - IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") - SET(PCHSupport_FOUND TRUE) - ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") - IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]") - SET(PCHSupport_FOUND TRUE) - ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]") - ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") - - SET(_PCH_include_prefix "-I") - -ELSE(CMAKE_COMPILER_IS_GNUCXX) - IF(WIN32) - SET(PCHSupport_FOUND TRUE) # for experimental msvc support - SET(_PCH_include_prefix "/I") - ELSE(WIN32) - SET(PCHSupport_FOUND FALSE) - ENDIF(WIN32) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - - -MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags) - - - STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name) - SET(${_out_compile_flags} ${${_flags_var_name}} ) - - IF(CMAKE_COMPILER_IS_GNUCXX) - - GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE) - IF(${_targetType} STREQUAL SHARED_LIBRARY) - LIST(APPEND ${_out_compile_flags} "${${_out_compile_flags}} -fPIC") - ENDIF(${_targetType} STREQUAL SHARED_LIBRARY) - - ELSE(CMAKE_COMPILER_IS_GNUCXX) - ## TODO ... ? or does it work out of the box - ENDIF(CMAKE_COMPILER_IS_GNUCXX) - - GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES ) - FOREACH(item ${DIRINC}) - LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}${item}") - ENDFOREACH(item) - - SET(_build_type "${CMAKE_BUILD_TYPE}") - # MESSAGE(STATUS "build type: `${CMAKE_BUILD_TYPE}'") - IF (NOT _build_type) - SET(_build_type "Debug") - ENDIF (NOT _build_type) - string(TOUPPER ${_build_type} _build_type) - SET(_def_name "COMPILE_DEFINITIONS_${_build_type}") - GET_DIRECTORY_PROPERTY(_directory_flags ${_def_name}) - FOREACH(item ${_directory_flags}) - LIST(APPEND ${_out_compile_flags} "-D${item}") - ENDFOREACH(item) - # MESSAGE("_directory_flags ${_directory_flags}" ) - GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS) - #MESSAGE("_directory_flags ${_directory_flags}" ) - LIST(APPEND ${_out_compile_flags} ${_directory_flags}) - LIST(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS} ) - - SEPARATE_ARGUMENTS(${_out_compile_flags}) - -ENDMACRO(_PCH_GET_COMPILE_FLAGS) - - -MACRO(_PCH_WRITE_PCHDEP_CXX _targetName _include_file _dephelp) - - SET(${_dephelp} ${CMAKE_CURRENT_BINARY_DIR}/${_targetName}_pch_dephelp.cxx) - FILE(WRITE ${${_dephelp}} -"#include \"${_include_file}\" -int testfunction() -{ - return 0; -} -" - ) - -ENDMACRO(_PCH_WRITE_PCHDEP_CXX ) - -MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output) - - FILE(TO_NATIVE_PATH ${_input} _native_input) - FILE(TO_NATIVE_PATH ${_output} _native_output) - - - IF(CMAKE_COMPILER_IS_GNUCXX) - IF(CMAKE_CXX_COMPILER_ARG1) - # remove leading space in compiler argument - STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1}) - - SET(${out_command} - ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} - ) - ELSE(CMAKE_CXX_COMPILER_ARG1) - SET(${out_command} - ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} - ) - ENDIF(CMAKE_CXX_COMPILER_ARG1) - ELSE(CMAKE_COMPILER_IS_GNUCXX) - - SET(_dummy_str "#include <${_input}>") - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pch_dummy.cpp ${_dummy_str}) - - SET(${out_command} - ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} /c /Fp${_native_output} /Yc${_native_input} pch_dummy.cpp - ) - #/out:${_output} - - ENDIF(CMAKE_COMPILER_IS_GNUCXX) - -ENDMACRO(_PCH_GET_COMPILE_COMMAND ) - - - -MACRO(_PCH_GET_TARGET_COMPILE_FLAGS _cflags _header_name _pch_path _dowarn ) - - FILE(TO_NATIVE_PATH ${_pch_path} _native_pch_path) - - IF(CMAKE_COMPILER_IS_GNUCXX) - # for use with distcc and gcc >4.0.1 if preprocessed files are accessible - # on all remote machines set - # PCH_ADDITIONAL_COMPILER_FLAGS to -fpch-preprocess - # if you want warnings for invalid header files (which is very inconvenient - # if you have different versions of the headers for different build types - # you may set _pch_dowarn - IF (_dowarn) - SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include ${CMAKE_CURRENT_BINARY_DIR}/${_header_name} -Winvalid-pch " ) - ELSE (_dowarn) - SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include ${CMAKE_CURRENT_BINARY_DIR}/${_header_name} " ) - ENDIF (_dowarn) - ELSE(CMAKE_COMPILER_IS_GNUCXX) - - set(${_cflags} "/Fp\"${_native_pch_path}\" /Yu\"${_header_name}\" /FI\"${_header_name}\" " ) - - ENDIF(CMAKE_COMPILER_IS_GNUCXX) - -ENDMACRO(_PCH_GET_TARGET_COMPILE_FLAGS ) - -MACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input _output) - GET_FILENAME_COMPONENT(_name ${_input} NAME) - GET_FILENAME_COMPONENT(_path ${_input} PATH) - SET(_output "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch/${_targetName}_${CMAKE_BUILD_TYPE}.h++") -ENDMACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input) - - -MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use ) - - # to do: test whether compiler flags match between target _targetName - # and _pch_output_to_use - GET_FILENAME_COMPONENT(_name ${_input} NAME) - - IF( "${ARGN}" STREQUAL "0") - SET(_dowarn 0) - ELSE( "${ARGN}" STREQUAL "0") - SET(_dowarn 1) - ENDIF("${ARGN}" STREQUAL "0") - - - _PCH_GET_TARGET_COMPILE_FLAGS(_target_cflags ${_name} ${_pch_output_to_use} ${_dowarn}) - # MESSAGE("Add flags ${_target_cflags} to ${_targetName} " ) - SET_TARGET_PROPERTIES(${_targetName} - PROPERTIES - COMPILE_FLAGS ${_target_cflags} - ) - - ADD_CUSTOM_TARGET(pch_Generate_${_targetName} - DEPENDS ${_pch_output_to_use} - ) - - ADD_DEPENDENCIES(${_targetName} pch_Generate_${_targetName} ) - -ENDMACRO(ADD_PRECOMPILED_HEADER_TO_TARGET) - -MACRO(ADD_PRECOMPILED_HEADER _targetName _input) - - SET(_PCH_current_target ${_targetName}) - - IF(NOT CMAKE_BUILD_TYPE) - MESSAGE(FATAL_ERROR - "This is the ADD_PRECOMPILED_HEADER macro. " - "You must set CMAKE_BUILD_TYPE!" - ) - ENDIF(NOT CMAKE_BUILD_TYPE) - - IF( "${ARGN}" STREQUAL "0") - SET(_dowarn 0) - ELSE( "${ARGN}" STREQUAL "0") - SET(_dowarn 1) - ENDIF("${ARGN}" STREQUAL "0") - - - GET_FILENAME_COMPONENT(_name ${_input} NAME) - GET_FILENAME_COMPONENT(_path ${_input} PATH) - GET_PRECOMPILED_HEADER_OUTPUT( ${_targetName} ${_input} _output) - - GET_FILENAME_COMPONENT(_outdir ${_output} PATH ) - - GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE) - _PCH_WRITE_PCHDEP_CXX(${_targetName} ${_input} _pch_dephelp_cxx) - - IF(${_targetType} STREQUAL SHARED_LIBRARY) - ADD_LIBRARY(${_targetName}_pch_dephelp SHARED ${_pch_dephelp_cxx} ) - ELSE(${_targetType} STREQUAL SHARED_LIBRARY) - ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_pch_dephelp_cxx}) - ENDIF(${_targetType} STREQUAL SHARED_LIBRARY) - - FILE(MAKE_DIRECTORY ${_outdir}) - - - _PCH_GET_COMPILE_FLAGS(_compile_FLAGS) - - #MESSAGE("_compile_FLAGS: ${_compile_FLAGS}") - #message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}") - SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${_name} PROPERTIES GENERATED 1) - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name} - COMMAND ${CMAKE_COMMAND} -E copy ${_input} ${CMAKE_CURRENT_BINARY_DIR}/${_name} # ensure same directory! Required by gcc - DEPENDS ${_input} - ) - - #message("_command ${_input} ${_output}") - _PCH_GET_COMPILE_COMMAND(_command ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_output} ) - - #message(${_input} ) - #message("_output ${_output}") - - ADD_CUSTOM_COMMAND( - OUTPUT ${_output} - COMMAND ${_command} - DEPENDS ${_input} ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_targetName}_pch_dephelp - ) - - - ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_input} ${_output} ${_dowarn}) -ENDMACRO(ADD_PRECOMPILED_HEADER) - - -# Generates the use of precompiled in a target, -# without using depency targets (2 extra for each target) -# Using Visual, must also add ${_targetName}_pch to sources -# Not needed by Xcode - -MACRO(GET_NATIVE_PRECOMPILED_HEADER _targetName _input) - - if(CMAKE_GENERATOR MATCHES Visual*) - - SET(_dummy_str "#include \"${_input}\"\n" - "// This is required to suppress LNK4221. Very annoying.\n" - "void *g_${_targetName}Dummy = 0\;\n") - - # Use of cxx extension for generated files (as Qt does) - SET(${_targetName}_pch ${CMAKE_CURRENT_BINARY_DIR}/${_targetName}_pch.cxx) - if(EXISTS ${${_targetName}_pch}) - # Check if contents is the same, if not rewrite - # todo - else(EXISTS ${${_targetName}_pch}) - FILE(WRITE ${${_targetName}_pch} ${_dummy_str}) - endif(EXISTS ${${_targetName}_pch}) - endif(CMAKE_GENERATOR MATCHES Visual*) - -ENDMACRO(GET_NATIVE_PRECOMPILED_HEADER) - - -MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input) - - IF( "${ARGN}" STREQUAL "0") - SET(_dowarn 0) - ELSE( "${ARGN}" STREQUAL "0") - SET(_dowarn 1) - ENDIF("${ARGN}" STREQUAL "0") - - if(CMAKE_GENERATOR MATCHES Visual*) - # Auto include the precompile (useful for moc processing, since the use of - # precompiled is specified at the target level - # and I don't want to specifiy /F- for each moc/res/ui generated files (using Qt) - - GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS) - if (${oldProps} MATCHES NOTFOUND) - SET(oldProps "") - endif(${oldProps} MATCHES NOTFOUND) - - SET(newProperties "${oldProps} /Yu\"${_input}\" /FI\"${_input}\"") - SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "${newProperties}") - - #also inlude ${oldProps} to have the same compile options - SET_SOURCE_FILES_PROPERTIES(${${_targetName}_pch} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_input}\"") - - else(CMAKE_GENERATOR MATCHES Visual*) - - if (CMAKE_GENERATOR MATCHES Xcode) - # For Xcode, cmake needs my patch to process - # GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties - - GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS) - if (${oldProps} MATCHES NOTFOUND) - SET(oldProps "") - endif(${oldProps} MATCHES NOTFOUND) - - # When buiding out of the tree, precompiled may not be located - # Use full path instead. - GET_FILENAME_COMPONENT(fullPath ${_input} ABSOLUTE) - - SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}") - SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES") - - else (CMAKE_GENERATOR MATCHES Xcode) - - #Fallback to the "old" precompiled suppport - #ADD_PRECOMPILED_HEADER(${_targetName} ${_input} ${_dowarn}) - endif(CMAKE_GENERATOR MATCHES Xcode) - endif(CMAKE_GENERATOR MATCHES Visual*) - -ENDMACRO(ADD_NATIVE_PRECOMPILED_HEADER) +# - Try to find precompiled headers support for GCC 3.4 and 4.x +# Once done this will define: +# +# Variable: +# PCHSupport_FOUND +# +# Macro: +# ADD_PRECOMPILED_HEADER _targetName _input _dowarn +# ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use _dowarn +# ADD_NATIVE_PRECOMPILED_HEADER _targetName _input _dowarn +# GET_NATIVE_PRECOMPILED_HEADER _targetName _input + +IF(CMAKE_COMPILER_IS_GNUCXX) + + EXEC_PROGRAM( + ${CMAKE_CXX_COMPILER} + ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion + OUTPUT_VARIABLE gcc_compiler_version) + #MESSAGE("GCC Version: ${gcc_compiler_version}") + IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") + SET(PCHSupport_FOUND TRUE) + ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") + IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]") + SET(PCHSupport_FOUND TRUE) + ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]") + ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") + + SET(_PCH_include_prefix "-I") + +ELSE(CMAKE_COMPILER_IS_GNUCXX) + IF(WIN32) + SET(PCHSupport_FOUND TRUE) # for experimental msvc support + SET(_PCH_include_prefix "/I") + ELSE(WIN32) + SET(PCHSupport_FOUND FALSE) + ENDIF(WIN32) +ENDIF(CMAKE_COMPILER_IS_GNUCXX) + + +MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags) + + + STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name) + SET(${_out_compile_flags} ${${_flags_var_name}} ) + + IF(CMAKE_COMPILER_IS_GNUCXX) + + GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE) + IF(${_targetType} STREQUAL SHARED_LIBRARY) + LIST(APPEND ${_out_compile_flags} "${${_out_compile_flags}} -fPIC") + ENDIF(${_targetType} STREQUAL SHARED_LIBRARY) + + ELSE(CMAKE_COMPILER_IS_GNUCXX) + ## TODO ... ? or does it work out of the box + ENDIF(CMAKE_COMPILER_IS_GNUCXX) + + GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES ) + FOREACH(item ${DIRINC}) + LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}${item}") + ENDFOREACH(item) + + SET(_build_type "${CMAKE_BUILD_TYPE}") + # MESSAGE(STATUS "build type: `${CMAKE_BUILD_TYPE}'") + IF (NOT _build_type) + SET(_build_type "Debug") + ENDIF (NOT _build_type) + string(TOUPPER ${_build_type} _build_type) + SET(_def_name "COMPILE_DEFINITIONS_${_build_type}") + GET_DIRECTORY_PROPERTY(_directory_flags ${_def_name}) + FOREACH(item ${_directory_flags}) + LIST(APPEND ${_out_compile_flags} "-D${item}") + ENDFOREACH(item) + # MESSAGE("_directory_flags ${_directory_flags}" ) + GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS) + #MESSAGE("_directory_flags ${_directory_flags}" ) + LIST(APPEND ${_out_compile_flags} ${_directory_flags}) + LIST(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS} ) + + SEPARATE_ARGUMENTS(${_out_compile_flags}) + +ENDMACRO(_PCH_GET_COMPILE_FLAGS) + + +MACRO(_PCH_WRITE_PCHDEP_CXX _targetName _include_file _dephelp) + + SET(${_dephelp} ${CMAKE_CURRENT_BINARY_DIR}/${_targetName}_pch_dephelp.cxx) + FILE(WRITE ${${_dephelp}} +"#include \"${_include_file}\" +int testfunction() +{ + return 0; +} +" + ) + +ENDMACRO(_PCH_WRITE_PCHDEP_CXX ) + +MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output) + + FILE(TO_NATIVE_PATH ${_input} _native_input) + FILE(TO_NATIVE_PATH ${_output} _native_output) + + + IF(CMAKE_COMPILER_IS_GNUCXX) + IF(CMAKE_CXX_COMPILER_ARG1) + # remove leading space in compiler argument + STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1}) + + SET(${out_command} + ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} + ) + ELSE(CMAKE_CXX_COMPILER_ARG1) + SET(${out_command} + ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} + ) + ENDIF(CMAKE_CXX_COMPILER_ARG1) + ELSE(CMAKE_COMPILER_IS_GNUCXX) + + SET(_dummy_str "#include <${_input}>") + FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pch_dummy.cpp ${_dummy_str}) + + SET(${out_command} + ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} /c /Fp${_native_output} /Yc${_native_input} pch_dummy.cpp + ) + #/out:${_output} + + ENDIF(CMAKE_COMPILER_IS_GNUCXX) + +ENDMACRO(_PCH_GET_COMPILE_COMMAND ) + + + +MACRO(_PCH_GET_TARGET_COMPILE_FLAGS _cflags _header_name _pch_path _dowarn ) + + FILE(TO_NATIVE_PATH ${_pch_path} _native_pch_path) + + IF(CMAKE_COMPILER_IS_GNUCXX) + # for use with distcc and gcc >4.0.1 if preprocessed files are accessible + # on all remote machines set + # PCH_ADDITIONAL_COMPILER_FLAGS to -fpch-preprocess + # if you want warnings for invalid header files (which is very inconvenient + # if you have different versions of the headers for different build types + # you may set _pch_dowarn + IF (_dowarn) + SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include ${CMAKE_CURRENT_BINARY_DIR}/${_header_name} -Winvalid-pch " ) + ELSE (_dowarn) + SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include ${CMAKE_CURRENT_BINARY_DIR}/${_header_name} " ) + ENDIF (_dowarn) + ELSE(CMAKE_COMPILER_IS_GNUCXX) + + set(${_cflags} "/Fp\"${_native_pch_path}\" /Yu\"${_header_name}\" /FI\"${_header_name}\" " ) + + ENDIF(CMAKE_COMPILER_IS_GNUCXX) + +ENDMACRO(_PCH_GET_TARGET_COMPILE_FLAGS ) + +MACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input _output) + GET_FILENAME_COMPONENT(_name ${_input} NAME) + GET_FILENAME_COMPONENT(_path ${_input} PATH) + SET(_output "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch/${_targetName}_${CMAKE_BUILD_TYPE}.h++") +ENDMACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input) + + +MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use ) + + # to do: test whether compiler flags match between target _targetName + # and _pch_output_to_use + GET_FILENAME_COMPONENT(_name ${_input} NAME) + + IF( "${ARGN}" STREQUAL "0") + SET(_dowarn 0) + ELSE( "${ARGN}" STREQUAL "0") + SET(_dowarn 1) + ENDIF("${ARGN}" STREQUAL "0") + + + _PCH_GET_TARGET_COMPILE_FLAGS(_target_cflags ${_name} ${_pch_output_to_use} ${_dowarn}) + # MESSAGE("Add flags ${_target_cflags} to ${_targetName} " ) + SET_TARGET_PROPERTIES(${_targetName} + PROPERTIES + COMPILE_FLAGS ${_target_cflags} + ) + + ADD_CUSTOM_TARGET(pch_Generate_${_targetName} + DEPENDS ${_pch_output_to_use} + ) + + ADD_DEPENDENCIES(${_targetName} pch_Generate_${_targetName} ) + +ENDMACRO(ADD_PRECOMPILED_HEADER_TO_TARGET) + +MACRO(ADD_PRECOMPILED_HEADER _targetName _input) + + SET(_PCH_current_target ${_targetName}) + + IF(NOT CMAKE_BUILD_TYPE) + MESSAGE(FATAL_ERROR + "This is the ADD_PRECOMPILED_HEADER macro. " + "You must set CMAKE_BUILD_TYPE!" + ) + ENDIF(NOT CMAKE_BUILD_TYPE) + + IF( "${ARGN}" STREQUAL "0") + SET(_dowarn 0) + ELSE( "${ARGN}" STREQUAL "0") + SET(_dowarn 1) + ENDIF("${ARGN}" STREQUAL "0") + + + GET_FILENAME_COMPONENT(_name ${_input} NAME) + GET_FILENAME_COMPONENT(_path ${_input} PATH) + GET_PRECOMPILED_HEADER_OUTPUT( ${_targetName} ${_input} _output) + + GET_FILENAME_COMPONENT(_outdir ${_output} PATH ) + + GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE) + _PCH_WRITE_PCHDEP_CXX(${_targetName} ${_input} _pch_dephelp_cxx) + + IF(${_targetType} STREQUAL SHARED_LIBRARY) + ADD_LIBRARY(${_targetName}_pch_dephelp SHARED ${_pch_dephelp_cxx} ) + ELSE(${_targetType} STREQUAL SHARED_LIBRARY) + ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_pch_dephelp_cxx}) + ENDIF(${_targetType} STREQUAL SHARED_LIBRARY) + + FILE(MAKE_DIRECTORY ${_outdir}) + + + _PCH_GET_COMPILE_FLAGS(_compile_FLAGS) + + #MESSAGE("_compile_FLAGS: ${_compile_FLAGS}") + #message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}") + SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${_name} PROPERTIES GENERATED 1) + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name} + COMMAND ${CMAKE_COMMAND} -E copy ${_input} ${CMAKE_CURRENT_BINARY_DIR}/${_name} # ensure same directory! Required by gcc + DEPENDS ${_input} + ) + + #message("_command ${_input} ${_output}") + _PCH_GET_COMPILE_COMMAND(_command ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_output} ) + + #message(${_input} ) + #message("_output ${_output}") + + ADD_CUSTOM_COMMAND( + OUTPUT ${_output} + COMMAND ${_command} + DEPENDS ${_input} ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_targetName}_pch_dephelp + ) + + + ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_input} ${_output} ${_dowarn}) +ENDMACRO(ADD_PRECOMPILED_HEADER) + + +# Generates the use of precompiled in a target, +# without using depency targets (2 extra for each target) +# Using Visual, must also add ${_targetName}_pch to sources +# Not needed by Xcode + +MACRO(GET_NATIVE_PRECOMPILED_HEADER _targetName _input) + + if(CMAKE_GENERATOR MATCHES Visual*) + + SET(_dummy_str "#include \"${_input}\"\n" + "// This is required to suppress LNK4221. Very annoying.\n" + "void *g_${_targetName}Dummy = 0\;\n") + + # Use of cxx extension for generated files (as Qt does) + SET(${_targetName}_pch ${CMAKE_CURRENT_BINARY_DIR}/${_targetName}_pch.cxx) + if(EXISTS ${${_targetName}_pch}) + # Check if contents is the same, if not rewrite + # todo + else(EXISTS ${${_targetName}_pch}) + FILE(WRITE ${${_targetName}_pch} ${_dummy_str}) + endif(EXISTS ${${_targetName}_pch}) + endif(CMAKE_GENERATOR MATCHES Visual*) + +ENDMACRO(GET_NATIVE_PRECOMPILED_HEADER) + + +MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input) + + IF( "${ARGN}" STREQUAL "0") + SET(_dowarn 0) + ELSE( "${ARGN}" STREQUAL "0") + SET(_dowarn 1) + ENDIF("${ARGN}" STREQUAL "0") + + if(CMAKE_GENERATOR MATCHES Visual*) + # Auto include the precompile (useful for moc processing, since the use of + # precompiled is specified at the target level + # and I don't want to specifiy /F- for each moc/res/ui generated files (using Qt) + + GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS) + if (${oldProps} MATCHES NOTFOUND) + SET(oldProps "") + endif(${oldProps} MATCHES NOTFOUND) + + SET(newProperties "${oldProps} /Yu\"${_input}\" /FI\"${_input}\"") + SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "${newProperties}") + + #also inlude ${oldProps} to have the same compile options + SET_SOURCE_FILES_PROPERTIES(${${_targetName}_pch} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_input}\"") + + else(CMAKE_GENERATOR MATCHES Visual*) + + if (CMAKE_GENERATOR MATCHES Xcode) + # For Xcode, cmake needs my patch to process + # GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties + + GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS) + if (${oldProps} MATCHES NOTFOUND) + SET(oldProps "") + endif(${oldProps} MATCHES NOTFOUND) + + # When buiding out of the tree, precompiled may not be located + # Use full path instead. + GET_FILENAME_COMPONENT(fullPath ${_input} ABSOLUTE) + + SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}") + SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES") + + else (CMAKE_GENERATOR MATCHES Xcode) + + #Fallback to the "old" precompiled suppport + #ADD_PRECOMPILED_HEADER(${_targetName} ${_input} ${_dowarn}) + endif(CMAKE_GENERATOR MATCHES Xcode) + endif(CMAKE_GENERATOR MATCHES Visual*) + +ENDMACRO(ADD_NATIVE_PRECOMPILED_HEADER) Modified: branches/tora-trotl/doc/help/database.html =================================================================== --- branches/tora-trotl/doc/help/database.html 2010-03-14 11:24:22 UTC (rev 3464) +++ branches/tora-trotl/doc/help/database.html 2010-03-14 19:37:30 UTC (rev 3465) @@ -63,7 +63,12 @@ <br><dt><strong>Maximum size display</strong><dd> The maximum width a list column will get automatically regardless of how large the content is. This is so you can still see the rest of the columns even if one of the first can contain very large values. You can always resize the column by hand afterwards. -<br><dt><strong>Firewall mode.</strong><dd> TODO. +<br><dt><strong>Firewall mode.</strong><dd> Makes each connection in connection pool to run extra queries (selecting sysdate from dual) at specified + interval (see "Connection test interval" option). This could be useful if there is a firewall between + TOra and database and firewall is dropping connections if there is no traffic. + + <p><strong>Note!</strong> If you change this option, you have to reconnect in order to make it effective. +<br><dt><strong>Connection test interval</strong><dd> Interval in seconds at which TOra should be sending dummy queries to database (see "Firewall mode"). <br><dt><strong>Indicate empty values as ”.</strong><dd> TODO. <br><dt><strong>Number format.</strong><dd> TODO. </dl> Modified: branches/tora-trotl/doc/help/database.texi =================================================================== --- branches/tora-trotl/doc/help/database.texi 2010-03-14 11:24:22 UTC (rev 3464) +++ branches/tora-trotl/doc/help/database.texi 2010-03-14 19:37:30 UTC (rev 3465) @@ -34,7 +34,13 @@ you can still see the rest of the columns even if one of the first can contain very large values. You can always resize the column by hand afterwards. @item @strong{Firewall mode.} - TODO. + Makes each connection in connection pool to run extra queries (selecting sysdate from dual) at specified + interval (see "Connection test interval" option). This could be useful if there is a firewall between + TOra and database and firewall is dropping connections if there is no traffic. + + @strong{Note!} If you change this option, you have to reconnect in order to make it effective. +@item @strong{Connection test interval} + Interval in seconds at which TOra should be sending dummy queries to database (see "Firewall mode"). @item @strong{Indicate empty values as ''.} TODO. @item @strong{Number format.} Modified: branches/tora-trotl/doc/help/debugger.texi =================================================================== --- branches/tora-trotl/doc/help/debugger.texi 2010-03-14 11:24:22 UTC (rev 3464) +++ branches/tora-trotl/doc/help/debugger.texi 2010-03-14 19:37:30 UTC (rev 3465) @@ -114,7 +114,7 @@ Watches are a way to inspect the contents of variables in a running program. When you add a watch using the @strong{add watch} command you are presented with the following dialog. -@image{images/addwatch,4cm} +@image{images/addwatch,5cm} First of all you need to select the scope the variable is declared in. The @strong{local} scope is variables only declared in the current context, like for instance this function or procedure. The @strong{head} and @strong{body} are variables declared in packages. Variables in packages are usually also available in the global scope. When you declare a watch in any scope except for @strong{local} you should also indicate the object in which the variable is declared in the format schema.object.variable. The current object is prepended to the variable name when you select anything but the @strong{local} scope. @@ -128,7 +128,7 @@ You can also change the content of a watch. First you select the watch you want to change in the watch list, then you select the @strong{change watch} command. You will be shown this dialog. -@image{images/changewatch,10cm} +@image{images/changewatch,7cm} If you have selected the parent of an array watch you will be able to select the index you want to assign a new value with the @strong{index} indicator to right. Then you enter the new value in the text field or check the @strong{NULL} indicator to set the value to NULL. Modified: branches/tora-trotl/doc/help/images/addwatch.png =================================================================== --- branches/tora-trotl/doc/help/images/addwatch.png 2010-03-14 11:24:22 UTC (rev 3464) +++ branches/tora-trotl/doc/help/images/addwatch.png 2010-03-14 19:37:30 UTC (rev 3465) @@ -1,42 +1,170 @@ \x89PNG |
From: <ibr...@us...> - 2010-03-25 21:02:06
|
Revision: 3472 http://tora.svn.sourceforge.net/tora/?rev=3472&view=rev Author: ibre5041 Date: 2010-03-25 21:01:57 +0000 (Thu, 25 Mar 2010) Log Message: ----------- sync with tora trunk: version 2.1.2 Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/ChangeLog branches/tora-trotl/README.RELEASE branches/tora-trotl/configure.ac branches/tora-trotl/doc/help/Index_002dlist.html branches/tora-trotl/doc/help/additionalhelp.html branches/tora-trotl/doc/help/alert.html branches/tora-trotl/doc/help/analyze.html branches/tora-trotl/doc/help/api.html branches/tora-trotl/doc/help/browser.html branches/tora-trotl/doc/help/charts.html branches/tora-trotl/doc/help/common.html branches/tora-trotl/doc/help/current.html branches/tora-trotl/doc/help/database.html branches/tora-trotl/doc/help/debugger.html branches/tora-trotl/doc/help/editor.html branches/tora-trotl/doc/help/editor.texi branches/tora-trotl/doc/help/editors.html branches/tora-trotl/doc/help/explainplan.html branches/tora-trotl/doc/help/extendingtora.html branches/tora-trotl/doc/help/externalapi.html branches/tora-trotl/doc/help/gettingbindparameters.html branches/tora-trotl/doc/help/globalsettings.html branches/tora-trotl/doc/help/help.html branches/tora-trotl/doc/help/history.html branches/tora-trotl/doc/help/images/editor.png branches/tora-trotl/doc/help/index.html branches/tora-trotl/doc/help/invalid.html branches/tora-trotl/doc/help/lists.html branches/tora-trotl/doc/help/memoeditor.html branches/tora-trotl/doc/help/newconnection.html branches/tora-trotl/doc/help/objectdescription.html branches/tora-trotl/doc/help/output.html branches/tora-trotl/doc/help/plsqleditor.html branches/tora-trotl/doc/help/preferences.html branches/tora-trotl/doc/help/rollback.html branches/tora-trotl/doc/help/script.html branches/tora-trotl/doc/help/searchreplace.html branches/tora-trotl/doc/help/security.html branches/tora-trotl/doc/help/session.html branches/tora-trotl/doc/help/sgastatement.html branches/tora-trotl/doc/help/sqledit.html branches/tora-trotl/doc/help/storage.html branches/tora-trotl/doc/help/template.html branches/tora-trotl/doc/help/tools.html branches/tora-trotl/doc/help/toolsetting.html branches/tora-trotl/doc/help/tora.texi branches/tora-trotl/doc/help/trace.html branches/tora-trotl/doc/help/tuning.html branches/tora-trotl/doc/help/unittest.html branches/tora-trotl/doc/help/whatprivileges.html branches/tora-trotl/doc/help/window.html branches/tora-trotl/doc/help/worksheet.html branches/tora-trotl/doc/help/workspace.html branches/tora-trotl/src/qscintilla2/Qt4/Qsci/qsciglobal.h branches/tora-trotl/src/tobrowsertable.cpp branches/tora-trotl/src/toconf.h branches/tora-trotl/src/toconfiguration.cpp branches/tora-trotl/src/toconfiguration.h branches/tora-trotl/src/tooracleconnection.cpp branches/tora-trotl/src/tooracleextract.cpp branches/tora-trotl/src/topreferencesui.ui branches/tora-trotl/src/tora.qrc branches/tora-trotl/src/tosyntaxsetup.cpp branches/tora-trotl/src/tosyntaxsetupui.ui branches/tora-trotl/src/trotl_test3.cpp Added Paths: ----------- branches/tora-trotl/debian/changelog branches/tora-trotl/doc/help/images/editor_syntax.png branches/tora-trotl/src/help/images/editor_syntax.png Removed Paths: ------------- branches/tora-trotl/debian/changelog Property Changed: ---------------- branches/tora-trotl/ Property changes on: branches/tora-trotl ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/tora:3191-3464 + /trunk/tora:3191-3471 Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/CMakeLists.txt 2010-03-25 21:01:57 UTC (rev 3472) @@ -50,7 +50,7 @@ #where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level) SET (VERSION_MAJOR "2") SET (VERSION_MINOR "1") -SET (VERSION_PATCH "1") +SET (VERSION_PATCH "2") SET (VERSION_SUFFIX "") SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") Modified: branches/tora-trotl/ChangeLog =================================================================== --- branches/tora-trotl/ChangeLog 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/ChangeLog 2010-03-25 21:01:57 UTC (rev 3472) @@ -1,3 +1,411 @@ -2005-02-16 Henrik Johnson and others <someemail> - * tora: automake wants this. +tora (2.1.2-1) unstable; urgency=low + * Improved: Add editor option for uppler/lowercase object names + * Improved: Db extract/compare tool now remembers widgets states + * New: Filesystem completer for target line edit + * Improved: Compatibility with sql+ + * New: Color/pixmap identifier for connection + * Improved: Schema browser improvements + * New: Ability to add external static check + * New: Save package specification and body to one file + * New: Initial support for creating/modifying tables + * Bugfixes + +tora (2.1.1-1) unstable; urgency=low + + * New upstream version + + -- Nathan Neulinger <nn...@ne...> Tue, 13 Oct 2009 13:44:40 -0600 + +tora (2.1.0-1) unstable; urgency=low + + * New upstream version, the rebuild closes: #540046. + * Bumped Standards-Version to 3.8.3, no changes needed. + * New project homepage. + * Removed no longer needed 01_missing_includes.dpatch. + * Removed no longer used dh_desktop call. + * Added README.source file. + + -- Michael Meskes <me...@de...> Fri, 11 Sep 2009 12:37:52 +0200 + +tora (2.0.0-4) unstable; urgency=low + + * Added patch to add missing include directives, closes: #526166 + + -- Michael Meskes <me...@de...> Mon, 04 May 2009 16:12:37 +0200 + +tora (2.0.0-3) unstable; urgency=low + + * Cleaned up packaging a little bit. + * Added homepage information to control file. + * Bumped Standards-Version to 3.8.1. + * Released to unstable. + + -- Michael Meskes <me...@de...> Tue, 07 Apr 2009 13:16:05 +0200 + +tora (2.0.0-2) experimental; urgency=low + + * Added build dependency on libpq-dev to get full PostgreSQL support. + + -- Michael Meskes <me...@de...> Tue, 06 Jan 2009 08:49:43 +0100 + +tora (2.0.0-1) experimental; urgency=low + + * New upstream version for KDE4/Qt4. + * Added watch file. + * Updated to standards version 3.8.0, no additional changes needed. + * No longer need texinfo to build, the html files are part of the tarball. + * Streamlined build dependencies. + * Updated copyright file. + + -- Michael Meskes <me...@de...> Sat, 03 Jan 2009 20:51:13 +0100 + +tora (1.3.23-1) unstable; urgency=low + + * New upstream version + * Moved config.* handling from clean target to configure target. + + -- Michael Meskes <me...@de...> Wed, 26 Mar 2008 09:55:07 +0100 + +tora (1.3.22-7) unstable; urgency=low + + * Removed build dependency on libqt3-compat-headers, closes: #464914 + * Added include directives needed by gcc-4.3, closes: #462239 + + -- Michael Meskes <me...@de...> Mon, 11 Feb 2008 10:57:12 +0100 + +tora (1.3.22-6) unstable; urgency=low + + * Fixed clean target yet again so building twice in a row is possible. + * Bumped up build dependency on debhelper to correct version. + + -- Michael Meskes <me...@de...> Thu, 10 Jan 2008 11:55:07 +0100 + +tora (1.3.22-5) unstable; urgency=low + + * Bumped standards version to 3.7.3. + * Bumped tora.dekstop to version 1.0, closes: #455588 + * Added call to dh_desktop. + * Bumbed debhelper version to 5. + * Build-depend on autotools-dev and cp up-to-date files to archive. + * Do not ignore errors in "make clean". + + -- Michael Meskes <me...@de...> Tue, 11 Dec 2007 10:32:06 +0100 + +tora (1.3.22-4) unstable; urgency=low + + * Removed build dependency on g++, closes: #452976 + * Also removed build dependency on libqt3-mt-dev because kdelibs4-dev + depends on it. + * Made menu file adhere new standard. + * Do not install sources for help files. + + -- Michael Meskes <me...@de...> Thu, 06 Dec 2007 10:13:24 +0100 + +tora (1.3.22-3) unstable; urgency=low + + * Moved to team maintenance: + Debian KDE Extras Team <pkg...@li...>. + + -- Michael Meskes <me...@de...> Thu, 22 Nov 2007 11:12:43 +0100 + +tora (1.3.22-2) unstable; urgency=low + + * Fixed help system + * Moved translations to /usr/share, closes: #448950 + * Remove deprecated debian.patch file. + + -- Michael Meskes <me...@de...> Tue, 20 Nov 2007 13:05:47 +0100 + +tora (1.3.22-1) unstable; urgency=low + + * New upstream version. + * Added texinfo to Build-Depends, closes: #443296 + * Build process now uses dpatch. + + -- Michael Meskes <me...@de...> Fri, 21 Sep 2007 13:48:45 +0200 + +tora (1.3.21pre22-3) unstable; urgency=low + + * Do not remove files from the orig tarball in our clean target, closes: #442749 + * Resynced with svn to prepare for upcoming 1.3.22 release. + + -- Michael Meskes <me...@de...> Tue, 18 Sep 2007 11:15:46 +0200 + +tora (1.3.21pre22-2) unstable; urgency=low + + * Fixed incorrect display of UTF-8 characters, closes: #418524 + + -- Michael Meskes <me...@de...> Fri, 08 Jun 2007 14:44:29 +0200 + +tora (1.3.21pre22-1) unstable; urgency=low + + * Applied latest upstream pre1.3.22 patch. + * Moved to qscintilla 1.7. + + -- Michael Meskes <me...@de...> Tue, 22 May 2007 15:35:55 +0200 + +tora (1.3.21-3) unstable; urgency=low + + * Added XDG menu support, closes: #354166 + + -- Michael Meskes <me...@de...> Mon, 17 Apr 2006 13:41:02 +0200 + +tora (1.3.21-2) unstable; urgency=low + + * Added patch by Martin Michlmayr to make tora compile with G++ 4.1, + closes: #357810 + * Fixed URL in copyright file, closes: #358394 + + -- Michael Meskes <me...@de...> Fri, 24 Mar 2006 13:30:31 +0100 + +tora (1.3.21-1) unstable; urgency=low + + * New upstream version, fixing the bug that urged me to call autogen.sh and + thus making the package build again without build-depending on automake et + al., closes: #352513 + * Added most of the debian specific patch to upstream sources. + + -- Michael Meskes <me...@de...> Mon, 13 Feb 2006 15:02:29 +0100 + +tora (1.3.20-1) unstable; urgency=low + + * New upstream version. + * Use the 16x16 icon that is provided by upstream. + + -- Michael Meskes <me...@de...> Sat, 11 Feb 2006 10:24:33 +0100 + +tora (1.3.18-4) unstable; urgency=low + + * Changed QODBC to QODBC3 one more time, closes: #347373 + + -- Michael Meskes <me...@de...> Thu, 12 Jan 2006 13:32:24 +0100 + +tora (1.3.18-3) unstable; urgency=low + + * Updated libtool so hopefully Debian GNU/k*BSD is supported now + closes: #342702 + * Added 16x16 menu icon + * Updated debhelper to version 4 + + -- Michael Meskes <me...@de...> Sun, 11 Dec 2005 19:03:49 +0100 + +tora (1.3.18-2) unstable; urgency=low + + * Added --enable-libsuffix= to make sure kdelibs are found even on sparc, + closes: #328124 + + -- Michael Meskes <me...@de...> Fri, 16 Sep 2005 08:48:14 +0200 + +tora (1.3.18-1) unstable; urgency=low + + * New upstream version + * Compiled against KDE 3.4.2, closes: #312432 + + -- Michael Meskes <me...@de...> Tue, 6 Sep 2005 13:32:17 +0200 + +tora (1.3.16-1) unstable; urgency=low + + * New upstream version + + -- Michael Meskes <me...@de...> Sun, 6 Mar 2005 11:08:40 +0100 + +tora (1.3.15-1) unstable; urgency=low + + * New upstream version + * Changed QODBC to QODBC3, closes: #285510 + + -- Michael Meskes <me...@de...> Fri, 4 Mar 2005 11:26:34 +0100 + +tora (1.3.14.1-3) unstable; urgency=low + + * This time really add the build-depend on kdebase-bin + + -- Michael Meskes <me...@de...> Mon, 5 Jul 2004 20:26:14 +0200 + +tora (1.3.14.1-2) unstable; urgency=low + + * Build-depend on kdebase-bin (closes: #253765) + * Changed configure.pl to check for kdcop instead of kwin. + + -- Michael Meskes <me...@de...> Mon, 5 Jul 2004 12:47:34 +0200 + +tora (1.3.14.1-1) unstable; urgency=low + + * New upstream version. + * Made sure KDE files are installed (closes: #253765) + + -- Michael Meskes <me...@de...> Sun, 4 Jul 2004 17:12:34 +0200 + +tora (1.3.13-3) unstable; urgency=low + + * Updated standards version. + * Added man page. + * Added symlink from /usr/share/doc/tora to help files. + * Make sure all built files are cleaned. + * Compile without "new check". + * Added kderemove="y" to menu entry. Use icons already installed in + KDE structure; don't install twice. Improved menu text. + * Updated copyright. + + -- Michael Meskes <me...@de...> Wed, 24 Mar 2004 19:27:28 +0100 + +tora (1.3.13-2) unstable; urgency=low + + * Added icon, improved capitalization of menu entry. + + -- Michael Meskes <me...@de...> Mon, 01 Mar 2004 11:30:15 +0100 + +tora (1.3.13-1) unstable; urgency=low + + * New upstream version + + -- Michael Meskes <me...@de...> Sun, 15 Feb 2004 10:47:47 +0100 + +tora (1.3.12-1) unstable; urgency=low + + * New upstream version + + -- Michael Meskes <me...@de...> Tue, 21 Oct 2003 19:13:32 +0200 + +tora (1.3.11-1) unstable; urgency=low + + * New upstream version + * Moved help files from /usr/lib to /usr/share + + -- Michael Meskes <me...@de...> Sun, 31 Aug 2003 12:15:51 +0200 + +tora (1.3.9.2-3) unstable; urgency=low + + * Removed full screen opening (closes: #167590) + * Added patch from CVS so changed values are saved. + * Added my patches to doc/ + + -- Michael Meskes <me...@de...> Sun, 15 Jun 2003 14:31:11 +0200 + +tora (1.3.9.2-2) unstable; urgency=low + + * Include qobjectlist.h instead of qobjcoll.h (closes: #181522) + * Include qt3-compat-headers in Build-Depends until kdelibs4-dev is fixed + * Made sure qt3-mt is used (closes: #183063) + + -- Michael Meskes <me...@de...> Mon, 24 Feb 2003 14:31:50 +0100 + +tora (1.3.9.2-1) unstable; urgency=low + + * New upstream version + * Compiled against new libqt3 (closes: #181091) + + -- Michael Meskes <me...@de...> Mon, 17 Feb 2003 00:56:12 +0100 + +tora (1.3.8-1) unstable; urgency=low + + * New upstream version + + -- Michael Meskes <me...@de...> Fri, 11 Oct 2002 09:09:50 +0200 + +tora (1.3.7-4) unstable; urgency=low + + * Fixed dependancy to list -mt qt3 modules (closes: #154259) + * Added several fixes to compiler warnings from CVS. + + -- Michael Meskes <me...@de...> Sun, 1 Sep 2002 11:44:46 +0200 + +tora (1.3.7-3) unstable; urgency=low + + * Added compiler optimization (closes: #159036). + + -- Michael Meskes <me...@de...> Sun, 1 Sep 2002 11:44:46 +0200 +tora (1.3.7-2) unstable; urgency=low + + * Fixed Built-Depends to note that qt 3.0.5 or greater is needed + (closes: #156420). + + -- Michael Meskes <me...@de...> Mon, 12 Aug 2002 18:07:51 +0200 + +tora (1.3.7-1) unstable; urgency=low + + * New upstream version. + * Compiled against libqt3 3.0.5 which should fix missing connection provider + problem (closes: #154259). + + -- Michael Meskes <me...@de...> Mon, 12 Aug 2002 13:57:08 +0200 +tora (1.3.6.1-2) unstable; urgency=low + + * Changed Suggests to Depends as tora won't work without a database + connector. (closes: #152251) + + -- Michael Meskes <me...@de...> Sun, 14 Jul 2002 09:54:07 +0200 + +tora (1.3.6.1-1) unstable; urgency=low + + * New upstream version. + + -- Michael Meskes <me...@de...> Fri, 5 Jul 2002 12:29:52 +0200 + +tora (1.3.6-1) unstable; urgency=low + + * New upstream version. + * Added some more patches from CVS to fix several minor bugs. + + -- Michael Meskes <me...@de...> Wed, 3 Jul 2002 10:37:51 +0200 + +tora (1.3.5.1-1) unstable; urgency=low + + * New upstream version with several minor bugfixes + + -- Michael Meskes <me...@de...> Fri, 19 Apr 2002 10:32:16 +0200 + +tora (1.3.5-1) unstable; urgency=low + + * New upstream version with new style selection code and other improvements. + * Fixed spelling bug in help file (closes: 143344). + + -- Michael Meskes <me...@de...> Wed, 17 Apr 2002 19:54:18 +0200 +tora (1.3.4-3) unstable; urgency=low + + * Deactivated style selection stuff (ENABLE_STYLE) to make tora compile + again (closes: 141919, 142128). + + -- Michael Meskes <me...@de...> Sun, 14 Apr 2002 14:54:47 +0200 + +tora (1.3.4-2) unstable; urgency=low + + * Added upstream fixes. + * Added menu entry. + + -- Michael Meskes <me...@de...> Sat, 9 Mar 2002 20:23:02 +0100 + +tora (1.3.4-1) unstable; urgency=low + + * New upstream version. + + -- Michael Meskes <me...@de...> Thu, 7 Mar 2002 12:42:50 +0100 + + +tora (1.3.3-4) unstable; urgency=low + + * Added more upstream fixes (closes: 133777) + + -- Michael Meskes <me...@de...> Sun, 3 Mar 2002 11:26:44 +0100 + +tora (1.3.3-3) unstable; urgency=low + + * Added some upstream fixes (closes: 134133) + + -- Michael Meskes <me...@de...> Sun, 17 Feb 2002 18:42:01 +0100 + +tora (1.3.3-2) unstable; urgency=low + + * Added Suggests for database modules (closes: 132724) + * Added some upstream fixes + * Added missing images (closes: 132791) + + -- Michael Meskes <me...@de...> Wed, 13 Feb 2002 20:13:34 +0100 + +tora (1.3.3-1) unstable; urgency=low + + * Initial Release (closes: 130650) + + -- Michael Meskes <me...@de...> Fri, 25 Jan 2002 09:37:32 +0100 + Modified: branches/tora-trotl/README.RELEASE =================================================================== --- branches/tora-trotl/README.RELEASE 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/README.RELEASE 2010-03-25 21:01:57 UTC (rev 3472) @@ -4,7 +4,8 @@ Source tarball: --------------- Check out the tora module from SVN -Edit the configure.in file to set the version number +Edit the configure.ac file to set the version number +Edit CMakeLists.txt file to set the version number for CMake Edit the NEWS file to set a release date Commit, and then copy trunk to an appropriately named tag, such as: @@ -31,3 +32,12 @@ No longer producing this, too specific to particular builds and difficult to resolve some Qt dependencies with static only. +TOra documentation +------------------ +Update version info in /doc/help/tora.texi (two places) +Run /doc/help/make-pdf.sh to generate latest version of tora_documentation.pdf +Upload it to TOra root folder: + +sftp yourusername,to...@fr... +cd /home/pfs/project/t/to/tora/tora/ +put tora_documentation.pdf Modified: branches/tora-trotl/configure.ac =================================================================== --- branches/tora-trotl/configure.ac 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/configure.ac 2010-03-25 21:01:57 UTC (rev 3472) @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([tora],[2.1.1],[tor...@li...]) +AC_INIT([tora],[2.1.2],[tor...@li...]) AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(config) # Every other copy of the package version number gets its value from here Deleted: branches/tora-trotl/debian/changelog =================================================================== --- branches/tora-trotl/debian/changelog 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/debian/changelog 2010-03-25 21:01:57 UTC (rev 3472) @@ -1,398 +0,0 @@ -tora (2.1.1-1) unstable; urgency=low - - * New upstream version - - -- Nathan Neulinger <nn...@ne...> Tue, 13 Oct 2009 13:44:40 -0600 - -tora (2.1.0-1) unstable; urgency=low - - * New upstream version, the rebuild closes: #540046. - * Bumped Standards-Version to 3.8.3, no changes needed. - * New project homepage. - * Removed no longer needed 01_missing_includes.dpatch. - * Removed no longer used dh_desktop call. - * Added README.source file. - - -- Michael Meskes <me...@de...> Fri, 11 Sep 2009 12:37:52 +0200 - -tora (2.0.0-4) unstable; urgency=low - - * Added patch to add missing include directives, closes: #526166 - - -- Michael Meskes <me...@de...> Mon, 04 May 2009 16:12:37 +0200 - -tora (2.0.0-3) unstable; urgency=low - - * Cleaned up packaging a little bit. - * Added homepage information to control file. - * Bumped Standards-Version to 3.8.1. - * Released to unstable. - - -- Michael Meskes <me...@de...> Tue, 07 Apr 2009 13:16:05 +0200 - -tora (2.0.0-2) experimental; urgency=low - - * Added build dependency on libpq-dev to get full PostgreSQL support. - - -- Michael Meskes <me...@de...> Tue, 06 Jan 2009 08:49:43 +0100 - -tora (2.0.0-1) experimental; urgency=low - - * New upstream version for KDE4/Qt4. - * Added watch file. - * Updated to standards version 3.8.0, no additional changes needed. - * No longer need texinfo to build, the html files are part of the tarball. - * Streamlined build dependencies. - * Updated copyright file. - - -- Michael Meskes <me...@de...> Sat, 03 Jan 2009 20:51:13 +0100 - -tora (1.3.23-1) unstable; urgency=low - - * New upstream version - * Moved config.* handling from clean target to configure target. - - -- Michael Meskes <me...@de...> Wed, 26 Mar 2008 09:55:07 +0100 - -tora (1.3.22-7) unstable; urgency=low - - * Removed build dependency on libqt3-compat-headers, closes: #464914 - * Added include directives needed by gcc-4.3, closes: #462239 - - -- Michael Meskes <me...@de...> Mon, 11 Feb 2008 10:57:12 +0100 - -tora (1.3.22-6) unstable; urgency=low - - * Fixed clean target yet again so building twice in a row is possible. - * Bumped up build dependency on debhelper to correct version. - - -- Michael Meskes <me...@de...> Thu, 10 Jan 2008 11:55:07 +0100 - -tora (1.3.22-5) unstable; urgency=low - - * Bumped standards version to 3.7.3. - * Bumped tora.dekstop to version 1.0, closes: #455588 - * Added call to dh_desktop. - * Bumbed debhelper version to 5. - * Build-depend on autotools-dev and cp up-to-date files to archive. - * Do not ignore errors in "make clean". - - -- Michael Meskes <me...@de...> Tue, 11 Dec 2007 10:32:06 +0100 - -tora (1.3.22-4) unstable; urgency=low - - * Removed build dependency on g++, closes: #452976 - * Also removed build dependency on libqt3-mt-dev because kdelibs4-dev - depends on it. - * Made menu file adhere new standard. - * Do not install sources for help files. - - -- Michael Meskes <me...@de...> Thu, 06 Dec 2007 10:13:24 +0100 - -tora (1.3.22-3) unstable; urgency=low - - * Moved to team maintenance: - Debian KDE Extras Team <pkg...@li...>. - - -- Michael Meskes <me...@de...> Thu, 22 Nov 2007 11:12:43 +0100 - -tora (1.3.22-2) unstable; urgency=low - - * Fixed help system - * Moved translations to /usr/share, closes: #448950 - * Remove deprecated debian.patch file. - - -- Michael Meskes <me...@de...> Tue, 20 Nov 2007 13:05:47 +0100 - -tora (1.3.22-1) unstable; urgency=low - - * New upstream version. - * Added texinfo to Build-Depends, closes: #443296 - * Build process now uses dpatch. - - -- Michael Meskes <me...@de...> Fri, 21 Sep 2007 13:48:45 +0200 - -tora (1.3.21pre22-3) unstable; urgency=low - - * Do not remove files from the orig tarball in our clean target, closes: #442749 - * Resynced with svn to prepare for upcoming 1.3.22 release. - - -- Michael Meskes <me...@de...> Tue, 18 Sep 2007 11:15:46 +0200 - -tora (1.3.21pre22-2) unstable; urgency=low - - * Fixed incorrect display of UTF-8 characters, closes: #418524 - - -- Michael Meskes <me...@de...> Fri, 08 Jun 2007 14:44:29 +0200 - -tora (1.3.21pre22-1) unstable; urgency=low - - * Applied latest upstream pre1.3.22 patch. - * Moved to qscintilla 1.7. - - -- Michael Meskes <me...@de...> Tue, 22 May 2007 15:35:55 +0200 - -tora (1.3.21-3) unstable; urgency=low - - * Added XDG menu support, closes: #354166 - - -- Michael Meskes <me...@de...> Mon, 17 Apr 2006 13:41:02 +0200 - -tora (1.3.21-2) unstable; urgency=low - - * Added patch by Martin Michlmayr to make tora compile with G++ 4.1, - closes: #357810 - * Fixed URL in copyright file, closes: #358394 - - -- Michael Meskes <me...@de...> Fri, 24 Mar 2006 13:30:31 +0100 - -tora (1.3.21-1) unstable; urgency=low - - * New upstream version, fixing the bug that urged me to call autogen.sh and - thus making the package build again without build-depending on automake et - al., closes: #352513 - * Added most of the debian specific patch to upstream sources. - - -- Michael Meskes <me...@de...> Mon, 13 Feb 2006 15:02:29 +0100 - -tora (1.3.20-1) unstable; urgency=low - - * New upstream version. - * Use the 16x16 icon that is provided by upstream. - - -- Michael Meskes <me...@de...> Sat, 11 Feb 2006 10:24:33 +0100 - -tora (1.3.18-4) unstable; urgency=low - - * Changed QODBC to QODBC3 one more time, closes: #347373 - - -- Michael Meskes <me...@de...> Thu, 12 Jan 2006 13:32:24 +0100 - -tora (1.3.18-3) unstable; urgency=low - - * Updated libtool so hopefully Debian GNU/k*BSD is supported now - closes: #342702 - * Added 16x16 menu icon - * Updated debhelper to version 4 - - -- Michael Meskes <me...@de...> Sun, 11 Dec 2005 19:03:49 +0100 - -tora (1.3.18-2) unstable; urgency=low - - * Added --enable-libsuffix= to make sure kdelibs are found even on sparc, - closes: #328124 - - -- Michael Meskes <me...@de...> Fri, 16 Sep 2005 08:48:14 +0200 - -tora (1.3.18-1) unstable; urgency=low - - * New upstream version - * Compiled against KDE 3.4.2, closes: #312432 - - -- Michael Meskes <me...@de...> Tue, 6 Sep 2005 13:32:17 +0200 - -tora (1.3.16-1) unstable; urgency=low - - * New upstream version - - -- Michael Meskes <me...@de...> Sun, 6 Mar 2005 11:08:40 +0100 - -tora (1.3.15-1) unstable; urgency=low - - * New upstream version - * Changed QODBC to QODBC3, closes: #285510 - - -- Michael Meskes <me...@de...> Fri, 4 Mar 2005 11:26:34 +0100 - -tora (1.3.14.1-3) unstable; urgency=low - - * This time really add the build-depend on kdebase-bin - - -- Michael Meskes <me...@de...> Mon, 5 Jul 2004 20:26:14 +0200 - -tora (1.3.14.1-2) unstable; urgency=low - - * Build-depend on kdebase-bin (closes: #253765) - * Changed configure.pl to check for kdcop instead of kwin. - - -- Michael Meskes <me...@de...> Mon, 5 Jul 2004 12:47:34 +0200 - -tora (1.3.14.1-1) unstable; urgency=low - - * New upstream version. - * Made sure KDE files are installed (closes: #253765) - - -- Michael Meskes <me...@de...> Sun, 4 Jul 2004 17:12:34 +0200 - -tora (1.3.13-3) unstable; urgency=low - - * Updated standards version. - * Added man page. - * Added symlink from /usr/share/doc/tora to help files. - * Make sure all built files are cleaned. - * Compile without "new check". - * Added kderemove="y" to menu entry. Use icons already installed in - KDE structure; don't install twice. Improved menu text. - * Updated copyright. - - -- Michael Meskes <me...@de...> Wed, 24 Mar 2004 19:27:28 +0100 - -tora (1.3.13-2) unstable; urgency=low - - * Added icon, improved capitalization of menu entry. - - -- Michael Meskes <me...@de...> Mon, 01 Mar 2004 11:30:15 +0100 - -tora (1.3.13-1) unstable; urgency=low - - * New upstream version - - -- Michael Meskes <me...@de...> Sun, 15 Feb 2004 10:47:47 +0100 - -tora (1.3.12-1) unstable; urgency=low - - * New upstream version - - -- Michael Meskes <me...@de...> Tue, 21 Oct 2003 19:13:32 +0200 - -tora (1.3.11-1) unstable; urgency=low - - * New upstream version - * Moved help files from /usr/lib to /usr/share - - -- Michael Meskes <me...@de...> Sun, 31 Aug 2003 12:15:51 +0200 - -tora (1.3.9.2-3) unstable; urgency=low - - * Removed full screen opening (closes: #167590) - * Added patch from CVS so changed values are saved. - * Added my patches to doc/ - - -- Michael Meskes <me...@de...> Sun, 15 Jun 2003 14:31:11 +0200 - -tora (1.3.9.2-2) unstable; urgency=low - - * Include qobjectlist.h instead of qobjcoll.h (closes: #181522) - * Include qt3-compat-headers in Build-Depends until kdelibs4-dev is fixed - * Made sure qt3-mt is used (closes: #183063) - - -- Michael Meskes <me...@de...> Mon, 24 Feb 2003 14:31:50 +0100 - -tora (1.3.9.2-1) unstable; urgency=low - - * New upstream version - * Compiled against new libqt3 (closes: #181091) - - -- Michael Meskes <me...@de...> Mon, 17 Feb 2003 00:56:12 +0100 - -tora (1.3.8-1) unstable; urgency=low - - * New upstream version - - -- Michael Meskes <me...@de...> Fri, 11 Oct 2002 09:09:50 +0200 - -tora (1.3.7-4) unstable; urgency=low - - * Fixed dependancy to list -mt qt3 modules (closes: #154259) - * Added several fixes to compiler warnings from CVS. - - -- Michael Meskes <me...@de...> Sun, 1 Sep 2002 11:44:46 +0200 - -tora (1.3.7-3) unstable; urgency=low - - * Added compiler optimization (closes: #159036). - - -- Michael Meskes <me...@de...> Sun, 1 Sep 2002 11:44:46 +0200 -tora (1.3.7-2) unstable; urgency=low - - * Fixed Built-Depends to note that qt 3.0.5 or greater is needed - (closes: #156420). - - -- Michael Meskes <me...@de...> Mon, 12 Aug 2002 18:07:51 +0200 - -tora (1.3.7-1) unstable; urgency=low - - * New upstream version. - * Compiled against libqt3 3.0.5 which should fix missing connection provider - problem (closes: #154259). - - -- Michael Meskes <me...@de...> Mon, 12 Aug 2002 13:57:08 +0200 -tora (1.3.6.1-2) unstable; urgency=low - - * Changed Suggests to Depends as tora won't work without a database - connector. (closes: #152251) - - -- Michael Meskes <me...@de...> Sun, 14 Jul 2002 09:54:07 +0200 - -tora (1.3.6.1-1) unstable; urgency=low - - * New upstream version. - - -- Michael Meskes <me...@de...> Fri, 5 Jul 2002 12:29:52 +0200 - -tora (1.3.6-1) unstable; urgency=low - - * New upstream version. - * Added some more patches from CVS to fix several minor bugs. - - -- Michael Meskes <me...@de...> Wed, 3 Jul 2002 10:37:51 +0200 - -tora (1.3.5.1-1) unstable; urgency=low - - * New upstream version with several minor bugfixes - - -- Michael Meskes <me...@de...> Fri, 19 Apr 2002 10:32:16 +0200 - -tora (1.3.5-1) unstable; urgency=low - - * New upstream version with new style selection code and other improvements. - * Fixed spelling bug in help file (closes: 143344). - - -- Michael Meskes <me...@de...> Wed, 17 Apr 2002 19:54:18 +0200 -tora (1.3.4-3) unstable; urgency=low - - * Deactivated style selection stuff (ENABLE_STYLE) to make tora compile - again (closes: 141919, 142128). - - -- Michael Meskes <me...@de...> Sun, 14 Apr 2002 14:54:47 +0200 - -tora (1.3.4-2) unstable; urgency=low - - * Added upstream fixes. - * Added menu entry. - - -- Michael Meskes <me...@de...> Sat, 9 Mar 2002 20:23:02 +0100 - -tora (1.3.4-1) unstable; urgency=low - - * New upstream version. - - -- Michael Meskes <me...@de...> Thu, 7 Mar 2002 12:42:50 +0100 - - -tora (1.3.3-4) unstable; urgency=low - - * Added more upstream fixes (closes: 133777) - - -- Michael Meskes <me...@de...> Sun, 3 Mar 2002 11:26:44 +0100 - -tora (1.3.3-3) unstable; urgency=low - - * Added some upstream fixes (closes: 134133) - - -- Michael Meskes <me...@de...> Sun, 17 Feb 2002 18:42:01 +0100 - -tora (1.3.3-2) unstable; urgency=low - - * Added Suggests for database modules (closes: 132724) - * Added some upstream fixes - * Added missing images (closes: 132791) - - -- Michael Meskes <me...@de...> Wed, 13 Feb 2002 20:13:34 +0100 - -tora (1.3.3-1) unstable; urgency=low - - * Initial Release (closes: 130650) - - -- Michael Meskes <me...@de...> Fri, 25 Jan 2002 09:37:32 +0100 - Copied: branches/tora-trotl/debian/changelog (from rev 3471, trunk/tora/debian/changelog) =================================================================== --- branches/tora-trotl/debian/changelog (rev 0) +++ branches/tora-trotl/debian/changelog 2010-03-25 21:01:57 UTC (rev 3472) @@ -0,0 +1 @@ +link ../ChangeLog \ No newline at end of file Property changes on: branches/tora-trotl/debian/changelog ___________________________________________________________________ Added: svn:special + * Added: svn:mergeinfo + Modified: branches/tora-trotl/doc/help/Index_002dlist.html =================================================================== --- branches/tora-trotl/doc/help/Index_002dlist.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/Index_002dlist.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -8,7 +8,7 @@ <link rel="prev" href="extendingtora.html#extendingtora" title="extendingtora"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/additionalhelp.html =================================================================== --- branches/tora-trotl/doc/help/additionalhelp.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/additionalhelp.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -10,7 +10,7 @@ <link rel="next" href="toolsetting.html#toolsetting" title="toolsetting"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/alert.html =================================================================== --- branches/tora-trotl/doc/help/alert.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/alert.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -10,7 +10,7 @@ <link rel="next" href="invalid.html#invalid" title="invalid"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/analyze.html =================================================================== --- branches/tora-trotl/doc/help/analyze.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/analyze.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -10,7 +10,7 @@ <link rel="next" href="alert.html#alert" title="alert"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/api.html =================================================================== --- branches/tora-trotl/doc/help/api.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/api.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -9,7 +9,7 @@ <link rel="next" href="externalapi.html#externalapi" title="externalapi"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/browser.html =================================================================== --- branches/tora-trotl/doc/help/browser.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/browser.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -10,7 +10,7 @@ <link rel="next" href="plsqleditor.html#plsqleditor" title="plsqleditor"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/charts.html =================================================================== --- branches/tora-trotl/doc/help/charts.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/charts.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -10,7 +10,7 @@ <link rel="next" href="searchreplace.html#searchreplace" title="searchreplace"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/common.html =================================================================== --- branches/tora-trotl/doc/help/common.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/common.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -9,7 +9,7 @@ <link rel="prev" href="preferences.html#preferences" title="preferences"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/current.html =================================================================== --- branches/tora-trotl/doc/help/current.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/current.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -10,7 +10,7 @@ <link rel="next" href="script.html#script" title="script"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/database.html =================================================================== --- branches/tora-trotl/doc/help/database.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/database.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -10,7 +10,7 @@ <link rel="next" href="additionalhelp.html#additionalhelp" title="additionalhelp"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/debugger.html =================================================================== --- branches/tora-trotl/doc/help/debugger.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/debugger.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -10,7 +10,7 @@ <link rel="next" href="unittest.html#unittest" title="unittest"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/editor.html =================================================================== --- branches/tora-trotl/doc/help/editor.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/editor.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -10,7 +10,7 @@ <link rel="next" href="database.html#database" title="database"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } @@ -37,45 +37,51 @@ <h4 class="subsection">3.8.2 Editor Settings</h4> <p><a name="index-Editor-Settings-12"></a> -This page of the options contains settings on how to use TOra editors. +This page of the options contains settings for TOra editors. Editor settings are organised in two tabs: Options and Syntax. - <p>TODO + <p><strong>Options tab</strong> <div class="block-image"><img src="images/editor.png" alt="images/editor.png"></div> <dl> -<dt><strong>Syntax components</strong><dd> This list contains different parts of the SQL syntax. You can change the color used for the element by selecting the item in this list and then pressing the Pick button to select a color. The current color of the currently selected item in the list is displayed just to the left of the Pick button. - - <p>The available elements are as follows. - <p><table summary=""> <tr align="left"><td valign="top" width="30%"><strong>Background</strong> </td><td valign="top" width="70%">The normal background color for text. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Comment</strong> </td><td valign="top" width="70%">An SQL comment. Currently this only includes – comments, not rem comments. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Current background</strong> </td><td valign="top" width="70%">This is the background to use for the current line of execution in the PL/SQL debugger. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Error background</strong> </td><td valign="top" width="70%">This is the background to use for lines that have SQL errors in the in the PL/SQL debugger/editor. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Keyword</strong> </td><td valign="top" width="70%">This is the color to use for the text of an SQL keyword. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Normal</strong> </td><td valign="top" width="70%">Normal text color. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>String</strong> </td><td valign="top" width="70%">Color to use for text in strings. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Unfinished string</strong> </td><td valign="top" width="70%">Color to use for strings that miss their terminating ' or ". - <br></td></tr></table> - At the bottom of this dialog is a text field that displays en example of the current setting. - - <br><dt><strong>Syntax highlighting</strong><dd> Use this to control whether you want syntax highlighting or not. Observe that without syntax highlighting you will not see the indications for errors and current lines in the PL/SQL editor. -<br><dt><strong>Use maximum text width mark</strong><dd> TODO. +<dt><strong>Syntax highlighting</strong><dd> Use this to control whether you want syntax highlighting or not. Observe that without syntax highlighting you will not see the indications for errors and current lines in the PL/SQL editor. +<br><dt><strong>Use maximum text width mark</strong><dd> Check this option and specify maximum length of text. A vertical line indicating this margin will be displayed in text editor. Note that this option will <strong>not</strong> prevent text to be writen beyond maximum text width margin. this option is purely for visual representation. <br><dt><strong>Keyword upper</strong><dd> Check this box to convert all keywords to uppercase before displaying them. The text itself is not changed so resetting this not changed and the text sent to the database still contain lowercase letters. This setting is disabled if you do not have a monospaced font selected. +<br><dt><strong>Object names upper</strong><dd> Extract all names of objects (tables, views, columns etc.) from database as uppercase (default). For example this setting will be used when generating object creation scripts. <br><dt><strong>Code completion</strong><dd> Check this box to enable code completion in SQL editors. -<br><dt><strong>Editor shortcuts (TAB replacement)</strong><dd> TODO. +<br><dt><strong>Editor shortcuts (TAB replacement)</strong><dd> By checking this option and pressing a button "Edit..." you can add/modify/delete editor shortcuts. Editor shortcut is a short word which can be replaced to a long phrase by pressing TAB button. For example you can set that a short word "selsysd" be replaced with "select sysdate from dual". <br><dt><strong>Sort completion rows</strong><dd> If checked the completion alternatives are sorted in alphabetical order, otherwise they are in the same order as in the source. <br><dt><strong>Indent same as previous line</strong><dd> When inserting a new line indent it to the same level as the previous one. <br><dt><strong>Text example</strong><dd> This is the font to use for all editors in TOra that are not syntax highlighted. Choose the <strong>Choose</strong> button immediately to the right of the label to select a new font. <br><dt><strong>Code example</strong><dd> This is the font to use for all syntax highlighted SQL editors in TOra. Choose the <strong>Choose</strong> button immediately to the right of the label to select a new font. <br><dt><strong>List example</strong><dd> This is the font to use for all lists in TOra. Choose the <strong>Choose</strong> button immediately to the right of the label to select a new font. <br><dt><strong>Filename extensions</strong><dd> TODO. -<br><dt><strong>Tab stop width</strong><dd> TODO. +<br><dt><strong>Tab stop width</strong><dd> With of tab character. This value is also used when indenting automatically generated/formated scripts. <br><dt><strong>Use only spaces when indenting</strong><dd> TODO. <br><dt><strong>Static checker</strong><dd> Specifies static checker to be used. This configuration option should contain %1 which will be replaced with a filename (with full path) containing code to be checked. For example: <pre class="example"> perl /usr/bin/staticChecker.pl --output=TORA --file=%1 </pre> </dl> - There may also be pages under this for each individual database provider. Currently only Oracle uses this feature. That setup looks like this. + <p><strong>Syntax tab</strong> + + <div class="block-image"><img src="images/editor_syntax.png" alt="images/editor_syntax.png"></div> + + <dl> +<dt><strong>Syntax components</strong><dd> This list contains different parts of the SQL syntax. You can change the color used for the element by selecting the item in this list and then pressing the Pick button to select a color. The current color of the currently selected item in the list is displayed just to the left of the Pick button. + + <p>The available elements are as follows. + <p><table summary=""> <tr align="left"><td valign="top" width="30%"><strong>Background</strong> </td><td valign="top" width="70%">The normal background color for text. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Comment</strong> </td><td valign="top" width="70%">An SQL comment. Currently this only includes – comments, not rem comments. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Current background</strong> </td><td valign="top" width="70%">This is the background to use for the current line of execution in the PL/SQL debugger. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Error background</strong> </td><td valign="top" width="70%">This is the background to use for lines that have SQL errors in the in the PL/SQL debugger/editor. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Keyword</strong> </td><td valign="top" width="70%">This is the color to use for the text of an SQL keyword. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Normal</strong> </td><td valign="top" width="70%">Normal text color. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>String</strong> </td><td valign="top" width="70%">Color to use for text in strings. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Unfinished string</strong> </td><td valign="top" width="70%">Color to use for strings that miss their terminating ' or ". + <br></td></tr></table> + At the bottom of this dialog is a text field that displays en example of the current setting. +</dl> + </body></html> Modified: branches/tora-trotl/doc/help/editor.texi =================================================================== --- branches/tora-trotl/doc/help/editor.texi 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/editor.texi 2010-03-25 21:01:57 UTC (rev 3472) @@ -2,53 +2,39 @@ @subsection Editor Settings @cindex Editor Settings -This page of the options contains settings on how to use TOra editors. +This page of the options contains settings for TOra editors. Editor settings are organised in two tabs: Options and Syntax. -TODO +@strong{Options tab} @image{images/editor,15cm} @table @asis -@item @strong{Syntax components} - This list contains different parts of the SQL syntax. You can change the color used for the element by selecting the item in this list and then pressing the Pick button to select a color. The current color of the currently selected item in the list is displayed just to the left of the Pick button. - -The available elements are as follows. - @multitable @columnfractions .3 .7 - @item @strong{Background} @tab The normal background color for text. - @item @strong{Comment} @tab An SQL comment. Currently this only includes -- comments, not rem comments. - @item @strong{Current background} @tab This is the background to use for the current line of execution in the PL/SQL debugger. - @item @strong{Error background} @tab This is the background to use for lines that have SQL errors in the in the PL/SQL debugger/editor. - @item @strong{Keyword} @tab This is the color to use for the text of an SQL keyword. - @item @strong{Normal} @tab Normal text color. - @item @strong{String} @tab Color to use for text in strings. - @item @strong{Unfinished string} @tab Color to use for strings that miss their terminating ' or ". - @end multitable - At the bottom of this dialog is a text field that displays en example of the current setting. - @item @strong{Syntax highlighting} Use this to control whether you want syntax highlighting or not. Observe that without syntax highlighting you will not see the indications for errors and current lines in the PL/SQL editor. @item @strong{Use maximum text width mark} - TODO. + Check this option and specify maximum length of text. A vertical line indicating this margin will be displayed in text editor. Note that this option will @strong{not} prevent text to be writen beyond maximum text width margin. this option is purely for visual representation. @item @strong{Keyword upper} - Check this box to convert all keywords to uppercase before displaying them. The text itself is not changed so resetting this not changed and the text sent to the database still contain lowercase letters. This setting is disabled if you do not have a monospaced font selected. + Check this box to convert all keywords to uppercase before displaying them. The text itself is not changed so resetting this not changed and the text sent to the database still contain lowercase letters. This setting is disabled if you do not have a monospaced font selected. +@item @strong{Object names upper} + Extract all names of objects (tables, views, columns etc.) from database as uppercase (default). For example this setting will be used when generating object creation scripts. @item @strong{Code completion} - Check this box to enable code completion in SQL editors. + Check this box to enable code completion in SQL editors. @item @strong{Editor shortcuts (TAB replacement)} - TODO. + By checking this option and pressing a button "Edit..." you can add/modify/delete editor shortcuts. Editor shortcut is a short word which can be replaced to a long phrase by pressing TAB button. For example you can set that a short word "selsysd" be replaced with "select sysdate from dual". @item @strong{Sort completion rows} - If checked the completion alternatives are sorted in alphabetical order, otherwise they are in the same order as in the source. + If checked the completion alternatives are sorted in alphabetical order, otherwise they are in the same order as in the source. @item @strong{Indent same as previous line} When inserting a new line indent it to the same level as the previous one. @item @strong{Text example} - This is the font to use for all editors in TOra that are not syntax highlighted. Choose the @strong{Choose} button immediately to the right of the label to select a new font. + This is the font to use for all editors in TOra that are not syntax highlighted. Choose the @strong{Choose} button immediately to the right of the label to select a new font. @item @strong{Code example} - This is the font to use for all syntax highlighted SQL editors in TOra. Choose the @strong{Choose} button immediately to the right of the label to select a new font. + This is the font to use for all syntax highlighted SQL editors in TOra. Choose the @strong{Choose} button immediately to the right of the label to select a new font. @item @strong{List example} This is the font to use for all lists in TOra. Choose the @strong{Choose} button immediately to the right of the label to select a new font. @item @strong{Filename extensions} TODO. @item @strong{Tab stop width} - TODO. + With of tab character. This value is also used when indenting automatically generated/formated scripts. @item @strong{Use only spaces when indenting} TODO. @item @strong{Static checker} @@ -57,4 +43,25 @@ perl /usr/bin/staticChecker.pl --output=TORA --file=%1 @end example @end table -There may also be pages under this for each individual database provider. Currently only Oracle uses this feature. That setup looks like this. + +@strong{Syntax tab} + +@image{images/editor_syntax,15cm} + +@table @asis +@item @strong{Syntax components} + This list contains different parts of the SQL syntax. You can change the color used for the element by selecting the item in this list and then pressing the Pick button to select a color. The current color of the currently selected item in the list is displayed just to the left of the Pick button. + +The available elements are as follows. + @multitable @columnfractions .3 .7 + @item @strong{Background} @tab The normal background color for text. + @item @strong{Comment} @tab An SQL comment. Currently this only includes -- comments, not rem comments. + @item @strong{Current background} @tab This is the background to use for the current line of execution in the PL/SQL debugger. + @item @strong{Error background} @tab This is the background to use for lines that have SQL errors in the in the PL/SQL debugger/editor. + @item @strong{Keyword} @tab This is the color to use for the text of an SQL keyword. + @item @strong{Normal} @tab Normal text color. + @item @strong{String} @tab Color to use for text in strings. + @item @strong{Unfinished string} @tab Color to use for strings that miss their terminating ' or ". + @end multitable + At the bottom of this dialog is a text field that displays en example of the current setting. +@end table Modified: branches/tora-trotl/doc/help/editors.html =================================================================== --- branches/tora-trotl/doc/help/editors.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/editors.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -10,7 +10,7 @@ <link rel="next" href="lists.html#lists" title="lists"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/explainplan.html =================================================================== --- branches/tora-trotl/doc/help/explainplan.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/explainplan.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -10,7 +10,7 @@ <link rel="next" href="gettingbindparameters.html#gettingbindparameters" title="gettingbindparameters"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/extendingtora.html =================================================================== --- branches/tora-trotl/doc/help/extendingtora.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/extendingtora.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -9,7 +9,7 @@ <link rel="next" href="Index_002dlist.html#Index_002dlist" title="Index-list"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/externalapi.html =================================================================== --- branches/tora-trotl/doc/help/externalapi.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/externalapi.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -9,7 +9,7 @@ <link rel="prev" href="api.html#api" title="api"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/gettingbindparameters.html =================================================================== --- branches/tora-trotl/doc/help/gettingbindparameters.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/gettingbindparameters.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -10,7 +10,7 @@ <link rel="next" href="objectdescription.html#objectdescription" title="objectdescription"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.1+.--> +This manual is for TOra, version 2.1.2+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/globalsettings.html =================================================================== --- branches/tora-trotl/doc/help/globalsettings.html 2010-03-23 21:32:23 UTC (rev 3471) +++ branches/tora-trotl/doc/help/globalsettings.html 2010-03-25 21:01:57 UTC (rev 3472) @@ -9,7 +9,7 @@ <link rel="next" href="editor.html#editor" title="editor"> <link href="http://www.gnu.org/softw... [truncated message content] |
From: <ibr...@us...> - 2010-05-19 21:30:51
|
Revision: 3527 http://tora.svn.sourceforge.net/tora/?rev=3527&view=rev Author: ibre5041 Date: 2010-05-19 21:30:44 +0000 (Wed, 19 May 2010) Log Message: ----------- This sandbox directory is just a playground for SQL grammar parser tests. This code is not ready to be used with tora sources. Added Paths: ----------- branches/tora-trotl/sandbox/ branches/tora-trotl/sandbox/Makefile branches/tora-trotl/sandbox/SELECT_SIMPLE.g branches/tora-trotl/sandbox/SELECT_SIMPLE.tokens branches/tora-trotl/sandbox/input branches/tora-trotl/sandbox/input.model.1.test branches/tora-trotl/sandbox/main.c Added: branches/tora-trotl/sandbox/Makefile =================================================================== --- branches/tora-trotl/sandbox/Makefile (rev 0) +++ branches/tora-trotl/sandbox/Makefile 2010-05-19 21:30:44 UTC (rev 3527) @@ -0,0 +1,28 @@ +.PRECIOUS=.o + +ANTLRGRAMMARS ?= $(wildcard *.g) + +all: a.out + +a.out: main.c SELECT_SIMPLE.tokens + gcc -ggdb -O0 -fno-inline -I/home/ibrezina/devel/libantlr3c-3.2/include/ -I/home/ibrezina/devel/libantlr3c-3.2/ *.c /home/ibrezina/devel/libantlr3c-3.2/.libs/libantlr3c.a + +clean: + rm *.o a.out + +%.u: %.g + @echo "Bulding dependencies for "$< + java -jar /home/ibrezina/workspace/SQL_Grammar/antlr-3.2.jar -depend $< > $@ + @grep ":" $@ |awk 'BEGIN {printf "ANTLRGENLIST := " }{printf " " $$1}END {print ""}' >> $@.tmp + @cat $@.tmp >> $@ + $(RM) $@.tmp + + +%.tokens %.c %Lexer.c %Parser.c %Lexer.h %Parser.h %.h: %.g + java -jar /home/ibrezina/workspace/SQL_Grammar/antlr-3.2.jar $(GRAMMAROPTIONS) $< + +#ifneq ($(MAKECMDGOALS),clean) +ifneq ($(strip $(ANTLRGRAMMARS)),) +-include $(ANTLRGRAMMARS:.g=.u) +endif +#endif Added: branches/tora-trotl/sandbox/SELECT_SIMPLE.g =================================================================== --- branches/tora-trotl/sandbox/SELECT_SIMPLE.g (rev 0) +++ branches/tora-trotl/sandbox/SELECT_SIMPLE.g 2010-05-19 21:30:44 UTC (rev 3527) @@ -0,0 +1,1148 @@ +/******************************************************************************* + +DESCRIPTION: + Grammar for Oracle's SELECT statement for ANTLR v3, target any language +AUTHOR: + ibr...@ib... + +DATE: + MAY 2010 +BASED ON: + PLSQL3.g Andrey Kharitonkin (th...@gm...) + PLSQLGrammar.g for ANTLR v2 + Qazi Firdous Ahmed (qaz...@in...) + Krupa Benhur (kru...@in...) + Manojaba Banerjee (man...@in...) + Infosys Technologies Ltd., Bangalore, India + Sept 18, 2002 + This grammar is for PL/SQL. +COMMENT: + This grammar file is based on freely downloadable + file PLSQL3.g. I extracted only those rules that + are mandatory for SELECT statement. Column list was + partialy rewritten, support for analytic queries add, + list of reserved words and keywords added. +ORIGINAL COMMENT: + The grammar has been mostly re-written for ANTLR v3, + using Oracle 10g Release 2 documentation and ANTLR book. + New SQL and PL/SQL expression rules, SQL statments + SELECT, INSERT, UPDATE, DELETE are fully supported. + Generated parser can parse most of valid PL/SQL and + it was tested with over 10 Mb of test source code. + Let me know if something cannot be parsed by this grammar. +KNOWN ISSUES: + "FOR UPDATE" clause is not yet supported and support for + some exceptional constructs like "PIVOT XML" is still + missing. + +*******************************************************************************/ + +grammar SELECT_SIMPLE; + +options { +// language=Java; + language=C; +// k=4; + backtrack=true; + memoize=true; + output=AST; +// ASTLabelType=CommonTree; +} + +tokens { + T_RESERVED = 'reserved'; + T_WITH = 'with'; + T_SELECT = 't_select'; + T_COLUMN_LIST = 'column_list'; + T_SELECT_COLUMN = 'select_column'; + T_FROM = 'from'; + T_SELECTED_TABLE = 'selected_table'; + T_WHERE = 'where'; + T_HIERARCHICAL = 'hierarchical'; + T_GROUP_BY = 'group_by'; + T_HAVING = 'having'; + T_MODEL = 't_model'; + T_SET_OP = 'set_op'; + T_ORDER_BY_CLAUSE='t_order_by'; +} + +// @members { +// private boolean is_sql = false; +// } + +// @header { +// package org.tora; +// } + +// @lexer::header { +// package org.tora; +// } + +//@parser::includes { +// #include "expr.h" +//} + +@members { +// ExprFactory *exprFactory; + unsigned _class; +} + +start_rule + : select_expression + ; + +select_expression + : + subquery_factoring_clause? + /*'SELECT'*/k_select /*( hint )?*/ ( /*'DISTINCT'*/k_distinct | /*'UNIQUE'*/k_union | /*'ALL'*/k_all )? select_list + /*'FROM'*/k_from + ( table_reference_list | join_clause | LPAREN join_clause RPAREN ) + ( where_clause )? + ( hierarchical_query_clause )? + ( group_by_clause )? + ( /*'HAVING'*/k_having sql_condition )? + ( model_clause )? + ( ( /*'UNION'*/k_union ( /*'ALL'*/k_all )? + | /*'INTERSECT'*/k_intersect + | /*'MINUS'*/k_minus + ) + ( select_expression | subquery ) + )? + ( order_by_clause )? + -> ^('t_select' /*'SELECT'*/k_select + subquery_factoring_clause? + select_list + ^('from' k_from table_reference_list? join_clause?) + where_clause? + hierarchical_query_clause? //TODO TEST ME + model_clause? + order_by_clause? + ) + ; + +subquery_factoring_clause + : /*'WITH'*/k_with sql_identifier /*'AS'*/k_as subquery (COMMA sql_identifier /*'AS'*/k_as subquery)* + //->^('with' 'WITH' (sql_identifier 'AS' subquery)+ ) + //TODO comma is missing here + ; + +/* ================================================================================ + Query column list specs (ie. everything between 'SELECT' ... 'FROM' + ================================================================================ */ +select_list + : displayed_column ( COMMA displayed_column )* + -> ^('column_list' displayed_column*) + ; + +displayed_column + : ( + asterisk1=ASTERISK + | schema=sql_identifier DOT asterisk2=ASTERISK + | sql_expression + ) + (alias|alias_name=sql_identifier)? + -> ^('select_column' $asterisk1? $schema? DOT? $asterisk2? sql_expression? alias? $alias_name? ) + ; +sql_expression + : expr_add + ; +expr_add + : expr_mul ( ( PLUS | MINUS | DOUBLEVERTBAR ) expr_mul )* + ; +expr_mul + : expr_sign ( ( ASTERISK | DIVIDE ) expr_sign )* + ; +expr_sign + : ( PLUS | MINUS )? expr_pow + ; +expr_pow + : expr_expr ( EXPONENT expr_expr )* + ; +expr_expr + : ( expr_paren ) => expr_paren + | ( function_expression ) => function_expression +// | ( compound_expression ) => compound_expression + | ( case_expression ) => case_expression +// | ( cursor_expression ) => cursor_expression + | ( simple_expression ) => simple_expression +// | ( select_expression ) => select_expression replaced with subquery +// | ( special_expression ) => special_expression +// | datetime_expression +// | interval_expression +// | object_access_expression +// | scalar_subquery_expression +// | model_expression +// | type_constructor_expression +// | variable_expression +// : 'NULL' | NUMBER | QUOTED_STRING | IDENTIFIER + | ( subquery ) => subquery + ; +expr_paren + : LPAREN nested_expression RPAREN + ; +nested_expression + : sql_expression + ; +function_expression + : (function_name|analytic_function_name) LPAREN call_parameters RPAREN + ; +call_parameters + : ASTERISK + | call_parameter ( COMMA call_parameter )* + ; +call_parameter + : ( parameter_name ARROW )? nested_expression + ; +parameter_name + : identifier + ; +case_expression + : /*'CASE'*/k_case ( simple_case_expression | searched_case_expression ) ( else_case_expression )? /*'END'*/k_end + ; +simple_case_expression + : nested_expression ( /*'WHEN'*/k_when nested_expression /*'THEN'*/k_then nested_expression )+ + ; +searched_case_expression + : ( /*'WHEN'*/k_when sql_condition /*'THEN'*/k_then nested_expression )+ + ; +else_case_expression + : /*'ELSE'*/k_else nested_expression + ; + +simple_expression + : boolean_literal + | /*'SQL'*/k_sql ( FOUND_ATTR | NOTFOUND_ATTR | ISOPEN_ATTR | ROWCOUNT_ATTR | BULK_ROWCOUNT_ATTR ) + | ( cell_assignment ) => cell_assignment // this is used only in model_clause s[PROD='A'] = S['B'] + 1 + | ( column_spec ) => column_spec + | QUOTED_STRING + | NUMBER +// | sequence_name DOT ( 'CURRVAL' | 'NEXTVAL' ) +// | 'ROWID' +// | 'ROWNUM' + | /*'NULL'*/k_null + ; + +subquery + : LPAREN select_expression RPAREN + ; + +boolean_literal + : /*'TRUE'*/k_true | /*'FALSE'*/k_false + ; +alias + : ( /*'AS'*/k_as ) sql_identifier? + ; + +column_spec + : sql_identifier DOT sql_identifier DOT sql_identifier + | sql_identifier DOT sql_identifier + | sql_identifier + ; + +function_name + : sql_identifier DOT sql_identifier DOT sql_identifier + | sql_identifier DOT sql_identifier + | sql_identifier + ; + +identifier + : ID + | DOUBLEQUOTED_STRING + ; + +sql_identifier + : identifier + | keyword + | 'ROWID' + | 'ROWNUM' + ; + +/* ================================================================================ + Query tables specs (ie. everything between 'FROM' ... 'WHERE' + ================================================================================ */ +table_reference_list + : selected_table ( COMMA selected_table )* + ; +join_clause + : table_name ( inner_cross_join_clause | outer_join_clause )+ + ; +inner_cross_join_clause + : ( 'INNER' )? 'JOIN' table_name ( 'ON' sql_condition | 'USING' LPAREN column_specs RPAREN ) + | ( 'CROSS' | 'NATURAL' ( 'INNER' ) ) 'JOIN' table_name + ; +outer_join_clause + : ( query_partition_clause )? + ( outer_join_type 'JOIN' + | 'NATURAL' ( outer_join_type )? 'JOIN' + ) + table_name ( query_partition_clause )? + ( 'ON' sql_condition | 'USING' LPAREN column_specs RPAREN )? + ; +column_specs + : column_spec ( COMMA column_spec )* + ; +query_partition_clause + : 'PARTITION' 'BY' expression_list + ; +outer_join_type + : ( 'FULL' | 'LEFT' | 'RIGHT' ) ( 'OUTER' )? + ; +outer_join_sign + : LPAREN PLUS RPAREN + ; +selected_table + : ( table_spec | ( 'TABLE' | 'THE' )? subquery ) ( alias )? + ; + +table_spec + : ( schema_name DOT )? table_name ( AT_SIGN link_name )? + -> ^('selected_table' schema_name? DOT? table_name AT_SIGN? link_name?) + ; + +schema_name + : sql_identifier + ; +table_name + : sql_identifier + ; +table_alias + : ( schema_name DOT )? table_name ( AT_SIGN link_name )? ( alias )? + ; +link_name + : sql_identifier + ; + +/* ================================================================================ + where clause + ================================================================================ */ +where_clause + : /*'WHERE'*/k_where sql_condition + -> ^( 'where' k_where sql_condition) + ; +/* ================================================================================ + hierarchical query clause + ================================================================================ */ +hierarchical_query_clause + : ( 'START' 'WITH' start=sql_condition )? 'CONNECT' 'BY' ( 'NOCYCLE' )? connect=sql_condition + -> ^('hierarchical' 'START'? 'WITH'? $start? 'CONNECT' 'BY' 'NOCYCLE'? $connect) + ; + +/* ================================================================================ + group by clause + ================================================================================ */ +group_by_clause + : 'GROUP' 'BY' group_by_exprs + -> ^('group_by' 'GROUP' 'BY' group_by_exprs) + ; +group_by_exprs + : group_by_expr ( COMMA group_by_expr )* + ; +group_by_expr + : rollup_cube_clause + | grouping_sets_clause + | grouping_expression_list + ; +rollup_cube_clause + : ( 'ROLLUP' | 'CUBE' ) LPAREN grouping_expression_list RPAREN + ; +grouping_sets_clause + : 'GROUPING' 'SETS' LPAREN grouping_expression_list RPAREN + ; +grouping_sets_exprs + : grouping_sets_expr ( COMMA grouping_sets_expr )* + ; +grouping_sets_expr + : rollup_cube_clause | grouping_expression_list + ; +sql_condition + : condition_or + ; +condition_or + : condition_and ( 'OR' condition_and )* + ; +condition_and + : condition_not ( 'AND' condition_not )* + ; +condition_not + : 'NOT' condition_expr + | condition_expr + ; +condition_expr + : condition_exists + | condition_is + | condition_comparison + | condition_group_comparison + | condition_in + | condition_is_a_set + | condition_is_any + | condition_is_empty + | condition_is_of_type + | condition_is_present + | condition_like + | condition_memeber + | condition_between + | condition_regexp_like + | condition_submultiset + | condition_equals_path + | condition_under_path + | condition_paren + ; + +condition_exists + : 'EXISTS' subquery + ; +condition_is + : sql_expression 'IS' ( 'NOT' )? ( 'NAN' | 'INFINITE' | 'NULL' ) + ; +condition_comparison + : LPAREN sql_expressions RPAREN ( outer_join_sign )? ( EQ | NOT_EQ ) subquery ( outer_join_sign )? + | ( 'PRIOR' )? sql_expression ( outer_join_sign )? ( EQ | NOT_EQ | GTH | GEQ | LTH | LEQ ) ( 'PRIOR' )? ( sql_expression | LPAREN select_expression RPAREN ) ( outer_join_sign )? + ; +condition_group_comparison + : LPAREN sql_expressions RPAREN ( EQ | NOT_EQ ) ( 'ANY' | 'SOME' | 'ALL' ) LPAREN ( grouping_expression_list | select_expression ) RPAREN + | sql_expression ( EQ | NOT_EQ | GTH | GEQ | LTH | LEQ ) ( 'ANY' | 'SOME' | 'ALL' ) LPAREN ( sql_expressions | select_expression ) RPAREN + ; +condition_in + : LPAREN sql_expressions RPAREN ( 'NOT' )? 'IN' LPAREN ( grouping_expression_list | select_expression ) RPAREN + | sql_expression ( 'NOT' )? 'IN' LPAREN ( expression_list | select_expression ) RPAREN + ; +condition_is_a_set + : nested_table_column_name 'IS' ( 'NOT' )? /*'A'*/k_a 'SET' + ; +condition_is_any + : ( column_name 'IS' )? 'ANY' + ; +condition_is_empty + : nested_table_column_name 'IS' ( 'NOT' )? 'EMPTY' + ; +condition_is_of_type + : sql_expression 'IS' ('NOT')? 'OF' ( 'TYPE' )? LPAREN type_name RPAREN + ; +condition_is_of_type_names + : condition_is_of_type_name ( COMMA condition_is_of_type_name )* + ; +condition_is_of_type_name + : ( 'ONLY' )? type_name + ; +condition_is_present + : cell_reference 'IS' 'PRESENT' + ; +condition_like + : sql_expression ( 'NOT' )? ( 'LIKE' | 'LIKEC' | 'LIKE2' | 'LIKE4' ) sql_expression ( 'ESCAPE' sql_expression )? + ; +condition_memeber + : sql_expression ( 'NOT' )? 'MEMBER' ( 'OF' )? nested_table_column_name + ; +condition_between + : sql_expression ( 'NOT' )? 'BETWEEN' sql_expression 'AND' sql_expression + ; +condition_regexp_like + : 'REGEXP_LIKE' LPAREN call_parameters RPAREN + ; +condition_submultiset + : nested_table_column_name ( 'NOT' )? 'SUBMULTISET' ( 'OF' )? nested_table_column_name + ; +condition_equals_path + : 'EQUALS_PATH' LPAREN column_name COMMA path_string ( COMMA correlation_integer )? RPAREN + ; +condition_under_path + : 'UNDER_PATH' LPAREN column_name ( COMMA levels )? COMMA path_string ( COMMA correlation_integer )? RPAREN + ; +levels + : integer + ; +correlation_integer + : integer + ; +path_string + : QUOTED_STRING + ; +type_name + : identifier ( DOT identifier )* + ; +integer + : NUMBER + ; +column_name + : sql_identifier + ; +nested_table + : sql_identifier + ; +nested_table_column_name + : ( schema_name DOT )? (table_name DOT)? (nested_table DOT)? column_name + ; +sql_expressions + : sql_expression ( COMMA sql_expression )* + ; +grouping_expression_list + : expression_list ( COMMA expression_list )* + ; +expression_list + : LPAREN sql_expressions RPAREN + | sql_expressions + ; +cell_reference + : sql_identifier + ; + +condition_paren + : LPAREN sql_condition RPAREN + ; + +/* ================================================================================ + MODEL clause + ================================================================================ */ +model_clause + : 'MODEL' main_model + ( cell_reference_options )? + ( return_rows_clause )? + ( reference_model )* //main_model + -> ^( 't_model' 'MODEL' main_model cell_reference_options? return_rows_clause? reference_model* ) + ; +cell_reference_options + : ( ( 'IGNORE' | 'KEEP' ) 'NAV' )? + ( 'UNIQUE' ( 'DIMENSION' | 'SINGLE' 'REFERENCE' ) )? + ; +return_rows_clause + : 'RETURN' ( 'UPDATED' | 'ALL' ) 'ROWS' + ; +reference_model + : 'REFERENCE' reference_model_name 'ON' LPAREN subquery RPAREN + model_column_clauses ( cell_reference_options ) + ; +reference_model_name + : identifier + ; +main_model + : ( 'MAIN' main_model_name )? model_column_clauses + ( cell_reference_options ) model_rules_clause + ; +main_model_name + : identifier + ; +model_column_clauses + : ( query_partition_clause ( column_spec )? )? + 'DIMENSION' 'BY' LPAREN model_columns RPAREN + 'MEASURES' LPAREN model_columns RPAREN + ; +model_columns + : model_column ( COMMA model_column )* + ; +model_column + : sql_expression ( ( /*'AS'*/k_as )? column_spec )? + ; +model_rules_clause + : ( 'RULES' ( 'UPDATE' | 'UPSERT' ( 'ALL' )? )? ( ( 'AUTOMATIC' | 'SEQUENTIAL' ) 'ORDER' )? )? + ( 'ITERATE' LPAREN NUMBER RPAREN ( 'UNTIL' LPAREN sql_condition RPAREN )? )? + LPAREN model_rules_exprs RPAREN + ; +model_rules_exprs + : model_rules_expr ( COMMA model_rules_expr )* + ; +model_rules_expr + : ( 'UPDATE' | 'UPSERT' ( 'ALL' )? )? cell_assignment ( order_by_clause )? EQ sql_expression + ; +cell_assignment + : measure_column LBRACK ( multi_column_for_loop | cell_assignment_exprs ) RBRACK + ; +cell_assignment_exprs + : cell_assignment_expr ( COMMA cell_assignment_expr )* + ; +cell_assignment_expr + : sql_condition | sql_expression | single_column_for_loop + ; +measure_column + : column_name + ; +single_column_for_loop + : 'FOR' column_name + ( 'IN' LPAREN ( literals | subquery ) RPAREN + | ( 'LIKE' pattern )? /*'FROM'*/k_from literal 'TO' literal ( 'INCREMENT' | 'DECREMENT' ) literal + ) + ; +pattern + : QUOTED_STRING + ; +literal + : ( PLUS | MINUS )? NUMBER + | QUOTED_STRING + ; +literals + : literal ( COMMA literal )* + ; +multi_column_for_loop + : 'FOR' LPAREN column_specs RPAREN 'IN' LPAREN ( bracket_literals_list | subquery ) RPAREN + ; +bracket_literals + : LPAREN literals RPAREN + ; +bracket_literals_list + : bracket_literals ( COMMA bracket_literals )* + ; +/* ================================================================================ + ORDER BY clause + ================================================================================ */ +order_by_clause + : 'ORDER' 'SIBLINGS'? 'BY' + ( sql_expression 'ASC'? 'DESC'? ('NULLS' 'FIRST')? ('NULLS' 'LAST')? ) + ( COMMA sql_expression 'ASC'? 'DESC'? ('NULLS' 'FIRST')? ('NULLS' 'LAST')? )* +// order_by_exprs + -> ^('t_order_by' 'ORDER' 'SIBLINGS'? 'BY' (sql_expression 'ASC'? 'DESC'?) *) + ; + +/* ================================================================================ + Analytic query part + ================================================================================ */ +analytic_function_name + : + | 'AVG' | 'CORR' | 'COVAR_POP' | 'COVAR_SAMP' | 'COUNT' | 'CUME_DIST' | 'DENSE_RANK' + | 'FIRST' | 'FIRST_VALUE' | 'LAG' | 'LAST' | 'LAST_VALUE' | 'LEAD' | 'MAX' | 'MIN' + | 'NTILE' | 'PERCENT_RANK' | 'PERCENTILE_CONT' | 'PERCENTILE_DISC' | 'RANK' | 'RATIO_TO_REPORT' + | 'REGR_SLOPE' | 'REGR_INTERCEPT' | 'REGR_COUNT' | 'REGR_R2' | 'REGR_AVGX' | 'REGR_AVGY' + | 'REGR_SXX' | 'REGR_SYY' | 'REGR_SXY' | 'ROW_NUMBER' | 'STDDEV' | 'STDDEV_POP' + | 'STDDEV_SAMP' | 'SUM' | 'VAR_POP' | 'VAR_SAMP' | 'VARIANCE' ; + +analytic_function_call + : analytic_function_name + LPAREN ('DISTINCT' | 'ALL')? sql_expression? (COMMA sql_expression)* RPAREN + ; + +analytic_function + : function_expression 'OVER' LPAREN analytic_clause RPAREN + ; + +analytic_clause + : query_partition_clause? (order_by_clause windowing_clause?)? + ; + +windowing_clause_part + : + ('UNBOUNDED' 'PRECEEDING')|('CURRENT' 'ROW')|(sql_expression 'RECEEDING') + ; + +windowing_clause + : ('ROWS' | 'RANGE') + ( windowing_clause_part + | + ( 'BETWEEN' windowing_clause_part 'AND' windowing_clause_part) + ) + ; + +/* ================================================================================ + FOR UPDATE CLAUSE + ================================================================================ */ +for_update + : k_for k_update + ( k_of ( (schema_name DOT)? (table_name DOT)? column_name )? + (COMMA (schema_name DOT)? (table_name DOT)? column_name )* + )? + ; + +/* ================================================================================ + Oracle reserved words + cannot by used for name database objects such as columns, tables, or indexes. + ================================================================================ */ +k_access : r='ACCESS' { $r->setType($r, T_RESERVED); } ; +k_add : r='ADD' { $r->setType($r, T_RESERVED); } ; +k_all : r='ALL' { $r->setType($r, T_RESERVED); } ; +k_alter : r='ALTER' { $r->setType($r, T_RESERVED); } ; +k_and : r='AND' { $r->setType($r, T_RESERVED); } ; +k_any : r='ANY' { $r->setType($r, T_RESERVED); } ; +k_arraylen : r='ARRAYLEN' { $r->setType($r, T_RESERVED); } ; +k_as : r='AS' { $r->setType($r, T_RESERVED); } ; +k_asc : r='ASC' { $r->setType($r, T_RESERVED); } ; +k_audit : r='AUDIT' { $r->setType($r, T_RESERVED); } ; +k_between : r='BETWEEN' { $r->setType($r, T_RESERVED); } ; +k_by : r='BY' { $r->setType($r, T_RESERVED); } ; +k_case : r='CASE' { $r->setType($r, T_RESERVED); } ; //PL/SQL +k_char : r='CHAR' { $r->setType($r, T_RESERVED); } ; +k_check : r='CHECK' { $r->setType($r, T_RESERVED); } ; +k_cluster : r='CLUSTER' { $r->setType($r, T_RESERVED); } ; +k_column : r='COLUMN' { $r->setType($r, T_RESERVED); } ; +k_comment : r='COMMENT' { $r->setType($r, T_RESERVED); } ; +k_compress : r='COMPRESS' { $r->setType($r, T_RESERVED); } ; +k_connect : r='CONNECT' { $r->setType($r, T_RESERVED); } ; +k_create : r='CREATE' { $r->setType($r, T_RESERVED); } ; +k_current : r='CURRENT' { $r->setType($r, T_RESERVED); } ; +k_date : r='DATE' { $r->setType($r, T_RESERVED); } ; +k_decimal : r='DECIMAL' { $r->setType($r, T_RESERVED); } ; +k_default : r='DEFAULT' { $r->setType($r, T_RESERVED); } ; +k_delete : r='DELETE' { $r->setType($r, T_RESERVED); } ; +k_desc : r='DESC' { $r->setType($r, T_RESERVED); } ; +k_distinct : r='DISTINCT' { $r->setType($r, T_RESERVED); } ; +k_drop : r='DROP' { $r->setType($r, T_RESERVED); } ; +k_else : r='ELSE' { $r->setType($r, T_RESERVED); } ; +k_exclusive : r='EXCLUSIVE' { $r->setType($r, T_RESERVED); } ; +k_exists : r='EXISTS' { $r->setType($r, T_RESERVED); } ; +k_false : r='FALSE' { $r->setType($r, T_RESERVED); } ; //PL/SQL +k_file : r='FILE' { $r->setType($r, T_RESERVED); } ; +k_float : r='FLOAT' { $r->setType($r, T_RESERVED); } ; +k_for : r='FOR' { $r->setType($r, T_RESERVED); } ; +k_from : r='FROM' { $r->setType($r, T_RESERVED); } ; +k_grant : r='GRANT' { $r->setType($r, T_RESERVED); } ; +k_group : r='GROUP' { $r->setType($r, T_RESERVED); } ; +k_having : r='HAVING' { $r->setType($r, T_RESERVED); } ; +k_identified : r='IDENTIFIED' { $r->setType($r, T_RESERVED); } ; +k_immediate : r='IMMEDIATE' { $r->setType($r, T_RESERVED); } ; +k_in : r='IN' { $r->setType($r, T_RESERVED); } ; +k_increment : r='INCREMENT' { $r->setType($r, T_RESERVED); } ; +k_index : r='INDEX' { $r->setType($r, T_RESERVED); } ; +k_initial : r='INITIAL' { $r->setType($r, T_RESERVED); } ; +k_insert : r='INSERT' { $r->setType($r, T_RESERVED); } ; +k_integer : r='INTEGER' { $r->setType($r, T_RESERVED); } ; +k_intersect : r='INTERSECT' { $r->setType($r, T_RESERVED); } ; +k_into : r='INTO' { $r->setType($r, T_RESERVED); } ; +k_is : r='IS' { $r->setType($r, T_RESERVED); } ; +k_level : r='LEVEL' { $r->setType($r, T_RESERVED); } ; +k_like : r='LIKE' { $r->setType($r, T_RESERVED); } ; +k_lock : r='LOCK' { $r->setType($r, T_RESERVED); } ; +k_long : r='LONG' { $r->setType($r, T_RESERVED); } ; +k_maxextents : r='MAXEXTENTS' { $r->setType($r, T_RESERVED); } ; +k_minus : r='MINUS' { $r->setType($r, T_RESERVED); } ; +k_mode : r='MODE' { $r->setType($r, T_RESERVED); } ; +k_modify : r='MODIFY' { $r->setType($r, T_RESERVED); } ; +k_noaudit : r='NOAUDIT' { $r->setType($r, T_RESERVED); } ; +k_nocompress : r='NOCOMPRESS' { $r->setType($r, T_RESERVED); } ; +k_not : r='NOT' { $r->setType($r, T_RESERVED); } ; +k_notfound : r='NOTFOUND' { $r->setType($r, T_RESERVED); } ; +k_nowait : r='NOWAIT' { $r->setType($r, T_RESERVED); } ; +k_null : r='NULL' { $r->setType($r, T_RESERVED); } ; +k_number : r='NUMBER' { $r->setType($r, T_RESERVED); } ; +k_of : r='OF' { $r->setType($r, T_RESERVED); } ; +k_offline : r='OFFLINE' { $r->setType($r, T_RESERVED); } ; +k_on : r='ON' { $r->setType($r, T_RESERVED); } ; +k_online : r='ONLINE' { $r->setType($r, T_RESERVED); } ; +k_option : r='OPTION' { $r->setType($r, T_RESERVED); } ; +k_or : r='OR' { $r->setType($r, T_RESERVED); } ; +k_order : r='ORDER' { $r->setType($r, T_RESERVED); } ; +k_pctfree : r='PCTFREE' { $r->setType($r, T_RESERVED); } ; +k_prior : r='PRIOR' { $r->setType($r, T_RESERVED); } ; +k_privileges : r='PRIVILEGES' { $r->setType($r, T_RESERVED); } ; +k_public : r='PUBLIC' { $r->setType($r, T_RESERVED); } ; +k_raw : r='RAW' { $r->setType($r, T_RESERVED); } ; +k_rename : r='RENAME' { $r->setType($r, T_RESERVED); } ; +k_resource : r='RESOURCE' { $r->setType($r, T_RESERVED); } ; +k_revoke : r='REVOKE' { $r->setType($r, T_RESERVED); } ; +k_row : r='ROW' { $r->setType($r, T_RESERVED); } ; +k_rowid : r='ROWID' { $r->setType($r, T_RESERVED); } ; +k_rowlabel : r='ROWLABEL' { $r->setType($r, T_RESERVED); } ; +k_rownum : r='ROWNUM' { $r->setType($r, T_RESERVED); } ; +k_rows : r='ROWS' { $r->setType($r, T_RESERVED); } ; +k_select : r='SELECT' { $r->setType($r, T_RESERVED); } ; +k_session : r='SESSION' { $r->setType($r, T_RESERVED); } ; +k_set : r='SET' { $r->setType($r, T_RESERVED); } ; +k_share : r='SHARE' { $r->setType($r, T_RESERVED); } ; +k_size : r='SIZE' { $r->setType($r, T_RESERVED); } ; +k_smallint : r='SMALLINT' { $r->setType($r, T_RESERVED); } ; +k_sqlbuf : r='SQLBUF' { $r->setType($r, T_RESERVED); } ; +k_start : r='START' { $r->setType($r, T_RESERVED); } ; +k_successful : r='SUCCESSFUL' { $r->setType($r, T_RESERVED); } ; +k_synonym : r='SYNONYM' { $r->setType($r, T_RESERVED); } ; +k_sysdate : r='SYSDATE' { $r->setType($r, T_RESERVED); } ; +k_table : r='TABLE' { $r->setType($r, T_RESERVED); } ; +k_then : r='THEN' { $r->setType($r, T_RESERVED); } ; +k_to : r='TO' { $r->setType($r, T_RESERVED); } ; +k_trigger : r='TRIGGER' { $r->setType($r, T_RESERVED); } ; +k_true : r='TRUE' { $r->setType($r, T_RESERVED); } ; // PL/SQL +k_uid : r='UID' { $r->setType($r, T_RESERVED); } ; +k_union : r='UNION' { $r->setType($r, T_RESERVED); } ; +k_unique : r='UNIQUE' { $r->setType($r, T_RESERVED); } ; +k_update : r='UPDATE' { $r->setType($r, T_RESERVED); } ; +k_user : r='USER' { $r->setType($r, T_RESERVED); } ; +k_validate : r='VALIDATE' { $r->setType($r, T_RESERVED); } ; +k_values : r='VALUES' { $r->setType($r, T_RESERVED); } ; +k_varchar : r='VARCHAR' { $r->setType($r, T_RESERVED); } ; +k_varchar2 : r='VARCHAR2' { $r->setType($r, T_RESERVED); } ; +k_view : r='VIEW' { $r->setType($r, T_RESERVED); } ; +k_whenever : r='WHENEVER' { $r->setType($r, T_RESERVED); } ; +k_where : r='WHERE' { $r->setType($r, T_RESERVED); } ; +k_with : r='WITH' { $r->setType($r, T_RESERVED); } ; + +reserved_word options { backtrack=false; } + : r=( 'ACCESS' | 'ADD' | 'ALL' | 'ALTER' | 'AND' | 'ANY' | 'ARRAYLEN' | 'AS' | 'ASC' | 'AUDIT' + | 'BETWEEN' | 'BY' + | 'CHAR' | 'CHECK' | 'CLUSTER' | 'COLUMN' | 'COMMENT' | 'COMPRESS' | 'CONNECT' | 'CREATE' | 'CURRENT' + | 'DATE' | 'DECIMAL' | 'DEFAULT' | 'DELETE' | 'DESC' | 'DISTINCT' | 'DROP' + | 'ELSE' | 'EXCLUSIVE' | 'EXISTS' + | 'FILE' | 'FLOAT' | 'FOR' | 'FROM' + | 'GRANT' | 'GROUP' + | 'HAVING' + | 'IDENTIFIED' | 'IMMEDIATE' | 'IN' | 'INCREMENT' | 'INDEX' | 'INITIAL' | 'INSERT' | 'INTEGER' + | 'INTERSECT' | 'INTO' | 'IS' + | 'LEVEL' | 'LIKE' | 'LOCK' | 'LONG' + | 'MAXEXTENTS' | 'MINUS' | 'MODE' | 'MODIFY' + | 'NOAUDIT' | 'NOCOMPRESS' | 'NOT' | 'NOTFOUND' | 'NOWAIT' | 'NULL' | 'NUMBER' + | 'OF' | 'OFFLINE' | 'ON' | 'ONLINE' | 'OPTION' | 'OR' | 'ORDER' + | 'PCTFREE' | 'PRIOR' | 'PRIVILEGES' | 'PUBLIC' + | 'RAW' | 'RENAME' | 'RESOURCE' | 'REVOKE' | 'ROW' | 'ROWID' | 'ROWLABEL' | 'ROWNUM' | 'ROWS' + | 'SELECT' | 'SESSION' | 'SET' | 'SHARE' | 'SIZE' | 'SMALLINT' | 'SQLBUF' + | 'START' | 'SUCCESSFUL' | 'SYNONYM' | 'SYSDATE' + | 'TABLE' | 'THEN' | 'TO' | 'TRIGGER' + | 'UID' | 'UNION' | 'UNIQUE' | 'UPDATE' | 'USER' + | 'VALIDATE' | 'VALUES' | 'VARCHAR' | 'VARCHAR2' | 'VIEW' + | 'WHENEVER' | 'WHERE' | 'WITH' + ) //{ $r->setType($r, T_RESERVED); } + //{ $type = T_RESERVED; } + // -> ^(T_RESERVED[$r]) + ; + +/* ================================================================================ + Oracle keywords + can by used for name database objects such as columns, tables, or indexes. + ================================================================================ */ +k_a : r='A' { $r->setType($r, T_RESERVED); } ; +k_admin : r='ADMIN' { $r->setType($r, T_RESERVED); } ; +k_after : r='AFTER' { $r->setType($r, T_RESERVED); } ; +k_allocate : r='ALLOCATE' { $r->setType($r, T_RESERVED); } ; +k_analyze : r='ANALYZE' { $r->setType($r, T_RESERVED); } ; +k_archive : r='ARCHIVE' { $r->setType($r, T_RESERVED); } ; +k_archivelog : r='ARCHIVELOG' { $r->setType($r, T_RESERVED); } ; +k_authorization : r='AUTHORIZATION' { $r->setType($r, T_RESERVED); } ; +k_avg : r='AVG' { $r->setType($r, T_RESERVED); } ; +k_backup : r='BACKUP' { $r->setType($r, T_RESERVED); } ; +k_become : r='BECOME' { $r->setType($r, T_RESERVED); } ; +k_before : r='BEFORE' { $r->setType($r, T_RESERVED); } ; +k_begin : r='BEGIN' { $r->setType($r, T_RESERVED); } ; +k_block : r='BLOCK' { $r->setType($r, T_RESERVED); } ; +k_body : r='BODY' { $r->setType($r, T_RESERVED); } ; +k_cache : r='CACHE' { $r->setType($r, T_RESERVED); } ; +k_cancel : r='CANCEL' { $r->setType($r, T_RESERVED); } ; +k_cascade : r='CASCADE' { $r->setType($r, T_RESERVED); } ; +k_change : r='CHANGE' { $r->setType($r, T_RESERVED); } ; +k_character : r='CHARACTER' { $r->setType($r, T_RESERVED); } ; +k_checkpoint : r='CHECKPOINT' { $r->setType($r, T_RESERVED); } ; +k_close : r='CLOSE' { $r->setType($r, T_RESERVED); } ; +k_cobol : r='COBOL' { $r->setType($r, T_RESERVED); } ; +k_commit : r='COMMIT' { $r->setType($r, T_RESERVED); } ; +k_compile : r='COMPILE' { $r->setType($r, T_RESERVED); } ; +k_constraint : r='CONSTRAINT' { $r->setType($r, T_RESERVED); } ; +k_constraints : r='CONSTRAINTS' { $r->setType($r, T_RESERVED); } ; +k_contents : r='CONTENTS' { $r->setType($r, T_RESERVED); } ; +k_continue : r='CONTINUE' { $r->setType($r, T_RESERVED); } ; +k_controlfile : r='CONTROLFILE' { $r->setType($r, T_RESERVED); } ; +k_count : r='COUNT' { $r->setType($r, T_RESERVED); } ; +k_cursor : r='CURSOR' { $r->setType($r, T_RESERVED); } ; +k_cycle : r='CYCLE' { $r->setType($r, T_RESERVED); } ; +k_database : r='DATABASE' { $r->setType($r, T_RESERVED); } ; +k_datafile : r='DATAFILE' { $r->setType($r, T_RESERVED); } ; +k_dba : r='DBA' { $r->setType($r, T_RESERVED); } ; +k_dec : r='DEC' { $r->setType($r, T_RESERVED); } ; +k_declare : r='DECLARE' { $r->setType($r, T_RESERVED); } ; +k_disable : r='DISABLE' { $r->setType($r, T_RESERVED); } ; +k_dismount : r='DISMOUNT' { $r->setType($r, T_RESERVED); } ; +k_double : r='DOUBLE' { $r->setType($r, T_RESERVED); } ; +k_dump : r='DUMP' { $r->setType($r, T_RESERVED); } ; +k_each : r='EACH' { $r->setType($r, T_RESERVED); } ; +k_enable : r='ENABLE' { $r->setType($r, T_RESERVED); } ; +k_end : r='END' { $r->setType($r, T_RESERVED); } ; +k_escape : r='ESCAPE' { $r->setType($r, T_RESERVED); } ; +k_events : r='EVENTS' { $r->setType($r, T_RESERVED); } ; +k_except : r='EXCEPT' { $r->setType($r, T_RESERVED); } ; +k_exceptions : r='EXCEPTIONS' { $r->setType($r, T_RESERVED); } ; +k_exec : r='EXEC' { $r->setType($r, T_RESERVED); } ; +k_execute : r='EXECUTE' { $r->setType($r, T_RESERVED); } ; +k_explain : r='EXPLAIN' { $r->setType($r, T_RESERVED); } ; +k_extent : r='EXTENT' { $r->setType($r, T_RESERVED); } ; +k_externally : r='EXTERNALLY' { $r->setType($r, T_RESERVED); } ; +k_fetch : r='FETCH' { $r->setType($r, T_RESERVED); } ; +k_flush : r='FLUSH' { $r->setType($r, T_RESERVED); } ; +k_force : r='FORCE' { $r->setType($r, T_RESERVED); } ; +k_foreign : r='FOREIGN' { $r->setType($r, T_RESERVED); } ; +k_fortran : r='FORTRAN' { $r->setType($r, T_RESERVED); } ; +k_found : r='FOUND' { $r->setType($r, T_RESERVED); } ; +k_freelist : r='FREELIST' { $r->setType($r, T_RESERVED); } ; +k_freelists : r='FREELISTS' { $r->setType($r, T_RESERVED); } ; +k_function : r='FUNCTION' { $r->setType($r, T_RESERVED); } ; +k_go : r='GO' { $r->setType($r, T_RESERVED); } ; +k_goto : r='GOTO' { $r->setType($r, T_RESERVED); } ; +k_groups : r='GROUPS' { $r->setType($r, T_RESERVED); } ; +k_including : r='INCLUDING' { $r->setType($r, T_RESERVED); } ; +k_indicator : r='INDICATOR' { $r->setType($r, T_RESERVED); } ; +k_initrans : r='INITRANS' { $r->setType($r, T_RESERVED); } ; +k_instance : r='INSTANCE' { $r->setType($r, T_RESERVED); } ; +k_int : r='INT' { $r->setType($r, T_RESERVED); } ; +k_key : r='KEY' { $r->setType($r, T_RESERVED); } ; +k_language : r='LANGUAGE' { $r->setType($r, T_RESERVED); } ; +k_layer : r='LAYER' { $r->setType($r, T_RESERVED); } ; +k_link : r='LINK' { $r->setType($r, T_RESERVED); } ; +k_lists : r='LISTS' { $r->setType($r, T_RESERVED); } ; +k_logfile : r='LOGFILE' { $r->setType($r, T_RESERVED); } ; +k_manage : r='MANAGE' { $r->setType($r, T_RESERVED); } ; +k_manual : r='MANUAL' { $r->setType($r, T_RESERVED); } ; +k_max : r='MAX' { $r->setType($r, T_RESERVED); } ; +k_maxdatafiles : r='MAXDATAFILES' { $r->setType($r, T_RESERVED); } ; +k_maxinstances : r='MAXINSTANCES' { $r->setType($r, T_RESERVED); } ; +k_maxlogfiles : r='MAXLOGFILES' { $r->setType($r, T_RESERVED); } ; +k_maxloghistory : r='MAXLOGHISTORY' { $r->setType($r, T_RESERVED); } ; +k_maxlogmembers : r='MAXLOGMEMBERS' { $r->setType($r, T_RESERVED); } ; +k_maxtrans : r='MAXTRANS' { $r->setType($r, T_RESERVED); } ; +k_maxvalue : r='MAXVALUE' { $r->setType($r, T_RESERVED); } ; +k_min : r='MIN' { $r->setType($r, T_RESERVED); } ; +k_minextents : r='MINEXTENTS' { $r->setType($r, T_RESERVED); } ; +k_minvalue : r='MINVALUE' { $r->setType($r, T_RESERVED); } ; +k_module : r='MODULE' { $r->setType($r, T_RESERVED); } ; +k_mount : r='MOUNT' { $r->setType($r, T_RESERVED); } ; +k_new : r='NEW' { $r->setType($r, T_RESERVED); } ; +k_next : r='NEXT' { $r->setType($r, T_RESERVED); } ; +k_noarchivelog : r='NOARCHIVELOG' { $r->setType($r, T_RESERVED); } ; +k_nocache : r='NOCACHE' { $r->setType($r, T_RESERVED); } ; +k_nocycle : r='NOCYCLE' { $r->setType($r, T_RESERVED); } ; +k_nomaxvalue : r='NOMAXVALUE' { $r->setType($r, T_RESERVED); } ; +k_nominvalue : r='NOMINVALUE' { $r->setType($r, T_RESERVED); } ; +k_none : r='NONE' { $r->setType($r, T_RESERVED); } ; +k_noorder : r='NOORDER' { $r->setType($r, T_RESERVED); } ; +k_noresetlogs : r='NORESETLOGS' { $r->setType($r, T_RESERVED); } ; +k_normal : r='NORMAL' { $r->setType($r, T_RESERVED); } ; +k_nosort : r='NOSORT' { $r->setType($r, T_RESERVED); } ; +k_numeric : r='NUMERIC' { $r->setType($r, T_RESERVED); } ; +k_off : r='OFF' { $r->setType($r, T_RESERVED); } ; +k_old : r='OLD' { $r->setType($r, T_RESERVED); } ; +k_only : r='ONLY' { $r->setType($r, T_RESERVED); } ; +k_open : r='OPEN' { $r->setType($r, T_RESERVED); } ; +k_optimal : r='OPTIMAL' { $r->setType($r, T_RESERVED); } ; +k_own : r='OWN' { $r->setType($r, T_RESERVED); } ; +k_package : r='PACKAGE' { $r->setType($r, T_RESERVED); } ; +k_parallel : r='PARALLEL' { $r->setType($r, T_RESERVED); } ; +k_pctincrease : r='PCTINCREASE' { $r->setType($r, T_RESERVED); } ; +k_pctused : r='PCTUSED' { $r->setType($r, T_RESERVED); } ; +k_plan : r='PLAN' { $r->setType($r, T_RESERVED); } ; +k_pli : r='PLI' { $r->setType($r, T_RESERVED); } ; +k_precision : r='PRECISION' { $r->setType($r, T_RESERVED); } ; +k_primary : r='PRIMARY' { $r->setType($r, T_RESERVED); } ; +k_private : r='PRIVATE' { $r->setType($r, T_RESERVED); } ; +k_procedure : r='PROCEDURE' { $r->setType($r, T_RESERVED); } ; +k_profile : r='PROFILE' { $r->setType($r, T_RESERVED); } ; +k_quota : r='QUOTA' { $r->setType($r, T_RESERVED); } ; +k_read : r='READ' { $r->setType($r, T_RESERVED); } ; +k_real : r='REAL' { $r->setType($r, T_RESERVED); } ; +k_recover : r='RECOVER' { $r->setType($r, T_RESERVED); } ; +k_references : r='REFERENCES' { $r->setType($r, T_RESERVED); } ; +k_referencing : r='REFERENCING' { $r->setType($r, T_RESERVED); } ; +k_resetlogs : r='RESETLOGS' { $r->setType($r, T_RESERVED); } ; +k_restricted : r='RESTRICTED' { $r->setType($r, T_RESERVED); } ; +k_reuse : r='REUSE' { $r->setType($r, T_RESERVED); } ; +k_role : r='ROLE' { $r->setType($r, T_RESERVED); } ; +k_roles : r='ROLES' { $r->setType($r, T_RESERVED); } ; +k_rollback : r='ROLLBACK' { $r->setType($r, T_RESERVED); } ; +k_savepoint : r='SAVEPOINT' { $r->setType($r, T_RESERVED); } ; +k_schema : r='SCHEMA' { $r->setType($r, T_RESERVED); } ; +k_scn : r='SCN' { $r->setType($r, T_RESERVED); } ; +k_section : r='SECTION' { $r->setType($r, T_RESERVED); } ; +k_segment : r='SEGMENT' { $r->setType($r, T_RESERVED); } ; +k_sequence : r='SEQUENCE' { $r->setType($r, T_RESERVED); } ; +k_shared : r='SHARED' { $r->setType($r, T_RESERVED); } ; +k_snapshot : r='SNAPSHOT' { $r->setType($r, T_RESERVED); } ; +k_some : r='SOME' { $r->setType($r, T_RESERVED); } ; +k_sort : r='SORT' { $r->setType($r, T_RESERVED); } ; +k_sql : r='SQL' { $r->setType($r, T_RESERVED); } ; +k_sqlcode : r='SQLCODE' { $r->setType($r, T_RESERVED); } ; +k_sqlerror : r='SQLERROR' { $r->setType($r, T_RESERVED); } ; +k_sqlstate : r='SQLSTATE' { $r->setType($r, T_RESERVED); } ; +k_statement_ID : r='STATEMENT' { $r->setType($r, T_RESERVED); } ; +k_statistics : r='STATISTICS' { $r->setType($r, T_RESERVED); } ; +k_stop : r='STOP' { $r->setType($r, T_RESERVED); } ; +k_storage : r='STORAGE' { $r->setType($r, T_RESERVED); } ; +k_sum : r='SUM' { $r->setType($r, T_RESERVED); } ; +k_switch : r='SWITCH' { $r->setType($r, T_RESERVED); } ; +k_system : r='SYSTEM' { $r->setType($r, T_RESERVED); } ; +k_tables : r='TABLES' { $r->setType($r, T_RESERVED); } ; +k_tablespace : r='TABLESPACE' { $r->setType($r, T_RESERVED); } ; +k_temporary : r='TEMPORARY' { $r->setType($r, T_RESERVED); } ; +k_thread : r='THREAD' { $r->setType($r, T_RESERVED); } ; +k_time : r='TIME' { $r->setType($r, T_RESERVED); } ; +k_tracing : r='TRACING' { $r->setType($r, T_RESERVED); } ; +k_transaction : r='TRANSACTION' { $r->setType($r, T_RESERVED); } ; +k_triggers : r='TRIGGERS' { $r->setType($r, T_RESERVED); } ; +k_truncate : r='TRUNCATE' { $r->setType($r, T_RESERVED); } ; +k_under : r='UNDER' { $r->setType($r, T_RESERVED); } ; +k_unlimited : r='UNLIMITED' { $r->setType($r, T_RESERVED); } ; +k_until : r='UNTIL' { $r->setType($r, T_RESERVED); } ; +k_use : r='USE' { $r->setType($r, T_RESERVED); } ; +k_using : r='USING' { $r->setType($r, T_RESERVED); } ; +k_when : r='WHEN' { $r->setType($r, T_RESERVED); } ; +k_work : r='WORK' { $r->setType($r, T_RESERVED); } ; +k_write : r='WRITE' { $r->setType($r, T_RESERVED); } ; + +keyword + : 'A' // note: this one is not listed in the docs but is a part of "IS A SET" condition clause + | 'ADMIN' | 'AFTER' | 'ALLOCATE' | 'ANALYZE' | 'ARCHIVE' | 'ARCHIVELOG' | 'AUTHORIZATION' | 'AVG' + | 'BACKUP' | 'BECOME' | 'BEFORE' | 'BEGIN' | 'BLOCK' | 'BODY' + | 'CACHE' | 'CANCEL' | 'CASCADE' | 'CHANGE' | 'CHARACTER' | 'CHECKPOINT' | 'CLOSE' + | 'COBOL' | 'COMMIT' | 'COMPILE' | 'CONSTRAINT' | 'CONSTRAINTS' | 'CONTENTS' | 'CONTINUE' + | 'CONTROLFILE' | 'COUNT' | 'CURSOR' | 'CYCLE' + | 'DATABASE' | 'DATAFILE' | 'DBA' | 'DEC' | 'DECLARE' | 'DISABLE' | 'DISMOUNT' | 'DOUBLE' | 'DUMP' + | 'EACH' | 'ENABLE' | 'END' | 'ESCAPE' | 'EVENTS' | 'EXCEPT' | 'EXCEPTIONS' | 'EXEC' | 'EXECUTE' + | 'EXPLAIN' | 'EXTENT' | 'EXTERNALLY' + | 'FETCH' | 'FLUSH' | 'FORCE' | 'FOREIGN' | 'FORTRAN' | 'FOUND' | 'FREELIST' + | 'FREELISTS' | 'FUNCTION' + | 'GO' | 'GOTO' | 'GROUPS' + | 'INCLUDING' | 'INDICATOR' | 'INITRANS' | 'INSTANCE' | 'INT' + | 'KEY' + | 'LANGUAGE' | 'LAYER' | 'LINK' | 'LISTS' | 'LOGFILE' + | 'MANAGE' | 'MANUAL' | 'MAX' | 'MAXDATAFILES' | 'MAXINSTANCES' | 'MAXLOGFILES' | 'MAXLOGHISTORY' + | 'MAXLOGMEMBERS' | 'MAXTRANS' | 'MAXVALUE' | 'MIN' | 'MINEXTENTS' | 'MINVALUE' | 'MODULE' | 'MOUNT' + | 'NEW' | 'NEXT' | 'NOARCHIVELOG' | 'NOCACHE' | 'NOCYCLE' | 'NOMAXVALUE' | 'NOMINVALUE' | 'NONE' + | 'NOORDER' | 'NORESETLOGS' | 'NORMAL' | 'NOSORT' | 'NUMERIC' + | 'OFF' | 'OLD' | 'ONLY' | 'OPEN' | 'OPTIMAL' | 'OWN' + | 'PACKAGE' | 'PARALLEL' | 'PCTINCREASE' | 'PCTUSED' | 'PLAN' | 'PLI' | 'PRECISION' | 'PRIMARY' + | 'PRIVATE' | 'PROCEDURE' | 'PROFILE' + | 'QUOTA' + | 'READ' | 'REAL' | 'RECOVER' | 'REFERENCES' | 'REFERENCING' | 'RESETLOGS' | 'RESTRICTED' | 'REUSE' + | 'ROLE' | 'ROLES' | 'ROLLBACK' + | 'SAVEPOINT' | 'SCHEMA' | 'SCN' | 'SECTION' | 'SEGMENT' | 'SEQUENCE' | 'SHARED' | 'SNAPSHOT' + | 'SOME' | 'SORT' | 'SQL' | 'SQLCODE' | 'SQLERROR' | 'SQLSTATE' | 'STATEMENT_ID' + | 'STATISTICS' | 'STOP' | 'STORAGE' | 'SUM' | 'SWITCH' | 'SYSTEM' + | 'TABLES' | 'TABLESPACE' | 'TEMPORARY' | 'THREAD' | 'TIME' | 'TRACING' | 'TRANSACTION' | 'TRIGGERS' + | 'TRUNCATE' + | 'UNDER' | 'UNLIMITED' | 'UNTIL' | 'USE' | 'USING' + | 'WHEN' | 'WORK' | 'WRITE' + ; + +QUOTED_STRING + : ( 'n' )? '\'' ( '\'\'' | ~('\'') )* '\'' + ; +ID /*options { testLiterals=true; }*/ + : 'A' .. 'Z' ( 'A' .. 'Z' | '0' .. '9' | '_' | '$' | '#' )* + | DOUBLEQUOTED_STRING + ; +SEMI + : ';' + ; +COLON + : ':' + ; +DOUBLEDOT + : POINT POINT + ; +DOT + : POINT + ; +fragment +POINT + : '.' + ; +COMMA + : ',' + ; +EXPONENT + : '**' + ; +ASTERISK + : '*' + ; +AT_SIGN + : '@' + ; +RPAREN + : ')' + ; +LPAREN + : '(' + ; +RBRACK + : ']' + ; +LBRACK + : '[' + ; +PLUS + : '+' + ; +MINUS + : '-' + ; +DIVIDE + : '/' + ; +EQ + : '=' + ; +PERCENTAGE + : '%' + ; +LLABEL + : '<<' + ; +RLABEL + : '>>' + ; +ASSIGN + : ':=' + ; +ARROW + : '=>' + ; +VERTBAR + : '|' + ; +DOUBLEVERTBAR + : '||' + ; +NOT_EQ + : '<>' | '!=' | '^=' + ; +LTH + : '<' + ; +LEQ + : '<=' + ; +GTH + : '>' + ; +GEQ + : '>=' + ; +NUMBER + : //( PLUS | MINUS )? + ( ( N POINT N ) => N POINT N + | POINT N + | N + ) + ( 'E' ( PLUS | MINUS )? N )? + ; +fragment +N + : '0' .. '9' ( '0' .. '9' )* + ; +QUOTE + : '\'' + ; +fragment +DOUBLEQUOTED_STRING + : '"' ( ~('"') )* '"' + ; +WS : (' '|'\r'|'\t'|'\n') {$channel=HIDDEN;} + ; +SL_COMMENT + : '--' ~('\n'|'\r')* '\r'? '\n' {$channel=HIDDEN;} + ; +ML_COMMENT + : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;} + ; +TYPE_ATTR + : '%TYPE' + ; +ROWTYPE_ATTR + : '%ROWTYPE' + ; +NOTFOUND_ATTR + : '%NOTFOUND' + ; +FOUND_ATTR + : '%FOUND' + ; +ISOPEN_ATTR + : '%ISOPEN' + ; +ROWCOUNT_ATTR + : '%ROWCOUNT' + ; +BULK_ROWCOUNT_ATTR + : '%BULK_ROWCOUNT' + ; +CHARSET_ATTR + : '%CHARSET' + ; + Added: branches/tora-trotl/sandbox/SELECT_SIMPLE.tokens =================================================================== --- branches/tora-trotl/sandbox/SELECT_SIMPLE.tokens (rev 0) +++ branches/tora-trotl/sandbox/SELECT_SIMPLE.tokens 2010-05-19 21:30:44 UTC (rev 3527) @@ -0,0 +1,818 @@ +BULK_ROWCOUNT_ATTR=33 +T_FROM=9 +T__93=93 +T__94=94 +RPAREN=19 +T__91=91 +T__92=92 +T_SELECT_COLUMN=8 +T__90=90 +GEQ=42 +EQ=39 +T__99=99 +T__98=98 +DIVIDE=26 +T__97=97 +T__96=96 +T__95=95 +RBRACK=46 +T__80=80 +T__81=81 +T__82=82 +T__83=83 +N=56 +T__85=85 +T__84=84 +T__87=87 +T__86=86 +PERCENTAGE=51 +T__89=89 +T__88=88 +T__71=71 +T__72=72 +T__70=70 +T_WHERE=11 +SL_COMMENT=59 +T_SELECT=6 +T__76=76 +T__75=75 +T__74=74 +T__73=73 +T__79=79 +T__78=78 +T__77=77 +LBRACK=45 +POINT=49 +TYPE_ATTR=61 +PLUS=23 +NOTFOUND_ATTR=30 +MINUS=24 +SEMI=47 +NOT_EQ=40 +VERTBAR=55 +COLON=48 +ARROW=28 +T__377=377 +T__376=376 +T__375=375 +T__374=374 +T__373=373 +T__372=372 +T__371=371 +T__370=370 +T_SELECTED_TABLE=10 +T__369=369 +DOUBLEDOT=50 +T__367=367 +T__368=368 +QUOTE=57 +T__380=380 +T__386=386 +T__385=385 +T__388=388 +T__387=387 +T__382=382 +T__381=381 +T__384=384 +T__383=383 +T__378=378 +T__379=379 +T__391=391 +T__390=390 +T__395=395 +T__394=394 +T__393=393 +T__392=392 +T__399=399 +T__398=398 +T__397=397 +T__396=396 +T__389=389 +DOUBLEVERTBAR=25 +T_SET_OP=16 +T__200=200 +T__201=201 +T__68=68 +T__332=332 +T__69=69 +T__333=333 +T__66=66 +T__330=330 +T__67=67 +T__331=331 +T__64=64 +T__65=65 +ID=36 +T__329=329 +T__328=328 +T__327=327 +T__326=326 +T__325=325 +T__324=324 +T__323=323 +T__341=341 +T__342=342 +T__343=343 +T__344=344 +T__340=340 +COMMA=20 +QUOTED_STRING=34 +T__339=339 +T__338=338 +ISOPEN_ATTR=31 +T__335=335 +T__334=334 +T__337=337 +T__336=336 +T__350=350 +T__351=351 +T__354=354 +T__355=355 +T__352=352 +T__353=353 +T__348=348 +T__347=347 +T__346=346 +T__345=345 +T__349=349 +T__360=360 +T__361=361 +T__362=362 +T__363=363 +T__364=364 +T__365=365 +T__366=366 +ASSIGN=54 +T__357=357 +T__356=356 +T__359=359 +T__358=358 +CHARSET_ATTR=63 +LEQ=44 +T_RESERVED=4 +T__159=159 +T__158=158 +T__259=259 +T__258=258 +T__257=257 +T__435=435 +T__433=433 +T__434=434 +T__262=262 +T__160=160 +T__263=263 +T__260=260 +T__261=261 +T__266=266 +T__267=267 +T__264=264 +T__265=265 +T__167=167 +T__168=168 +T__165=165 +T__166=166 +T__163=163 +T__300=300 +T__164=164 +T__161=161 +T__162=162 +T_WITH=5 +T__148=148 +T__147=147 +T__149=149 +T__247=247 +T__426=426 +T__246=246 +T__427=427 +T__249=249 +T__428=428 +T__248=248 +T__429=429 +T__422=422 +T__423=423 +T__424=424 +T__425=425 +T__430=430 +T__250=250 +T__251=251 +T__432=432 +T__252=252 +T__431=431 +T__253=253 +T__254=254 +T__255=255 +T__256=256 +T__154=154 +T__155=155 +T__156=156 +T__157=157 +T__150=150 +T__151=151 +T__152=152 +T__153=153 +T__139=139 +T__318=318 +T__138=138 +T__319=319 +T__137=137 +T__316=316 +T__419=419 +T__136=136 +T__317=317 +T__314=314 +T_COLUMN_LIST=7 +T__315=315 +T__312=312 +T__313=313 +T__413=413 +T__414=414 +T__411=411 +T__412=412 +T__417=417 +T__418=418 +T__415=415 +NUMBER=35 +T__279=279 +T__416=416 +T__288=288 +T__289=289 +AT_SIGN=38 +T__286=286 +T__287=287 +T__284=284 +T__421=421 +T__285=285 +T__420=420 +T__282=282 +T__283=283 +T__141=141 +T__280=280 +T__322=322 +T__142=142 +T__281=281 +T__321=321 +T__320=320 +T__140=140 +T__145=145 +T__146=146 +T__143=143 +T__144=144 +T__126=126 +T__305=305 +T__408=408 +T__125=125 +T__306=306 +T__409=409 +T__128=128 +T__307=307 +T__127=127 +T__308=308 +WS=58 +T__301=301 +T__129=129 +T__302=302 +T__303=303 +T__304=304 +T__400=400 +T__401=401 +T__402=402 +T__403=403 +T__269=269 +T__309=309 +T__404=404 +T__268=268 +T__405=405 +T__406=406 +T__407=407 +T__275=275 +T__276=276 +T__277=277 +T__278=278 +T__271=271 +T__272=272 +T__273=273 +T__410=410 +T__274=274 +T__130=130 +T__311=311 +T__131=131 +T__270=270 +T__310=310 +T__132=132 +T__133=133 +ROWTYPE_ATTR=62 +T__134=134 +T__135=135 +T__215=215 +T__216=216 +T__213=213 +T__214=214 +T__219=219 +T__217=217 +T__218=218 +T__118=118 +T__119=119 +T__116=116 +T__117=117 +T__114=114 +T__115=115 +T__124=124 +LLABEL=52 +T__123=123 +T__122=122 +T__121=121 +T__120=120 +T__223=223 +ASTERISK=21 +LPAREN=18 +T__222=222 +T__221=221 +RLABEL=53 +T__220=220 +T__202=202 +T__203=203 +T__204=204 +T__205=205 +T__206=206 +T__207=207 +T__208=208 +T__209=209 +T__107=107 +T__108=108 +T__109=109 +T__103=103 +T__104=104 +T__105=105 +T__106=106 +T__111=111 +T__110=110 +T__113=113 +T__112=112 +T__210=210 +T_GROUP_BY=13 +T__212=212 +T__211=211 +T__239=239 +T__237=237 +T__238=238 +T__235=235 +T__236=236 +T__102=102 +T__101=101 +T__100=100 +T__245=245 +T__244=244 +T__243=243 +T__242=242 +T__241=241 +T__240=240 +T__228=228 +T__229=229 +T__224=224 +T__225=225 +T__226=226 +T__227=227 +T__232=232 +T__231=231 +T__234=234 +T__233=233 +T__230=230 +EXPONENT=27 +FOUND_ATTR=29 +ROWCOUNT_ATTR=32 +T_ORDER_BY_CLAUSE=17 +T_MODEL=15 +T_HIERARCHICAL=12 +T_HAVING=14 +GTH=41 +ML_COMMENT=60 +T__199=199 +T__198=198 +T__197=197 +T__292=292 +T__196=196 +T__291=291 +T__195=195 +T__290=290 +T__194=194 +T__193=193 +T__296=296 +T__192=192 +T__295=295 +T__191=191 +T__294=294 +T__190=190 +T__293=293 +T__299=299 +T__298=298 +T__297=297 +DOT=22 +T__184=184 +T__183=183 +T__186=186 +T__185=185 +T__188=188 +T__187=187 +T__189=189 +DOUBLEQUOTED_STRING=37 +T__180=180 +T__182=182 +T__181=181 +LTH=43 +T__175=175 +T__174=174 +T__173=173 +T__172=172 +T__179=179 +T__178=178 +T__177=177 +T__176=176 +T__171=171 +T__170=170 +T__169=169 +'PUBLIC'=246 +'STATEMENT'=414 +'UNDER'=429 +'CURSOR'=303 +'FETCH'=325 +'with'=5 +'SQLBUF'=257 +'FORTRAN'=329 +'group_by'=13 +'OFFLINE'=241 +'VARIANCE'=185 +'EXTENT'=323 +'AVG'=150 +'PERCENTILE_CONT'=165 +'FULL'=74 +'ADMIN'=275 +'CLOSE'=294 +'NUMERIC'=372 +'ASC'=145 +'TYPE'=105 +'SELECT'=252 +'INT'=341 +'MANAGE'=348 +'LIKE'=108 +'THREAD'=423 +'FLOAT'=217 +'COMMIT'=296 +'ROW'=191 +'ACCESS'=194 +'MAXVALUE'=356 +'STDDEV_POP'=180 +'ROLE'=398 +'INCLUDING'=337 +'PRIMARY'=385 +'THE'=79 +'NULLS'=147 +'INSTANCE'=340 +'NOMINVALUE'=366 +'START'=80 +'RIGHT'=76 +'EQUALS_PATH'=117 +'EXCEPTIONS'=319 +'CONTENTS'=300 +'LIKEC'=109 +'REGR_SXX'=175 +'NOCYCLE'=83 +'ARCHIVELOG'=280 +'CREATE'=207 +'NEW'=361 +'PRIVILEGES'=245 +'SETS'=88 +'LEFT'=75 +'GROUPS'=336 +'ANALYZE'=278 +'VARCHAR'=269 +'VARCHAR2'=270 +'MANUAL'=349 +'TO'=141 +'PARTITION'=72 +'UPSERT'=134 +'RESETLOGS'=395 +'having'=14 +'LAG'=158 +'UNTIL'=139 +'ARRAYLEN'=197 +'CONTROLFILE'=302 +'RESTRICTED'=396 +'REFERENCES'=393 +'hierarchical'=12 +'NORMAL'=370 +'ADD'=195 +'PRESENT'=107 +'CHAR'=201 +'PERCENTILE_DISC'=166 +'CHARACTER'=292 +'FREELIST'=331 +'UNLIMITED'=430 +'MAX'=161 +'DEC'=308 +'CASE'=200 +'VAR_SAMP'=184 +'NOORDER'=368 +'TRUE'=263 +'ROLES'=399 +'ROWLABEL'=251 +'CONTINUE'=301 +'FORCE'=327 +'reserved'=4 +'END'=316 +'COMPRESS'=206 +'RECEEDING'=192 +'PLAN'=382 +'ARCHIVE'=279 +'column_list'=7 +'SQLERROR'=412 +'SUBMULTISET'=116 +'DISABLE'=310 +'FUNCTION'=333 +'ONLY'=106 +'UPDATE'=133 +'REGR_INTERCEPT'=170 +'EMPTY'=103 +'INTO'=228 +'BODY'=287 +'SESSION'=253 +'VALUES'=268 +'HAVING'=220 +'REGEXP_LIKE'=115 +'REFERENCING'=394 +'TEMPORARY'=422 +'select_column'=8 +'NOT'=91 +'REGR_AVGY'=174 +'RETURN'=127 +'SAVEPOINT'=401 +'LAYER'=344 +'ROW_NUMBER'=178 +'REGR_SLOPE'=169 +'NOWAIT'=239 +'ITERATE'=138 +'set_op'=16 +'DECREMENT'=143 +'RANGE'=193 +'REGR_COUNT'=171 +'EXEC'=320 +'STATEMENT_ID'=435 +'REGR_AVGX'=173 +'BLOCK'=286 +'CONSTRAINTS'=299 +'RAW'=247 +'SYNONYM'=259 +'MAXINSTANCES'=351 +'WORK'=433 +'REGR_SXY'=177 +'WHERE'=273 +'SWITCH'=418 +'GROUP'=84 +'MAXDATAFILES'=350 +'IDENTIFIED'=221 +'WITH'=81 +'REAL'=391 +'WHEN'=432 +'PLI'=383 +'NUMBER'=240 +'ALTER'=196 +'NTILE'=163 +'MEMBER'=113 +'ROWNUM'=65 +'IMMEDIATE'=222 +'PARALLEL'=379 +'DECLARE'=309 +'TRACING'=425 +'LINK'=345 +'MINVALUE'=358 +'ALLOCATE'=277 +'OPTIMAL'=376 +'THEN'=261 +'INTERSECT'=227 +'LISTS'=346 +'COUNT'=154 +'BECOME'=283 +'MODE'=234 +'NAN'=94 +'INITRANS'=339 +'ROWID'=64 +'BACKUP'=282 +'IGNORE'=120 +'DESC'=146 +'TABLE'=78 +'OPEN'=375 +'AUTOMATIC'=135 +'OWN'=377 +'SUCCESSFUL'=258 +'SYSTEM'=419 +'RENAME'=248 +'NOTFOUND'=238 +'ENABLE'=315 +'STATISTICS'=415 +'COMMENT'=205 +'EXTERNALLY'=324 +'WHENEVER'=272 +'SEQUENTIAL'=136 +'ALL'=100 +'OF'=104 +'t_order_by'=17 +'EVENTS'=317 +'DATABASE'=305 +'AFTER'=276 +'MIN'=162 +'KEY'=342 +'CLUSTER'=203 +'LEVEL'=229 +'CONNECT'=82 +'SECTION'=404 +'LAST'=149 +'OFF'=373 +'CHANGE'=291 +'WRITE'=434 +'INDICATOR'=338 +'MAXEXTENTS'=232 +'MAXLOGFILES'=352 +'EXCLUSIVE'=214 +'PRIVATE'=386 +'INCREMENT'=142 +'USER'=266 +'MAXTRANS'=355 +'RANK'=167 +'GRANT'=219 +'PACKAGE'=378 +'SEGMENT'=405 +'MAXLOGMEMBERS'=354 +'SOME'=99 +'EACH'=314 +'SHARED'=407 +'EXISTS'=92 +'SNAPSHOT'=408 +'AUDIT'=199 +'NAV'=122 +'DENSE_RANK'=156 +'UNDER_PATH'=118 +'FOUND'=330 +'NEXT'=362 +'PCTFREE'=244 +'OLD'=374 +'CANCEL'=289 +'SUM'=182 +'LONG'=231 +'ORDER'=137 +'PERCENT_RANK'=164 +'SIBLINGS'=144 +'ROLLBACK'=400 +'TRUNCATE'=428 +'MINUS'=233 +'COVAR_SAMP'=153 +'BEFORE'=284 +'CYCLE'=304 +'FLUSH'=326 +'LEAD'=160 +'BEGIN'=285 +'where'=11 +'PROFILE'=388 +'DOUBLE'=312 +'ON'=68 +'ROWS'=129 +'OPTION'=243 +'REGR_SYY'=176 +'SMALLINT'=256 +'MODIFY'=235 +'REGR_R2'=172 +'COVAR_POP'=152 +'NULL'=96 +'PROCEDURE'=387 +'NATURAL'=71 +'FALSE'=215 +'JOIN'=67 +'UNBOUNDED'=188 +'DATE'=208 +'MINEXTENTS'=357 +'RECOVER'=392 +'FOREIGN'=328 +'TIME'=424 +'READ'=390 +'t_model'=15 +'BY'=73 +'DIMENSION'=124 +'COBOL'=295 +'FROM'=218 +'DROP'=212 +'TABLESPACE'=421 +'PCTUSED'=381 +'OUTER'=77 +'DISMOUNT'=311 +'GOTO'=335 +'MOUNT'=360 +'SORT'=409 +'SQLCODE'=411 +'SHARE'=254 +'CASCADE'=290 +'NOAUDIT'=236 +'LIKE4'=111 +'INNER'=66 +'CURRENT'=190 +'CORR'=151 +'CACHE'=288 +'BETWEEN'=114 +'RATIO_TO_REPORT'=168 +'FREELISTS'=332 +'GO'=334 +'STDDEV'=179 +'A'=274 +'DBA'=307 +'t_select'=6 +'COMPILE'=297 +'DISTINCT'=186 +'INDEX'=223 +'UNION'=265 +'LIKE2'=110 +'VAR_POP'=183 +'UNIQUE'=123 +'UPDATED'=128 +'LANGUAGE'=343 +'SYSDATE'=260 +'MODULE'=359 +'REVOKE'=250 +'TRANSACTION'=426 +'EXPLAIN'=322 +'SINGLE'=125 +'VALIDATE'=267 +'FILE'=216 +'SIZE'=255 +'OR'=89 +'LAST_VALUE'=159 +'GROUPING'=87 +'INITIAL'=224 +'TABLES'=420 +'VIEW'=271 +'NORESETLOGS'=369 +'CUBE'=86 +'INTEGER'=226 +'ESCAPE'=112 +'TRIGGER'=262 +'QUOTA'=389 +'ANY'=98 +'PRECISION'=384 +'IS'=93 +'REUSE'=397 +'NOCACHE'=364 +'INFINITE'=95 +'NOSORT'=371 +'DECIMAL'=209 +'SET'=102 +'selected_table'=10 +'STOP'=416 +'EXECUTE'=321 +'ELSE'=213 +'AS'=198 +'MODEL'=119 +'PRECEEDING'=189 +'CONSTRAINT'=298 +'AUTHORIZATION'=281 +'NONE'=367 +'PCTINCREASE'=380 +'TRIGGERS'=427 +'ONLINE'=242 +'SQL'=410 +'SEQUENCE'=406 +'OVER'=187 +'SCN'=403 +'COLUMN'=204 +'SCHEMA'=402 +'USING'=69 +'CHECKPOINT'=293 +'DUMP'=313 +'FOR'=140 +'DEFAULT'=210 +'FIRST'=148 +'RESOURCE'=249 +'EXCEPT'=318 +'DATAFILE'=306 +'FIRST_VALUE'=157 +'CROSS'=70 +'MAIN'=130 +'MAXLOGHISTORY'=353 +'ROLLUP'=85 +'PRIOR'=97 +'CHECK'=202 +'INSERT'=225 +'NOARCHIVELOG'=363 +'USE'=431 +'STORAGE'=417 +'REFERENCE'=126 +'AND'=90 +'LOCK'=230 +'RULES'=132 +'UID'=264 +'KEEP'=121 +'IN'=101 +'MEASURES'=131 +'STDDEV_SAMP'=181 +'LOGFILE'=347 +'SQLSTATE'=413 +'DELETE'=211 +'NOCOMPRESS'=237 +'CUME_DIST'=155 +'NOMAXVALUE'=365 +'from'=9 Added: branches/tora-trotl/sandbox/input =================================================================== --- branches/tora-trotl/sandbox/input (rev 0) +++ branches/tora-trotl/sandbox/input 2010-05-19 21:30:44 UTC (rev 3527) @@ -0,0 +1,28 @@ +WITH +X1 AS (SELECT MAX(Y1) FROM KLM1), +X2 AS (SELECT MAX(Y2) FROM KLM2), +X3 AS (SELECT MAX(Y3) FROM KLM3), +X4 AS (SELECT MAX(Y4) FROM KLM4) +SELECT + DISTINCT + -1, + +1, + A + B * (A * D) AS, + T1.REGION_NAME, + T2.DIVISION_NAME, + T1.REGION_NAME AS A, + T2.DIVISION_NAME AS, + *, + A.*, + SUM(T3.AMOUNT), + SUM(COUNT(1)) + COUNT(*) + , SUM(1) + (SELECT COUNT(1) FROM DDD) A +FROM DUAL, FFF +WHERE A IS NULL +OR B IS NOT NULL +AND ( A LIKE 'D') +AND 1 = 0 +AND A.B.C IS A SET +UNION +SELECT A FROM DUAL + Added: branches/tora-trotl/sandbox/input.model.1.test =================================================================== --- branches/tora-trotl/sandbox/input.model.1.test (rev 0) +++ branches/tora-trotl/sandbox/input.model.1.test 2010-05-19 21:30:44 UTC (rev 3527) @@ -0,0 +1,16 @@ +SELECT COUNTRY,PROD,YEAR,S +FROM SALES_VIEW_REF +MODEL +PARTITION BY (COUNTRY) +DIMENSION BY (PROD, YEAR) +MEASURES (SALE S) +IGNORE NAV +-- cell_reference_options +UNIQUE DIMENSION +-- here starts model_rules_clause +RULES UPSERT SEQUENTIAL ORDER +( +S[PROD='Mouse Pad', YEAR=2001] = S['Mouse Pad', 1999] + S['Mouse Pad', 2000], +S['Standard Mouse', 2002] = S['Standard Mouse', 2001] +) +ORDER BY COUNTRY, PROD, YEAR Added: branches/tora-trotl/sandbox/main.c =================================================================== --- branches/tora-trotl/sandbox/main.c (rev 0) +++ branches/tora-trotl/sandbox/main.c 2010-05-19 21:30:44 UTC (rev 3527) @@ -0,0 +1,308 @@ +// Example of a grammar for a trivial tree parser. +// Adapted from Java equivalent example, by Terence Parr +// Author: Jim Idle - April 2007 +// Permission is granted to use this example code in any way you want, so long as +// all the original authors are cited. +// + +// set ts=4,sw=4 +// Tab size is 4 chars, indent is 4 chars + +// Notes: Although all the examples provided are configured to be built +// by Visual Studio 2005, based on the custom build rules +// provided in $(ANTLRSRC)/code/antlr/main/runtime/C/vs2005/rulefiles/antlr3.rules +// there is no reason that this MUST be the case. Provided that you know how +// to run the antlr tool, then just compile the resulting .c files and this +// file together, using say gcc or whatever: gcc *.c -I. -o XXX +// The C code is generic and will compile and run on all platforms (please +// report any warnings or errors to the antlr-interest newsgroup (see www.antlr.org) +// so that they may be corrected for any platform that I have not specifically tested. +// +// The project settings such as additional library paths and include paths have been set +// relative to the place where this source code sits on the ANTLR perforce system. You +// may well need to change the settings to locate the includes and the lib files. UNIX +// people need -L path/to/antlr/libs -lantlr3c (release mode) or -lantlr3cd (debug) +// +// Jim Idle (jimi cut-this at idle ws) +// + +// You may adopt your own practices by all means, but in general it is best +// to create a single include for your project, that will include the ANTLR3 C +// runtime header files, the generated header files (all of which are safe to include +// multiple times) and your own project related header files. Use <> to include and +// -I on the compile line (which vs2005 now handles, where vs2003 did not). +// +#include "SELECT_SIMPLELexer.h" +#include "SELECT_SIMPLEParser.h" + +// Main entry point for this example +// +int ANTLR3_CDECL +main (int argc, char *argv[]) +{ + // Now we declare the ANTLR related local variables we need. + // Note that unless you are convinced you will never need thread safe + // versions for your project, then you should always create such things + // as instance variables for each invocation. + // ------------------- + + // Name of the input file. Note that we always use the abstract type pANTLR3_UINT8 + // for ASCII/8 bit strings - the runtime library guarantees that this will be + // good on all platforms. This is a general rule - always use the ANTLR3 supplied + // typedefs for pointers/types/etc. + // + pANTLR3_UINT8 fName; + + // The ANTLR3 character input stream, which abstracts the input source such that + // it is easy to provide input from different sources such as files, or + // memory strings. + // + // For an ASCII/latin-1 memory string use: + // input = antlr3NewAsciiStringInPlaceStream (stringtouse, (ANTLR3_UINT64) length, NULL); + // + // For a UCS2 (16 bit) memory string use: + // input = antlr3NewUCS2StringInPlaceStream (stringtouse, (ANTLR3_UINT64) length, NULL); + // + // For input from a file, see code below + // + // Note that this is essentially a pointer to a structure containing pointers to functions. + // You can create your own input stream type (copy one of the existing ones) and override any + // individual function by installing your own pointer after you have created the standard + // version. + // + pANTLR3_INPUT_STREAM input; + + // The lexer is of course generated by ANTLR, and so the lexer type is not upper case. + // The lexer is supplied with a pANTLR3_INPUT_STREAM from whence it consumes its + // input and generates a token stream as output. + // + pSELECT_SIMPLELexer lxr; + + // The token stream is produced by the ANTLR3 generated lexer. Again it is a structure based + // API/Object, which you can customise and override methods of as you wish. a Token stream is + // supplied to the generated parser, and you can write your own token stream and pass this in + // if you wish. + // + pANTLR3_COMMON_TOKEN_STREAM tstream; + + // The Lang parser is also generated by ANTLR and accepts a token stream as explained + // above. The token stream can be any source in fact, so long as it implements the + // ANTLR3_TOKEN_SOURCE interface. In this case the parser does not return anything + // but it can of course specify any kind of return type from the rule you invoke + // when calling it. + // + pSELECT_SIMPLEParser psr; + + // The parser produces an AST, which is returned as... [truncated message content] |
From: <ibr...@us...> - 2010-05-20 07:39:26
|
Revision: 3529 http://tora.svn.sourceforge.net/tora/?rev=3529&view=rev Author: ibre5041 Date: 2010-05-20 07:39:17 +0000 (Thu, 20 May 2010) Log Message: ----------- sync with tora trunk Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/ChangeLog branches/tora-trotl/README.RELEASE branches/tora-trotl/configure.ac branches/tora-trotl/debian/control branches/tora-trotl/debian/rules branches/tora-trotl/debian/tora.install branches/tora-trotl/doc/help/alert.html branches/tora-trotl/doc/help/alert.texi branches/tora-trotl/doc/help/analyze.html branches/tora-trotl/doc/help/analyze.texi branches/tora-trotl/doc/help/browser.html branches/tora-trotl/doc/help/browser.texi branches/tora-trotl/doc/help/database.html branches/tora-trotl/doc/help/database.texi branches/tora-trotl/doc/help/globalsettings.html branches/tora-trotl/doc/help/images/mysql.png branches/tora-trotl/doc/help/invalid.html branches/tora-trotl/doc/help/invalid.texi branches/tora-trotl/doc/help/preferences.texi branches/tora-trotl/doc/help/sqledit.html branches/tora-trotl/doc/help/sqledit.texi branches/tora-trotl/osx_tools/dmg/tora.dmgCanvas branches/tora-trotl/rpm/tora.spec.in branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/Makefile.am branches/tora-trotl/src/i18n/tora_fr.ts branches/tora-trotl/src/i18n/tora_it.ts branches/tora-trotl/src/i18n/tora_se.ts branches/tora-trotl/src/loki/include/loki/CachedFactory.h branches/tora-trotl/src/templates/sqlfunctions.tpl branches/tora-trotl/src/tobrowser.cpp branches/tora-trotl/src/tobrowserbasewidget.cpp branches/tora-trotl/src/tobrowserbasewidget.h branches/tora-trotl/src/tobrowsercodewidget.cpp branches/tora-trotl/src/tobrowserindexwidget.cpp branches/tora-trotl/src/tocodemodel.cpp branches/tora-trotl/src/toconf.h branches/tora-trotl/src/toconfiguration.cpp branches/tora-trotl/src/toconfiguration.h branches/tora-trotl/src/toconnection.cpp branches/tora-trotl/src/toconnection.h branches/tora-trotl/src/todatabasesettingui.ui branches/tora-trotl/src/todebug.cpp branches/tora-trotl/src/todebug.h branches/tora-trotl/src/tohighlightedtext.cpp branches/tora-trotl/src/tohtml.cpp branches/tora-trotl/src/tomain.cpp branches/tora-trotl/src/tomain.h branches/tora-trotl/src/tomarkedtext.cpp branches/tora-trotl/src/tomarkedtext.h branches/tora-trotl/src/tomemoeditor.cpp branches/tora-trotl/src/tomodeleditor.cpp branches/tora-trotl/src/tonewconnection.cpp branches/tora-trotl/src/tonewconnection.h branches/tora-trotl/src/tonewconnectionui.ui branches/tora-trotl/src/toplsqleditor.cpp branches/tora-trotl/src/toplsqleditor.h branches/tora-trotl/src/toplsqltext.cpp branches/tora-trotl/src/toqsqlconnection.cpp branches/tora-trotl/src/tora.qrc branches/tora-trotl/src/toresultfield.cpp branches/tora-trotl/src/toresultfield.h branches/tora-trotl/src/toresultschema.cpp branches/tora-trotl/src/toresultstorage.cpp branches/tora-trotl/src/toresulttableviewedit.h branches/tora-trotl/src/tosql.h branches/tora-trotl/src/tosqlparse.cpp branches/tora-trotl/src/tosqlparse.h branches/tora-trotl/src/tosqlparsetest.cpp branches/tora-trotl/src/tothread.cpp branches/tora-trotl/src/toworksheet.cpp branches/tora-trotl/src/toworksheet.h branches/tora-trotl/src/ts_log/decorator.h branches/tora-trotl/src/utils.cpp branches/tora-trotl/src/utils.h branches/tora-trotl/src/windows/installer/tora.nsi Added Paths: ----------- branches/tora-trotl/src/icons/xmlwrap.png Removed Paths: ------------- branches/tora-trotl/debian/README.source branches/tora-trotl/debian/patches/00list branches/tora-trotl/debian/patches/03_README.LAYOUT.dpatch Property Changed: ---------------- branches/tora-trotl/ branches/tora-trotl/debian/changelog Property changes on: branches/tora-trotl ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/tora:3191-3471 + /trunk/tora:3191-3523 Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/CMakeLists.txt 2010-05-20 07:39:17 UTC (rev 3529) @@ -50,7 +50,7 @@ #where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level) SET (VERSION_MAJOR "2") SET (VERSION_MINOR "1") -SET (VERSION_PATCH "2") +SET (VERSION_PATCH "3") SET (VERSION_SUFFIX "") SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") @@ -330,20 +330,24 @@ ENDIF (NOT WANT_BUNDLE) +# packaging related stuff +#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") +# SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) +string(TOLOWER ${CMAKE_PROJECT_NAME} CPACK_PACKAGE_NAME) +#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") +#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") +SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") +SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2") +#SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt;refresh-copyright-and-license.pl") +SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) +INCLUDE(CPack) +# simulate autotools' "make dist" +add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) + + IF (WANT_RPM) - # packaging related stuff - #SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") - SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) - #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") - #SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") - SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") - SET(CPACK_SOURCE_GENERATOR "TGZ") - #SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") - SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") - SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt") - SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) - INCLUDE(CPack) - # Check for SVN FIND_PACKAGE(Subversion) IF(NOT Subversion_FOUND) Modified: branches/tora-trotl/ChangeLog =================================================================== --- branches/tora-trotl/ChangeLog 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/ChangeLog 2010-05-20 07:39:17 UTC (rev 3529) @@ -1,21 +1,27 @@ tora (2.1.2-1) unstable; urgency=low - * Improved: Add editor option for uppler/lowercase object names - * Improved: Db extract/compare tool now remembers widgets states - * New: Filesystem completer for target line edit - * Improved: Compatibility with sql+ - * New: Color/pixmap identifier for connection - * Improved: Schema browser improvements - * New: Ability to add external static check - * New: Save package specification and body to one file - * New: Initial support for creating/modifying tables - * Bugfixes + * Added debug package. (Closes: #560064) + * New Upstream version 2.1.2 + * Improved: Add editor option for uppler/lowercase object names + * Improved: Db extract/compare tool now remembers widgets states + * New: Filesystem completer for target line edit + * Improved: Compatibility with sql+ + * New: Color/pixmap identifier for connection + * Improved: Schema browser improvements + * New: Ability to add external static check + * New: Save package specification and body to one file + * New: Initial support for creating/modifying tables + * Bugfixes + * Bumped Standards-Version to 3.8.4, no changes needed. + * No patches needed anymore, removed patch system. + -- Michael Meskes <me...@de...> Tue, 30 Mar 2010 13:14:16 +0200 + tora (2.1.1-1) unstable; urgency=low - * New upstream version + * New upstream version. - -- Nathan Neulinger <nn...@ne...> Tue, 13 Oct 2009 13:44:40 -0600 + -- Michael Meskes <me...@de...> Thu, 19 Nov 2009 15:18:19 +0100 tora (2.1.0-1) unstable; urgency=low Modified: branches/tora-trotl/README.RELEASE =================================================================== --- branches/tora-trotl/README.RELEASE 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/README.RELEASE 2010-05-20 07:39:17 UTC (rev 3529) @@ -9,18 +9,26 @@ Edit the NEWS file to set a release date Commit, and then copy trunk to an appropriately named tag, such as: -svn copy -m "tag before starting 2.1.0 release process" https://tora.svn.sourceforge.net/svnroot/tora/trunk/tora https://tora.svn.sourceforge.net/svnroot/tora/tags/tora-2-1-0 +VER=2.1.0 +USR=nneul +svn copy -m "tag before starting $VER release process" https://tora.svn.sourceforge.net/svnroot/tora/trunk/tora https://tora.svn.sourceforge.net/svnroot/tora/tags/tora-$VER + configure make dist -sftp nneul,to...@fr... -cd /home/pfs/project/t/to/tora/tora/2.1.0 -put tora-2.1.0.tar.gz +sftp $USR,to...@fr... +cd /home/pfs/project/t/to/tora/tora +mkdir $VER +chmod 775 $VER +cd /home/pfs/project/t/to/tora/tora/$VER +put tora-$VER.tar.gz -scp tora-2.1.0.tar.gz nneul,to...@fr...:/home/frs/project/t/to/tora/tora/2.1.0/ +or +scp tora-$VER.tar.gz $USR,to...@fr...:/home/frs/project/t/to/tora/tora/$VER/ + add new release to the 'tora' package RPM binaries: Modified: branches/tora-trotl/configure.ac =================================================================== --- branches/tora-trotl/configure.ac 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/configure.ac 2010-05-20 07:39:17 UTC (rev 3529) @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([tora],[2.1.2],[tor...@li...]) +AC_INIT([tora],[2.1.3],[tor...@li...]) AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(config) # Every other copy of the package version number gets its value from here @@ -39,6 +39,8 @@ AC_FUNC_CLOSEDIR_VOID AC_TYPE_SIZE_T +AC_DEFINE(SCI_LEXER, 1, [Always defined in CMake build.]) + AC_VALIDIFY_CXXFLAGS TORA_DEBUG TORA_CHECK_MONO Deleted: branches/tora-trotl/debian/README.source =================================================================== --- branches/tora-trotl/debian/README.source 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/debian/README.source 2010-05-20 07:39:17 UTC (rev 3529) @@ -1,57 +0,0 @@ -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -To configure quilt to use debian/patches instead of patches, you want -either to export QUILT_PATCHES=debian/patches in your environment -or use this snippet in your ~/.quiltrc: - - for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do - if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then - export QUILT_PATCHES=debian/patches - fi - done - -To get the fully patched source after unpacking the source package, cd to -the root level of the source package and run: - - quilt push -a - -The last patch listed in debian/patches/series will become the current -patch. - -To add a new set of changes, first run quilt push -a, and then run: - - quilt new <patch> - -where <patch> is a descriptive name for the patch, used as the filename in -debian/patches. Then, for every file that will be modified by this patch, -run: - - quilt add <file> - -before editing those files. You must tell quilt with quilt add what files -will be part of the patch before making changes or quilt will not work -properly. After editing the files, run: - - quilt refresh - -to save the results as a patch. - -Alternately, if you already have an external patch and you just want to -add it to the build system, run quilt push -a and then: - - quilt import -P <patch> /path/to/patch - quilt push -a - -(add -p 0 to quilt import if needed). <patch> as above is the filename to -use in debian/patches. The last quilt push -a will apply the patch to -make sure it works properly. - -To remove an existing patch from the list of patches that will be applied, -run: - - quilt delete <patch> - -You may need to run quilt pop -a to unapply patches first before running -this command. Property changes on: branches/tora-trotl/debian/changelog ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/tora/debian/changelog:159-2137 + /branches/tora-1.4/tora/debian/changelog:2138-2496 /trunk/tora/debian/changelog:5-2137,3472-3523 Modified: branches/tora-trotl/debian/control =================================================================== --- branches/tora-trotl/debian/control 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/debian/control 2010-05-20 07:39:17 UTC (rev 3529) @@ -3,8 +3,8 @@ Priority: optional Maintainer: Debian KDE Extras Team <pkg...@li...> Uploaders: Michael Meskes <me...@de...> -Build-Depends: debhelper (>= 5), kdelibs5-dev, kdebase-bin, dpatch, libqscintilla2-dev, cdbs, libpq-dev -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 5), libqscintilla2-dev, cdbs, libpq-dev, cmake +Standards-Version: 3.8.4 Homepage: http://www.torasql.com Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/tora.git Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/tora.git @@ -17,3 +17,15 @@ storage manager, rollback segment monitor, instance manager, and SQL output viewer. Via qt4 it can access PostgreSQL and MySQL directly. Any other database systems can be accessed via ODBC. + +Package: tora-dbg +Section: debug +Architecture: any +Depends: ${misc:Depends}, tora +Description: A graphical toolkit for database developers and administrators - debugging symbols + Tora features a schema browser, SQL worksheet, PL/SQL editor & debugger, + storage manager, rollback segment monitor, instance manager, and SQL output + viewer. Via qt4 it can access PostgreSQL and MySQL directly. Any other + database systems can be accessed via ODBC. + . + This package provides the debugging symbols for tora. Deleted: branches/tora-trotl/debian/patches/00list =================================================================== --- branches/tora-trotl/debian/patches/00list 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/debian/patches/00list 2010-05-20 07:39:17 UTC (rev 3529) @@ -1 +0,0 @@ -03_README.LAYOUT Deleted: branches/tora-trotl/debian/patches/03_README.LAYOUT.dpatch =================================================================== --- branches/tora-trotl/debian/patches/03_README.LAYOUT.dpatch 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/debian/patches/03_README.LAYOUT.dpatch 2010-05-20 07:39:17 UTC (rev 3529) @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_README.LAYOUT.dpatch by Michael Meskes <me...@de...> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No such file README.LAYOUT - -@DPATCH@ - -diff -ruN tora-2.0.0.orig/CMakeLists.txt tora-2.0.0/CMakeLists.txt ---- tora-2.0.0.orig/CMakeLists.txt 2008-11-03 21:32:20.000000000 +0100 -+++ tora-2.0.0/CMakeLists.txt 2009-01-03 21:29:48.000000000 +0100 -@@ -282,7 +282,6 @@ - README.BINARIES - README.CMAKE - README.CODESTYLE -- README.LAYOUT - README.LICENSE - README.OSX - README.RELEASE Modified: branches/tora-trotl/debian/rules =================================================================== --- branches/tora-trotl/debian/rules 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/debian/rules 2010-05-20 07:39:17 UTC (rev 3529) @@ -2,28 +2,18 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/dpatch.mk -DEB_KDE_ENABLE_FINAL := yes +DEB_DBG_PACKAGES := tora-dbg -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb - ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) - cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) - else - cdbs_kde_enable_final = - endif -endif - install/tora:: # remove some file we don't want to install - rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/README.OSX - rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/README.LICENSE - rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/README.WINDOWS - rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/INSTALL - rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/COPYING - rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/ChangeLog - rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/changelog + rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/README.OSX + rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/README.LICENSE + rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/README.WINDOWS + rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/INSTALL + rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/COPYING + rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/ChangeLog + rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/changelog # this file cannot be installed by dh_install because it has to be renamed -install --owner root --group root --mode=644 $(CURDIR)/src/icons/toramini.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/16x16/apps/tora.xpm # we have a desktop file Modified: branches/tora-trotl/debian/tora.install =================================================================== --- branches/tora-trotl/debian/tora.install 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/debian/tora.install 2010-05-20 07:39:17 UTC (rev 3529) @@ -2,3 +2,6 @@ doc/help/images/*.png /usr/share/tora/help/images src/icons/tora.xpm /usr/share/icons/hicolor/32x32/apps + +debian/tmp/usr/share/doc/tora/* /usr/share/doc/tora +debian/tmp/usr/bin/tora /usr/bin Modified: branches/tora-trotl/doc/help/alert.html =================================================================== --- branches/tora-trotl/doc/help/alert.html 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/alert.html 2010-05-20 07:39:17 UTC (rev 3529) @@ -36,7 +36,7 @@ <h3 class="section">4.15 Alert Tool</h3> -<p><a name="index-Alert-Tool-33"></a>This tool is usefull for debugging database packages that send or depend on receiving dbms alerts. +<p><a name="index-Alert-Tool-33"></a>This tool is useful for debugging database packages that send or depend on receiving dbms alerts. <div class="block-image"><img src="images/alert.png" alt="images/alert.png"></div> @@ -53,7 +53,7 @@ <br><dt><strong>Message</strong><dd>Message to send in an alert. Pressing return in this lineedit will send the alert. - <br><dt><strong>Edit message in memo</strong><dd>Edit the message in a memo editor, usefull for sending newlines and longer messages. + <br><dt><strong>Edit message in memo</strong><dd>Edit the message in a memo editor, useful for sending newlines and longer messages. <br><dt><strong>Send alert</strong><dd>Send the currently defined alert. You can also send an alert by pressing return in the message line editor. Modified: branches/tora-trotl/doc/help/alert.texi =================================================================== --- branches/tora-trotl/doc/help/alert.texi 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/alert.texi 2010-05-20 07:39:17 UTC (rev 3529) @@ -1,7 +1,7 @@ @node alert @section Alert Tool @cindex Alert Tool -This tool is usefull for debugging database packages that send or depend on receiving dbms alerts. +This tool is useful for debugging database packages that send or depend on receiving dbms alerts. @image{images/alert,13cm} @@ -24,7 +24,7 @@ Message to send in an alert. Pressing return in this lineedit will send the alert. @item @strong{Edit message in memo} -Edit the message in a memo editor, usefull for sending newlines and longer messages. +Edit the message in a memo editor, useful for sending newlines and longer messages. @item @strong{Send alert} Send the currently defined alert. You can also send an alert by pressing return in the message line editor. Modified: branches/tora-trotl/doc/help/analyze.html =================================================================== --- branches/tora-trotl/doc/help/analyze.html 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/analyze.html 2010-05-20 07:39:17 UTC (rev 3529) @@ -37,7 +37,7 @@ <h3 class="section">4.14 Statistics manager</h3> <p><a name="index-Statistics-manager-32"></a> -This tool is usefull for collecting statistics and analysing tables in parallel. You can also use it to browse collected statistics. +This tool is useful for collecting statistics and analysing tables in parallel. You can also use it to browse collected statistics. <div class="block-image"><img src="images/analyze.png" alt="images/analyze.png"></div> Modified: branches/tora-trotl/doc/help/analyze.texi =================================================================== --- branches/tora-trotl/doc/help/analyze.texi 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/analyze.texi 2010-05-20 07:39:17 UTC (rev 3529) @@ -2,7 +2,7 @@ @section Statistics manager @cindex Statistics manager -This tool is usefull for collecting statistics and analysing tables in parallel. You can also use it to browse collected statistics. +This tool is useful for collecting statistics and analysing tables in parallel. You can also use it to browse collected statistics. @image{images/analyze,15cm} Modified: branches/tora-trotl/doc/help/browser.html =================================================================== --- branches/tora-trotl/doc/help/browser.html 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/browser.html 2010-05-20 07:39:17 UTC (rev 3529) @@ -249,7 +249,7 @@ <br><dt><strong>Go to last row</strong><dd>Go to the last record in the editor. Observe that this will read in all available records in the table into memory. - <br><dt><strong>Toggle between table or single record editing</strong><dd>Swith between editing data as a table or single record (the later one could be usefull for table with a lot of columns). + <br><dt><strong>Toggle between table or single record editing</strong><dd>Swith between editing data as a table or single record (the later one could be useful for table with a lot of columns). </dl> Modified: branches/tora-trotl/doc/help/browser.texi =================================================================== --- branches/tora-trotl/doc/help/browser.texi 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/browser.texi 2010-05-20 07:39:17 UTC (rev 3529) @@ -279,7 +279,7 @@ Go to the last record in the editor. Observe that this will read in all available records in the table into memory. @item @strong{Toggle between table or single record editing} -Swith between editing data as a table or single record (the later one could be usefull for table with a lot of columns). +Swith between editing data as a table or single record (the later one could be useful for table with a lot of columns). @end table Modified: branches/tora-trotl/doc/help/database.html =================================================================== --- branches/tora-trotl/doc/help/database.html 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/database.html 2010-05-20 07:39:17 UTC (rev 3529) @@ -99,6 +99,20 @@ <dl> <dt><strong>Possibility to break MySql queries</strong><dd> TODO. +<br><dt><strong>When calling create routine statement in worksheet</strong><dd> MySQL routine creation does not support "create or replace" therefore if you try to create new routine and it + already exists you will get an exception. This option controls if TOra should try to avoid such exceptions in + one of supported ways: + <ul> + <li><strong>Do nothing</strong> - do not try to detect and avoid exception when creating routines. + <li><strong>Drop before creating</strong> - execute "drop <procedure|function> if exists <name>" before calling create statement. + <li><strong>Drop before creating (if exists)</strong> - check routines table if routine already exists. If so - execute drop statement. + <li><strong>Ask</strong> - ask user if TOra should try dropping a routine before creating it (without checking if it already exists). + <li><strong>Ask (if exists)</strong> - check routines table if routine already exists. If so - ask user if drop + statement should be called (without it creating procedure will fail, but it could be usefull if you didn't know + that routine with given name exists already and now you would like to skip creation and probably change the name + of routine). + </ul> + <strong>Note!</strong> - if routine creation statement fails you will be left without <strong>any</strong> version of routine in the database! </dl> </body></html> Modified: branches/tora-trotl/doc/help/database.texi =================================================================== --- branches/tora-trotl/doc/help/database.texi 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/database.texi 2010-05-20 07:39:17 UTC (rev 3529) @@ -80,4 +80,19 @@ @table @asis @item @strong{Possibility to break MySql queries} TODO. +@item @strong{When calling create routine statement in worksheet} + MySQL routine creation does not support "create or replace" therefore if you try to create new routine and it + already exists you will get an exception. This option controls if TOra should try to avoid such exceptions in + one of supported ways: + @itemize @bullet + @item @strong{Do nothing} - do not try to detect and avoid exception when creating routines. + @item @strong{Drop before creating} - execute "drop <procedure|function> if exists <name>" before calling create statement. + @item @strong{Drop before creating (if exists)} - check routines table if routine already exists. If so - execute drop statement. + @item @strong{Ask} - ask user if TOra should try dropping a routine before creating it (without checking if it already exists). + @item @strong{Ask (if exists)} - check routines table if routine already exists. If so - ask user if drop + statement should be called (without it creating procedure will fail, but it could be usefull if you didn't know + that routine with given name exists already and now you would like to skip creation and probably change the name + of routine). + @end itemize + @strong{Note!} - if routine creation statement fails you will be left without @strong{any} version of routine in the database! @end table Modified: branches/tora-trotl/doc/help/globalsettings.html =================================================================== --- branches/tora-trotl/doc/help/globalsettings.html 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/globalsettings.html 2010-05-20 07:39:17 UTC (rev 3529) @@ -49,7 +49,7 @@ <br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Antialias fonts</strong> </td><td valign="top" width="80%">Check this if you want TOra to use antialiased fonts in X11 if available. This option may not be available (Regardless of if you have access to antialiased fonts or not). <br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Docks use toolbars</strong> </td><td valign="top" width="80%">This option tells TOra how to emulate docked windows when they are not available. Docked windows are not available if you do not use KDE and have a Qt version less than 3 (If you run in windows you're it). If this is checked docks will be emulated with a toolbar, this has the drawback that you can't resize them. If unchecked docks appear in normal windows. <br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Style</strong> </td><td valign="top" width="80%">The GUI style to use for the TOra application. This switch is only available for Qt only applications. -<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Display alerts in statusbar only</strong> </td><td valign="top" width="80%">Display errors only in the statusbar. This is really usefull since it doesn't interrupt you as much as a dialog window as long as you know to look for information in the statusbar when things doesn't work. +<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Display alerts in statusbar only</strong> </td><td valign="top" width="80%">Display errors only in the statusbar. This is really useful since it doesn't interrupt you as much as a dialog window as long as you know to look for information in the statusbar when things doesn't work. <br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Connect history</strong> </td><td valign="top" width="80%">How many connection entries to save in the new connection history list. <br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Table scale</strong> </td><td valign="top" width="80%">This is the scale which to use when printing lists. Lists on paper can usually be a little smaller and still be readable. Given as a fraction where 0.5 means half the size on paper and 1.0 the same size. <br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Status message</strong> </td><td valign="top" width="80%">The number of seconds to display error messages in the status bar. If you specify 0 they are kept until the next message is displayed. Modified: branches/tora-trotl/doc/help/images/mysql.png =================================================================== (Binary files differ) Modified: branches/tora-trotl/doc/help/invalid.html =================================================================== --- branches/tora-trotl/doc/help/invalid.html 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/invalid.html 2010-05-20 07:39:17 UTC (rev 3529) @@ -37,7 +37,7 @@ <h3 class="section">4.16 Invalid Objects</h3> <p><a name="index-Invalid-Objects-34"></a> -This tool is usefull to recompile invalid objects in the database. +This tool is useful to recompile invalid objects in the database. <div class="block-image"><img src="images/invalid.png" alt="images/invalid.png"></div> Modified: branches/tora-trotl/doc/help/invalid.texi =================================================================== --- branches/tora-trotl/doc/help/invalid.texi 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/invalid.texi 2010-05-20 07:39:17 UTC (rev 3529) @@ -2,7 +2,7 @@ @section Invalid Objects @cindex Invalid Objects -This tool is usefull to recompile invalid objects in the database. +This tool is useful to recompile invalid objects in the database. @image{images/invalid,15cm} @@ -27,4 +27,4 @@ @verbatim alter <object_type> <schema.object_name> compile @end verbatim -@end table \ No newline at end of file +@end table Modified: branches/tora-trotl/doc/help/preferences.texi =================================================================== --- branches/tora-trotl/doc/help/preferences.texi 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/preferences.texi 2010-05-20 07:39:17 UTC (rev 3529) @@ -44,7 +44,7 @@ @item @strong{Antialias fonts} @tab Check this if you want TOra to use antialiased fonts in X11 if available. This option may not be available (Regardless of if you have access to antialiased fonts or not). @item @strong{Docks use toolbars} @tab This option tells TOra how to emulate docked windows when they are not available. Docked windows are not available if you do not use KDE and have a Qt version less than 3 (If you run in windows you're it). If this is checked docks will be emulated with a toolbar, this has the drawback that you can't resize them. If unchecked docks appear in normal windows. @item @strong{Style} @tab The GUI style to use for the TOra application. This switch is only available for Qt only applications. -@item @strong{Display alerts in statusbar only} @tab Display errors only in the statusbar. This is really usefull since it doesn't interrupt you as much as a dialog window as long as you know to look for information in the statusbar when things doesn't work. +@item @strong{Display alerts in statusbar only} @tab Display errors only in the statusbar. This is really useful since it doesn't interrupt you as much as a dialog window as long as you know to look for information in the statusbar when things doesn't work. @item @strong{Connect history} @tab How many connection entries to save in the new connection history list. @item @strong{Table scale} @tab This is the scale which to use when printing lists. Lists on paper can usually be a little smaller and still be readable. Given as a fraction where 0.5 means half the size on paper and 1.0 the same size. @item @strong{Status message} @tab The number of seconds to display error messages in the status bar. If you specify 0 they are kept until the next message is displayed. Modified: branches/tora-trotl/doc/help/sqledit.html =================================================================== --- branches/tora-trotl/doc/help/sqledit.html 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/sqledit.html 2010-05-20 07:39:17 UTC (rev 3529) @@ -47,7 +47,7 @@ <p>The window is divided into several parts. To the left is a list of SQL statements available divided into modules. When an item is selected in this list you can use the right part of the screen to modify the SQL associated by the selected name. - <p>The right part of the window is divided into the name and version at the top. The version is also preceeded with the name of the provider (Usually <strong>Oracle</strong>) separated by a colon. Each statement name can have several versions of an SQL. You can add a new version by simply entering a new text into the version combobox. You can also select any of the existing versions by selecting them from the list. + <p>The right part of the window is divided into the name and version at the top. The version is also preceded with the name of the provider (Usually <strong>Oracle</strong>) separated by a colon. Each statement name can have several versions of an SQL. You can add a new version by simply entering a new text into the version combobox. You can also select any of the existing versions by selecting them from the list. <p>Below the name and version is the description which is independent from the version. Below that is a worksheet (see <a href="worksheet.html#worksheet">SQL Worksheet</a>) which you can use to edit and test the SQL statement that should be associated with the given name and version. Modified: branches/tora-trotl/doc/help/sqledit.texi =================================================================== --- branches/tora-trotl/doc/help/sqledit.texi 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/doc/help/sqledit.texi 2010-05-20 07:39:17 UTC (rev 3529) @@ -14,7 +14,7 @@ The window is divided into several parts. To the left is a list of SQL statements available divided into modules. When an item is selected in this list you can use the right part of the screen to modify the SQL associated by the selected name. -The right part of the window is divided into the name and version at the top. The version is also preceeded with the name of the provider (Usually @strong{Oracle}) separated by a colon. Each statement name can have several versions of an SQL. You can add a new version by simply entering a new text into the version combobox. You can also select any of the existing versions by selecting them from the list. +The right part of the window is divided into the name and version at the top. The version is also preceded with the name of the provider (Usually @strong{Oracle}) separated by a colon. Each statement name can have several versions of an SQL. You can add a new version by simply entering a new text into the version combobox. You can also select any of the existing versions by selecting them from the list. Below the name and version is the description which is independent from the version. Below that is a worksheet (@pxref{worksheet,SQL Worksheet}) which you can use to edit and test the SQL statement that should be associated with the given name and version. Modified: branches/tora-trotl/osx_tools/dmg/tora.dmgCanvas =================================================================== (Binary files differ) Modified: branches/tora-trotl/rpm/tora.spec.in =================================================================== --- branches/tora-trotl/rpm/tora.spec.in 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/rpm/tora.spec.in 2010-05-20 07:39:17 UTC (rev 3529) @@ -10,6 +10,8 @@ %define _version @VERSION@ %define _release 1 +%define _iconsdir %{_datadir}/icons + # filter out oracle libraries because oracle-instantclient rpm doesn't provide them %define _use_internal_dependency_generator 0 %{expand:%global __orig__find_requires %{__find_requires}} @@ -24,19 +26,22 @@ Source: %{_name}-%{_version}.tar.gz URL: http://tora.sourceforge.net Group: Development/Databases +Vendor: TOra License: GPL BuildRoot: %{_tmppath}/tora-root BuildRequires: postgresql-devel -BuildRequires: oracle-instantclient11.1-devel +BuildRequires: oracle-instantclient11.2-devel BuildRequires: qt4-devel >= 4.3.0 BuildRequires: openssl-devel -BuildRequires: qscintilla-devel >= 2.0.0 BuildRequires: perl BuildRequires: cmake >= 2.4.0 BuildRequires: gcc-c++ Requires: qt4 >= 4.3.0 -Requires: oracle-instantclient11.1-basic +Requires: oracle-instantclient11.2-basic +%if ! 0%{?rhel} || 0%{?rhel} > 5 +BuildRequires: qscintilla-devel >= 2.0.0 Requires: qscintilla >= 2.0.0 +%endif # @@ -83,6 +88,9 @@ -DORACLE_PATH_INCLUDES=$(ls -d -1 %{oraincdir}/*/%{oraclientdir} | tail -n 1) \ -DORACLE_PATH_LIB=$(ls -d -1 %{oralibdir}/*/%{oraclientdir}/lib | tail -n 1) \ -DPOSTGRESQL_PATH_INCLUDES=%{_includedir} \ +%if 0%{?rhel} && 0%{?rhel} < 6 + -DWANT_INTERNAL_QSCINTILLA=1 \ +%endif . %build @@ -128,6 +136,10 @@ %{__rm} -rf "${RPM_BUILD_ROOT}" %changelog +* Tue Apr 6 2010 Michael Mraka <mic...@re...> 2.1.2-1 +- updated to TOra 2.1.2 +- updated instanclient to oracle-instantclient11.2 + * Tue Nov 18 2008 Michael Mraka <mic...@re...> 2.1.0-1 - bumped to latest version - uses oracle-instantclient11.1 Modified: branches/tora-trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/CMakeLists.txt 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/src/CMakeLists.txt 2010-05-20 07:39:17 UTC (rev 3529) @@ -519,11 +519,11 @@ # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified LINK_LIBRARIES(${QT_QTMAIN_LIBRARY}) SET (GUI_TYPE WIN32) - IF (WANT_DEBUG) - SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") - ELSE (WANT_DEBUG) - SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") - ENDIF (WANT_DEBUG) +# IF (WANT_DEBUG) +# SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") +# ELSE (WANT_DEBUG) +# SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") +# ENDIF (WANT_DEBUG) ENDIF (MSVC) ENDIF(WIN32) @@ -563,6 +563,7 @@ # prevent opening the cmd.exe window IF (WIN32) LIST(APPEND TORA_LIBS ${WINDOWS_LIB}) + TARGET_LINK_LIBRARIES(${EXE_NAME} "ws2_32.lib") # don't use console subsystem IF (MINGW) TARGET_LINK_LIBRARIES(${EXE_NAME} "-mwindows") Modified: branches/tora-trotl/src/Makefile.am =================================================================== --- branches/tora-trotl/src/Makefile.am 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/src/Makefile.am 2010-05-20 07:39:17 UTC (rev 3529) @@ -276,6 +276,13 @@ toocistub.cpp \ tooraclepreload.cpp \ toresultresources.h \ + tooracleextract.h \ + tologger.h \ + ts_log/critical_section.h \ + ts_log/decorator.h \ + ts_log/message_handler_log.h \ + ts_log/thread_safe_log.h \ + ts_log/ts_log_utils.h \ $(TRANSLATIONS) \ LICENSE.h \ tora.qrc \ Modified: branches/tora-trotl/src/i18n/tora_fr.ts =================================================================== --- branches/tora-trotl/src/i18n/tora_fr.ts 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/src/i18n/tora_fr.ts 2010-05-20 07:39:17 UTC (rev 3529) @@ -2289,7 +2289,7 @@ <translation type="unfinished"></translation> </message> <message> - <source>Specify if changes should be automatically commited.</source> + <source>Specify if changes should be automatically committed.</source> <translation type="unfinished"></translation> </message> <message> @@ -3756,7 +3756,7 @@ <translation type="unfinished"></translation> </message> <message> - <source>Exceded qualifier max in toHtml</source> + <source>Exceeded qualifier max in toHtml</source> <translation type="unfinished"></translation> </message> <message> Modified: branches/tora-trotl/src/i18n/tora_it.ts =================================================================== --- branches/tora-trotl/src/i18n/tora_it.ts 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/src/i18n/tora_it.ts 2010-05-20 07:39:17 UTC (rev 3529) @@ -3270,7 +3270,7 @@ </message> <message> <location filename="../ui_todatabasesettingui.h" line="214"/> - <source>Specify if changes should be automatically commited.</source> + <source>Specify if changes should be automatically committed.</source> <translation>Specificare se i cambiamenti devono essere committati automaticamente.</translation> </message> <message> @@ -5110,7 +5110,7 @@ </message> <message> <location filename="../tohtml.cpp" line="197"/> - <source>Exceded qualifier max in toHtml</source> + <source>Exceeded qualifier max in toHtml</source> <translation type="unfinished"></translation> </message> <message> Modified: branches/tora-trotl/src/i18n/tora_se.ts =================================================================== --- branches/tora-trotl/src/i18n/tora_se.ts 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/src/i18n/tora_se.ts 2010-05-20 07:39:17 UTC (rev 3529) @@ -2336,7 +2336,7 @@ <translation>&Autocommit på alla ändringar</translation> </message> <message> - <source>Specify if changes should be automatically commited.</source> + <source>Specify if changes should be automatically committed.</source> <translation>Anger att alla databasändringar automatiskt skall sparas i databasen direkt.</translation> </message> <message> @@ -3909,7 +3909,7 @@ <translation>Oavslutat attribut på slutet</translation> </message> <message> - <source>Exceded qualifier max in toHtml</source> + <source>Exceeded qualifier max in toHtml</source> <translation>Attribut överskred max i toHtml</translation> </message> <message> Copied: branches/tora-trotl/src/icons/xmlwrap.png (from rev 3523, trunk/tora/src/icons/xmlwrap.png) =================================================================== (Binary files differ) Modified: branches/tora-trotl/src/loki/include/loki/CachedFactory.h =================================================================== --- branches/tora-trotl/src/loki/include/loki/CachedFactory.h 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/src/loki/include/loki/CachedFactory.h 2010-05-20 07:39:17 UTC (rev 3529) @@ -151,7 +151,7 @@ * * This implementation will prevent from Creating more than maxCreation objects * within byTime ms by throwing an exception. - * Could be usefull to detect prevent loads (http connection for instance). + * Could be useful to detect prevent loads (http connection for instance). * Use the setRate method to set the rate parameters. * default is 10 objects in a second. */ Modified: branches/tora-trotl/src/templates/sqlfunctions.tpl =================================================================== --- branches/tora-trotl/src/templates/sqlfunctions.tpl 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/src/templates/sqlfunctions.tpl 2010-05-20 07:39:17 UTC (rev 3529) @@ -1,6 +1,6 @@ Aggregate Functions:COVAR_POP ( expr1 , expr2 )=Get the population covariance of a set of pairs.<P>\n\nPairs where either <I>expr1</I> or <I>expr2</I> are eliminated first. Then the following\ncalculation is performed:\n\n<PRE>\n(SUM(expr1 * expr2) - SUM(expr2) * SUM(expr1) / n) / n\n</PRE>\n\nThe function returns a number, if applied to an empty set NULL is returned.<P>\n<B>Example:</B>\n<PRE>\nSELECT itemid,COVAR_POP(amount,profit) FROM saleitems GROUP BY itemid;\n\n ITEMID COVAR_POP(AMOUNT,PROFIT)\n---------- ------------------------\n 1 84000\n 2 5062.5\n 3 325000\n 4 4111.11111\n</PRE> Aggregate Functions:COVAR_SAMP ( expr1 , expr2 )=Get the sample covariance of a set of pairs.<P>\n\nPairs where either <I>expr1</I> or <I>expr2</I> are eliminated first. Then the following\ncalculation is performed:\n\n<PRE>\n(SUM(expr1 * expr2) - SUM(expr2) * SUM(expr1) / n) / (n - 1)\n</PRE>\n\nThe function returns a number, if applied to an empty set NULL is returned.<P>\n<B>Example:</B>\n<PRE>\nSELECT itemid,COVAR_SAMP(amount,profit) FROM saleitems GROUP BY itemid;\n\n ITEMID COVAR_POP(AMOUNT,PROFIT)\n---------- ------------------------\n 1 84000\n 2 5062.5\n 3 325000\n 4 4111.11111\n</PRE> -Aggregate Functions:GROUPING ( expr )=This function is only usefull in select statements with a group by extension such as <CODE>ROLLUP</CODE>\nor <CODE>CUBE</CODE>. These function generate extra rows with nulls which is the group by aggregate.\nThis function can be use to distinguish these rows from rows that are actually null.<P>\nThe <I>expr</I> must match a group by expression. If the <I>expr</I> is a null that represent an\naggregate row this function returns 1, otherwise it returns 0.<P>\n<B>Example:</B>\n<PRE>\nSELECT DECODE(GROUPING(itemid),1,'Total',itemid) item,\n SUM(amount) amount,\n SUM(profit) profit\n FROM saleitems\n GROUP BY ROLLUP (itemid);\n\nITEM AMOUNT PROFIT\n----- ------ ------\n1 12000 2200\n2 2760 195\n3 10000 2200\n4 1300 170\nTotal 26060 4765\n</PRE> +Aggregate Functions:GROUPING ( expr )=This function is only useful in select statements with a group by extension such as <CODE>ROLLUP</CODE>\nor <CODE>CUBE</CODE>. These function generate extra rows with nulls which is the group by aggregate.\nThis function can be use to distinguish these rows from rows that are actually null.<P>\nThe <I>expr</I> must match a group by expression. If the <I>expr</I> is a null that represent an\naggregate row this function returns 1, otherwise it returns 0.<P>\n<B>Example:</B>\n<PRE>\nSELECT DECODE(GROUPING(itemid),1,'Total',itemid) item,\n SUM(amount) amount,\n SUM(profit) profit\n FROM saleitems\n GROUP BY ROLLUP (itemid);\n\nITEM AMOUNT PROFIT\n----- ------ ------\n1 12000 2200\n2 2760 195\n3 10000 2200\n4 1300 170\nTotal 26060 4765\n</PRE> Aggregate Functions:MAX( expr )=Get the largest value of <I>expr</I>.<P>\n<B>Example:</B>\n<PRE>\nSELECT MAX(amount) FROM saleitems;\n\nMAX(AMOUNT)\n-----------\n 4000\n</PRE> Aggregate Functions:MIN ( expr )=Get the smallest value of <I>expr</I>.<P>\n<B>Example:</B>\n<PRE>\nSELECT MIN(amount) FROM saleitems;\n\nMIN(AMOUNT)\n-----------\n 240\n</PRE> Aggregate Functions:REGR_AVGX ( expr1 , expr2 )=Pairs where either <I>expr1</I> or <I>expr2</I> are eliminated to begin with. Then the following function is calculated:\n<PRE>\nAVG ( expr2 )\n</PRE>\n<B>Example:</B><P>\n<PRE>\nSELECT TRUNC((SYSDATE - saledate) / 7) WEEK,\n REGR_AVGX ( SYSDATE - saledate , amount )\n FROM sales , saleitems\n WHERE sales.saleid = saleitems.saleid\n GROUP BY TRUNC((SYSDATE - saledate) / 7);\n\n WEEK REGR_AVGX(SYSDATE-SALEDATE,AMOUNT)\n---------- ----------------------------------\n 0 1280\n 8 500\n 10 300\n 13 3333.33333\n 15 1360\n 73 1000\n 74 1400\n</PRE> @@ -66,7 +66,7 @@ Char to Char Functions:REPLACE ( char , search , replace )=This function will return a string where every occurance in <I>char</I> of the string <I>search</I> is replaced with the <I>replace</I> string.<P>\n<B>Example:</B>\n<PRE>\nSELECT REPLACE ('Gnu','Gnu','Gnu Is Not Unix') FROM DUAL;\n\nREPLACE('GNU','\n---------------\nGnu Is Not Unix\n</PRE> Char to Char Functions:RPAD ( char1 , n , char2 )=This function returns <I>char1</I> padded from the right to <I>n</I> number of characters. If <I>char2</I> is specified this is used for padding instead of space which is the default.<P>\n<B>Examples:</B>\n<PRE>\nSELECT RPAD ( 'Padding<' , 12 , '=-' ) FROM DUAL;\n\nRPAD('PADDIN\n------------\nPadding<=-=-\n</PRE> Char to Char Functions:RTRIM ( char1 , char2 )=Removes all characters from the <I>char1</I> available in the set defined by the characters available in the string <I>char2</I> from the right until a character not in the set is encountered.<P>\n<B>Examples:</B>\n<PRE>\nSELECT RTRIM ( 'Text<=-=-=-' , '<-=' ) FROM DUAL;\n\nRTRI\n----\nText\n</PRE> -Char to Char Functions:SOUNDEX ( char )=Returns a string that contains a phonetic representation of <I>char</I>. This is usefull for comparing strings that sound similarly, but are spelled different. The algorithm used is available in <I>The Art of Computer Programming, Volume 3: Sorting and Searching, by Donald E. Knuth</I>.<P>\n<B>Examples:</B>\n<PRE>\nSELECT 'Johnson sounds like Jonsson'\n FROM DUAL WHERE SOUNDEX ( 'Johnson' ) = SOUNDEX ( 'Jonsson' );\n\n'JOHNSONSOUNDSLIKEJONSSON'\n---------------------------\nJohnson sounds like Jonsson\n</PRE> +Char to Char Functions:SOUNDEX ( char )=Returns a string that contains a phonetic representation of <I>char</I>. This is useful for comparing strings that sound similarly, but are spelled different. The algorithm used is available in <I>The Art of Computer Programming, Volume 3: Sorting and Searching, by Donald E. Knuth</I>.<P>\n<B>Examples:</B>\n<PRE>\nSELECT 'Johnson sounds like Jonsson'\n FROM DUAL WHERE SOUNDEX ( 'Johnson' ) = SOUNDEX ( 'Jonsson' );\n\n'JOHNSONSOUNDSLIKEJONSSON'\n---------------------------\nJohnson sounds like Jonsson\n</PRE> Char to Char Functions:SUBSTR ( char , m , n )=This function returns a substring of of the <I>char</I> string. If <I>m</I> is 0 it is treated as 1 which means the beginning of the string, 2 meaning the second character etc. If <I>m</I> is negative it will count from the end of the string with -1 meaning the last character of the string. If <I>n</I> is not specified the rest of the string is returned.<P>\n<B>Examples:</B>\n<PRE>\nSELECT SUBSTR('Henrik P Johnson',8,3) FROM DUAL;\n\nSUB\n---\nP J\n</PRE> Char to Char Functions:SUBSTRB ( char , m , n )=This function returns a substring of of the <I>char</I> string. The difference from <CODE>SUBSTR</CODE> is that this function counts bytes instead of characters which differs if you use multichar charactersets.<P>\n<B>Examples:</B><P>\nIf run on a UNICODE characterset database.\n<PRE>\nSELECT SUBSTRB('Henrik P Johnson',7,4) FROM DUAL;\n\nSU\n--\nri\n</PRE> Char to Char Functions:TRANSLATE ( char , from , to )=This function will return a string where every occurance of a character in <I>char</I> is replaced from the character in <I>from</I> with the corresponding character in <I>to</I>. If the character is not available in <I>to</I> it is removed from the result.<P>\n<B>Example:</B>\n<PRE>\nSELECT TRANSLATE ( 'Mauritz' , 'Mauritz' , 'Henrik' ) FROM DUAL;\n\nTRANSL\n------\nHenrik\n</PRE> Modified: branches/tora-trotl/src/tobrowser.cpp =================================================================== --- branches/tora-trotl/src/tobrowser.cpp 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/src/tobrowser.cpp 2010-05-20 07:39:17 UTC (rev 3529) @@ -1919,8 +1919,12 @@ toIsOracle(connection()) || toIsPostgreSQL(connection())); addTab(synonymSplitter, tr("S&ynonyms"), toIsOracle(connection())); + // 2010-03-31 + // Starting with version 5.0 MySQL supports stored functions/procedures + // If TOra is used a lot with older versions of MySQL the "true" parameter + // should be enhanced with a check for MySQL version addTab(codeSplitter, tr("Cod&e"), - !toIsMySQL(connection())); + true); addTab(triggerSplitter, tr("Tri&ggers"), !toIsMySQL(connection()) && !toIsPostgreSQL(connection())); addTab(dblinkSplitter, tr("DBLinks"), @@ -1967,7 +1971,21 @@ if (m_browsersMap.contains(ix)) { - m_browsersMap[ix]->changeParams(schema(), currentItemText()); + if (ix != codeSplitter) + m_browsersMap[ix]->changeParams(schema(), currentItemText()); + else + { + // If code browser has been clicked we need to know type of code (function, procedure...) too + // as it is not possible to identify code by just schema and object (in MySQL there can be + // a function and procedure with the same name in the same schema) + toBrowserSchemaCodeBrowser * browser = dynamic_cast<toBrowserSchemaCodeBrowser*>(m_objectsMap[ix]); + if (!browser) + { + qDebug("Only for code - toBrowserSchemaCodeBrowser cast!"); + return; + } + m_browsersMap[ix]->changeParams(schema(), currentItemText(), browser->objectType()); + } } else get_log(2).ts<toDecorator>( __HERE__) << "changeItem() unhandled index" << ix; Modified: branches/tora-trotl/src/tobrowserbasewidget.cpp =================================================================== --- branches/tora-trotl/src/tobrowserbasewidget.cpp 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/src/tobrowserbasewidget.cpp 2010-05-20 07:39:17 UTC (rev 3529) @@ -44,8 +44,10 @@ #include "toresult.h" #include "toresultdata.h" #include "tobrowserbasewidget.h" +#include "toconnection.h" +#include "tomain.h" +#include "utils.h" - toBrowserBaseWidget::toBrowserBaseWidget(QWidget * parent) : QTabWidget(parent), m_schema(0), @@ -92,12 +94,13 @@ m_tabs[page->objectName()] = r; } -void toBrowserBaseWidget::changeParams(const QString & schema, const QString & object) +void toBrowserBaseWidget::changeParams(const QString & schema, const QString & object, const QString & type) { - if (m_schema != schema || m_object != object) + if (m_schema != schema || m_object != object || m_type != type) { m_schema = schema; m_object = object; + m_type = type; updateData(currentWidget()->objectName()); } } @@ -105,6 +108,7 @@ void toBrowserBaseWidget::changeConnection() { m_schema = ""; + m_type = ""; m_object = ""; m_tabs.clear(); @@ -135,5 +139,12 @@ { if (schema().isEmpty() || object().isEmpty()) return; - m_tabs[ix]->changeParams(schema(), object()); + toConnection &conn = toMainWidget()->currentConnection(); + if (toIsMySQL(conn) && !type().isEmpty()) + // MySQL requires additional parameter to fetch routine (procedure/function) creation script + // Parameter must be passed first. This parameter (type) is only specified when it is a MySQL + // connection and routine code is being fetched (as opposed to fetching say tables) + m_tabs[ix]->changeParams(type(), schema(), object()); + else + m_tabs[ix]->changeParams(schema(), object()); } Modified: branches/tora-trotl/src/tobrowserbasewidget.h =================================================================== --- branches/tora-trotl/src/tobrowserbasewidget.h 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/src/tobrowserbasewidget.h 2010-05-20 07:39:17 UTC (rev 3529) @@ -74,7 +74,7 @@ Update data if it's different from previously used schema/object. See updateData(). */ - virtual void changeParams(const QString & schema, const QString & object); + virtual void changeParams(const QString & schema, const QString & object, const QString & type = ""); /*! \brief Change connection for widget. It has to handle visibility of tabs depending on DB features. @@ -88,6 +88,8 @@ //! Returns currently used schema. QString schema() { return m_schema; }; + //! Returns type of currently used object. + QString type() { return m_type; }; //! Returns currently used object name. QString object() { return m_object; }; @@ -105,6 +107,7 @@ private: QString m_schema; + QString m_type; QString m_object; /*! Some kind of cache to save some fetching from DB. Modified: branches/tora-trotl/src/tobrowsercodewidget.cpp =================================================================== --- branches/tora-trotl/src/tobrowsercodewidget.cpp 2010-05-19 21:35:48 UTC (rev 3528) +++ branches/tora-trotl/src/tobrowsercodewidget.cpp 2010-05-20 07:39:17 UTC (rev 3529) @@ -86,7 +86,22 @@ " AND Type IN ('PROCEDURE','FUNCTION','PACKAGE BODY','TYPE BODY')", ""); +// Fetching from routine_definition table is not enough as it does not return information about +// routine arguments, return type etc. +/*static toSQL SQLSQLBodyMySQL("toBrowser:CodeBody", + "select routine_definition from information_schema.routines\n" + " where routine_schema = :f1<char[101]> and routine_name = :f2<char[101]>", + "", + "5.0", + "MySQL");*/ +// NOTE! MySQL query has an additional argument :f1 which should be set to 'FUNCTION' or 'PROCEDURE'! +static toSQL SQLSQLBodyMySQL("toBrowser:CodeBody", + "show create :f3<noquote> `:f1<noquote>`.`:f2<noquote>`;", + "", + "5.0", + "MySQL"); + toBrowserCodeWidget::toBrowserCodeWidget(QWidget * parent) : toBrowserBaseWidget(parent) { @@ -99,6 +114,12 @@ bodyResult = new toResultField(this); bodyResult->setObjectName("bodyResult"); bodyResult->setSQL(SQLSQLBody); + toConnection & c = toCurrentConnection(this); + if (toIsMySQL(c)) + // For MySQL we need value from third column. As it is not a query which is fetching + // routine creation script - particular field cannot be specified (or I do not know + // how to do it). Therefore we need this workaround. + bodyResult->setWhichResultField(3); grantsView = new toResultGrants(this); grantsView->setObjectName("grantsView"); Modified: branches/tora-trotl/src/tobrows... [truncated message content] |
From: <ibr...@us...> - 2010-06-25 08:57:15
|
Revision: 3586 http://tora.svn.sourceforge.net/tora/?rev=3586&view=rev Author: ibre5041 Date: 2010-06-25 08:57:06 +0000 (Fri, 25 Jun 2010) Log Message: ----------- sync with tora trunk Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/INSTALL branches/tora-trotl/README branches/tora-trotl/README.RELEASE branches/tora-trotl/README.WINDOWS branches/tora-trotl/cmake/modules/FindOracle.cmake branches/tora-trotl/cmake/modules/FindQScintilla.cmake branches/tora-trotl/configure.ac branches/tora-trotl/rpm/tora.desktop branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/Makefile.am branches/tora-trotl/src/tobackuptool.cpp branches/tora-trotl/src/tobrowser.cpp branches/tora-trotl/src/tobrowser.h branches/tora-trotl/src/tobrowserbasewidget.cpp branches/tora-trotl/src/tobrowserindexwidget.cpp branches/tora-trotl/src/tobrowsertablewidget.cpp branches/tora-trotl/src/toconnection.cpp branches/tora-trotl/src/toconnection.h branches/tora-trotl/src/todocklet.cpp branches/tora-trotl/src/tohighlightedtext.cpp branches/tora-trotl/src/tomain.cpp branches/tora-trotl/src/tomain.h branches/tora-trotl/src/toplsqleditor.cpp branches/tora-trotl/src/toplsqleditor.h branches/tora-trotl/src/toqsqlconnection.cpp branches/tora-trotl/src/toresult.cpp branches/tora-trotl/src/toresult.h branches/tora-trotl/src/toresultcols.cpp branches/tora-trotl/src/toresultcolscomment.cpp branches/tora-trotl/src/toresultmodel.cpp branches/tora-trotl/src/toresultmodel.h branches/tora-trotl/src/toresultschema.cpp branches/tora-trotl/src/toresultstorage.cpp branches/tora-trotl/src/toresulttableview.cpp branches/tora-trotl/src/toresulttableview.h branches/tora-trotl/src/toresulttableviewedit.cpp branches/tora-trotl/src/torollback.cpp branches/tora-trotl/src/torollback.h branches/tora-trotl/src/tosqlparse.cpp branches/tora-trotl/src/utils.cpp branches/tora-trotl/src/utils.h Added Paths: ----------- branches/tora-trotl/cmake/modules/FindTeradata.cmake branches/tora-trotl/cmake/modules/TeradataTest.c branches/tora-trotl/config/m4/teradata.m4 branches/tora-trotl/src/tobrowserdirectorieswidget.cpp branches/tora-trotl/src/tobrowserdirectorieswidget.h branches/tora-trotl/src/toteradataconnection.cpp branches/tora-trotl/src/windows/installer/tora-teradata.nsi Property Changed: ---------------- branches/tora-trotl/ branches/tora-trotl/debian/changelog branches/tora-trotl/src/tologger.h branches/tora-trotl/src/ts_log/ Property changes on: branches/tora-trotl ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/tora:3191-3523 + /trunk/tora:3191-3578 Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/CMakeLists.txt 2010-06-25 08:57:06 UTC (rev 3586) @@ -7,6 +7,7 @@ OPTION(ENABLE_ORACLE "Enable/Disable Oracle support at all. Including detection" ON) OPTION(ENABLE_PGSQL "Enable/Disable PostgreSQL support. Including detection" ON) OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON) +OPTION(ENABLE_TERADATA "Enable/Disable Teradata support." OFF) OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" ON) OPTION(WANT_BUNDLE "Enable Mac OS X bundle build" OFF) OPTION(WANT_BUNDLE_STANDALONE "Do not copy required libs and tools into bundle (WANT_BUNDLE)" ON) @@ -20,9 +21,18 @@ # handle new cmake versions correctly if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) - cmake_policy(SET CMP0005 OLD) # FIXME change it to new when there will be cmake 2.6.x in most distros - cmake_policy(SET CMP0011 NEW) + if (POLICY CMP0003) + cmake_policy(SET CMP0003 NEW) + endif (POLICY CMP0003) + if (POLICY CMP0005) + cmake_policy(SET CMP0005 OLD) # FIXME change it to new when there will be cmake 2.6.x in most distros + endif (POLICY CMP0005) + if (POLICY CMP0011) + cmake_policy(SET CMP0011 NEW) + endif (POLICY CMP0011) + if (POLICY CMP0015) + cmake_policy(SET CMP0015 NEW) + endif (POLICY CMP0015) endif(COMMAND cmake_policy) @@ -131,13 +141,13 @@ SET(CMAKE_BUILD_TYPE RELEASE) ENDIF(WANT_DEBUG) - # Lets disable Wall warnings due the MSVC too much talkative # output. Wall can slow down compiletion up to hours and # my boxes can boil eggs too. # MSVC, MSVC_IDE, MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005 IF (MSVC) SET (CXX_WARNINGS "") + ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) ELSE (MSVC) SET (CXX_WARNINGS "-Wall") ENDIF (MSVC) @@ -149,7 +159,6 @@ SET(CMAKE_C_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_C_FLAGS_RELEASE}") ENDIF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) - ############################################################################################################## ########## Find Dependencies ########## @@ -201,7 +210,7 @@ ADD_DEFINITIONS("-DTO_NO_ORACLE") ELSE (NOT ENABLE_ORACLE) - FIND_PACKAGE(Oracle) + FIND_PACKAGE(Oracle COMPONENTS CLNTSH XML) IF(ORACLE_FOUND) MESSAGE("Oracle OCI Library Found OK") # what else is hidden in the ifdef hell?! @@ -245,15 +254,25 @@ ADD_DEFINITIONS(-DHAVE_DB2) ELSE (DB2_FOUND) MESSAGE(" ") - MESSAGE(WARNING " No DB2 client libraries have been found.") - MESSAGE(WARNING " TOra can be build without it - without DB2 support.") - MESSAGE(WARNING " Specify -DDB2_PATH_INCLUDES=path") - MESSAGE(WARNING " and -DDB2_PATH_LIB=path manually") + MESSAGE(STATUS " No DB2 client libraries have been found.") + MESSAGE(STATUS " TOra can be build without it - without DB2 support.") + MESSAGE(STATUS " Specify -DDB2_PATH_INCLUDES=path") + MESSAGE(STATUS " and -DDB2_PATH_LIB=path manually") MESSAGE(" ") ENDIF (DB2_FOUND) ENDIF (NOT ENABLE_DB2) +IF (NOT ENABLE_TERADATA) + MESSAGE(STATUS "Teradata support disabled (enable with -DENABLE_TERADATA=on)") +ELSE (NOT ENABLE_TERADATA) + FIND_PACKAGE(TERADATA) + IF (TERADATA_FOUND) + MESSAGE(STATUS "Teradata found") + ENDIF (TERADATA_FOUND) +ENDIF (NOT ENABLE_TERADATA) + + ############################################################################################################## ########## Include Setup ########## Modified: branches/tora-trotl/INSTALL =================================================================== --- branches/tora-trotl/INSTALL 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/INSTALL 2010-06-25 08:57:06 UTC (rev 3586) @@ -4,8 +4,10 @@ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. - 5. You can remove the program binaries and object files from the + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,9 +83,16 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= + If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -288,7 +351,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. Modified: branches/tora-trotl/README =================================================================== --- branches/tora-trotl/README 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/README 2010-06-25 08:57:06 UTC (rev 3586) @@ -48,6 +48,12 @@ TOra is supported for running with an Oracle 8.1.7 or newer client installation. It has been verified to work with Oracle 10g and 11g. +WINDOWS / ORACLE NOTICE: The windows build of tora includes a stub Oracle DLL to +enable the product to work with other database engines even if oracle is not +installed. If you have Oracle client installed, and want oracle support in TOra to +function, remove the oci.dll file from the TOra installation directory after +installing it. + In addition, TOra also supports postgres and mysql if your Qt library is compiled with that support. Modified: branches/tora-trotl/README.RELEASE =================================================================== --- branches/tora-trotl/README.RELEASE 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/README.RELEASE 2010-06-25 08:57:06 UTC (rev 3586) @@ -28,6 +28,8 @@ scp tora-$VER.tar.gz $USR,to...@fr...:/home/frs/project/t/to/tora/tora/$VER/ +For each uploaded release source tarball or binary, also upload a .md5sum and .sha1sum file for +the upload in the same directory. add new release to the 'tora' package Modified: branches/tora-trotl/README.WINDOWS =================================================================== --- branches/tora-trotl/README.WINDOWS 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/README.WINDOWS 2010-06-25 08:57:06 UTC (rev 3586) @@ -1,3 +1,6 @@ +There is also a Mingw32 Fedora 11 Cross Compile build - see the README file +in the win32-cross directory, which also contains utility scripts for that build. + Content: - Building with MSVC - CMake - Building Windows installer. @@ -61,15 +64,38 @@ 8. Compile Tora - read README.CMAKE and dont forget to check environment is in 5. Example: -c:\ +c: cd \build\tora-build set PATH=%PATH%;c:\build\qt\bin + +# If you need to refresh from cmake, otherwise skip this step cmake -G "NMake Makefiles" -DWANT_INTERNAL_QSCINTILLA=1 -DCMAKE_INSTALL_PREFIX=c:\build\tora-build\RELEASE -DORACLE_OCI_VERSION=10G_R2 ..\tora + Misc notes: seting ORACLE_HOME is a good thing (TM) building with internal qscintilla is easier for beginners ;) prepare for longer headache (if you're a windows devel newbie) + If you build qscintilla externally, follow the directions to make a staticlib. + Otherwise you get mysterious linker unresolved external symbols + even though depends.exe can see them. Meh, Windows. + +nmake + Issuing nmake will actually run the build process itself. + # +# Testing +# +Above build will generate into the tora-build\RELEASE dir. Copy the various dll files from Qt, Postgres, MySQL +installs into that dir as well: + comerr32.dll gssapi32.dll k5sprt32.dll krb5_32.dll libeay32.dll libiconv-2.dll libintl-8.dll libpq.dll ssleay32.dll + libmysql.dll qsqlmysqld4.dll + oci.dll + QtCore4.dll QtGui4.dll QtNetwork4.dll QtSql4.dll QtXml4.dll +Then you should be able to run tora.exe from that dir. This can be used to test prior to packaging. + +(NOTE- Above is ghastly, surely there is a better way of doing this?!?!) + +# # Building Windows installer. # Modified: branches/tora-trotl/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora-trotl/cmake/modules/FindOracle.cmake 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/cmake/modules/FindOracle.cmake 2010-06-25 08:57:06 UTC (rev 3586) @@ -4,6 +4,10 @@ # ORACLE_HAS_XML - Oracle has XDK support(thick client installed) # ORACLE_INCLUDES - where to find oci.h # ORACLE_LIBRARIES - the libraries to link against to use Oracle OCI +# +# Components: CLNTSH, OCCI, XML, OCIEI +# CLNTSH is enabled by default +# for example: FIND_PACKAGE(Oracle REQUIRED CLNTSH OCCI) # # copyright (c) 2007 Petr Vanek <pe...@sc...> # copyright (c) 2009 Ivan Brezina <ibr...@ib...> @@ -14,7 +18,26 @@ SET(ORACLE_HAS_XML "NO") SET(ORACLE_HOME $ENV{ORACLE_HOME}) +# "components" handling. It enables to find various independent libraries, +IF( Oracle_FIND_COMPONENTS ) + FOREACH( component ${Oracle_FIND_COMPONENTS} ) + STRING( TOUPPER ${component} _COMPONENT ) + SET( ORACLE_USE_${_COMPONENT} 1 ) + ENDFOREACH( component ) + # legacy behaviour + IF (NOT ORACLE_USE_CLNTSH) + SET(ORACLE_USE_CLNTSH 1) + ENDIF (NOT ORACLE_USE_CLNTSH) + + # it looks like it's mandatory on macosx + IF (APPLE) + SET(ORACLE_USE_OCIEI 1) + ENDIF (APPLE) + +ENDIF( Oracle_FIND_COMPONENTS ) + + IF (ORACLE_PATH_INCLUDES) SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) ELSE (ORACLE_PATH_INCLUDES) @@ -49,50 +72,96 @@ NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH ) -FIND_PATH( - ORACLE_INCLUDES_XML - xml.h - ${ORACLE_INCLUDES_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH -) +SET(FORCE_ERROR 0) -FIND_LIBRARY( - ORACLE_LIBRARY_CLNTSH - NAMES libclntsh clntsh oci - PATHS ${ORACLE_LIB_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH -) -FIND_LIBRARY( - ORACLE_LIBRARY_XML - NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11 - PATHS ${ORACLE_LIB_LOCATION} - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH -) +IF (ORACLE_USE_CLNTSH) + FIND_LIBRARY( + ORACLE_LIBRARY_CLNTSH + NAMES libclntsh clntsh oci + PATHS ${ORACLE_LIB_LOCATION} + # NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_LIBRARY_CLNTSH) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "CLNTSH") + ENDIF (Oracle_FIND_REQUIRED) + set(ORACLE_LIBRARY_CLNTSH "") + ENDIF (NOT ORACLE_LIBRARY_CLNTSH) +ENDIF (ORACLE_USE_CLNTSH) -SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_CLNTSH}) -IF (APPLE) +#set (ORACLE_LIBRARY_OCCI "") +IF (ORACLE_USE_OCCI) + FIND_LIBRARY( + ORACLE_LIBRARY_OCCI + NAMES libocci occi + PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_LIBRARY_OCCI) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "OCCI") + ENDIF (Oracle_FIND_REQUIRED) + set (ORACLE_LIBRARY_OCCI "") + ENDIF (NOT ORACLE_LIBRARY_OCCI) +ENDIF (ORACLE_USE_OCCI) + + +IF (ORACLE_USE_XML) + FIND_PATH( + ORACLE_INCLUDES_XML + xml.h + ${ORACLE_INCLUDES_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_INCLUDES_XML) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "XML") + ENDIF (Oracle_FIND_REQUIRED) + set (ORACLE_INCLUDES_XML "") + ENDIF (NOT ORACLE_INCLUDES_XML) + + FIND_LIBRARY( + ORACLE_LIBRARY_XML + NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11 + PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH + ) + IF (NOT ORACLE_LIBRARY_XML) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "XML") + endif (Oracle_FIND_REQUIRED) + set (ORACLE_LIBRARY_XML "") + ENDIF (NOT ORACLE_LIBRARY_XML) +ENDIF (ORACLE_USE_XML) + +IF (ORACLE_USE_OCIEI) FIND_LIBRARY(ORACLE_LIBRARY_OCIEI NAMES libociei ociei PATHS ${ORACLE_LIB_LOCATION} + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH ) - MESSAGE(STATUS "Searching for libociei: ${ORACLE_LIBRARY_OCIEI} in ${ORACLE_LIB_LOCATION}") - IF (ORACLE_LIBRARY_OCIEI) - LIST(APPEND ORACLE_LIBRARY ${ORACLE_LIBRARY_OCIEI}) - ELSE (ORACLE_LIBRARY_OCIEI) - MESSAGE(STATUS "libociei.dylib is not found. Maybe it will cause crashes if you are building BUNDLE") - ENDIF (ORACLE_LIBRARY_OCIEI) -ENDIF (APPLE) + IF (NOT ORACLE_LIBRARY_OCIEI) + IF (Oracle_FIND_REQUIRED) + SET(FORCE_ERROR "OCIEI") + ENDIF (Oracle_FIND_REQUIRED) + set (ORACLE_LIBRARY_OCIEI "") + ENDIF (NOT ORACLE_LIBRARY_OCIEI) +ENDIF (ORACLE_USE_OCIEI) -IF (ORACLE_LIBRARY_XML) - LIST(APPEND ORACLE_LIBRARY ${ORACLE_LIBRARY_XML}) -ENDIF (ORACLE_LIBRARY_XML) +IF (NOT FORCE_ERROR) + SET (ORACLE_LIBRARIES ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_XML} ${ORACLE_LIBRARY_OCIEI}) +ENDIF (NOT FORCE_ERROR) +MESSAGE(STATUS "ORACLE_LIBRARY_CLNTSH ${ORACLE_LIBRARY_CLNTSH}") +MESSAGE(STATUS "ORACLE_LIBRARY_OCCI ${ORACLE_LIBRARY_OCCI}") +MESSAGE(STATUS "ORACLE_LIBRARY_XML ${ORACLE_LIBRARY_XML}") +MESSAGE(STATUS "ORACLE_LIBRARY_OCIEI ${ORACLE_LIBRARY_OCIEI}") -IF (ORACLE_INCLUDES AND ORACLE_LIBRARY) - SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY}) + +IF (ORACLE_INCLUDES AND ORACLE_LIBRARIES) SET(ORACLE_FOUND "YES") -ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARY) +ENDIF (ORACLE_INCLUDES AND ORACLE_LIBRARIES) IF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML) ADD_DEFINITIONS(-DORACLE_HAS_XML) @@ -127,13 +196,11 @@ MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION} for ${OCIVER_TYPE}") ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES) -MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") +MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARIES} (ORACLE_HOME='${ORACLE_HOME}')") +MESSAGE(STATUS " includes: ${ORACLE_INCLUDES}") MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}") + IF (ORACLE_FOUND) - IF (NOT ORACLE_FIND_QUIETLY) - MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')") - MESSAGE(STATUS " ${ORACLE_INCLUDES}") - ENDIF (NOT ORACLE_FIND_QUIETLY) # there *must* be OCI version defined for internal libraries #IF (ORACLE_OCI_VERSION) # ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) @@ -142,15 +209,21 @@ #ENDIF (ORACLE_OCI_VERSION) ELSE (ORACLE_FOUND) + MESSAGE(STATUS "Oracle not found.") MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client") MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}") MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib") - MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARY}") - IF (ORACLE_FIND_REQUIRED) + MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARIES}") + + IF (FORCE_ERROR) + MESSAGE(STATUS "Failed module info: ${FORCE_ERROR}") + ENDIF (FORCE_ERROR) + IF (Oracle_FIND_REQUIRED) MESSAGE(FATAL_ERROR "Could not find Oracle library") - ELSE (ORACLE_FIND_REQUIRED) + ELSE (Oracle_FIND_REQUIRED) # setup the variables for silent continue SET (ORACLE_INCLUDES "") - ENDIF (ORACLE_FIND_REQUIRED) + ENDIF (Oracle_FIND_REQUIRED) + ENDIF (ORACLE_FOUND) Modified: branches/tora-trotl/cmake/modules/FindQScintilla.cmake =================================================================== --- branches/tora-trotl/cmake/modules/FindQScintilla.cmake 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/cmake/modules/FindQScintilla.cmake 2010-06-25 08:57:06 UTC (rev 3586) @@ -17,8 +17,29 @@ SET(QSCINTILLA_FOUND FALSE) IF(QT4_FOUND) + + # macosx specific tests for frameworks and include paths + set (FRAMEWORK_INCLUDE_DIR "") + if (APPLE) + # HACK to fixup macosx issue with QT_INCLUDE_DIR: + # QT_INCLUDE_DIR /opt/local/libexec/qt4-mac/include;/opt/local/libexec/qt4-mac/lib/QtCore.framework + # it should be only: + # QT_INCLUDE_DIR /opt/local/libexec/qt4-mac/include + list(LENGTH QT_INCLUDE_DIR QT_INCLUDE_DIR_LENGTH) + if (QT_INCLUDE_DIR_LENGTH) + list(GET QT_INCLUDE_DIR 0 FRAMEWORK_INCLUDE_DIR) + endif (QT_INCLUDE_DIR_LENGTH) + endif (APPLE) + + FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h - "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci + # standard locations + /usr/include + /usr/include/Qsci + # qt4 location except mac's frameworks + "${QT_INCLUDE_DIR}/Qsci" + # mac's frameworks + ${FRAMEWORK_INCLUDE_DIR}/Qsci ) SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2) Copied: branches/tora-trotl/cmake/modules/FindTeradata.cmake (from rev 3570, trunk/tora/cmake/modules/FindTeradata.cmake) =================================================================== --- branches/tora-trotl/cmake/modules/FindTeradata.cmake (rev 0) +++ branches/tora-trotl/cmake/modules/FindTeradata.cmake 2010-06-25 08:57:06 UTC (rev 3586) @@ -0,0 +1,52 @@ +# FindTeradata.cmake + +SET(TERADATA_FOUND "NO") + +MESSAGE(STATUS "Looking for Teradata...") + +IF (NOT TERADATA_PATH_LIB) + MESSAGE(FATAL_ERROR "Please set path to cliv2 LIBRARIES with -DTERADATA_PATH_LIB") +ENDIF (NOT TERADATA_PATH_LIB) + +IF (NOT TERADATA_PATH_INCLUDES) + MESSAGE(FATAL_ERROR "Please set path to cliv2 INCLUDES with -DTERADATA_PATH_INCLUDES") +ENDIF (NOT TERADATA_PATH_INCLUDES) + +FIND_LIBRARY( + TERADATA_LIBRARY_LIBCLIV2 + NAMES libcliv2 wincli32 + PATHS ${TERADATA_PATH_LIB} +) + +FIND_LIBRARY( + TERADATA_LIBRARY_LIBTDUSR + NAMES libtdusr + PATHS ${TERADATA_LIBRARY_LIBTDUSR} +) + +SET (TERADATA_LIBRARIES "${TERADATA_LIBRARY_LIBCLIV2}") +# teradata doesn't distribute a .lib for this one on windows +IF (TERADATA_LIBRARY_LIBTDUSR) + SET (TERADATA_LIBRARIES "${TERADATA_LIBRARIES} ${TERADATA_LIBRARY_LIBTDUSR}") +ENDIF (TERADATA_LIBRARY_LIBTDUSR) + +MESSAGE(STATUS "Teradata Libraries: ${TERADATA_LIBRARIES}") + +#TRY_RUN(TDRUNRESULT TDCOMPILERESULT +# ${CMAKE_BINARY_DIR} +# ${CMAKE_SOURCE_DIR}/cmake/modules/TeradataTest.c +# CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${TERADATA_PATH_INCLUDES}" +# OUTPUT_VARIABLE TDOUTPUTVAR) + +#IF (NOT TDCOMPILERESULT) +# MESSAGE(STATUS "Compile Result: ${TDCOMPILERESULT}") +# MESSAGE(STATUS "Run Result: ${TDRUNRESULT}") +# MESSAGE(STATUS "Output: ${TDOUTPUTVAR}") +# MESSAGE(FATAL_ERROR "Failed to run a simple Teradata compile test. Please double-check TERADATA_PATH_LIB and TERADATA_PATH_INCLUDES are set correctly.") +#ENDIF (NOT TDCOMPILERESULT) + +IF (NOT TERADATA_LIBRARIES) + SET(TERADATA_LIBRARIES "${TERADATA_PATH_LIB} ${TERADATA_LIBRARY_LIBTDUSR}") +ENDIF (NOT TERADATA_LIBRARIES) + +SET(TERADATA_FOUND "YES") Copied: branches/tora-trotl/cmake/modules/TeradataTest.c (from rev 3570, trunk/tora/cmake/modules/TeradataTest.c) =================================================================== --- branches/tora-trotl/cmake/modules/TeradataTest.c (rev 0) +++ branches/tora-trotl/cmake/modules/TeradataTest.c 2010-06-25 08:57:06 UTC (rev 3586) @@ -0,0 +1,19 @@ +#include <stdlib.h> + +#include <coptypes.h> /* Teradata include files */ +#include <coperr.h> +#include <dbcarea.h> +#include <parcel.h> +#include <dbchqep.h> + +int main(int c, char **v) { + static Int32 result; + static char cnta[4]; + struct DBCAREA *dbcp; + + dbcp = (DBCAREA *) malloc(sizeof(struct DBCAREA)); + dbcp->total_len = sizeof(struct DBCAREA); + DBCHINI(&result,cnta, dbcp); + + return 0; +} Copied: branches/tora-trotl/config/m4/teradata.m4 (from rev 3559, trunk/tora/config/m4/teradata.m4) =================================================================== --- branches/tora-trotl/config/m4/teradata.m4 (rev 0) +++ branches/tora-trotl/config/m4/teradata.m4 2010-06-25 08:57:06 UTC (rev 3586) @@ -0,0 +1,99 @@ +AC_DEFUN([TORA_CHECK_TERADATA], +[ + AC_MSG_CHECKING([for teradata]) + + dnl the default + have_teradata=no + + AC_ARG_WITH(teradata, + [ --with-teradata=DIR enable support for Teradata (default NO)], + [ + have_teradata=$withval + ], ) + + teradata_user_inc= + AC_ARG_WITH(teradata-includes, + [ --with-teradata-includes=DIR + set teradata include dir], + [ + have_teradata=yes + teradata_user_inc=$withval + ], ) + + teradata_user_lib= + AC_ARG_WITH(teradata-libraries, + [ --with-teradata-libraries=DIR + set teradata lib dir], + [ + have_teradata=yes + teradata_user_lib=$withval + ], ) + + cflags_td_save=$CXXFLAGS + ldflags_td_save=$LDFLAGS + libs_td_save=$LIBS + + td_cflags= + td_ldflags= + td_lib="-lcliv2 -ltdusr" + + if test "x$teradata_user_lib" != "x"; then + td_ldflags="-L$teradata_user_lib" + fi + if test "x$teradata_user_inc" != "x"; then + td_cflags="-I$teradata_user_inc" + fi + + if test $have_teradata = no; then + AC_MSG_RESULT(no) + else + AC_DEFINE(TO_HAVE_TERADATA, 1, [Define if Teradata support is enabled.]) + + CXXFLAGS="$CXXFLAGS $td_cflags" + LDFLAGS="$LDFLAGS $td_ldflags" + LIBS="$td_lib" + + AC_RUN_IFELSE([[ +#include <stdlib.h> + +#include <coptypes.h> /* Teradata include files */ +#include <coperr.h> +#include <dbcarea.h> +#include <parcel.h> +#include <dbchqep.h> + + int main(int c, char **v) { + static Int32 result; + static char cnta[4]; + struct DBCAREA *dbcp; + + dbcp = (DBCAREA *) malloc(sizeof(struct DBCAREA)); + dbcp->total_len = sizeof(struct DBCAREA); + DBCHINI(&result,cnta, dbcp); + + return 0; + } + ]], [found_td=yes], + [found_td=no], ) + + if test $found_td = no; then + AC_MSG_ERROR([ +Couldn't compile and run a Teradata client.]) + fi + + # AM_CONDITIONAL in configure.in uses this variable to enable td + # targets. + enable_teradata=yes + AC_MSG_RESULT(yes) + + # don't change flags for all targets, just export TD variables. + CXXFLAGS=$cflags_td_save + AC_SUBST(TERADATA_CXXFLAGS, $td_cflags) + + LDFLAGS=$ldflags_td_save + AC_SUBST(TERADATA_LDFLAGS, $td_ldflags) + + LIBS=$libs_td_save + AC_SUBST(TERADATA_LIBS, $td_lib) + fi +]) Modified: branches/tora-trotl/configure.ac =================================================================== --- branches/tora-trotl/configure.ac 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/configure.ac 2010-06-25 08:57:06 UTC (rev 3586) @@ -51,6 +51,7 @@ AC_PATH_UIC AC_PATH_RCC TORA_CHECK_POSTGRES +TORA_CHECK_TERADATA TORA_CHECK_ORACLE TORA_CHECK_QSCINTILLA AX_PATH_LIB_PCRE @@ -59,6 +60,7 @@ # Makefile.am uses these AM_CONDITIONAL(HAVE_ORACLE, test "$enable_oracle" = yes) +AM_CONDITIONAL(HAVE_TERADATA, test "$enable_teradata" = yes) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([utils/Makefile]) Property changes on: branches/tora-trotl/debian/changelog ___________________________________________________________________ Modified: svn:mergeinfo - /branches/tora-1.4/tora/debian/changelog:2138-2496 /trunk/tora/debian/changelog:5-2137,3472-3523 + /branches/tora-1.4/tora/debian/changelog:2138-2496 /trunk/tora/debian/changelog:5-2137,3472-3578 Modified: branches/tora-trotl/rpm/tora.desktop =================================================================== --- branches/tora-trotl/rpm/tora.desktop 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/rpm/tora.desktop 2010-06-25 08:57:06 UTC (rev 3586) @@ -3,7 +3,7 @@ Name=Toolkit for Oracle Comment=Toolkit for Oracle and other databases administration and development X-KDE-StartupNotify=true -MimeType=application/x-tora +MimeType=application/x-tora; Icon=tora Terminal=false Type=Application Modified: branches/tora-trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/CMakeLists.txt 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/src/CMakeLists.txt 2010-06-25 08:57:06 UTC (rev 3586) @@ -103,6 +103,7 @@ tobrowsercodewidget.h tobrowsertriggerwidget.h tobrowserdblinkswidget.h + tobrowserdirectorieswidget.h # tobrowserschemabasewidget.h # toconf.h # toconfiguration.h @@ -275,6 +276,7 @@ tobrowsercodewidget.cpp tobrowsertriggerwidget.cpp tobrowserdblinkswidget.cpp + tobrowserdirectorieswidget.cpp # tobrowserschemabasewidget.cpp toconfiguration.cpp toconnection.cpp @@ -429,6 +431,11 @@ db2/db2query.cpp) #db2/qsql_db2.cpp) ENDIF (DB2_FOUND) + +IF (TERADATA_FOUND) + LIST (APPEND TORA_SOURCES toteradataconnection.cpp) +ENDIF (TERADATA_FOUND) + # compiled in icons for windows IF (WIN32 AND MSVC) SET (TORA_SOURCES ${TORA_SOURCES} tora.rc) @@ -496,6 +503,10 @@ INCLUDE_DIRECTORIES( ${DB2_INCLUDES} ) ENDIF (DB2_INCLUDES) +IF (TERADATA_PATH_INCLUDES) + INCLUDE_DIRECTORIES( ${TERADATA_PATH_INCLUDES} ) +ENDIF (TERADATA_PATH_INCLUDES) + IF (WANT_INTERNAL_QSCINTILLA) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/qscintilla2/Qt4 @@ -549,6 +560,10 @@ TARGET_LINK_LIBRARIES (${EXE_NAME} ${DB2_LIBRARIES}) ENDIF (DB2_LIBRARIES) +IF (TERADATA_LIBRARIES) + TARGET_LINK_LIBRARIES (${EXE_NAME} ${TERADATA_LIBRARIES}) +ENDIF (TERADATA_LIBRARIES) + IF (USE_TROTL) SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") TARGET_LINK_LIBRARIES (${EXE_NAME} ${TROTL_LIB}) Modified: branches/tora-trotl/src/Makefile.am =================================================================== --- branches/tora-trotl/src/Makefile.am 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/src/Makefile.am 2010-06-25 08:57:06 UTC (rev 3586) @@ -19,6 +19,7 @@ -DDEFAULT_PLUGIN_DIR=\"$(libdir)\" \ -DTOVERSION=\"$(PACKAGE_VERSION)\" \ $(ORACLE_CXXFLAGS) \ + $(TERADATA_CXXFLAGS) \ $(QT_DEFINES) \ $(WIN_CXXFLAGS) \ $(QSCINTILLA_CXXFLAGS) @@ -29,13 +30,14 @@ -lstdc++ \ $(LIBPTHREAD) \ $(ORACLE_LDFLAGS) \ + $(TERADATA_LDFLAGS) \ $(WIN_LDFLAGS) \ $(QSCINTILLA_LDFLAGS) # fix for annoying automake naming problems. tora_CXXFLAGS = $(AM_CXXFLAGS) -tora_LDADD = $(ORACLE_LIBS) $(PQ_LIBS) $(@TORA_LINK_OTHERS@) +tora_LDADD = $(ORACLE_LIBS) $(PQ_LIBS) $(TERADATA_LIBS) $(@TORA_LINK_OTHERS@) if HAVE_ORACLE EXTRA_ORACLE_MONO_SOURCE = tooracleconnection.cpp tooraclesetting.h \ @@ -44,6 +46,10 @@ EXTRA_ORACLE_MONO_SOURCE_MOC = moc_tooraclesetting.cpp endif +if HAVE_TERADATA +EXTRA_TERADATE_SOURCE = toteradataconnection.cpp +endif + tora_SOURCES=main.cpp \ tomainwindow.cpp tomainwindow.h \ toabout.cpp toabout.h \ @@ -195,6 +201,7 @@ tobrowsercodewidget.cpp tobrowsercodewidget.h \ tobrowsertriggerwidget.cpp tobrowsertriggerwidget.h \ tobrowserdblinkswidget.cpp tobrowserdblinkswidget.h \ + tobrowserdirectorieswidget.cpp tobrowserdirectorieswidget.h \ toresultgrants.cpp toresultgrants.h \ migratetool/sqldeveloper.cpp migratetool/sqldeveloper.h \ migratetool/squirrelsql.cpp migratetool/squirrelsql.h \ @@ -202,6 +209,7 @@ shortcuteditor/shortcuteditordialog.cpp shortcuteditor/shortcuteditordialog.h \ shortcuteditor/shortcutmodel.cpp shortcuteditor/shortcutmodel.h \ $(EXTRA_ORACLE_MONO_SOURCE) \ + $(EXTRA_TERADATE_SOURCE) \ $(LOKIDIR_SRC)/SmallObj.cpp \ $(LOKIDIR_SRC)/Singleton.cpp \ $(EXTRA_tora_SOURCES) \ @@ -427,6 +435,7 @@ moc_tobrowsercodewidget.cpp \ moc_tobrowsertriggerwidget.cpp \ moc_tobrowserdblinkswidget.cpp \ + moc_tobrowserdirectorieswidget.cpp \ moc_toresultgrants.cpp \ docklets/moc_toviewdirectory.cpp \ docklets/moc_toviewconnections.cpp \ Modified: branches/tora-trotl/src/tobackuptool.cpp =================================================================== --- branches/tora-trotl/src/tobackuptool.cpp 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/src/tobackuptool.cpp 2010-06-25 08:57:06 UTC (rev 3586) @@ -79,4 +79,5 @@ Windows.erase(i); } +static toBackupTool BackupTool; Modified: branches/tora-trotl/src/tobrowser.cpp =================================================================== --- branches/tora-trotl/src/tobrowser.cpp 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/src/tobrowser.cpp 2010-06-25 08:57:06 UTC (rev 3586) @@ -126,6 +126,7 @@ #include "tobrowsercodewidget.h" #include "tobrowsertriggerwidget.h" #include "tobrowserdblinkswidget.h" +#include "tobrowserdirectorieswidget.h" #include "tobrowseraccesswidget.h" #include "tobrowserschemawidget.h" @@ -151,7 +152,7 @@ bool toBrowserTool::canHandle(toConnection &conn) { - return toIsOracle(conn) || toIsMySQL(conn) || toIsPostgreSQL(conn) || toIsSapDB(conn); + return toIsOracle(conn) || toIsMySQL(conn) || toIsPostgreSQL(conn) || toIsSapDB(conn) || toIsTeradata(conn); } void toBrowserTool::customSetup() @@ -669,16 +670,25 @@ #define TAB_DBLINK_INFO "DBLinkInfo" #define TAB_DBLINK_SYNONYMS "DBLinkSynonyms" +#define TAB_DIRECTORIES "Directories" + #define TAB_ACCESS "Access" #define TAB_ACCESS_CONTENT "AccessContent" #define TAB_ACCESS_USER "AccessUser" #define TAB_ACCESS_OBJECTS "AccessObjects" -static toSQL SQLListTablesMysql("toBrowser:ListTables", - "SHOW TABLES FROM `:f1<noquote>`", +static toSQL SQLListTablesMysql3("toBrowser:ListTables", + "SHOW TABLES FROM :f1<noquote>", "List the available tables in a schema.", "3.0", "MySQL"); +static toSQL SQLListTablesMysql("toBrowser:ListTables", + "SELECT TABLE_NAME TABLES\n" + " FROM information_schema.tables\n" + " WHERE table_schema = :f1<char[101]>", + "", + "5.0", + "MySQL"); static toSQL SQLListTables("toBrowser:ListTables", "SELECT Table_Name,NULL \" Ignore\",NULL \" Ignore2\",Tablespace_name \" Ignore2\"\n" " FROM SYS.ALL_ALL_TABLES WHERE OWNER = :f1<char[101]> AND IOT_Name IS NULL\n" @@ -717,61 +727,70 @@ "", "", "SapDB"); - -static toSQL SQLTableIndex("toBrowser:TableIndex", - "SELECT IND.index_name AS \"Index Name\",\n" - " ind.column_name AS \"Column Name\",\n" - " al.uniqueness AS \"Unique\",\n" - " AL.index_type AS \"Type\",\n" - " EX.column_expression AS \"Column Expression\"\n" - " FROM SYS.ALL_IND_COLUMNS IND,\n" - " SYS.ALL_IND_EXPRESSIONS EX,\n" - " sys.All_Indexes AL\n" - " WHERE IND.INDEX_OWNER = :own<char[101]>\n" - " AND IND.TABLE_NAME = :nam<char[101]>\n" - " AND EX.index_owner ( + ) = IND.index_owner\n" - " AND EX.index_name ( + ) = IND.index_name\n" - " AND IND.index_name = AL.index_name ( + )\n" - " AND IND.index_owner = AL.owner ( + )", - "List the indexes on a table", - ""); -static toSQL SQLTableIndexSapDB("toBrowser:TableIndex", - "SELECT owner,\n" - " indexname \"Index_Name\",\n" - " 'NORMAL',\n" - " type\n" - " FROM indexes \n" - " WHERE owner = :f1<char[101]> and tablename = :f2<char[101]> \n" - " ORDER by indexname", - "", - "", - "SapDB"); - -static toSQL SQLTableIndexPG("toBrowser:TableIndex", - "SELECT u.usename AS \"Owner\",\n" - " c2.relname AS \"Index Name\",\n" - " pg_get_indexdef(i.indexrelid) as \"Definition\"\n" - " FROM pg_class c,\n" - " pg_class c2,\n" - " pg_index i,\n" - " pg_user u,\n" - " pg_namespace n\n" - " WHERE c.relowner = u.usesysid\n" - " AND n.nspname = :f1\n" - " AND c.relname = :f2\n" - " AND c.relowner = u.usesysid\n" - " AND n.OID = c.relnamespace\n" - " AND c.OID = i.indrelid\n" - " AND i.indexrelid = c2.OID", +static toSQL SQLListTablesTD("toBrowser:ListTables", + "SELECT trim ( tablename ) AS \"Table Name\"\n" + " FROM dbc.TABLES\n" + " WHERE databasename = trim ( upper ( :f1<char[101]> ) )\n" + " AND tablekind = 'T'\n" + " ORDER BY 1", "", "", - "PostgreSQL"); + "Teradata"); -static toSQL SQLTableIndexMySQL("toBrowser:TableIndex", - "SHOW INDEX FROM `:f1<noquote>`.`:tab<noquote>`", - "", - "", - "MySQL"); +// static toSQL SQLTableIndex("toBrowser:TableIndex", +// "SELECT IND.index_name AS \"Index Name\",\n" +// " ind.column_name AS \"Column Name\",\n" +// " al.uniqueness AS \"Unique\",\n" +// " AL.index_type AS \"Type\",\n" +// " EX.column_expression AS \"Column Expression\"\n" +// " FROM SYS.ALL_IND_COLUMNS IND,\n" +// " SYS.ALL_IND_EXPRESSIONS EX,\n" +// " sys.All_Indexes AL\n" +// " WHERE IND.INDEX_OWNER = :own<char[101]>\n" +// " AND IND.TABLE_NAME = :nam<char[101]>\n" +// " AND EX.index_owner ( + ) = IND.index_owner\n" +// " AND EX.index_name ( + ) = IND.index_name\n" +// " AND IND.index_name = AL.index_name ( + )\n" +// " AND IND.index_owner = AL.owner ( + )", +// "List the indexes on a table", +// ""); +// static toSQL SQLTableIndexSapDB("toBrowser:TableIndex", +// "SELECT owner,\n" +// " indexname \"Index_Name\",\n" +// " 'NORMAL',\n" +// " type\n" +// " FROM indexes \n" +// " WHERE owner = :f1<char[101]> and tablename = :f2<char[101]> \n" +// " ORDER by indexname", +// "", +// "", +// "SapDB"); +// +// static toSQL SQLTableIndexPG("toBrowser:TableIndex", +// "SELECT u.usename AS \"Owner\",\n" +// " c2.relname AS \"Index Name\",\n" +// " pg_get_indexdef(i.indexrelid) as \"Definition\"\n" +// " FROM pg_class c,\n" +// " pg_class c2,\n" +// " pg_index i,\n" +// " pg_user u,\n" +// " pg_namespace n\n" +// " WHERE c.relowner = u.usesysid\n" +// " AND n.nspname = :f1\n" +// " AND c.relname = :f2\n" +// " AND c.relowner = u.usesysid\n" +// " AND n.OID = c.relnamespace\n" +// " AND c.OID = i.indrelid\n" +// " AND i.indexrelid = c2.OID", +// "", +// "", +// "PostgreSQL"); +// +// static toSQL SQLTableIndexMySQL3("toBrowser:TableIndex", +// "SHOW INDEX FROM `:f1<noquote>`.`:tab<noquote>`", +// "", +// "3.0", +// "MySQL"); // static toSQL SQLTableConstraint( // "toBrowser:TableConstraint", @@ -1025,6 +1044,16 @@ "", "", "SapDB"); +static toSQL SQLListViewTD("toBrowser:ListView", + "SELECT trim ( tablename ) AS \"View_Name\"\n" + " FROM dbc.TABLES\n" + " WHERE databasename = trim ( upper ( :f1<char[101]> ) )\n" + " AND tablekind = 'V'\n" + " ORDER BY 1", + "", + "", + "Teradata"); + // static toSQL SQLViewSQLPgSQL("toBrowser:ViewSQL", // "SELECT pg_get_viewdef(c.relname)\n" // " FROM pg_class c LEFT OUTER JOIN pg_namespace n ON c.relnamespace=n.oid\n" @@ -1332,6 +1361,11 @@ // "Display foreign synonyms"); // #endif +static toSQL SQLListDirectories("toBrowser:ListDirectories", + "SELECT DISTINCT directory_name FROM SYS.ALL_DIRECTORIES\n" + " ORDER BY directory_name", + "List database external directories"); + static toSQL SQLMySQLAccess("toBrowser:MySQLAcess", "SHOW TABLES FROM mysql", "Show access tables for MySQL databases", @@ -1697,6 +1731,43 @@ m_browsersMap[dblinkSplitter] = dblinkBrowserWidget; // #endif // dblink + + + directoriesSplitter = new QSplitter(Qt::Horizontal, m_mainTab); + directoriesSplitter->setObjectName(TAB_DIRECTORIES); + + QWidget * directoriesWidget = new QWidget(directoriesSplitter); + + QVBoxLayout * directoriesLayout = new QVBoxLayout; + directoriesLayout->setSpacing(0); + directoriesLayout->setContentsMargins(0, 0, 0, 0); + directoriesWidget->setLayout(directoriesLayout); + + directoriesView = new toBrowserSchemaTableView(directoriesWidget); + directoriesBrowserWidget = new toBrowserDirectoriesWidget(directoriesSplitter); + + directoriesLayout->addWidget(directoriesView); + directoriesView->setReadAll(true); + directoriesView->setSQL(SQLListDirectories); + directoriesView->resize(FIRST_WIDTH, directoriesView->height()); + + connect(directoriesView, + SIGNAL(selectionChanged()), + this, + SLOT(changeItem())); + connect(directoriesView, + SIGNAL(displayMenu(QMenu *)), + this, + SLOT(displayIndexMenu(QMenu *))); + + directoriesWidget->resize(FIRST_WIDTH, directoriesView->height()); + directoriesSplitter->setStretchFactor(directoriesSplitter->indexOf(directoriesView), 0); + directoriesSplitter->setStretchFactor(directoriesSplitter->indexOf(directoriesBrowserWidget), 1); + + m_objectsMap[directoriesSplitter] = directoriesView; + m_browsersMap[directoriesSplitter] = directoriesBrowserWidget; + + accessSplitter = new QSplitter(Qt::Horizontal, m_mainTab); accessSplitter->setObjectName(TAB_ACCESS); // m_mainTab->addTab(accessSplitter, tr("Access")); @@ -1776,7 +1847,10 @@ "main widget of the tab is not QSplitter as is mandatory!"); if (m_objectsMap.contains(ix)) + { m_objectsMap[ix]->changeParams(schema(), Filter ? Filter->wildCard() : "%"); + changeItem(); + } else get_log(2).ts<toDecorator>( __HERE__) << "mainTab_currentChanged unhandled index:" << ix; } @@ -1909,12 +1983,9 @@ // enable/disable main tabs depending on DB m_mainTab->clear(); - addTab(tableSplitter, tr("T&ables"), - true); - addTab(viewSplitter, tr("&Views"), - !toIsMySQL(connection())); - addTab(indexSplitter, tr("Inde&xes"), - true); + addTab(tableSplitter, tr("T&ables"), true); + addTab(viewSplitter, tr("&Views"), !toIsMySQL(connection())); + addTab(indexSplitter, tr("Inde&xes"), true); addTab(sequenceSplitter, tr("Se&quences"), toIsOracle(connection()) || toIsPostgreSQL(connection())); addTab(synonymSplitter, tr("S&ynonyms"), @@ -1923,14 +1994,12 @@ // Starting with version 5.0 MySQL supports stored functions/procedures // If TOra is used a lot with older versions of MySQL the "true" parameter // should be enhanced with a check for MySQL version - addTab(codeSplitter, tr("Cod&e"), - true); + addTab(codeSplitter, tr("Cod&e"), true); addTab(triggerSplitter, tr("Tri&ggers"), !toIsMySQL(connection()) && !toIsPostgreSQL(connection())); - addTab(dblinkSplitter, tr("DBLinks"), - toIsOracle(connection())); - addTab(accessSplitter, tr("Access"), - toIsMySQL(connection())); + addTab(dblinkSplitter, tr("DBLinks"), toIsOracle(connection())); + addTab(directoriesSplitter, tr("Directories"), toIsOracle(connection())); + addTab(accessSplitter, tr("Access"), toIsMySQL(connection())); foreach (toBrowserBaseWidget * w, m_browsersMap.values()) w->changeConnection(); Modified: branches/tora-trotl/src/tobrowser.h =================================================================== --- branches/tora-trotl/src/tobrowser.h 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/src/tobrowser.h 2010-06-25 08:57:06 UTC (rev 3586) @@ -74,6 +74,7 @@ class toBrowserCodeWidget; class toBrowserTriggerWidget; class toBrowserDBLinksWidget; +class toBrowserDirectoriesWidget; class toBrowserAccessWidget; class toBrowserBaseWidget; class toBrowserSchemaBase; @@ -148,6 +149,10 @@ QSplitter * dblinkSplitter; toBrowserSchemaTableView * dblinkView; toBrowserDBLinksWidget * dblinkBrowserWidget; + + QSplitter * directoriesSplitter; + toBrowserSchemaTableView * directoriesView; + toBrowserDirectoriesWidget * directoriesBrowserWidget; QSplitter * accessSplitter; toBrowserSchemaTableView * accessView; Modified: branches/tora-trotl/src/tobrowserbasewidget.cpp =================================================================== --- branches/tora-trotl/src/tobrowserbasewidget.cpp 2010-06-25 08:55:12 UTC (rev 3585) +++ branches/tora-trotl/src/tobrowserbasewidget.cpp 2010-06-25 08:57:06 UTC (rev 3586) @@ -137,14 +137,27 @@ void toBrowserBaseWidget::updateData(const QString & ix) { - if (schema().isEmpty() || object().isEmpty()) - return; + QString sch(schema()); + QString obj(object()); + // HACK: clear content on "refresh" or "schema change" with dummy empty names + // resolving bug #514310 - When switching to a different schema, or refreshing + // the current schema in schema browser, the detail + // window still displays the info for the last item selected... + if (sch.isEmpty()) + sch = " "; + if (obj.isEmpty()) + obj = " "; + toConnection &conn = toMainWidget()->currentConnection(); if (toIsMySQL(conn) && !type().isEmpty()) - // MySQL requires additional parameter to fetch routine (procedure/function) creation script - // Parameter must be passed first. This parameter (type) is only specified when it is a MySQL - // connection and routine code is being fetched (as opposed to fetching say tables) - m_tabs[ix]->changeParams(type(), schema(), object()); + { + // MySQL requires additional parameter to fetch routine (procedure/function) creation script + // Parameter must be passed first. This parameter (type) is only specified when it is a MySQL + // connection and routine code is being fetched (as opposed to fetching say tables) + m_tabs[ix]->changeParams(type(), sch, obj); + } else - m_tabs[ix]->changeParams(schema(), object()); + { + m_tabs[ix]->changeParams(sch, obj); + } } Copied: branches/tora-trotl/src/tobrowserdirectorieswidget.cpp (from rev 3578, trunk/tora/src/tobrowserdirectorieswidget.cpp) =================================================================== --- branches/tora-trotl/src/tobrowserdirectorieswidget.cpp (rev 0) +++ branches/tora-trotl/src/tobrowserdirectorieswidget.cpp 2010-06-25 08:57:06 UTC (rev 3586) @@ -0,0 +1,79 @@ + +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2009 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + +#include "toresulttableview.h" +#include "utils.h" + +#include "tobrowserdirectorieswidget.h" + +static toSQL SQLDirectoriesInfo("toBrowser:DirectoriesInformation", + "SELECT * FROM sys.all_directories\n" + " WHERE directory_name = :f1<char[101]>\n" + " ORDER BY owner, directory_name", + "Display information about directories by name"); + + + +toBrowserDirectoriesWidget::toBrowserDirectoriesWidget(QWidget * parent) + : toBrowserBaseWidget(parent) +{ + setObjectName("toBrowserDirectoriesWidget"); + + synonymsView = new toResultTableView(this); + synonymsView->setObjectName("directoriesView"); + synonymsView->setSQL(SQLDirectoriesInfo); + + changeConnection(); +} + +void toBrowserDirectoriesWidget::changeConnection() +{ + toBrowserBaseWidget::changeConnection(); + toConnection & c = toCurrentConnection(this); + if (toIsOracle(c)) + { + addTab(synonymsView, "&Directories"); + } + else + { + synonymsView->setVisible(false); + } +} Copied: branches/tora-trotl/src/tobrowserdirectorieswidget.h (from rev 3578, trunk/tora/src/tobrowserdirectorieswidget.h) =================================================================== --- branches/tora-trotl/src/tobrowserdirectorieswidget.h (rev 0) +++ branches/tora-trotl/src/tobrowserdirectorieswidget.h 2010-06-25 08:57:06 UTC (rev 3586) @@ -0,0 +1,67 @@ + +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2009 Numerous O... [truncated message content] |
From: <ibr...@us...> - 2010-07-08 21:59:32
|
Revision: 3610 http://tora.svn.sourceforge.net/tora/?rev=3610&view=rev Author: ibre5041 Date: 2010-07-08 21:59:25 +0000 (Thu, 08 Jul 2010) Log Message: ----------- sync with Tora trunk Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/cmake/modules/FindOracle.cmake branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/tobrowser.cpp branches/tora-trotl/src/tobrowserdirectorieswidget.cpp branches/tora-trotl/src/tobrowserdirectorieswidget.h Property Changed: ---------------- branches/tora-trotl/debian/changelog Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2010-07-08 21:52:38 UTC (rev 3609) +++ branches/tora-trotl/CMakeLists.txt 2010-07-08 21:59:25 UTC (rev 3610) @@ -11,7 +11,7 @@ OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" ON) OPTION(WANT_BUNDLE "Enable Mac OS X bundle build" OFF) OPTION(WANT_BUNDLE_STANDALONE "Do not copy required libs and tools into bundle (WANT_BUNDLE)" ON) -OPTION(USE_PCH "Use percompiled headers" OFF) +OPTION(USE_PCH "Use percompiled headers" ON) #Set our CMake minimum version #Require 2.4.2 for Qt finding Modified: branches/tora-trotl/cmake/modules/FindOracle.cmake =================================================================== --- branches/tora-trotl/cmake/modules/FindOracle.cmake 2010-07-08 21:52:38 UTC (rev 3609) +++ branches/tora-trotl/cmake/modules/FindOracle.cmake 2010-07-08 21:59:25 UTC (rev 3610) @@ -202,11 +202,11 @@ IF (ORACLE_FOUND) # there *must* be OCI version defined for internal libraries - #IF (ORACLE_OCI_VERSION) - # ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) - #ELSE (ORACLE_OCI_VERSION) - # MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") - #ENDIF (ORACLE_OCI_VERSION) + IF (ORACLE_OCI_VERSION) + ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION}) + ELSE (ORACLE_OCI_VERSION) + MESSAGE(FATAL_ERROR "Set -DORACLE_OCI_VERSION for your oci. [8, 8I, 9I, 10G, 10G_R2]") + ENDIF (ORACLE_OCI_VERSION) ELSE (ORACLE_FOUND) Property changes on: branches/tora-trotl/debian/changelog ___________________________________________________________________ Modified: svn:mergeinfo - /branches/tora-1.4/tora/debian/changelog:2138-2496 /trunk/tora/debian/changelog:5-2137,3472-3578 + /branches/tora-1.4/tora/debian/changelog:2138-2496 /trunk/tora/debian/changelog:5-2137,3472-3606 Modified: branches/tora-trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/CMakeLists.txt 2010-07-08 21:52:38 UTC (rev 3609) +++ branches/tora-trotl/src/CMakeLists.txt 2010-07-08 21:59:25 UTC (rev 3610) @@ -81,6 +81,7 @@ toabout.h toalert.h toanalyze.h + toawr.h # tobackground.h # tobackgroundlabel.h tobackup.h @@ -242,7 +243,6 @@ docklets/toviewconnections.h docklets/toviewdirectory.h # - toawr.h ) IF (ORACLE_FOUND) LIST(APPEND TORA_MOC_CLASSES tooraclesetting.h) @@ -255,6 +255,7 @@ toabout.cpp toalert.cpp toanalyze.cpp + toawr.cpp tobackground.cpp tobackgroundlabel.cpp tobackup.cpp @@ -419,7 +420,6 @@ docklets/toviewconnections.cpp docklets/toviewdirectory.cpp # - toawr.cpp tooracletable.cpp ) Modified: branches/tora-trotl/src/tobrowser.cpp =================================================================== --- branches/tora-trotl/src/tobrowser.cpp 2010-07-08 21:52:38 UTC (rev 3609) +++ branches/tora-trotl/src/tobrowser.cpp 2010-07-08 21:59:25 UTC (rev 3610) @@ -1363,6 +1363,8 @@ static toSQL SQLListDirectories("toBrowser:ListDirectories", "SELECT DISTINCT directory_name FROM SYS.ALL_DIRECTORIES\n" + " WHERE (owner = 'SYS' or owner=:f1<char[101]>) and\n" + " UPPER(directory_name) like :f2<char[101]>", " ORDER BY directory_name", "List database external directories"); Modified: branches/tora-trotl/src/tobrowserdirectorieswidget.cpp =================================================================== --- branches/tora-trotl/src/tobrowserdirectorieswidget.cpp 2010-07-08 21:52:38 UTC (rev 3609) +++ branches/tora-trotl/src/tobrowserdirectorieswidget.cpp 2010-07-08 21:59:25 UTC (rev 3610) @@ -57,9 +57,9 @@ { setObjectName("toBrowserDirectoriesWidget"); - synonymsView = new toResultTableView(this); - synonymsView->setObjectName("directoriesView"); - synonymsView->setSQL(SQLDirectoriesInfo); + directoriesView = new toResultTableView(this); + directoriesView->setObjectName("directoriesView"); + directoriesView->setSQL(SQLDirectoriesInfo); changeConnection(); } @@ -70,10 +70,10 @@ toConnection & c = toCurrentConnection(this); if (toIsOracle(c)) { - addTab(synonymsView, "&Directories"); + addTab(directoriesView, "&Directories"); } else { - synonymsView->setVisible(false); + directoriesView->setVisible(false); } } Modified: branches/tora-trotl/src/tobrowserdirectorieswidget.h =================================================================== --- branches/tora-trotl/src/tobrowserdirectorieswidget.h 2010-07-08 21:52:38 UTC (rev 3609) +++ branches/tora-trotl/src/tobrowserdirectorieswidget.h 2010-07-08 21:59:25 UTC (rev 3610) @@ -55,7 +55,7 @@ { Q_OBJECT - toResultTableView *synonymsView; + toResultTableView *directoriesView; public: toBrowserDirectoriesWidget(QWidget * parent); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2010-07-28 22:47:11
|
Revision: 3640 http://tora.svn.sourceforge.net/tora/?rev=3640&view=rev Author: ibre5041 Date: 2010-07-28 22:47:00 +0000 (Wed, 28 Jul 2010) Log Message: ----------- sync with TOra trunk Modified Paths: -------------- branches/tora-trotl/README.CMAKE branches/tora-trotl/doc/help/Index_002dlist.html branches/tora-trotl/doc/help/additionalhelp.html branches/tora-trotl/doc/help/alert.html branches/tora-trotl/doc/help/analyze.html branches/tora-trotl/doc/help/api.html branches/tora-trotl/doc/help/browser.html branches/tora-trotl/doc/help/charts.html branches/tora-trotl/doc/help/common.html branches/tora-trotl/doc/help/current.html branches/tora-trotl/doc/help/database.html branches/tora-trotl/doc/help/debugger.html branches/tora-trotl/doc/help/editor.html branches/tora-trotl/doc/help/editors.html branches/tora-trotl/doc/help/explainplan.html branches/tora-trotl/doc/help/extendingtora.html branches/tora-trotl/doc/help/externalapi.html branches/tora-trotl/doc/help/gettingbindparameters.html branches/tora-trotl/doc/help/globalsettings.html branches/tora-trotl/doc/help/help.html branches/tora-trotl/doc/help/history.html branches/tora-trotl/doc/help/index.html branches/tora-trotl/doc/help/invalid.html branches/tora-trotl/doc/help/lists.html branches/tora-trotl/doc/help/lists.texi branches/tora-trotl/doc/help/memoeditor.html branches/tora-trotl/doc/help/newconnection.html branches/tora-trotl/doc/help/objectdescription.html branches/tora-trotl/doc/help/output.html branches/tora-trotl/doc/help/plsqleditor.html branches/tora-trotl/doc/help/preferences.html branches/tora-trotl/doc/help/rollback.html branches/tora-trotl/doc/help/script.html branches/tora-trotl/doc/help/searchreplace.html branches/tora-trotl/doc/help/security.html branches/tora-trotl/doc/help/session.html branches/tora-trotl/doc/help/sgastatement.html branches/tora-trotl/doc/help/sqledit.html branches/tora-trotl/doc/help/storage.html branches/tora-trotl/doc/help/template.html branches/tora-trotl/doc/help/tools.html branches/tora-trotl/doc/help/toolsetting.html branches/tora-trotl/doc/help/tora.texi branches/tora-trotl/doc/help/trace.html branches/tora-trotl/doc/help/tuning.html branches/tora-trotl/doc/help/unittest.html branches/tora-trotl/doc/help/whatprivileges.html branches/tora-trotl/doc/help/window.html branches/tora-trotl/doc/help/worksheet.html branches/tora-trotl/doc/help/workspace.html branches/tora-trotl/sandbox/SELECT_SIMPLE.g branches/tora-trotl/src/tobrowser.cpp branches/tora-trotl/src/toconnection.h branches/tora-trotl/src/todebug.cpp branches/tora-trotl/src/todebug.h branches/tora-trotl/src/tolistviewformatter.h branches/tora-trotl/src/tolistviewformattercsv.cpp branches/tora-trotl/src/tolistviewformattersql.cpp branches/tora-trotl/src/tologger.h branches/tora-trotl/src/tomain.cpp branches/tora-trotl/src/tonewconnectionui.ui branches/tora-trotl/src/toplsqltext.cpp branches/tora-trotl/src/tora.qrc branches/tora-trotl/src/toresulttableview.cpp branches/tora-trotl/src/toresulttableview.h branches/tora-trotl/src/toresulttableviewedit.h branches/tora-trotl/src/toresultview.cpp branches/tora-trotl/src/toteradataconnection.cpp Added Paths: ----------- branches/tora-trotl/doc/help/images/exporttofile.png branches/tora-trotl/src/help/images/exporttofile.png Property Changed: ---------------- branches/tora-trotl/ branches/tora-trotl/debian/changelog Property changes on: branches/tora-trotl ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/tora:3191-3606 + /trunk/tora:3191-3639 Modified: branches/tora-trotl/README.CMAKE =================================================================== --- branches/tora-trotl/README.CMAKE 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/README.CMAKE 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,6 +9,11 @@ where "build_dir" can be e.g.: . for TOra source root directory or manually created directory to keep build files out of SVN copy. +Make targets: + * make + * make install + * make dist + Options: Cmake installs TOra into /usr/local as default. You can change it Property changes on: branches/tora-trotl/debian/changelog ___________________________________________________________________ Modified: svn:mergeinfo - /branches/tora-1.4/tora/debian/changelog:2138-2496 /trunk/tora/debian/changelog:5-2137,3472-3606 + /branches/tora-1.4/tora/debian/changelog:2138-2496 /trunk/tora/debian/changelog:5-2137,3472-3639 Modified: branches/tora-trotl/doc/help/Index_002dlist.html =================================================================== --- branches/tora-trotl/doc/help/Index_002dlist.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/Index_002dlist.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -8,7 +8,7 @@ <link rel="prev" href="extendingtora.html#extendingtora" title="extendingtora"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/additionalhelp.html =================================================================== --- branches/tora-trotl/doc/help/additionalhelp.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/additionalhelp.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="toolsetting.html#toolsetting" title="toolsetting"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/alert.html =================================================================== --- branches/tora-trotl/doc/help/alert.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/alert.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="invalid.html#invalid" title="invalid"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/analyze.html =================================================================== --- branches/tora-trotl/doc/help/analyze.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/analyze.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="alert.html#alert" title="alert"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/api.html =================================================================== --- branches/tora-trotl/doc/help/api.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/api.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="next" href="externalapi.html#externalapi" title="externalapi"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/browser.html =================================================================== --- branches/tora-trotl/doc/help/browser.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/browser.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="plsqleditor.html#plsqleditor" title="plsqleditor"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/charts.html =================================================================== --- branches/tora-trotl/doc/help/charts.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/charts.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="searchreplace.html#searchreplace" title="searchreplace"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/common.html =================================================================== --- branches/tora-trotl/doc/help/common.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/common.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="prev" href="preferences.html#preferences" title="preferences"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/current.html =================================================================== --- branches/tora-trotl/doc/help/current.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/current.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="script.html#script" title="script"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/database.html =================================================================== --- branches/tora-trotl/doc/help/database.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/database.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="additionalhelp.html#additionalhelp" title="additionalhelp"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/debugger.html =================================================================== --- branches/tora-trotl/doc/help/debugger.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/debugger.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="unittest.html#unittest" title="unittest"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/editor.html =================================================================== --- branches/tora-trotl/doc/help/editor.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/editor.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="database.html#database" title="database"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/editors.html =================================================================== --- branches/tora-trotl/doc/help/editors.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/editors.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="lists.html#lists" title="lists"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/explainplan.html =================================================================== --- branches/tora-trotl/doc/help/explainplan.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/explainplan.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="gettingbindparameters.html#gettingbindparameters" title="gettingbindparameters"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/extendingtora.html =================================================================== --- branches/tora-trotl/doc/help/extendingtora.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/extendingtora.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="next" href="Index_002dlist.html#Index_002dlist" title="Index-list"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/externalapi.html =================================================================== --- branches/tora-trotl/doc/help/externalapi.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/externalapi.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="prev" href="api.html#api" title="api"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/gettingbindparameters.html =================================================================== --- branches/tora-trotl/doc/help/gettingbindparameters.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/gettingbindparameters.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="objectdescription.html#objectdescription" title="objectdescription"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/globalsettings.html =================================================================== --- branches/tora-trotl/doc/help/globalsettings.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/globalsettings.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="next" href="editor.html#editor" title="editor"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/help.html =================================================================== --- branches/tora-trotl/doc/help/help.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/help.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="next" href="history.html#history" title="history"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/history.html =================================================================== --- branches/tora-trotl/doc/help/history.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/history.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="next" href="workspace.html#workspace" title="workspace"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Copied: branches/tora-trotl/doc/help/images/exporttofile.png (from rev 3639, trunk/tora/doc/help/images/exporttofile.png) =================================================================== (Binary files differ) Modified: branches/tora-trotl/doc/help/index.html =================================================================== --- branches/tora-trotl/doc/help/index.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/index.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -7,7 +7,7 @@ <link title="Top" rel="start" href="#Top"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } @@ -26,7 +26,7 @@ <div class="contents"> <h2>Table of Contents</h2> <ul> -<li><a name="toc_Top" href="index.html#Top">TOra Manual 2.1.2+</a> +<li><a name="toc_Top" href="index.html#Top">TOra Manual 2.1.3+</a> <li><a name="toc_help" href="help.html#help">1 Using the help browser</a> <li><a name="toc_history" href="history.html#history">2 History of TOra</a> <li><a name="toc_workspace" href="workspace.html#workspace">3 Getting to know your workspace</a> @@ -96,9 +96,9 @@ <hr> </div> -<h2 class="unnumbered">TOra Manual 2.1.2+</h2> +<h2 class="unnumbered">TOra Manual 2.1.3+</h2> -<p>This manual is for TOra, version 2.1.2+. +<p>This manual is for TOra, version 2.1.3+. <ul class="menu"> <li><a accesskey="1" href="help.html#help">Using the help browser</a> Modified: branches/tora-trotl/doc/help/invalid.html =================================================================== --- branches/tora-trotl/doc/help/invalid.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/invalid.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="output.html#output" title="output"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/lists.html =================================================================== --- branches/tora-trotl/doc/help/lists.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/lists.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="charts.html#charts" title="charts"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } @@ -66,6 +66,26 @@ <p>You can also place a line in the bind parameter(see <a href="gettingbindparameters.html#gettingbindparameters">gettingbindparameters</a>) cache by double clicking on a line. The bind name will be the same as the column name in lowercase. +<h4 class="subheading">Exporting the contents of a list</h4> + +<p>Contents of a list can be exported by choosing an "Export to file..." item from a context menu. This will give you a following dialog: + + <div class="block-image"><img src="images/exporttofile.png" alt="images/exporttofile.png"></div> + + <p>TOra allows you to export data in a number of formats: + + <ul> +<li><strong>Text</strong> - simple text file will be created with values in different columns separated by a required number of spaces. +<li><strong>Tab delimited</strong> - same as text just columns will be separated with a tab character. +<li><strong>CSV</strong> - values will be exported with a specified separator used. +<li><strong>Html</strong> - a html file be created with a single table containing values of a list. +<li><strong>SQL</strong> - a sql file will be created containing insert statements for values chosen. +</ul> + + <p>Please note that this functionality can be called from schema browser as well as from a sql worksheet tool. When exporting to sql file, only calling from schema browser tool will produce an insert statements with a correct table name. SQL Worksheet does not now exactly data of which table you're exporting (you could be exporting from a number of tables) therefore TOra will put "tablename" instead of actual name of table when exporting from SQL worksheet. Do not forget to update it in resulting sql file! + + <p>Case of keywords in insert statement can be controlled via configuration option "Keywords upper" found in editore preferences. + <h4 class="subheading">Other list functionality</h4> <p>Lists can always be printed by selecting the <strong>File|Print</strong> menu item. Modified: branches/tora-trotl/doc/help/lists.texi =================================================================== --- branches/tora-trotl/doc/help/lists.texi 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/lists.texi 2010-07-28 22:47:00 UTC (rev 3640) @@ -31,6 +31,26 @@ You can also place a line in the bind parameter(@pxref{gettingbindparameters}) cache by double clicking on a line. The bind name will be the same as the column name in lowercase. +@subheading Exporting the contents of a list + +Contents of a list can be exported by choosing an "Export to file..." item from a context menu. This will give you a following dialog: + +@image{images/exporttofile} + +TOra allows you to export data in a number of formats: + +@itemize @bullet +@item @strong{Text} - simple text file will be created with values in different columns separated by a required number of spaces. +@item @strong{Tab delimited} - same as text just columns will be separated with a tab character. +@item @strong{CSV} - values will be exported with a specified separator used. +@item @strong{Html} - a html file be created with a single table containing values of a list. +@item @strong{SQL} - a sql file will be created containing insert statements for values chosen. +@end itemize + +Please note that this functionality can be called from schema browser as well as from a sql worksheet tool. When exporting to sql file, only calling from schema browser tool will produce an insert statements with a correct table name. SQL Worksheet does not now exactly data of which table you're exporting (you could be exporting from a number of tables) therefore TOra will put "tablename" instead of actual name of table when exporting from SQL worksheet. Do not forget to update it in resulting sql file! + +Case of keywords in insert statement can be controlled via configuration option "Keywords upper" found in editore preferences. + @subheading Other list functionality Lists can always be printed by selecting the @strong{File|Print} menu item. Modified: branches/tora-trotl/doc/help/memoeditor.html =================================================================== --- branches/tora-trotl/doc/help/memoeditor.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/memoeditor.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="prev" href="objectdescription.html#objectdescription" title="objectdescription"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/newconnection.html =================================================================== --- branches/tora-trotl/doc/help/newconnection.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/newconnection.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="whatprivileges.html#whatprivileges" title="whatprivileges"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/objectdescription.html =================================================================== --- branches/tora-trotl/doc/help/objectdescription.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/objectdescription.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="memoeditor.html#memoeditor" title="memoeditor"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/output.html =================================================================== --- branches/tora-trotl/doc/help/output.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/output.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="template.html#template" title="template"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/plsqleditor.html =================================================================== --- branches/tora-trotl/doc/help/plsqleditor.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/plsqleditor.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="debugger.html#debugger" title="debugger"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/preferences.html =================================================================== --- branches/tora-trotl/doc/help/preferences.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/preferences.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="common.html#common" title="common"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/rollback.html =================================================================== --- branches/tora-trotl/doc/help/rollback.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/rollback.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="trace.html#trace" title="trace"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/script.html =================================================================== --- branches/tora-trotl/doc/help/script.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/script.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="analyze.html#analyze" title="analyze"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/searchreplace.html =================================================================== --- branches/tora-trotl/doc/help/searchreplace.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/searchreplace.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="preferences.html#preferences" title="preferences"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/security.html =================================================================== --- branches/tora-trotl/doc/help/security.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/security.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="storage.html#storage" title="storage"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/session.html =================================================================== --- branches/tora-trotl/doc/help/session.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/session.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="rollback.html#rollback" title="rollback"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/sgastatement.html =================================================================== --- branches/tora-trotl/doc/help/sgastatement.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/sgastatement.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="next" href="explainplan.html#explainplan" title="explainplan"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/sqledit.html =================================================================== --- branches/tora-trotl/doc/help/sqledit.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/sqledit.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="prev" href="template.html#template" title="template"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/storage.html =================================================================== --- branches/tora-trotl/doc/help/storage.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/storage.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="session.html#session" title="session"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/template.html =================================================================== --- branches/tora-trotl/doc/help/template.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/template.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="sqledit.html#sqledit" title="sqledit"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/tools.html =================================================================== --- branches/tora-trotl/doc/help/tools.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/tools.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="next" href="extendingtora.html#extendingtora" title="extendingtora"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/toolsetting.html =================================================================== --- branches/tora-trotl/doc/help/toolsetting.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/toolsetting.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="prev" href="additionalhelp.html#additionalhelp" title="additionalhelp"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/tora.texi =================================================================== --- branches/tora-trotl/doc/help/tora.texi 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/tora.texi 2010-07-28 22:47:00 UTC (rev 3640) @@ -8,7 +8,7 @@ @c %**end of header @copying -This manual is for TOra, version 2.1.2+. +This manual is for TOra, version 2.1.3+. @end copying @titlepage @@ -23,7 +23,7 @@ @ifnottex @node Top -@top TOra Manual 2.1.2+ +@top TOra Manual 2.1.3+ @insertcopying Modified: branches/tora-trotl/doc/help/trace.html =================================================================== --- branches/tora-trotl/doc/help/trace.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/trace.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="current.html#current" title="current"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/tuning.html =================================================================== --- branches/tora-trotl/doc/help/tuning.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/tuning.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="security.html#security" title="security"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/unittest.html =================================================================== --- branches/tora-trotl/doc/help/unittest.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/unittest.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="tuning.html#tuning" title="tuning"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/whatprivileges.html =================================================================== --- branches/tora-trotl/doc/help/whatprivileges.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/whatprivileges.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -10,7 +10,7 @@ <link rel="next" href="editors.html#editors" title="editors"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/window.html =================================================================== --- branches/tora-trotl/doc/help/window.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/window.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="next" href="newconnection.html#newconnection" title="newconnection"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/worksheet.html =================================================================== --- branches/tora-trotl/doc/help/worksheet.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/worksheet.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="next" href="browser.html#browser" title="browser"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/doc/help/workspace.html =================================================================== --- branches/tora-trotl/doc/help/workspace.html 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/doc/help/workspace.html 2010-07-28 22:47:00 UTC (rev 3640) @@ -9,7 +9,7 @@ <link rel="next" href="tools.html#tools" title="tools"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- -This manual is for TOra, version 2.1.2+.--> +This manual is for TOra, version 2.1.3+.--> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"><!-- pre.display { font-family:inherit } Modified: branches/tora-trotl/sandbox/SELECT_SIMPLE.g =================================================================== --- branches/tora-trotl/sandbox/SELECT_SIMPLE.g 2010-07-28 22:06:10 UTC (rev 3639) +++ branches/tora-trotl/sandbox/SELECT_SIMPLE.g 2010-07-28 22:47:00 UTC (rev 3640) @@ -98,11 +98,24 @@ | update_statement | insert_statement | merge_statement + | delete_statement ) SEMI ; /* ================================================================================ + DELETE Statement + ================================================================================ */ +delete_statement + : k_delete k_from? + ( + dml_table_expression_clause + | k_only LPAREN dml_table_expression_clause RPAREN + ) + t_alias? where_clause? returning_clause? error_logging_clause? + ; + +/* ================================================================================ MERGE Statement ================================================================================ */ merge_statement @@ -255,18 +268,18 @@ ; search_clause - : 'SEARCH' ('DEPTH'|'BREADTH') 'FIRST' 'BY' - ( c_alias 'ASC'? 'DESC'? ('NULLS' 'FIRST')? ('NULLS' 'LAST')? ) - ( COMMA c_alias 'ASC'? 'DESC'? ('NULLS' 'FIRST')? ('NULLS' 'LAST')? )* - 'SET' sql_identifier + : k_search (k_depth|k_breadth) k_first k_by + ( c_alias k_asc? k_desc? (k_nulls k_first)? (k_nulls k_last)? ) + ( COMMA c_alias k_asc? k_desc? ('NULLS' k_first)? ('NULLS' k_last)? )* + k_set sql_identifier ; cycle_clause - : 'CYCLE' c_alias ( COMMA c_alias)* 'SET' sql_identifier 'TO' literal 'DEFAULT' literal + : k_cycle c_alias ( COMMA c_alias)* k_set sql_identifier k_to literal k_default literal ; /* ================================================================================ - Query column list specs (ie. everything between 'SELECT' ... 'FROM' + Query column list specs (ie. everything between k_SELECT ... k_FROM ================================================================================ */ select_list // : displayed_column (COMMA displayed_column)* @@ -298,7 +311,7 @@ : expr_sign ( ( ASTERISK | DIVIDE ) expr_sign )* ; expr_sign // in fact this is not "sign" but unary operator - : ( PLUS | MINUS | 'PRIOR' | 'CONNECT_BY_ROOT' )? expr_pow + : ( PLUS | MINUS | k_prior | 'CONNECT_BY_ROOT' )? expr_pow ; expr_pow : expr_expr ( EXPONENT expr_expr )* @@ -321,7 +334,7 @@ // | model_expression // | type_constructor_expression // | variable_expression -// : 'NULL' | NUMBER | QUOTED_STRING | IDENTIFIER +// : k_null | NUMBER | QUOTED_STRING | IDENTIFIER | ( subquery ) => subquery ; expr_paren @@ -345,7 +358,7 @@ : identifier ; case_expression - : 'CASE' ( simple_case_expression | searched_case_expression ) ( else_case_expression )? 'END' + : k_case ( simple_case_expression | searched_case_expression ) ( else_case_expression )? k_end ; simple_case_expression : nested_expression ( k_when nested_expression k_then nested_expression )+ @@ -363,6 +376,7 @@ | ( cell_assignment ) => cell_assignment // this is used only in model_clause s[PROD='A'] = S['B'] + 1 | ( column_spec ) => column_spec | quoted_string + | k_sysdate | NUMBER ; query_block @@ -399,48 +413,48 @@ : cluster_set_clause ; cluster_set_clause - : 'CLUSTER_SET' LPAREN column_spec (COMMA column_spec)? (COMMA NUMBER)? 'USING' (column_specs|ASTERISK) RPAREN + : 'CLUSTER_SET' LPAREN column_spec (COMMA column_spec)? (COMMA NUMBER)? k_using (column_specs|ASTERISK) RPAREN ; cast_expression - : 'CAST' LPAREN (sql_expression | 'MULTISET' subquery) k_as (datatype|sql_identifier) RPAREN + : k_cast LPAREN (sql_expression | k_multiset subquery) k_as (datatype|sql_identifier) RPAREN ; datatype : 'BINARY_INTEGER' | 'BINARY_FLOAT' | 'BINARY_DOUBLE' - | 'NATURAL' - | 'POSITIVE' - | ( 'NUMBER' | 'NUMERIC' | 'DECIMAL' | 'DEC' ) ( LPAREN NUMBER ( COMMA NUMBER )? RPAREN )? - | 'LONG' ( 'RAW')? ( LPAREN NUMBER RPAREN )? - | 'RAW' ( LPAREN NUMBER RPAREN )? - | 'BOOLEAN' - | 'DATE' - | 'INTERVAL' 'DAY' ( LPAREN NUMBER RPAREN )? 'TO' 'SECOND' ( LPAREN NUMBER RPAREN )? - | 'INTERVAL' 'YEAR' ( LPAREN NUMBER RPAREN )? 'TO' 'MONTH' - | ( 'TIME' | 'TIMESTAMP' ) ( LPAREN NUMBER RPAREN )? ( 'WITH' ( 'LOCAL' )? 'TIME' 'ZONE')? - | 'INTEGER' - | 'INT' - | 'SMALLINT' - | 'FLOAT' ( LPAREN NUMBER RPAREN )? - | 'REAL' - | 'DOUBLE' 'PRECISION' - | 'CHAR' ( 'VARYING' )? ( LPAREN NUMBER ( 'BYTE' | 'CHAR' )? RPAREN )? ( 'CHARACTER' 'SET' ( identifier | column_spec CHARSET_ATTR ) )? - | 'VARCHAR' ( LPAREN NUMBER ( 'BYTE' | 'CHAR' )? RPAREN )? ( 'CHARACTER' 'SET' ( identifier | column_spec CHARSET_ATTR ) )? - | 'VARCHAR2' ( LPAREN NUMBER ( 'BYTE' | 'CHAR' )? RPAREN )? ( 'CHARACTER' 'SET' ( identifier | column_spec CHARSET_ATTR ) )? - | 'CHARACTER' ( 'VARYING' )? ( LPAREN NUMBER RPAREN )? - | 'NCHAR' ( 'VARYING' )? ( LPAREN NUMBER RPAREN )? - | 'NVARCHAR' ( LPAREN NUMBER RPAREN )? - | 'NVARCHAR2' ( LPAREN NUMBER RPAREN )? - | 'NATIONAL' ( 'CHARACTER' | 'CHAR' ) ( 'VARYING' )? ( LPAREN NUMBER RPAREN )? - | 'MLSLABEL' + | k_natural + | k_positive + | ( k_number | k_numeric | k_decimal | k_dec ) ( LPAREN NUMBER ( COMMA NUMBER )? RPAREN )? + | k_long ( k_raw)? ( LPAREN NUMBER RPAREN )? + | k_raw ( LPAREN NUMBER RPAREN )? + | k_boolean + | k_date + | k_interval k_day ( LPAREN NUMBER RPAREN )? k_to k_second ( LPAREN NUMBER RPAREN )? + | k_interval k_year ( LPAREN NUMBER RPAREN )? k_to k_month + | ( k_time | k_timestamp ) ( LPAREN NUMBER RPAREN )? ( k_with ( k_local )? k_time k_zone)? + | k_integer + | k_int + | k_smallint + | k_float ( LPAREN NUMBER RPAREN )? + | k_real + | k_double k_precision + | k_char ( k_varying )? ( LPAREN NUMBER ( k_byte | k_char )? RPAREN )? ( k_character k_set ( identifier | column_spec CHARSET_ATTR ) )? + | k_varchar ( LPAREN NUMBER ( k_byte | k_char )? RPAREN )? ( k_character k_set ( identifier | column_spec CHARSET_ATTR ) )? + | k_varchar2 ( LPAREN NUMBER ( k_byte | k_char )? RPAREN )? ( k_character k_set ( identifier | column_spec CHARSET_ATTR ) )? + | k_character ( k_varying )? ( LPAREN NUMBER RPAREN )? + | k_nchar ( k_varying )? ( LPAREN NUMBER RPAREN )? + | k_nvarchar ( LPAREN NUMBER RPAREN )? + | k_nvarchar2 ( LPAREN NUMBER RPAREN )? + | k_national ( k_character | k_char ) ( k_varying )? ( LPAREN NUMBER RPAREN )? + | k_mlslabel | 'PLS_INTEGER' - | 'BLOB' - | 'CLOB' ( 'CHARACTER' 'SET' ( identifier | column_spec CHARSET_ATTR ) )? - | 'NCLOB' - | 'BFILE' - | 'ROWID' - | 'UROWID' ( LPAREN NUMBER RPAREN )? + | k_blob + | k_clob ( k_character k_set ( identifier | column_spec CHARSET_ATTR ) )? + | k_nclob + | k_bfile + | k_rowid + | k_urowid ( LPAREN NUMBER RPAREN )? ; boolean_literal @@ -469,10 +483,10 @@ ; //TODO more pseudocolumns here - especially those who are reserved words pseudo_column - : 'NULL' - | 'ROWID' - | 'ROWNUM' - | 'LEVEL' // hierarchical query + : k_null + | k_rowid + | k_rownum + | k_level // hierarchical query | 'CONNECT_BY_ISLEAF' | 'CONNECT_BY_ISCYCLE' | 'VERSIONS_STARTTIME' // flashback query @@ -485,7 +499,7 @@ | 'OBJECT_ID' // | 'OBJECT_VALUE' // | 'ORA_ROWSCN' // - | 'XMLDATA' + | k_xmldata ; function_name @@ -502,12 +516,12 @@ sql_identifier : identifier | keyword - | 'ROWID' - | 'ROWNUM' + | k_rowid + | k_rownum ; /* ================================================================================ - Query tables specs (ie. everything between 'FROM' ... 'WHERE' + Query tables specs (ie. everything between k_FROM ... k_WHERE ================================================================================ */ table_reference_list : ( @@ -531,41 +545,41 @@ | table_collection_clause (pivot_clause|unpivot_clause)? ; flashback_query_clause - : ('VERSIONS' 'BETTWEEN' ('SCN'|'TIMESTAMP') (sql_expression|'MIVALUE') 'AND' (sql_expression|'MAXVALUE'))? - k_as 'OF' ('SCN'|'TIMESTAMP') sql_expression + : ('VERSIONS' k_bettween ('SCN'|k_timestamp) (sql_expression|k_mivalue) k_and (sql_expression|k_maxvalue))? + k_as k_of ('SCN'|k_timestamp) sql_expression ; sample_clause - : 'SAMPLE' 'BLOCK'? LPAREN sample_percent RPAREN ('SEED' LPAREN seed_value RPAREN)? + : k_sample k_block? LPAREN sample_percent RPAREN ('SEED' LPAREN seed_value RPAREN)? ; partition_extension_clause - : 'PARTITION' (( LPAREN partition RPAREN ) | ( 'FOR' LPAREN partition_key_value (COMMA partition_key_value)* RPAREN)) - | 'SUBPARTITION' (( LPAREN partition RPAREN ) | ( 'FOR' LPAREN subpartition_key_value (COMMA subpartition_key_value)* RPAREN)) + : k_partition (( LPAREN partition RPAREN ) | ( k_for LPAREN partition_key_value (COMMA partition_key_value)* RPAREN)) + | k_subpartition (( LPAREN partition RPAREN ) | ( k_for LPAREN subpartition_key_value (COMMA subpartition_key_value)* RPAREN)) ; subquery_restricrion_clause - : 'WITH' (('READ' 'ONLY') | ('CHECK' 'OPTION' ('CONSTRAINT' constraint)?)) + : k_with (('READ' k_only) | ('CHECK' k_option ('CONSTRAINT' constraint)?)) ; table_collection_clause - : 'TABLE' /*LPAREN*/ collection_expression /*RPAREN*/ (LPAREN PLUS RPAREN)? + : k_table /*LPAREN*/ collection_expression /*RPAREN*/ (LPAREN PLUS RPAREN)? ; join_clause : table_reference (inner_cross_join_clause|outer_join_clause)+ ; inner_cross_join_clause - : 'INNER'? 'JOIN' table_reference (('ON' sql_condition)|('USING' LPAREN column_specs RPAREN)) - | ('CROSS' | 'NATURAL' 'INNER'?) ('JOIN' table_reference) + : k_inner? k_join table_reference (('ON' sql_condition)|('USING' LPAREN column_specs RPAREN)) + | ('CROSS' | k_natural k_inner?) ('JOIN' table_reference) ; outer_join_clause : ( query_partition_clause )? - ( outer_join_type 'JOIN' - | 'NATURAL' ( outer_join_type )? 'JOIN' + ( outer_join_type k_join + | k_natural ( outer_join_type )? k_join ) - table_reference ( query_partition_clause )? ( 'ON' sql_condition | 'USING' LPAREN column_specs RPAREN )? + table_reference ( query_partition_clause )? ( k_on sql_condition | k_using LPAREN column_specs RPAREN )? ; query_partition_clause - : 'PARTITION' 'BY' expression_list + : k_partition k_by expression_list ; outer_join_type - : ( 'FULL' | 'LEFT' | 'RIGHT' ) ( 'OUTER' )? + : ( k_full | k_left | k_right ) ( k_outer )? ; sample_percent @@ -609,32 +623,32 @@ // : table_name c_alias? ( inner_cross_join_clause | outer_join_clause )+ // ; // inner_cross_join_clause -// : ( 'INNER' )? 'JOIN' table_name c_alias? ( 'ON' sql_condition | 'USING' LPAREN column_specs RPAREN ) -// | ( 'CROSS' | 'NATURAL' ( 'INNER' ) ) 'JOIN' table_name c_alias? +// : ( k_inner )? k_join table_name c_alias? ( k_on sql_condition | k_using LPAREN column_specs RPAREN ) +// | ( k_cross | k_natural ( k_inner ) ) k_join table_name c_alias? // ; // outer_join_clause // : ( query_partition_clause )? -// ( outer_join_type 'JOIN' -// | 'NATURAL' ( outer_join_type )? 'JOIN' +// ( outer_join_type k_join +// | k_natural ( outer_join_type )? k_join // ) // table_name c_alias? ( query_partition_clause )? -// ( 'ON' sql_condition | 'USING' LPAREN column_specs RPAREN )? +// ( k_on sql_condition | k_using LPAREN column_specs RPAREN )? // ; // column_specs // : column_spec ( COMMA column_spec )* // ; // query_partition_clause -// : 'PARTITION' 'BY' expression_list +// : k_partition k_by expression_list // ; // outer_join_type -// : ( 'FULL' | 'LEFT' | 'RIGHT' ) ( 'OUTER' )? +// : ( k_full | k_left | k_right ) ( k_outer )? // ; // outer_join_sign // : LPAREN PLUS RPAREN // ; // selected_table -// : ( table_spec | ( 'TABLE' | 'THE' )? subquery ) (alias|alias_name=sql_identifier)? -// -> ^('selected_table' table_spec? 'TABLE'? 'THE'? subquery? alias? $alias_name? ) +// : ( table_spec | ( k_table | k_the )? subquery ) (alias|alias_name=sql_identifier)? +// -> ^('selected_table' table_spec? k_table? k_the? subquery? alias? $alias_name? ) // ; // table_spec @@ -657,7 +671,7 @@ // : sql_identifier // ; // table_cast -// : 'TABLE' LPAREN (simple_expression | select_expression | cast_expression) RPAREN +// : k_table LPAREN (simple_expression | select_expression | cast_expression) RPAREN // ; /* ================================================================================ @@ -671,18 +685,18 @@ hierarchical query clause ================================================================================ */ hierarchical_query_clause - : 'CONNECT' 'BY' ( 'NOCYCLE' )? connect1=sql_condition ( 'START' 'WITH' start1=sql_condition )? - -> ^('t_hierarchical' 'CONNECT' 'BY' 'NOCYCLE'? $connect1 'START'? 'WITH'? $start1?) - | ( 'START' 'WITH' start2=sql_condition ) 'CONNECT' 'BY' ( 'NOCYCLE' )? connect2=sql_condition - -> ^('t_hierarchical' 'START' 'WITH' $start2 'CONNECT' 'BY' 'NOCYCLE'? $connect2) + : k_connect k_by ( k_nocycle )? connect1=sql_condition ( k_start k_with start1=sql_condition )? + -> ^('t_hierarchical' k_connect k_by k_nocycle? $connect1 k_start? k_with? $start1?) + | ( k_start k_with start2=sql_condition ) k_connect k_by ( k_nocycle )? connect2=sql_condition + -> ^('t_hierarchical' k_start k_with $start2 k_connect k_by k_nocycle? $connect2) ; /* ================================================================================ group by clause ================================================================================ */ group_by_clause - : 'GROUP' 'BY' group_by_exprs - -> ^('t_group_by' 'GROUP' 'BY' group_by_exprs) + : k_group k_by group_by_exprs + -> ^('t_group_by' k_group k_by group_by_exprs) ; group_by_exprs : group_by_expr ( COMMA group_by_expr )* @@ -693,10 +707,10 @@ | grouping_expression_list ; rollup_cube_clause - : ( 'ROLLUP' | 'CUBE' ) LPAREN grouping_expression_list RPAREN + : ( k_rollup | k_cube ) LPAREN grouping_expression_list RPAREN ; grouping_sets_clause - : 'GROUPING' 'SETS' LPAREN grouping_expression_list RPAREN + : k_grouping k_sets LPAREN grouping_expression_list RPAREN ; grouping_sets_exprs : grouping_sets_expr ( COMMA grouping_sets_expr )* @@ -708,13 +722,13 @@ : condition_or ; condition_or - : condition_and ( 'OR' condition_and )* + : condition_and ( k_or condition_and )* ; condition_and - : condition_not ( 'AND' condition_not )* + : condition_not ( k_and condition_not )* ; condition_not - : 'NOT' condition_expr + : k_not condition_expr | condition_expr ; condition_expr @@ -739,58 +753,58 @@ ; condition_exists - : 'EXISTS' subquery + : k_exists subquery ; condition_is - : sql_expression 'IS' ( 'NOT' )? ( 'NAN' | 'INFINITE' | 'NULL' ) + : sql_expression k_is ( k_not )? ( k_nan | k_infinite | k_null ) ; condition_comparison : LPAREN sql_expressions RPAREN ( outer_join_sign )? ( EQ | NOT_EQ ) subquery ( outer_join_sign )? - | ( 'PRIOR' )? sql_expression ( outer_join_sign )? ( EQ | NOT_EQ | GTH | GEQ | LTH | LEQ ) ( 'PRIOR' )? ( sql_expression | LPAREN select_statement RPAREN ) ( outer_join_sign )? + | ( k_prior )? sql_expression ( outer_join_sign )? ( EQ | NOT_EQ | GTH | GEQ | LTH | LEQ ) ( k_prior )? ( sql_expression | LPAREN select_statement RPAREN ) ( outer_join_sign )? ; condition_group_comparison - : LPAREN sql_expressions RPAREN ( EQ | NOT_EQ ) ( 'ANY' | 'SOME' | 'ALL' ) LPAREN ( grouping_expression_list | select_statement ) RPAREN - | sql_expression ( EQ | NOT_EQ | GTH | GEQ | LTH | LEQ ) ( 'ANY' | 'SOME' | 'ALL' ) LPAREN ( sql_expressions | select_statement ) RPAREN + : LPAREN sql_expressions RPAREN ( EQ | NOT_EQ ) ( k_any | k_some | k_all ) LPAREN ( grouping_expression_list | select_statement ) RPAREN + | sql_expression ( EQ | NOT_EQ | GTH | GEQ | LTH | LEQ ) ( k_any | k_some | k_all ) LPAREN ( sql_expressions | select_statement ) RPAREN ; condition_in - : LPAREN sql_expressions RPAREN ( 'NOT' )? 'IN' LPAREN ( grouping_expression_list | select_statement ) RPAREN - | sql_expression ( 'NOT' )? 'IN' LPAREN ( expression_list | select_statement ) RPAREN + : LPAREN sql_expressions RPAREN ( k_not )? k_in LPAREN ( grouping_expression_list | select_statement ) RPAREN + | sql_expression ( k_not )? k_in LPAREN ( expression_list | select_statement ) RPAREN ; condition_is_a_set - : nested_table_column_name 'IS' ( 'NOT' )? k_a 'SET' + : nested_table_column_name k_is ( k_not )? k_a k_set ; condition_is_any - : ( column_name 'IS' )? 'ANY' + : ( column_name k_is )? k_any ; condition_is_empty - : nested_table_column_name 'IS' ( 'NOT' )? 'EMPTY' + : nested_table_column_name k_is ( k_not )? k_empty ; condition_is_of_type - : sql_expression 'IS' ('NOT')? 'OF' ( 'TYPE' )? LPAREN type_name RPAREN + : sql_expression k_is ('NOT')? k_of ( k_type )? LPAREN type_name RPAREN ; condition_is_of_type_names : condition_is_of_type_name ( COMMA condition_is_of_type_name )* ; condition_is_of_type_name - : ( 'ONLY' )? type_name + : ( k_only )? type_name ; condition_is_present - : cell_reference 'IS' 'PRESENT' + : cell_reference k_is k_present ; condition_like - : sql_expression ( 'NOT' )? ( 'LIKE' | 'LIKEC' | 'LIKE2' | 'LIKE4' ) sql_expression ( 'ESCAPE' sql_expression )? + : sql_expression ( k_not )? ( k_like | k_likec | k_like2 | k_like4 ) sql_expression ( k_escape sql_expression )? ; condition_memeber - : sql_expression ( 'NOT' )? 'MEMBER' ( 'OF' )? nested_table_column_name + : sql_expression ( k_not )? k_member ( k_of )? nested_table_column_name ; condition_between - : sql_expression ( 'NOT' )? 'BETWEEN' sql_expression 'AND' sql_expression + : sql_expression ( ... [truncated message content] |
From: <ibr...@us...> - 2010-08-11 08:36:36
|
Revision: 3648 http://tora.svn.sourceforge.net/tora/?rev=3648&view=rev Author: ibre5041 Date: 2010-08-11 08:36:28 +0000 (Wed, 11 Aug 2010) Log Message: ----------- windows compile fix Modified Paths: -------------- branches/tora-trotl/tora-trotl.vcproj branches/tora-trotl/trotl.vcproj Added Paths: ----------- branches/tora-trotl/loki.vcproj branches/tora-trotl/qscintilla2.vcproj Added: branches/tora-trotl/loki.vcproj =================================================================== --- branches/tora-trotl/loki.vcproj (rev 0) +++ branches/tora-trotl/loki.vcproj 2010-08-11 08:36:28 UTC (rev 3648) @@ -0,0 +1,415 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="loki" + ProjectGUID="{0FBEC51F-77B1-486D-B4F0-B306DE11C2CB}" + RootNamespace="toratrotl" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="0" + BuildLogFile="$(IntDir)$(ProjectName)\BuildLog.htm" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UseUnicodeResponseFiles="false" + Optimization="0" + AdditionalIncludeDirectories=""$(ProjectDir)\src\loki\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;SCI_LEXER" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)$(ProjectName)\" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + ForcedIncludeFiles="" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + AdditionalLibraryDirectories="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(ProjDir)\src\loki\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;SCI_LEXER" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)$(ProjectName)\" + WarningLevel="3" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + AdditionalLibraryDirectories="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\loki\src\OrderedStatic.cpp" + > + </File> + <File + RelativePath=".\src\loki\src\SafeFormat.cpp" + > + </File> + <File + RelativePath=".\src\loki\src\Singleton.cpp" + > + </File> + <File + RelativePath=".\src\loki\src\SmallObj.cpp" + > + </File> + <File + RelativePath=".\src\loki\src\SmartPtr.cpp" + > + </File> + <File + RelativePath=".\src\loki\src\StrongPtr.cpp" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\src\loki\include\loki\AbstractFactory.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\flex\allocatorstringstorage.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\AssocVector.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\CachedFactory.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\ConstPolicy.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\flex\cowstringopt.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\DataGenerators.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\EmptyType.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\Factory.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\flex\flex_string.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\flex\flex_string_details.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\flex\flex_string_shell.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\Function.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\Functor.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\HierarchyGenerators.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\Key.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\LockingPtr.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\LokiExport.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\LokiTypeInfo.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\MultiMethods.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\NullType.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\OrderedStatic.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\Pimpl.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\yasli\platform.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\yasli\random.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\readme.txt" + > + </File> + <File + RelativePath=".\src\loki\include\loki\RefToValue.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\Register.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\SafeFormat.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\ScopeGuard.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\Sequence.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\flex\simplestringstorage.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\Singleton.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\SmallObj.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\flex\smallstringopt.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\SmartPtr.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\SPCachedFactory.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\static_check.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\StrongPtr.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\Threads.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\Tuple.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\Typelist.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\TypelistMacros.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\TypeManip.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\TypeTraits.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\flex\vectorstringstorage.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\Visitor.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\yasli\yasli_fill_iterator.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\yasli\yasli_memory.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\yasli\yasli_protocols.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\yasli\yasli_traits.h" + > + </File> + <File + RelativePath=".\src\loki\include\loki\yasli\yasli_vector.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: branches/tora-trotl/qscintilla2.vcproj =================================================================== --- branches/tora-trotl/qscintilla2.vcproj (rev 0) +++ branches/tora-trotl/qscintilla2.vcproj 2010-08-11 08:36:28 UTC (rev 3648) @@ -0,0 +1,1289 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="qscintilla2" + ProjectGUID="{9114F6BB-E428-4797-97EB-EBF2144F1FFD}" + RootNamespace="toratrotl" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="0" + BuildLogFile="$(IntDir)$(ProjectName)\BuildLog.htm" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UseUnicodeResponseFiles="false" + Optimization="0" + AdditionalIncludeDirectories=""$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src\qscintilla2\Qt4";"$(ProjectDir)\src\qscintilla2\include";"$(ProjectDir)\src\qscintilla2\src"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;SCI_LEXER" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)$(ProjectName)\" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + ForcedIncludeFiles="" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + AdditionalDependencies="QtCored4.lib QtGuid4.lib" + AdditionalLibraryDirectories=""$(QTDIR)\lib"" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src\qscintilla2\Qt4";"$(ProjectDir)\src\qscintilla2\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;SCI_LEXER" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)$(ProjectName)\" + WarningLevel="3" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + AdditionalDependencies="QtCore4.lib QtGui4.lib" + AdditionalLibraryDirectories=""$(QTDIR)\lib"" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\qscintilla2\src\AutoComplete.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\CallTip.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\CellBuffer.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\CharClassify.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\ContractionState.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\Decoration.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\Document.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\DocumentAccessor.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\Editor.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\ExternalLexer.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\Indicator.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\KeyMap.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\KeyWords.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexAbaqus.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexAda.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexAPDL.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexAsm.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexAsn1.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexASY.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexAU3.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexAVE.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexBaan.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexBash.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexBasic.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexBullant.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexCaml.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexCLW.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexCmake.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexCOBOL.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexConf.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexCPP.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexCrontab.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexCsound.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexCSS.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexD.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexEiffel.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexErlang.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexEScript.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexFlagship.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexForth.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexFortran.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexGAP.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexGui4Cli.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexHaskell.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexHTML.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexInno.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexKix.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexLisp.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexLout.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexLua.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexMagik.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexMatlab.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexMetapost.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexMMIXAL.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexMPT.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexMSSQL.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexMySQL.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexNimrod.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexNsis.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexOpal.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexOthers.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexPascal.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexPB.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexPerl.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexPLM.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexPOV.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexPowerPro.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexPowerShell.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexProgress.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexPS.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexPython.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexR.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexRebol.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexRuby.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexScriptol.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexSmalltalk.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexSML.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexSorcus.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexSpecman.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexSpice.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexSQL.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexTACL.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexTADS3.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexTAL.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexTCL.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexTeX.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexVB.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexVerilog.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexVHDL.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LexYAML.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LineMarker.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\ListBoxQt.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qsciabstractapis.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qsciapis.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexer.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerbash.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerbatch.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexercmake.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexercpp.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexercsharp.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexercss.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexercustom.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerd.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerdiff.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerfortran.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerfortran77.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerhtml.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexeridl.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerjava.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerjavascript.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerlua.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexermakefile.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerpascal.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerperl.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerpostscript.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerpov.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerproperties.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerpython.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerruby.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerspice.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexersql.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexertcl.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexertex.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerverilog.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexervhdl.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexerxml.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscilexeryaml.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscimacro.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qsciscintilla.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qsciscintillabase.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscistyle.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\moc_qscistyledtext.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\moc_SciClasses.cxx" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\PerLine.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\PlatQt.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\PositionCache.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\PropSet.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qsciabstractapis.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qsciapis.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscicommand.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscicommandset.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscidocument.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexer.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerbash.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerbatch.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexercmake.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexercpp.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexercsharp.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexercss.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexercustom.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerd.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerdiff.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerfortran.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerfortran77.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerhtml.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexeridl.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerjava.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerjavascript.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerlua.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexermakefile.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerpascal.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerperl.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerpostscript.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerpov.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerproperties.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerpython.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerruby.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerspice.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexersql.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexertcl.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexertex.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerverilog.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexervhdl.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexerxml.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscilexeryaml.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscimacro.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qsciprinter.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qsciscintilla.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qsciscintillabase.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscistyle.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\qscistyledtext.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\RESearch.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\RunStyles.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\SciClasses.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\ScintillaBase.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\ScintillaQt.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\Style.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\StyleContext.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\UniConversion.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\ViewStyle.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\WindowAccessor.cpp" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\XPM.cpp" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\src\qscintilla2\include\Accessor.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\AutoComplete.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\CallTip.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\CellBuffer.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\CharacterSet.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\CharClassify.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\ContractionState.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\Decoration.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\Document.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\DocumentAccessor.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\Editor.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\ExternalLexer.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\Indicator.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\KeyMap.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\include\KeyWords.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\LineMarker.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\ListBoxQt.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\Partitioning.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\PerLine.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\include\Platform.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\PositionCache.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\include\PropSet.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qsciabstractapis.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qsciapis.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscicommand.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscicommandset.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscidocument.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qsciglobal.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexer.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerbash.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerbatch.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexercmake.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexercpp.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexercsharp.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexercss.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexercustom.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerd.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerdiff.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerfortran.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerfortran77.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerhtml.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexeridl.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerjava.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerjavascript.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerlua.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexermakefile.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerpascal.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerperl.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerpostscript.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerpov.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerproperties.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerpython.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerruby.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerspice.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexersql.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexertcl.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexertex.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerverilog.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexervhdl.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexerxml.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscilexeryaml.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscimacro.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qsciprinter.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qsciscintilla.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qsciscintillabase.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscistyle.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\Qsci\qscistyledtext.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\RESearch.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\RunStyles.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\SciClasses.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\include\SciLexer.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\include\Scintilla.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\ScintillaBase.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\Qt4\ScintillaQt.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\include\ScintillaWidget.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\SplitVector.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\include\SString.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\Style.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\StyleContext.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\SVector.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\UniConversion.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\ViewStyle.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\include\WindowAccessor.h" + > + </File> + <File + RelativePath=".\src\qscintilla2\src\XPM.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: branches/tora-trotl/tora-trotl.vcproj =================================================================== --- branches/tora-trotl/tora-trotl.vcproj 2010-08-10 13:14:37 UTC (rev 3647) +++ branches/tora-trotl/tora-trotl.vcproj 2010-08-11 08:36:28 UTC (rev 3648) @@ -43,8 +43,8 @@ Name="VCCLCompilerTool" UseUnicodeResponseFiles="false" Optimization="0" - AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"C:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" + AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"$(ORACLE_HOME)\sdk\include";C:\boost_1_42_0;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(QTDIR)\include\QtXml";"$(ProjectDir)\src";"$(ProjectDir)\$(ConfigurationName)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\trotl\src";"$(ProjectDir)\src\qscintilla2\Qt4"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;DEBUG;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"C:/tora-trotl/debug/share/tora/\";TOMONOLITHIC;QT_DEBUG;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA11G;DBLINK;HAVE_CONFIG_H;SCI_LEXER" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="1" @@ -72,8 +72,9 @@ <Tool Name="VCLinkerTool" UseUnicodeResponseFiles="false" - AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib wsock32.lib" - AdditionalLibraryDirectories=""$(OutDir)";"C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" + AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib QtXmld4.lib oci.lib wsock32.lib qscintilla2.lib tora_loki_lib.lib trotl.lib windows_lib.lib" + ShowProgress="2" + AdditionalLibraryDirectories=""$(OutDir)";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(ORACLE_HOME)\sdk\lib\msvc";"$(QTDIR)\lib"" ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" AssemblyDebug="1" @@ -128,7 +129,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" + AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"$(ORACLE_HOME)\sdk\include";C:\boost_1_42_0;C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(QTDIR)\include\QtXml";"$(ProjectDir)\src";"$(ProjectDir)\$(ConfigurationName)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"c:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -154,9 +155,9 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtSql4.lib oci.lib oraxml11.lib wsock32.lib" + AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtSql4.lib QtXml4.lib oci.lib wsock32.lib tora_qscintilla2_lib.lib tora_loki_lib.lib trotl.lib windows_lib.lib" LinkIncremental="1" - AdditionalLibraryDirectories=""$(OutDir)";"C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" + AdditionalLibraryDirectories=""$(OutDir)";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(ORACLE_HOME)\sdk\lib\msvc";"$(QTDIR)\lib";"C:\tora-trotl\$(ConfigurationName)\src\qscintilla2";"C:\tora-trotl\$(ConfigurationName)\src\loki";"C:\tora-trotl\$(ConfigurationName)\src\windows";"C:\tora-trotl\$(ConfigurationName)\src\trotl\src"" ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" SubSystem="1" @@ -200,514 +201,518 @@ > </File> <File - RelativePath=".\src\shortcuteditor\moc_shortcuteditordialog.cxx" + RelativePath=".\debug\src\shortcuteditor\moc_shortcuteditordialog.cxx" > </File> <File - RelativePath=".\src\shortcuteditor\moc_shortcutmodel.cxx" + RelativePath=".\debug\src\shortcuteditor\moc_shortcutmodel.cxx" > </File> <File - RelativePath=".\src\moc_toabout.cxx" + RelativePath=".\debug\src\moc_toabout.cxx" > </File> <File - RelativePath=".\src\moc_toalert.cxx" + RelativePath=".\debug\src\moc_toalert.cxx" > </File> <File - RelativePath=".\src\moc_toanalyze.cxx" + RelativePath=".\debug\src\moc_toanalyze.cxx" > </File> <File - RelativePath=".\src\moc_toawr.cxx" + RelativePath=".\debug\src\moc_toawr.cxx" > </File> <File - RelativePath=".\src\moc_tobackgroundlabel.cxx" + RelativePath=".\debug\src\moc_tobackgroundlabel.cxx" > </File> <File - RelativePath=".\src\moc_tobackup.cxx" + RelativePath=".\debug\src\moc_tobackup.cxx" > </File> <File - RelativePath=".\src\moc_tobarchart.cxx" + RelativePath=".\debug\src\moc_tobarchart.cxx" > </File> <File - RelativePath=".\src\moc_tobrowser.cxx" + RelativePath=".\debug\src\moc_tobrowser.cxx" > </File> <File - RelativePath=".\src\moc_tobrowseraccesswidget.cxx" + RelativePath=".\debug\src\moc_tobrowseraccesswidget.cxx" > </File> <File - RelativePath=".\src\moc_tobrowserbasewidget.cxx" + RelativePath=".\debug\src\moc_tobrowserbasewidget.cxx" > </File> <File - RelativePath=".\src\moc_tobrowsercodewidget.cxx" + RelativePath=".\debug\src\moc_tobrowsercodewidget.cxx" > </File> <File - RelativePath=".\src\moc_tobrowserconstraint.cxx" + RelativePath=".\debug\src\moc_tobrowserconstraint.cxx" > </File> <File - RelativePath=".\src\moc_tobrowserdblinkswidget.cxx" + RelativePath=".\debug\src\moc_tobrowserdblinkswidget.cxx" > </File> <File - RelativePath=".\src\moc_tobrowserindex.cxx" + RelativePath=".\debug\src\moc_tobrowserdirectorieswidget.cxx" > </File> <File - RelativePath=".\src\moc_tobrowserindexwidget.cxx" + RelativePath=".\debug\src\moc_tobrowserindex.cxx" > </File> <File - RelativePath=".\src\moc_tobrowserschemawidget.cxx" + RelativePath=".\debug\src\moc_tobrowserindexwidget.cxx" > </File> <File - RelativePath=".\src\moc_tobrowsersequencewidget.cxx" + RelativePath=".\debug\src\moc_tobrowserschemawidget.cxx" > </File> <File - RelativePath=".\src\moc_tobrowsersynonymwidget.cxx" + RelativePath=".\debug\src\moc_tobrowsersequencewidget.cxx" > </File> <File - RelativePath=".\src\moc_tobrowsertable.cxx" + RelativePath=".\debug\src\moc_tobrowsersynonymwidget.cxx" > </File> <File - RelativePath=".\src\moc_tobrowsertablewidget.cxx" + RelativePath=".\debug\src\moc_tobrowsertable.cxx" > </File> <File - RelativePath=".\src\moc_tobrowsertriggerwidget.cxx" + RelativePath=".\debug\src\moc_tobrowsertablewidget.cxx" > </File> <File - RelativePath=".\src\moc_tobrowserviewwidget.cxx" + RelativePath=".\debug\src\moc_tobrowsertriggerwidget.cxx" > </File> <File - RelativePath=".\src\moc_tochangeconnection.cxx" + RelativePath=".\debug\src\moc_tobrowserviewwidget.cxx" > </File> <File - RelativePath=".\src\moc_tochartmanager.cxx" + RelativePath=".\debug\src\moc_tochangeconnection.cxx" > </File> <File - RelativePath=".\src\moc_tocodemodel.cxx" + RelativePath=".\debug\src\moc_tochartmanager.cxx" > </File> <File - RelativePath=".\src\moc_toconnection.cxx" + RelativePath=".\debug\src\moc_tocodemodel.cxx" > </File> <File - RelativePath=".\src\moc_toconnectionimport.cxx" + RelativePath=".\debug\src\moc_toconnection.cxx" > </File> <File - RelativePath=".\src\moc_toconnectionmodel.cxx" + RelativePath=".\debug\src\moc_toconnectionimport.cxx" > </File> <File - RelativePath=".\src\moc_toconnectionpool.cxx" + RelativePath=".\debug\src\moc_toconnectionmodel.cxx" > </File> <File - RelativePath=".\src\moc_tocurrent.cxx" + RelativePath=".\debug\src\moc_toconnectionpool.cxx" > </File> <File - RelativePath=".\src\moc_todatatype.cxx" + RelativePath=".\debug\src\moc_tocurrent.cxx" > </File> <File - RelativePath=".\src\moc_todebug.cxx" + RelativePath=".\debug\src\moc_todatatype.cxx" > </File> <File - RelativePath=".\src\moc_todebugtext.cxx" + RelativePath=".\debug\src\moc_todebug.cxx" > </File> <File - RelativePath=".\src\moc_todescribe.cxx" + RelativePath=".\debug\src\moc_todebugtext.cxx" > </File> <File - RelativePath=".\src\moc_todockbar.cxx" + RelativePath=".\debug\src\moc_todescribe.cxx" > </File> <File - RelativePath=".\src\moc_todocklet.cxx" + RelativePath=".\debug\src\moc_todockbar.cxx" > </File> <File - RelativePath=".\src\moc_toeditablemenu.cxx" + RelativePath=".\debug\src\moc_todocklet.cxx" > </File> <File - RelativePath=".\src\moc_toeditextensions.cxx" + RelativePath=".\debug\src\moc_toeditablemenu.cxx" > </File> <File - RelativePath=".\src\moc_toeventquery.cxx" + RelativePath=".\debug\src\moc_toeditextensions.cxx" > </File> <File - RelativePath=".\src\moc_toeventquerytask.cxx" + RelativePath=".\debug\src\moc_toeventquery.cxx" > </File> <File - RelativePath=".\src\moc_tofilesize.cxx" + RelativePath=".\debug\src\moc_toeventquerytask.cxx" > </File> <File - RelativePath=".\src\moc_toglobalsetting.cxx" + RelativePath=".\debug\src\moc_tofilesize.cxx" > </File> <File - RelativePath=".\src\moc_tohelp.cxx" + RelativePath=".\debug\src\moc_toglobalsetting.cxx" > </File> <File - RelativePath=".\src\moc_tohelpsetup.cxx" + RelativePath=".\debug\src\moc_tohelp.cxx" > </File> <File - RelativePath=".\src\moc_tohighlightedtext.cxx" + RelativePath=".\debug\src\moc_tohelpsetup.cxx" > </File> <File - RelativePath=".\src\moc_toinvalid.cxx" + RelativePath=".\debug\src\moc_tohighlightedtext.cxx" > </File> <File - RelativePath=".\src\moc_tolegendchart.cxx" + RelativePath=".\debug\src\moc_toinvalid.cxx" > </File> <File - RelativePath=".\src\moc_tolinechart.cxx" + RelativePath=".\debug\src\moc_tolegendchart.cxx" > </File> <File - RelativePath=".\src\moc_tomain.cxx" + RelativePath=".\debug\src\moc_tolinechart.cxx" > </File> <File - RelativePath=".\src\moc_tomainwindow.cxx" + RelativePath=".\debug\src\moc_tomain.cxx" > </File> <File - RelativePath=".\src\moc_tomarkedtext.cxx" + RelativePath=".\debug\src\moc_tomainwindow.cxx" > </File> <File - RelativePath=".\src\moc_tomemoeditor.cxx" + RelativePath=".\debug\src\moc_tomarkedtext.cxx" > </File> <File - RelativePath=".\src\moc_tomessage.cxx" + RelativePath=".\debug\src\moc_tomemoeditor.cxx" > </File> <File - RelativePath=".\src\moc_tomodeleditor.cxx" + RelativePath=".\debug\src\moc_tomessage.cxx" > </File> <File - RelativePath=".\src\moc_tonewconnection.cxx" + RelativePath=".\debug\src\moc_tomodeleditor.cxx" > </File> <File - RelativePath=".\src\moc_tonoblockquery.cxx" + RelativePath=".\debug\src\moc_tonewconnection.cxx" > </File> <File - RelativePath=".\src\moc_tooraclesetting.cxx" + RelativePath=".\debug\src\moc_tonoblockquery.cxx" > </File> <File - RelativePath=".\src\moc_tooutput.cxx" + RelativePath=".\debug\src\moc_tooraclesetting.cxx" > </File> <File - RelativePath=".\src\moc_toparamget.cxx" + RelativePath=".\debug\src\moc_tooutput.cxx" > </File> <File - RelativePath=".\src\moc_topiechart.cxx" + RelativePath=".\debug\src\moc_toparamget.cxx" > </File> <File - RelativePath=".\src\moc_toplsqleditor.cxx" + RelativePath=".\debug\src\moc_topiechart.cxx" > </File> <File - RelativePath=".\src\moc_toplsqltext.cxx" + RelativePath=".\debug\src\moc_toplsqleditor.cxx" > </File> <File - RelativePath=".\src\moc_topreferences.cxx" + RelativePath=".\debug\src\moc_toplsqltext.cxx" > </File> <File - RelativePath=".\src\moc_toprofiler.cxx" + RelativePath=".\debug\src\moc_topreferences.cxx" > </File> <File - RelativePath=".\src\moc_toproject.cxx" + RelativePath=".\debug\src\moc_toprofiler.cxx" > </File> <File - RelativePath=".\src\moc_topushbutton.cxx" + RelativePath=".\debug\src\moc_toproject.cxx" > </File> <File - RelativePath=".\src\moc_toresult.cxx" + RelativePath=".\debug\src\moc_topushbutton.cxx" > </File> <File - RelativePath=".\src\moc_toresultbar.cxx" + RelativePath=".\debug\src\moc_toresult.cxx" > </File> <File - RelativePath=".\src\moc_toresultcols.cxx" + RelativePath=".\debug\src\moc_toresultbar.cxx" > </File> <File - RelativePath=".\src\moc_toresultcolscomment.cxx" + RelativePath=".\debug\src\moc_toresultcols.cxx" > </File> <File - RelativePath=".\src\moc_toresultcombo.cxx" + RelativePath=".\debug\src\moc_toresultcolscomment.cxx" > </File> <File - RelativePath=".\src\moc_toresultdata.cxx" + RelativePath=".\debug\src\moc_toresultcombo.cxx" > </File> <File - RelativePath=".\src\moc_toresultdatasingle.cxx" + RelativePath=".\debug\src\moc_toresultdata.cxx" > </File> <File - RelativePath=".\src\moc_toresultdepend.cxx" + RelativePath=".\debug\src\moc_toresultdatasingle.cxx" > </File> <File - RelativePath=".\src\moc_toresultextract.cxx" + RelativePath=".\debug\src\moc_toresultdepend.cxx" > </File> <File - RelativePath=".\src\moc_toresultfield.cxx" + RelativePath=".\debug\src\moc_toresultextract.cxx" > </File> <File - RelativePath=".\src\moc_toresultgrants.cxx" + RelativePath=".\debug\src\moc_toresultfield.cxx" > </File> <File - RelativePath=".\src\moc_toresultitem.cxx" + RelativePath=".\debug\src\moc_toresultgrants.cxx" > </File> <File - RelativePath=".\src\moc_toresultlabel.cxx" + RelativePath=".\debug\src\moc_toresultitem.cxx" > </File> <File - RelativePath=".\src\moc_toresultline.cxx" + RelativePath=".\debug\src\moc_toresultlabel.cxx" > </File> <File - RelativePath=".\src\moc_toresultlistformat.cxx" + RelativePath=".\debug\src\moc_toresultline.cxx" > </File> <File - RelativePath=".\src\moc_toresultlock.cxx" + RelativePath=".\debug\src\moc_toresultlistformat.cxx" > </File> <File - RelativePath=".\src\moc_toresultlong.cxx" + RelativePath=".\debug\src\moc_toresultlock.cxx" > </File> <File - RelativePath=".\src\moc_toresultmodel.cxx" + RelativePath=".\debug\src\moc_toresultlong.cxx" > </File> <File - RelativePath=".\src\moc_toresultparam.cxx" + RelativePath=".\debug\src\moc_toresultmodel.cxx" > </File> <File - RelativePath=".\src\moc_toresultpie.cxx" + RelativePath=".\debug\src\moc_toresultparam.cxx" > </File> <File - RelativePath=".\src\moc_toresultplan.cxx" + RelativePath=".\debug\src\moc_toresultpie.cxx" > </File> <File - RelativePath=".\src\moc_toresultschema.cxx" + RelativePath=".\debug\src\moc_toresultplan.cxx" > </File> <File - RelativePath=".\src\moc_toresultstats.cxx" + RelativePath=".\debug\src\moc_toresultschema.cxx" > </File> <File - RelativePath=".\src\moc_toresultstorage.cxx" + RelativePath=".\debug\src\moc_toresultstats.cxx" > </File> <File - RelativePath=".\src\moc_toresulttableview.cxx" + RelativePath=".\debug\src\moc_toresultstorage.cxx" > </File> <File - RelativePath=".\src\moc_toresulttableviewedit.cxx" + RelativePath=".\debug\src\moc_toresulttableview.cxx" > </File> <File - RelativePath=".\src\moc_toresultview.cxx" + RelativePath=".\debug\src\moc_toresulttableviewedit.cxx" > </File> <File - RelativePath=".\src\moc_torollback.cxx" + RelativePath=".\debug\src\moc_toresultview.cxx" > </File> <File - RelativePath=".\src\moc_torunnable.cxx" + RelativePath=".\debug\src\moc_torollback.cxx" > </File> <File - RelativePath=".\src\moc_toscript.cxx" + RelativePath=".\debug\src\moc_torunnable.cxx" > </File> <File - RelativePath=".\src\moc_toscriptschemawidget.cxx" + RelativePath=".\debug\src\moc_toscript.cxx" > </File> <File - RelativePath=".\src\moc_toscripttreemodel.cxx" + RelativePath=".\debug\src\moc_toscriptschemawidget.cxx" > </File> <File - RelativePath=".\src\moc_tosearchreplace.cxx" + RelativePath=".\debug\src\moc_toscripttreemodel.cxx" > </File> <File - RelativePath=".\src\moc_tosecurity.cxx" + RelativePath=".\debug\src\moc_tosearchreplace.cxx" > </File> <File - RelativePath=".\src\moc_tosecuritytreemodel.cxx" + RelativePath=".\debug\src\moc_tosecurity.cxx" > </File> <File - RelativePath=".\src\moc_tosession.cxx" + RelativePath=".\debug\src\moc_tosecuritytreemodel.cxx" > </File> <File - RelativePath=".\src\moc_tosgastatement.cxx" + RelativePath=".\debug\src\moc_tosession.cxx" > </File> <File - RelativePath=".\src\moc_tosgatrace.cxx" + RelativePath=".\debug\src\moc_tosgastatement.cxx" > </File> <File - RelativePath=".\src\moc_tosmtp.cxx" + RelativePath=".\debug\sr... [truncated message content] |
From: <ibr...@us...> - 2010-08-11 11:21:33
|
Revision: 3649 http://tora.svn.sourceforge.net/tora/?rev=3649&view=rev Author: ibre5041 Date: 2010-08-11 11:21:23 +0000 (Wed, 11 Aug 2010) Log Message: ----------- Windows compile fix Modified Paths: -------------- branches/tora-trotl/loki.vcproj branches/tora-trotl/qscintilla2.vcproj branches/tora-trotl/tora-trotl.vcproj branches/tora-trotl/trotl.vcproj Added Paths: ----------- branches/tora-trotl/tora_windows.vcproj Modified: branches/tora-trotl/loki.vcproj =================================================================== --- branches/tora-trotl/loki.vcproj 2010-08-11 08:36:28 UTC (rev 3648) +++ branches/tora-trotl/loki.vcproj 2010-08-11 11:21:23 UTC (rev 3649) @@ -113,7 +113,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(ProjDir)\src\loki\include"" + AdditionalIncludeDirectories=""$(ProjectDir)\src\loki\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;SCI_LEXER" RuntimeLibrary="2" UsePrecompiledHeader="0" Modified: branches/tora-trotl/qscintilla2.vcproj =================================================================== --- branches/tora-trotl/qscintilla2.vcproj 2010-08-11 08:36:28 UTC (rev 3648) +++ branches/tora-trotl/qscintilla2.vcproj 2010-08-11 11:21:23 UTC (rev 3649) @@ -114,7 +114,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src\qscintilla2\Qt4";"$(ProjectDir)\src\qscintilla2\include"" + AdditionalIncludeDirectories=""$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src\qscintilla2\Qt4";"$(ProjectDir)\src\qscintilla2\include";"$(ProjectDir)\src\qscintilla2\src"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;SCI_LEXER" RuntimeLibrary="2" UsePrecompiledHeader="0" Modified: branches/tora-trotl/tora-trotl.vcproj =================================================================== --- branches/tora-trotl/tora-trotl.vcproj 2010-08-11 08:36:28 UTC (rev 3648) +++ branches/tora-trotl/tora-trotl.vcproj 2010-08-11 11:21:23 UTC (rev 3649) @@ -72,7 +72,7 @@ <Tool Name="VCLinkerTool" UseUnicodeResponseFiles="false" - AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib QtXmld4.lib oci.lib wsock32.lib qscintilla2.lib tora_loki_lib.lib trotl.lib windows_lib.lib" + AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib QtXmld4.lib oci.lib wsock32.lib qscintilla2.lib loki.lib trotl.lib tora_windows.lib" ShowProgress="2" AdditionalLibraryDirectories=""$(OutDir)";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(ORACLE_HOME)\sdk\lib\msvc";"$(QTDIR)\lib"" ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" @@ -155,12 +155,13 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtSql4.lib QtXml4.lib oci.lib wsock32.lib tora_qscintilla2_lib.lib tora_loki_lib.lib trotl.lib windows_lib.lib" + AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtSql4.lib QtXml4.lib qtmain.lib oci.lib wsock32.lib qscintilla2.lib loki.lib trotl.lib tora_windows.lib" + ShowProgress="2" LinkIncremental="1" AdditionalLibraryDirectories=""$(OutDir)";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(ORACLE_HOME)\sdk\lib\msvc";"$(QTDIR)\lib";"C:\tora-trotl\$(ConfigurationName)\src\qscintilla2";"C:\tora-trotl\$(ConfigurationName)\src\loki";"C:\tora-trotl\$(ConfigurationName)\src\windows";"C:\tora-trotl\$(ConfigurationName)\src\trotl\src"" ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" - SubSystem="1" + SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" @@ -2216,6 +2217,10 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > + <File + RelativePath=".\src\tora.rc" + > + </File> </Filter> </Files> <Globals> Added: branches/tora-trotl/tora_windows.vcproj =================================================================== --- branches/tora-trotl/tora_windows.vcproj (rev 0) +++ branches/tora-trotl/tora_windows.vcproj 2010-08-11 11:21:23 UTC (rev 3649) @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="tora_windows" + ProjectGUID="{2AAD40DA-F955-496C-B207-0513E44D75B0}" + RootNamespace="toratrotl" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="0" + BuildLogFile="$(IntDir)$(ProjectName)\BuildLog.htm" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UseUnicodeResponseFiles="false" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)$(ProjectName)\" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + ForcedIncludeFiles="" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + AdditionalLibraryDirectories="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(ProjDir)\src\loki\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + ObjectFile="$(IntDir)$(ProjectName)\" + ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb" + XMLDocumentationFileName="$(IntDir)$(ProjectName)\" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)$(ProjectName)\" + WarningLevel="3" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + AdditionalLibraryDirectories="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\windows\cregistry.cpp" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\src\windows\cregistry.h" + > + </File> + <File + RelativePath=".\src\windows\resource.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + <File + RelativePath=".\src\windows\tora.rc" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: branches/tora-trotl/trotl.vcproj =================================================================== --- branches/tora-trotl/trotl.vcproj 2010-08-11 08:36:28 UTC (rev 3648) +++ branches/tora-trotl/trotl.vcproj 2010-08-11 11:21:23 UTC (rev 3649) @@ -107,7 +107,7 @@ Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" + ConfigurationType="2" CharacterSet="0" WholeProgramOptimization="1" > @@ -130,7 +130,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"$(ORACLE_HOME)\sdk\include";C:\boost_1_42_0;C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"c:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_MAKE_DLL;DEFAULT_PLUGIN_DIR=\"c:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderThrough="precompiled_msvc.h" @@ -155,9 +155,9 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtSql4.lib oci.lib oraxml11.lib wsock32.lib" + AdditionalDependencies="oci.lib" LinkIncremental="1" - AdditionalLibraryDirectories=""$(OutDir)";"C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib"" + AdditionalLibraryDirectories=""$(OutDir)";C:\boost_1_42_0;"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(ORACLE_HOME)\sdk\lib\msvc";"$(QTDIR)\lib"" ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" SubSystem="1" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |