Context Navigation

← Previous Changeset
Next Changeset →

Changeset 2590

Timestamp:

Jan 12, 2009, 5:06:56 PM (15 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

Files:

: 6 added
: 4 deleted
: 6 edited
: 4 copied
: 1 moved

bin/CMakeLists.txt (modified) (2 diffs)
bin/Debug (added)
bin/Debug/orxonox.ini (added)
bin/Release (added)
bin/Release/orxonox.ini (added)
bin/linux (deleted)
bin/mingw (deleted)
bin/msvc (deleted)
bin/ogre.cfg (copied) (copied from code/branches/buildsystem2/bin/tardis/ogre.cfg)
bin/run (moved) (moved from code/branches/buildsystem2/run) (1 diff)
bin/run.bat (copied) (copied from code/branches/buildsystem2/bin/mingw/orxonox.bat) (1 diff)
bin/tardis (deleted)
cmake/ConfigMSVC.cmake (modified) (3 diffs)
cmake/ConfigMinGW.cmake (modified) (1 diff)
cmake/ConfigPlatforms.cmake (modified) (1 diff)
src/orxonox/CMakeLists.txt (modified) (2 diffs)
src/orxonox/orxonox.vcproj.user (added)
visual_studio/vc8/bin (added)
visual_studio/vc8/bin/debug (copied) (copied from code/branches/buildsystem2/bin/msvc/orxonox_vc8/debug)
visual_studio/vc8/bin/release (copied) (copied from code/branches/buildsystem2/bin/msvc/orxonox_vc8/release)
visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

code/branches/buildsystem2/bin/CMakeLists.txt

-                      r2584
+                      r2590
+SET(CONFIG_FILES
+SET(COMMON_CONFIG_FILES
+  orxonox.ini
   def_keybindings.ini
   def_masterKeybindings.ini
 …
   # 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

r2582	r2590
1	1	#!/bin/sh
2		# convenience script for starting orxonox
	2	# convenience script for starting orxonox on Linux
3	3
4		cd ~~build/bin && exec ./run-script~~ $@
	4	cd @EXECUTABLE_OUTPUT_PATH@ && exec ./@ORXONOX_EXECUTABLE_NAME@ $@

code/branches/buildsystem2/bin/run.bat

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

code/branches/buildsystem2/cmake/ConfigMSVC.cmake

-                      r2588
+                      r2590
     MESSAGE(FATAL_ERROR "Could not find dependency directory for the Visual Studio libraries")
   ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/dependencies/orxonox_vc8)
+  SET(ORXONOX_LIBRARY_BIN_DIR ${MSVC_LIBRARY_DIR}/bin)
   # Set variables for the include directories and the libraries
 …
   SET(ENV{OPENALDIR}         ${MSVC_LIBRARY_DIR}/openal-1.1)
   SET(ENV{LUA_DIR}           ${MSVC_LIBRARY_DIR}/lua-5.1.3)
   SET(ENV{OGRE_HOME}        "${MSVC_LIBRARY_DIR}/ogre-1.4.9;${MSVC_LIBRARY_DIR}/bin")
+  SET(ENV{OGRE_HOME}        "${MSVC_LIBRARY_DIR}/ogre-1.4.9;${ORXONOX_LIBRARY_BIN_DIR}")
   SET(TCL_INCLUDE_PATH       ${MSVC_LIBRARY_DIR}/tcl-8.5.2/include)
   SET(TCL_LIBRARY            ${MSVC_LIBRARY_DIR}/tcl-8.5.2/lib/tcl85t.lib)
 …
   # Set tolua working directory because lua.dll is not where tolua is
   SET(TOLUA_PARSER_WORKING_DIRECTORY ${MSVC_LIBRARY_DIR}/bin)
+  SET(TOLUA_PARSER_WORKING_DIRECTORY ${ORXONOX_LIBRARY_BIN_DIR})
 ENDIF (MSVC)

code/branches/buildsystem2/cmake/ConfigMinGW.cmake

r2583	r2590
42	42	MESSAGE(FATAL_ERROR "Could not find dependency directory for the MinGW libraries")
43	43	ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/libs)
44
	44	SET(ORXONOX_LIBRARY_BIN_DIR ${MINGW_LIBRARY_DIR})
45	45
46	46	# Note: When setting ENV${} variables, make sure to use quotes when

code/branches/buildsystem2/cmake/ConfigPlatforms.cmake

r2588	r2590
34	34	# When searching for debug libraries, this is appended to the libarary name
35	35	SET(LIBRARY_DEBUG_POSTFIX "_d")
	36	# Sets where to find the binary directory of external libraries
	37	SET(ORXONOX_LIBRARY_BIN_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
36	38	# Working directory for the tolua parser. Adjust for windows because lua.dll has to be there!
37	39	SET(TOLUA_PARSER_WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})

code/branches/buildsystem2/src/orxonox/CMakeLists.txt

-                      r2588
+                      r2590
 ADD_EXECUTABLE(orxonox ${ORXONOX_SRC_FILES})
+GET_TARGET_PROPERTY(_exec_loc orxonox LOCATION)
+GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
+SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE STRING "")
+MARK_AS_ADVANCED(ORXONOX_EXECUTABLE_NAME)
 IF(NETWORKTRAFFIC_TESTING_ENABLED)
 …
+)
+# When using Visual Studio we want to use the output directory as working
+# directory and we also want to specify where the external dlls
+# (lua, ogre, etc.) are. The problem hereby is that these information cannot
+# be specified in CMake because they are not stored in the actual project file.
+# This workaround will create a configured *.vcproj.user file that holds the
+# right values. When starting the solution for the first time,
+# these get written to the *vcproj.yourPCname.yourname.user
+IF(MSVC)
+  IF(CMAKE_CL_64)
+    SET(MSVC_PLATFORM "x64")
+  ELSE(CMAKE_CL_64)
+    SET(MSVC_PLATFORM "Win32")
+  ENDIF(CMAKE_CL_64)
+  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox.vcproj.user" "${CMAKE_CURRENT_BINARY_DIR}/orxonox.vcproj.user")
+ENDIF(MSVC)
 IF (NOT WIN32)
   INSTALL(TARGETS orxonox RUNTIME DESTINATION bin)

code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj

-                      r2569
+                      r2590
                                 Name="VCPostBuildEventTool"
                                 Description="Copying default configuration files..."
                                 CommandLine="for %%a in ($(RootDir)\bin\msvc\$(SolutionName)\$(ConfigurationName)\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;for %%a in ($(RootDir)\bin\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;"
+                                CommandLine="for %%a in ($(SolutionDir)\bin\$(ConfigurationName)\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;for %%a in ($(RootDir)\bin\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;"
                         />
                 </Configuration>
 …
                                 Name="VCPostBuildEventTool"
                                 Description="Copying default configuration files..."
                                 CommandLine="for %%a in ($(RootDir)\bin\msvc\$(SolutionName)\$(ConfigurationName)\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;for %%a in ($(RootDir)\bin\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;"
+                                CommandLine="for %%a in ($(SolutionDir)\bin\$(ConfigurationName)\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;for %%a in ($(RootDir)\bin\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;"
                         />
                 </Configuration>

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 2590

Legend:

Download in other formats: