Changeset 3344 for code/branches/resource

Timestamp:

Jul 24, 2009, 6:00:36 PM (15 years ago)

Author:

landauf

Message:

tcl uses it's native library, orxonox adds new features later (defined in media/tcl/init.tcl)

Location:

code/branches/resource

Files:

• cmake/PackageConfig.cmake (modified) (1 diff)
• src/SpecialConfig.h.in (modified) (2 diffs)
• src/core/TclBind.cc (modified) (5 diffs)
• src/core/TclBind.h (modified) (2 diffs)
• src/core/TclThreadManager.cc (modified) (2 diffs)

code/branches/resource/cmake/PackageConfig.cmake

@@ -42 +42 @@
 SET(ENV{OGRE_PLUGIN_DIR}       ${DEP_BINARY_DIR})
 SET(ENV{OPENALDIR}             ${DEP_INCLUDE_DIR}/openal-1.1)
-LIST(APPEND CMAKE_INCLUDE_PATH ${DEP_INCLUDE_DIR}/tcl-8.5.2/include)
+LIST(APPEND CMAKE_INCLUDE_PATH ${DEP_INCLUDE_DIR}/tcl-8.5.7/include)
 LIST(APPEND CMAKE_INCLUDE_PATH ${DEP_INCLUDE_DIR}/zlib-1.2.3/include)
+
+SET(TCL_LIBRARY_DIR ${DEPENDENCY_PACKAGE_DIR}/tcl)
 
 ### INSTALL ###

code/branches/resource/src/SpecialConfig.h.in

@@ -88 +88 @@
     const char ORXONOX_LOG_DEV_PATH[]         = "@CMAKE_LOG_OUTPUT_DIRECTORY@";
 #endif
-    
+
     /* OGRE Plugins */
 #ifdef NDEBUG
@@ -105 +105 @@
 #  endif
 #endif
+
+    /* Tcl */
+#ifdef DEPENDENCY_PACKAGE_ENABLE
+    const char ORXONOX_TCL_LIBRARY_PATH[] = "@TCL_LIBRARY_DIR@";
+#endif
 }
 

code/branches/resource/src/core/TclBind.cc

@@ -38 +38 @@
 #include "ConsoleCommand.h"
 #include "TclThreadManager.h"
+#include "SpecialConfig.h"
 
 namespace orxonox
@@ -51 +52 @@
         singletonRef_s = this;
         this->interpreter_ = 0;
-        this->bSetTclLibPath_ = false;
+        this->bSetTclDataPath_ = false;
         this->setDataPath(datapath);
     }
@@ -65 +66 @@
     {
         // String has POSIX slashes
-        this->tclLibPath_ = datapath + "tcl" + TCL_VERSION + '/';
-        this->bSetTclLibPath_ = true;
+        this->tclDataPath_ = datapath + "tcl" + '/';
+        this->bSetTclDataPath_ = true;
 
-        this->createTclInterpreter();
+        this->initializeTclInterpreter();
     }
 
-    void TclBind::createTclInterpreter()
+    void TclBind::initializeTclInterpreter()
     {
-        if (this->bSetTclLibPath_ && !this->interpreter_)
+        if (this->bSetTclDataPath_ && !this->interpreter_)
         {
-            this->interpreter_ = new Tcl::interpreter(this->tclLibPath_);
+            this->interpreter_ = this->createTclInterpreter();
+
             this->interpreter_->def("orxonox::query", TclBind::tcl_query, Tcl::variadic());
             this->interpreter_->def("orxonox::crossquery", TclThreadManager::tcl_crossquery, Tcl::variadic());
@@ -88 +90 @@
                 this->interpreter_->eval("set id 0");
                 this->interpreter_->eval("rename exit tcl::exit; proc exit {} { execute exit }");
-                this->interpreter_->eval("redef_puts");
             }
             catch (Tcl::tcl_error const &e)
@@ -94 +95 @@
             catch (std::exception const &e)
             {   COUT(1) << "Error while creating Tcl-interpreter: " << e.what() << std::endl;   }
+            catch (...)
+            {   COUT(1) << "Error while creating Tcl-interpreter." << std::endl;   }
         }
     }
 
-    void TclBind::createNewTclInterpreter()
+    Tcl::interpreter* TclBind::createTclInterpreter()
     {
-        if (this->interpreter_)
+#ifdef DEPENDENCY_PACKAGE_ENABLE
+        Tcl::interpreter* interpreter = new Tcl::interpreter(ORXONOX_TCL_LIBRARY_PATH);
+#else
+        Tcl::interpreter* interpreter = new Tcl::interpreter();
+#endif
+        try
         {
-            delete this->interpreter_;
-            this->interpreter_ = 0;
+            interpreter->eval("source " + TclBind::getInstance().tclDataPath_ + "/init.tcl");
         }
+        catch (Tcl::tcl_error const &e)
+        {   COUT(1) << "Tcl error while creating Tcl-interpreter: " << e.what() << std::endl;   }
+        catch (std::exception const &e)
+        {   COUT(1) << "Error while creating Tcl-interpreter: " << e.what() << std::endl;   }
+        catch (...)
+        {   COUT(1) << "Error while creating Tcl-interpreter." << std::endl;   }
 
-        this->createTclInterpreter();
+        return interpreter;
     }
 

code/branches/resource/src/core/TclBind.h

@@ -49 +49 @@
 
             void setDataPath(const std::string& datapath);
-            std::string getTclLibPath() const { return this->tclLibPath_; }
-            void createTclInterpreter();
-            void createNewTclInterpreter();
+            const std::string& getTclDataPath() const { return this->tclDataPath_; }
+            void initializeTclInterpreter();
+            static Tcl::interpreter* createTclInterpreter();
             Tcl::interpreter* getTclInterpreter() const { return this->interpreter_; }
 
@@ -63 +63 @@
 
             Tcl::interpreter* interpreter_;
-            std::string tclLibPath_;
-            bool bSetTclLibPath_;
+            std::string tclDataPath_;
+            bool bSetTclDataPath_;
 
             static TclBind* singletonRef_s;

code/branches/resource/src/core/TclThreadManager.cc

@@ -240 +240 @@
         TclInterpreterBundle* newbundle = new TclInterpreterBundle();
         newbundle->id_ = id;
-        newbundle->interpreter_ = new Tcl::interpreter(TclBind::getInstance().getTclLibPath());
+        newbundle->interpreter_ = TclBind::createTclInterpreter();
 
         // Initialize the new interpreter
@@ -268 +268 @@
 
             // Redefine some native functions
-            newbundle->interpreter_->eval("redef_puts");
-
 //            newbundle->interpreter_->eval("rename while tcl::while");
 //            newbundle->interpreter_->eval("proc while {test command} { tcl::while {[uplevel 1 expr $test]} {uplevel 1 $command} }"); // (\"$test\" && [orxonox::running " + id + "]])