Changeset 2590 for code/branches/buildsystem2/bin

Timestamp:

Jan 12, 2009, 5:06:56 PM (16 years ago)

Author:

rgrieder

Message:

Added ${ORXONOX_LIBRARY_BIN_DIR} which represents the binary directory for the external dlls on windows.
Restructured concepts in bin/ dir:

• All files in bin/Release or bin/Debug get configured and copied to the output directory. Configure means setting all the variables marked with @Var@.
• MinSizeRel and RelWithDebInfo are considered Release versions.
• If there is not specialised file in bin/Debug resp. bin/Release, the file in bin/ is configured and copied.
• orxonox.ini gets configured with the available plugins (release and debug), the plugins folder and the media directory.
• Also the debug levels have been adjusted for Debug resp. Release versions of orxonox.ini
• When not using multi-config (debug, release, etc.) generator (like msvc or xcode), a run script called run (unix) or run.bat (windows) is configured in the root directory.
• For tardis, ogre.cfg is copied as well due to a yet unknown bug with fonts for the ogre gui
• moved all old style msvc project files to visual_studio folder (that only includes configured output files)
• This commit also makes the visual studio files run in all configurations (tested only on my box).

Location:

code/branches/buildsystem2/bin

Files:

• CMakeLists.txt (modified) (2 diffs)
• Debug (added)
• Debug/orxonox.ini (added)
• Release (added)
• Release/orxonox.ini (added)
• linux (deleted)
• mingw (deleted)
• msvc (deleted)
• ogre.cfg (copied) (copied from code/branches/buildsystem2/bin/tardis/ogre.cfg)
• run (moved) (moved from code/branches/buildsystem2/run) (1 diff)
• run.bat (copied) (copied from code/branches/buildsystem2/bin/mingw/orxonox.bat) (1 diff)
• tardis (deleted)

code/branches/buildsystem2/bin/CMakeLists.txt

@@ -1 @@
-SET(CONFIG_FILES
+SET(COMMON_CONFIG_FILES
+  orxonox.ini
   def_keybindings.ini
   def_masterKeybindings.ini
@@ -11 +12 @@
   # OGRE can't find fonts to display config screen on Tardis,
   # so providing default config file here (bug).
-  SET(CONFIG_FILES ${CONFIG_FILES}
-    linux/run-script
-    tardis/orxonox.ini
-    tardis/ogre.cfg
-  )
-
-ELSEIF(UNIX)
-  SET(CONFIG_FILES ${CONFIG_FILES}
-    linux/run-script
-    linux/orxonox.ini
-  )
+  SET(ADDITIONAL_CONFIG_FILES "ogre.cfg")
 ENDIF(TARDIS)
 
-IF(MINGW)
-  SET(CONFIG_FILES ${CONFIG_FILES}
-    "mingw/orxonox.ini"
-    "mingw/orxonox.bat"
-  )
-ENDIF(MINGW)
+SET(CONFIG_FILES ${COMMON_CONFIG_FILES} ${ADDITIONAL_CONFIG_FILES})
 
-FOREACH(_FILE ${CONFIG_FILES})
-  GET_FILENAME_COMPONENT(_filename ${_FILE} NAME)
-  IF (NOT EXISTS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_filename})
-    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_FILE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_filename} COPYONLY)
-  ENDIF (NOT EXISTS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_filename})
-ENDFOREACH(_FILE)
+# Copy config files to all Visual Studio output directories
+IF(CMAKE_CONFIGURATION_TYPES)
+  SET(BUILD_CONFIGS ${CMAKE_CONFIGURATION_TYPES})
+ELSE(CMAKE_CONFIGURATION_TYPES)
+  SET(CONFIG_OUT_PATHS_REL ".")
+  SET(BUILD_CONFIGS ${CMAKE_BUILD_TYPE})
+ENDIF(CMAKE_CONFIGURATION_TYPES)
+
+FOREACH(_build_config ${BUILD_CONFIGS})
+  FOREACH(_file_name ${CONFIG_FILES})
+    # Is there an extra file in bin/Debug or bin/Release?
+    IF(${_build_config} MATCHES "Rel")
+      SET(_build_config_short "Release")
+    ELSE(${_build_config} MATCHES "Rel")
+      SET(_build_config_short "Debug")
+    ENDIF(${_build_config} MATCHES "Rel")
+    IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_build_config_short}/${_file_name})
+      SET(_in_file ${CMAKE_CURRENT_SOURCE_DIR}/${_build_config_short}/${_file_name})
+    ELSE(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_build_config_short}/${_file_name})
+      SET(_in_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file_name})
+    ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_build_config_short}/${_file_name})
+
+    # Copy to the folder named like the build config for Visual Studio
+    IF(CMAKE_CONFIGURATION_TYPES)
+      SET(_out_file ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_build_config}/${_file_name})
+    ELSE(CMAKE_CONFIGURATION_TYPES)
+      SET(_out_file ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_file_name})
+    ENDIF(CMAKE_CONFIGURATION_TYPES)
+    # Only copy if target file doesn't exist. This may result in problems but
+    # otherwise we might delete the a user's config
+    IF (NOT EXISTS ${_out_file})
+      CONFIGURE_FILE(${_in_file} ${_out_file} @ONLY)
+    ENDIF (NOT EXISTS ${_out_file})
+  ENDFOREACH(_file_name)
+ENDFOREACH(_build_config)
+
+# Create a run script for both Windows and Linux in the source root path if
+# CMake is not used to create multi-configuration project files
+IF(NOT CMAKE_CONFIGURATION_TYPES)
+  IF(WIN32)
+    SET(RUN_SCRIPT ${ADDITIONAL_CONFIG_FILES} "run.bat")
+  ELSE(UNIX)
+    SET(RUN_SCRIPT ${ADDITIONAL_CONFIG_FILES} "run")
+  ENDIF(WIN32)
+  IF (NOT EXISTS ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT})
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT} ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT} @ONLY)
+  ENDIF (NOT EXISTS ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT})
+ENDIF(NOT CMAKE_CONFIGURATION_TYPES)

code/branches/buildsystem2/bin/run

@@ -1 +1 @@
 #!/bin/sh
-# convenience script for starting orxonox
+# convenience script for starting orxonox on Linux
 
-cd build/bin && exec ./run-script $@
+cd @EXECUTABLE_OUTPUT_PATH@ && exec ./@ORXONOX_EXECUTABLE_NAME@ $@

code/branches/buildsystem2/bin/run.bat

@@ -1 @@
-title Orxonox
-path ..\..\libs;%path%
-orxonox.exe
+title @PROJECT_NAME@
+path @ORXONOX_LIBRARY_BIN_DIR@;%path%
+@ORXONOX_EXECUTABLE_NAME@
 pause