[Orxonox-commit 3589] r8274 - in code/branches/kicklib: data src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-04-20 04:16:31 +0200 (Wed, 20 Apr 2011)
New Revision: 8274

Removed:
   code/branches/kicklib/data/DataInstallScript.cmake
Modified:
   code/branches/kicklib/data/CMakeLists.txt
   code/branches/kicklib/src/libraries/core/GraphicsManager.cc
Log:
Do not merge resources.oxr files to avoid problems at intall time.

Modified: code/branches/kicklib/data/CMakeLists.txt
===================================================================
--- code/branches/kicklib/data/CMakeLists.txt	2011-04-20 02:01:12 UTC (rev 8273)
+++ code/branches/kicklib/data/CMakeLists.txt	2011-04-20 02:16:31 UTC (rev 8274)
@@ -58,9 +58,5 @@
 INSTALL(
   DIRECTORY ${EXTERNAL_DATA_DIRECTORY}/
   DESTINATION ${DATA_INSTALL_DIRECTORY}
-  REGEX "\\.svn$|_svn$|resources\\.oxr|AUTHORS|LICENSE" EXCLUDE
+  REGEX "\\.svn$|_svn$|AUTHORS|LICENSE" EXCLUDE
 )
-# Configure the install scripts (variables not available during installation)
-CONFIGURE_FILE(DataInstallScript.cmake ${CMAKE_CURRENT_BINARY_DIR}/DataInstallScript.cmake @ONLY)
-# Join both resources.oxr files
-INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/DataInstallScript.cmake)

Deleted: code/branches/kicklib/data/DataInstallScript.cmake
===================================================================
--- code/branches/kicklib/data/DataInstallScript.cmake	2011-04-20 02:01:12 UTC (rev 8273)
+++ code/branches/kicklib/data/DataInstallScript.cmake	2011-04-20 02:16:31 UTC (rev 8274)
@@ -1,37 +0,0 @@
- #
- #             ORXONOX - the hottest 3D action shooter ever to exist
- #                             > www.orxonox.net <
- #
- #        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; either version 2
- #            of the License, or (at your option) any later version.
- #
- #       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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- #
- #
- #  Author:
- #    Reto Grieder
- #  Description:
- #    Joins both resources.oxr files together
- #  Caution:
- #    Variables are declared with @...@ because they don't exist anymore
- #    during the installation. But we still require variables (_external_file)
- #    so we can only replace @...@ but not ${...}
- #
-
-# Write some comment
-FILE(APPEND $ENV{DESTDIR}/@DATA_INSTALL_DIRECTORY@/DefaultResources.oxr "\n\n\n <!-- ---------------------------------------- -->")
-FILE(APPEND $ENV{DESTDIR}/@DATA_INSTALL_DIRECTORY@/DefaultResources.oxr     "\n <!-- Content from the external data directory -->")
-FILE(APPEND $ENV{DESTDIR}/@DATA_INSTALL_DIRECTORY@/DefaultResources.oxr     "\n <!-- ---------------------------------------- -->\n\n")
-
-# Append the external file
-FILE(READ   @EXTERNAL_DATA_DIRECTORY@/resources.oxr _external_file)
-FILE(APPEND $ENV{DESTDIR}/@DATA_INSTALL_DIRECTORY@/DefaultResources.oxr ${_external_file})

Modified: code/branches/kicklib/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/kicklib/src/libraries/core/GraphicsManager.cc	2011-04-20 02:01:12 UTC (rev 8273)
+++ code/branches/kicklib/src/libraries/core/GraphicsManager.cc	2011-04-20 02:16:31 UTC (rev 8274)
@@ -106,13 +106,12 @@
 
         // Only for development runs
         if (PathConfig::isDevelopmentRun())
-        {
             Ogre::ResourceGroupManager::getSingleton().addResourceLocation(PathConfig::getExternalDataPathString(), "FileSystem");
-            extResources_.reset(new XMLFile("resources.oxr"));
-            extResources_->setLuaSupport(false);
-            Loader::open(extResources_.get());
-        }
 
+        extResources_.reset(new XMLFile("resources.oxr"));
+        extResources_->setLuaSupport(false);
+        Loader::open(extResources_.get());
+
         if (bLoadRenderer)
         {
             // Reads the ogre config and creates the render window
@@ -133,8 +132,7 @@
 
         // Undeclare the resources
         Loader::unload(resources_.get());
-        if (PathConfig::isDevelopmentRun())
-            Loader::unload(extResources_.get());
+        Loader::unload(extResources_.get());
     }
 
     void GraphicsManager::setConfigValues()