Changeset 3345

Timestamp:

Jul 24, 2009, 9:31:31 PM (15 years ago)

Author:

rgrieder

Message:

Fixed installation: The Tcl script library should now be found in the installed version as well.

Location:

code/branches/resource

Files:

• cmake/Media.cmake (modified) (1 diff)
• cmake/PackageConfig.cmake (modified) (1 diff)
• src/SpecialConfig.h.in (modified) (2 diffs)
• src/core/Core.cc (modified) (3 diffs)
• src/core/Core.h (modified) (3 diffs)
• src/core/TclBind.cc (modified) (2 diffs)

code/branches/resource/cmake/Media.cmake

@@ -45 +45 @@
 ################ Installation #################
 
-# Try no to copy both tcl script file libraries
-IF(TCL_LIBRARY MATCHES "85|8\\.5")
-  SET(TCL_EXCLUDE_PATTERN "tcl8\\.4")
-ELSEIF(TCL_LIBRARY MATCHES "84|8\\.4")
-  SET(TCL_EXCLUDE_PATTERN "tcl8\\.5")
-ENDIF()
-
 INSTALL(
   DIRECTORY ${CMAKE_MEDIA_OUTPUT_DIRECTORY}/
   DESTINATION ${ORXONOX_MEDIA_INSTALL_PATH}
-  REGEX "\\.svn$|_svn$|backToPNG|${TCL_EXCLUDE_PATTERN}" EXCLUDE
+  REGEX "\\.svn$|_svn$|backToPNG" EXCLUDE
 )

code/branches/resource/cmake/PackageConfig.cmake

@@ -45 +45 @@
 LIST(APPEND CMAKE_INCLUDE_PATH ${DEP_INCLUDE_DIR}/zlib-1.2.3/include)
 
-SET(TCL_LIBRARY_DIR ${DEPENDENCY_PACKAGE_DIR}/tcl)
+### INSTALL ###
 
-### INSTALL ###
+# Tcl script library
+INSTALL(
+  DIRECTORY ${DEP_LIBRARY_DIR}/tcl/
+  DESTINATION lib/tcl
+)
+
 # On Windows, DLLs have to be in the executable folder, install them
 IF(WIN32 AND DEP_BINARY_DIR)

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

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

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

@@ -231 +231 @@
 
     Core::Core(const std::string& cmdLine)
-        : bGraphicsLoaded_(false)
+        : bDevRun_(false)
+        , bGraphicsLoaded_(false)
     {
         if (singletonRef_s != 0)
@@ -435 +436 @@
     }
 
+    /*static*/ const boost::filesystem::path& Core::getRootPath()
+    {
+        return getInstance().configuration_->rootPath_;
+    }
+    /*static*/ std::string Core::getRootPathString()
+    {
+        return getInstance().configuration_->rootPath_.string() + '/';
+    }
+
     /**
     @note
@@ -544 +554 @@
         {
             COUT(1) << "Running from the build tree." << std::endl;
-            Core::isDevBuild_ = true;
+            Core::bDevRun_ = true;
             configuration_->mediaPath_  = ORXONOX_MEDIA_DEV_PATH;
             configuration_->configPath_ = ORXONOX_CONFIG_DEV_PATH;

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

@@ -90 +90 @@
             //! Returns the path to the log files as boost::filesystem::path
             static const boost::filesystem::path& getLogPath();
+            //! Returns the path to the root folder as boost::filesystem::path
+            static const boost::filesystem::path& getRootPath();
             //! Returns the path to the data files as std::string
             static std::string getMediaPathString();
@@ -96 +98 @@
             //! Returns the path to the log files as std::string
             static std::string getLogPathString();
+            //! Returns the path to the root folder as std::string
+            static std::string getRootPathString();
+
+            static bool isDevelopmentRun() { return getInstance().bDevRun_; }
 
         private:
@@ -114 +120 @@
             TclThreadManager*     tclThreadManager_;
 
-            bool                  isDevBuild_;          //!< True for builds in the build directory (not installed)
+            bool                  bDevRun_;             //!< True for runs in the build directory (not installed)
             bool                  bGraphicsLoaded_;
             CoreConfiguration*    configuration_;

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

@@ -33 +33 @@
 #include <cpptcl/cpptcl.h>
 
+#include "SpecialConfig.h"
 #include "util/Debug.h"
 #include "util/StringUtils.h"
 #include "CommandExecutor.h"
 #include "ConsoleCommand.h"
+#include "Core.h"
 #include "TclThreadManager.h"
-#include "SpecialConfig.h"
 
 namespace orxonox
@@ -102 +103 @@
     Tcl::interpreter* TclBind::createTclInterpreter()
     {
+        Tcl::interpreter* interpreter;
 #ifdef DEPENDENCY_PACKAGE_ENABLE
-        Tcl::interpreter* interpreter = new Tcl::interpreter(ORXONOX_TCL_LIBRARY_PATH);
+        if (true)//Core::isDevelopmentRun())
+            interpreter = new Tcl::interpreter(std::string(ORXONOX_DEP_LIB_PATH) + "/tcl");
+        else
+            interpreter = new Tcl::interpreter(Core::getRootPathString() + "lib/tcl");
 #else
-        Tcl::interpreter* interpreter = new Tcl::interpreter();
+        interpreter = new Tcl::interpreter();
 #endif
         try
         {
-            interpreter->eval("source " + TclBind::getInstance().tclDataPath_ + "/init.tcl");
+            interpreter->eval("source \"" + TclBind::getInstance().tclDataPath_ + "/init.tcl\"");
         }
         catch (Tcl::tcl_error const &e)