From: <ibr...@us...> - 2011-02-21 16:26:41
|
Revision: 3904 http://tora.svn.sourceforge.net/tora/?rev=3904&view=rev Author: ibre5041 Date: 2011-02-21 16:26:35 +0000 (Mon, 21 Feb 2011) Log Message: ----------- sync with Tora trunk Modified Paths: -------------- branches/tora-trotl/CMakeLists.txt branches/tora-trotl/src/CMakeLists.txt branches/tora-trotl/src/main.cpp branches/tora-trotl/src/tooracleconnection_trotl.cpp Property Changed: ---------------- branches/tora-trotl/ Property changes on: branches/tora-trotl ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/tora:3191-3885 + /trunk/tora:3191-3902 Modified: branches/tora-trotl/CMakeLists.txt =================================================================== --- branches/tora-trotl/CMakeLists.txt 2011-02-21 15:15:54 UTC (rev 3903) +++ branches/tora-trotl/CMakeLists.txt 2011-02-21 16:26:35 UTC (rev 3904) @@ -12,6 +12,7 @@ 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" ON) +OPTION(USE_TROTL "Use trotl OCI wrapper library" ON) OPTION(USE_ANTLR "Use ANTLR3 parser engine - expermental option" ON) #Set our CMake minimum version Modified: branches/tora-trotl/src/CMakeLists.txt =================================================================== --- branches/tora-trotl/src/CMakeLists.txt 2011-02-21 15:15:54 UTC (rev 3903) +++ branches/tora-trotl/src/CMakeLists.txt 2011-02-21 16:26:35 UTC (rev 3904) @@ -564,16 +564,16 @@ ENDIF (POSTGRESQL_LIBRARIES) IF (DB2_LIBRARIES) - TARGET_LINK_LIBRARIES (${EXE_NAME} ${DB2_LIBRARIES}) + LIST(APPEND TORA_LIBS} ${DB2_LIBRARIES}) ENDIF (DB2_LIBRARIES) IF (TERADATA_LIBRARIES) - TARGET_LINK_LIBRARIES (${EXE_NAME} ${TERADATA_LIBRARIES}) + LIST(APPEND TORA_LIBS ${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}) + LIST(APPEND TORA_LIBS ${TROTL_LIB}) + ADD_DEFINITIONS("-DTROTL_DLL") ENDIF (USE_TROTL) IF (USE_ANTLR) @@ -593,8 +593,6 @@ ENDIF (MINGW) ENDIF (WIN32) -LIST(APPEND TORA_LIBS ${TROTL_LIB}) - ADD_EXECUTABLE(${EXE_NAME} ${GUI_TYPE} # ${TORA_I18N_QM} # ${TORA_MOC_SOURCES} @@ -604,7 +602,7 @@ ${TORA_RCC_SRCS} ${APPLE_BUNDLE_SOURCES} ) -SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") +#SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LIBS} ${TORA_MOC_LIB}) IF(USE_PCH) @@ -615,14 +613,11 @@ # Test programs ADD_EXECUTABLE(trotl_test0 ${GUI_TYPE} trotl_test0.cpp -# ${TORA_I18N_QM} -# ${TORA_MOC_SOURCES} ${TORA_SOURCES} -# ${TORA_UI_SOURCES} ${TORA_RCC_SRCS} ${APPLE_BUNDLE_SOURCES} ) -SET_TARGET_PROPERTIES(trotl_test0 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") +#SET_TARGET_PROPERTIES(trotl_test0 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") TARGET_LINK_LIBRARIES(trotl_test0 ${TORA_LIBS} ${TORA_MOC_LIB}) ADD_EXECUTABLE(trotl_test1 ${GUI_TYPE} @@ -631,7 +626,7 @@ ${TORA_RCC_SRCS} ${APPLE_BUNDLE_SOURCES} ) -SET_TARGET_PROPERTIES(trotl_test1 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") +#SET_TARGET_PROPERTIES(trotl_test1 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") TARGET_LINK_LIBRARIES(trotl_test1 ${TORA_LIBS} ${TORA_MOC_LIB}) ADD_EXECUTABLE(trotl_test2 ${GUI_TYPE} @@ -640,7 +635,7 @@ ${TORA_RCC_SRCS} ${APPLE_BUNDLE_SOURCES} ) -SET_TARGET_PROPERTIES(trotl_test2 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") +#SET_TARGET_PROPERTIES(trotl_test2 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") TARGET_LINK_LIBRARIES(trotl_test2 ${TORA_LIBS} ${TORA_MOC_LIB}) ADD_EXECUTABLE(trotl_test3 ${GUI_TYPE} @@ -649,7 +644,7 @@ ${TORA_RCC_SRCS} ${APPLE_BUNDLE_SOURCES} ) -SET_TARGET_PROPERTIES(trotl_test3 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") +#SET_TARGET_PROPERTIES(trotl_test3 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL") TARGET_LINK_LIBRARIES(trotl_test3 ${TORA_LIBS} ${TORA_MOC_LIB}) Modified: branches/tora-trotl/src/main.cpp =================================================================== --- branches/tora-trotl/src/main.cpp 2011-02-21 15:15:54 UTC (rev 3903) +++ branches/tora-trotl/src/main.cpp 2011-02-21 16:26:35 UTC (rev 3904) @@ -203,22 +203,9 @@ { TLOG(1,toDecorator,__HERE__) << " Ignored exception." << std::endl; } - toConnectionProvider::initializeAll(); - - { - QString nls = getenv("NLS_LANG"); - if (nls.isEmpty()) - nls = "american_america.UTF8"; - else - { - int pos = nls.lastIndexOf('.'); - if (pos > 0) - nls = nls.left(pos); - nls += ".UTF8"; - } - toSetEnv("NLS_LANG", nls); - } - + + toConnectionProvider::initializeAll(); + if (toConfigurationSingle::Instance().lastVersion() != TOVERSION) { std::auto_ptr<toAbout> about ( new toAbout(toAbout::About, NULL, "About " TOAPPNAME, true)); Modified: branches/tora-trotl/src/tooracleconnection_trotl.cpp =================================================================== --- branches/tora-trotl/src/tooracleconnection_trotl.cpp 2011-02-21 15:15:54 UTC (rev 3903) +++ branches/tora-trotl/src/tooracleconnection_trotl.cpp 2011-02-21 16:26:35 UTC (rev 3904) @@ -1295,6 +1295,18 @@ virtual void initialize(void) { + QString nls = getenv("NLS_LANG"); + if (nls.isEmpty()) + nls = "AMERICAN_AMERICA.AL32UTF8"; + else + { + int pos = nls.lastIndexOf('.'); + if (pos > 0) + nls = nls.left(pos); + nls += ".AL32UTF8"; + } + toSetEnv("NLS_LANG", nls); + toMaxLong = toConfigurationSingle::Instance().maxLong() == -1 ? 0x80000000 : toConfigurationSingle::Instance().maxLong(); ::trotl::g_OCIPL_MAX_LONG = toMaxLong; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |