Changeset 2243

Timestamp:

Nov 21, 2008, 12:22:22 AM (16 years ago)

Author:

rgrieder

Message:

• Inserted IF when copying the config files from bin/ so existing files don't get overwritten.
• Reorganised everything around the run-script: There are now folders in bin/ for each kind of distribution (tardis, linux, msvc and mingw). CMake will then copy the right files to the binary folder.
• Removed ugly parts in the run-script since tardis now got its own one.

Location:

code/branches/buildsystem

Files:

• bin/CMakeLists.txt (modified) (1 diff)
• bin/linux (added)
• bin/linux/plugins.cfg (copied) (copied from code/branches/buildsystem/bin/plugins.cfg-init) (1 diff, 1 prop)
• bin/linux/run-script (moved) (moved from code/branches/buildsystem/bin/run-script) (1 diff, 1 prop)
• bin/mingw (added)
• bin/mingw/orxonox.bat (moved) (moved from code/branches/buildsystem/bin/orxonox.bat) (1 diff, 1 prop)
• bin/mingw/plugins.cfg (moved) (moved from code/branches/buildsystem/bin/Plugins.cfg) (2 diffs, 1 prop)
• bin/msvc (added)
• bin/ogre.cfg-init (deleted)
• bin/tardis (added)
• bin/tardis/plugins.cfg (moved) (moved from code/branches/buildsystem/bin/plugins.cfg-init) (2 diffs, 1 prop)
• cmake/UseTolua.cmake (modified) (1 diff)

code/branches/buildsystem/bin/CMakeLists.txt

@@ -1 +1 @@
 SET(CONFIG_FILES
-    def_keybindings.ini
-    disco.txt
-    irc.tcl
-    ogre.cfg-init
-    orxonox.bat
-    Plugins.cfg
-    plugins.cfg-init
-    remote.tcl
-    run-script
-    telnet_server.tcl
+  def_keybindings.ini
+  disco.txt
+  irc.tcl
+  remote.tcl
+  telnet_server.tcl
 )
 
+IF(IS_TARDIS)
+  SET(CONFIG_FILES ${CONFIG_FILES}
+    linux/run-script
+        tardis/plugins.cfg
+  )
+
+ELSEIF(UNIX)
+  SET(CONFIG_FILES ${CONFIG_FILES}
+    linux/run-script
+        linux/plugins.cfg
+  )
+ENDIF(IS_TARDIS)
+
+IF(MINGW)
+  SET(CONFIG_FILES ${CONFIG_FILES}
+    "mingw/plugins.cfg"
+    "mingw/orxonox.bat"
+  )
+ENDIF(MINGW)
+
 FOREACH(_FILE ${CONFIG_FILES})
-    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_FILE} ${EXECUTABLE_OUTPUT_PATH}/${_FILE} COPYONLY)
+  GET_FILENAME_COMPONENT(_filename ${_FILE} NAME)
+  IF (NOT EXISTS ${EXECUTABLE_OUTPUT_PATH}/${_filename})
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_FILE} ${EXECUTABLE_OUTPUT_PATH}/${_filename} COPYONLY)
+  ENDIF (NOT EXISTS ${EXECUTABLE_OUTPUT_PATH}/${_filename})
 ENDFOREACH(_FILE)

code/branches/buildsystem/bin/linux/plugins.cfg

@@ -8 +8 @@
 Plugin=RenderSystem_GL
 Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=Plugin_OctreeSceneManager
-#Plugin=Plugin_CgProgramManager
+Plugin=Plugin_CgProgramManager
+#Plugin=Plugin_BSPSceneManager
+#Plugin=Plugin_OctreeSceneManager
 
 

code/branches/buildsystem/bin/linux/run-script

@@ -8 +8 @@
 fi
 
-if [ ! -f orge.cfg ]; then
-        cp ogre.cfg-init ogre.cfg
-fi
-
-# check if plugins.cfg exists, and of not create it
-# and modify 
-if [ ! -f plugins.cfg ]; then
-        if uname -n | grep -q "tardis"; then
-                sed -e 's:PluginFolder=/usr/lib/OGRE:PluginFolder=/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/OGRE/:' \
-                -e 's:#Plugin=Plugin_CgProgramManager:Plugin=Plugin_CgProgramManager:' plugins.cfg-init > plugins.cfg
-        else
-                cp plugins.cfg-init plugins.cfg
-        fi
-fi
-
 trap "xset r && echo 'resetting autorepeat'" HUP INT TERM QUIT ABRT KILL ALRM
 ./orxonox $@

code/branches/buildsystem/bin/mingw/orxonox.bat

@@ -1 +1 @@
 title Orxonox
-path lib;..\..\libs;%path%
+path ..\..\libs;%path%
 orxonox.exe
 pause

code/branches/buildsystem/bin/mingw/plugins.cfg

@@ -2 +2 @@
 
 # Define plugin folder
-PluginFolder=..\..\libs\ogre\Samples\Common\bin\Release
+PluginFolder=..\..\libs\ogre\Samples\Common\bin\Release\
 
 # Define plugins
@@ -8 +8 @@
 Plugin=RenderSystem_GL
 Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=Plugin_OctreeSceneManager
-#Plugin=Plugin_CgProgramManager
+Plugin=Plugin_CgProgramManager
+#Plugin=Plugin_BSPSceneManager
+#Plugin=Plugin_OctreeSceneManager
 

code/branches/buildsystem/bin/tardis/plugins.cfg

@@ -2 +2 @@
 
 # Define plugin folder
-PluginFolder=/usr/lib/OGRE
+PluginFolder=/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/OGRE/
 
 # Define plugins
@@ -8 +8 @@
 Plugin=RenderSystem_GL
 Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=Plugin_OctreeSceneManager
-#Plugin=Plugin_CgProgramManager
+Plugin=Plugin_CgProgramManager
+#Plugin=Plugin_BSPSceneManager
+#Plugin=Plugin_OctreeSceneManager
 
 

code/branches/buildsystem/cmake/UseTolua.cmake

@@ -43 +43 @@
                                   -s "${TOLUA_PARSER_SOURCE}"
                                      "${_tolua_pkgfile}"
-    DEPENDS "${_tolua_executable_name}" ${_tolua_inputfiles} ${TOLUA_PARSER_DEPENDENCIES}
+    DEPENDS "${_tolua_executable_name}" ${TOLUA_PARSER_DEPENDENCIES}
+    IMPLICIT_DEPENDS CXX ${_tolua_inputfiles}
     WORKING_DIRECTORY "${LIBRARY_OUTPUT_PATH}"
   )