Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 13, 2009, 10:50:07 PM (15 years ago)
Author:
rgrieder
Message:

Renamed media to data to restore consistency with game/data/trunk folder name.
Couldn't yet rename the media folder though probably due to some fundamental limitations of SVN (believe me, I tried).

Location:
code/branches/resource2
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • code/branches/resource2

    • Property svn:externals
      •  

        old new  
        1 media_stripped http://svn.orxonox.net/game/data/branches/media_stripped
         1data_stripped https://svn.orxonox.net/game/data/branches/media_stripped
  • code/branches/resource2/media/CMakeLists.txt

    r5641 r5645  
    2121 #    Reto Grieder
    2222 #  Description:
    23  #    Finds the external media directory and configures the media installation.
    24  #    Default search paths are: ../../media and ../media_extern
     23 #    Finds the external data directory and configures the data installation.
     24 #    Default search paths are: ../../data and ../data_extern
    2525 #
    2626
    27 # For dev runs we've got two media directory. The one from the other repository root folder
    28 # is called EXTERNAL_MEDIA
    29 SET(MEDIA_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
    30 SET(MEDIA_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
     27# For dev runs we've got two data directory. The one from the other repository root folder
     28# is called EXTERNAL_DATA
     29SET(DATA_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
     30SET(DATA_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
    3131
    32 # Specify media directory
    33 GET_FILENAME_COMPONENT(_search_path_1 ${CMAKE_SOURCE_DIR}/../${DEFAULT_MEDIA_PATH} ABSOLUTE)
    34 FIND_PATH(EXTERNAL_MEDIA_DIRECTORY resources.oxr
     32# Specify data directory
     33GET_FILENAME_COMPONENT(_search_path_1 ${CMAKE_SOURCE_DIR}/../${DEFAULT_DATA_PATH} ABSOLUTE)
     34FIND_PATH(EXTERNAL_DATA_DIRECTORY resources.oxr
    3535  PATHS
    36     ${CMAKE_SOURCE_DIR}/media_extern
     36    ${CMAKE_SOURCE_DIR}/data_extern
    3737    ${_search_path_1}
    3838  NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
    3939)
    4040
    41 IF(NOT EXTERNAL_MEDIA_DIRECTORY)
    42   MESSAGE(STATUS "Warning: External media directory not found. If you want to compile while downloading the media files, you will have to recompile about four files afterwards and relink everything. \\n You can specify your own folder with the MEDIA_DIRECTORY variable. Default location for the path is orxonox_root/media_extern")
     41IF(NOT EXTERNAL_DATA_DIRECTORY)
     42  MESSAGE(STATUS "Warning: External data directory not found. If you want to compile while downloading the data files, you will have to recompile about four files afterwards and relink everything. \\n You can specify your own folder with the DATA_DIRECTORY variable. Default location for the path is orxonox_root/data_extern")
    4343  # Temporary override to the default location.
    44   SET(EXTERNAL_MEDIA_DIRECTORY ${CMAKE_SOURCE_DIR}/media_extern)
     44  SET(EXTERNAL_DATA_DIRECTORY ${CMAKE_SOURCE_DIR}/data_extern)
    4545ENDIF()
    4646
     
    5050# Internal directory
    5151INSTALL(
    52   DIRECTORY ${MEDIA_DIRECTORY}/
    53   DESTINATION ${MEDIA_INSTALL_DIRECTORY}
     52  DIRECTORY ${DATA_DIRECTORY}/
     53  DESTINATION ${DATA_INSTALL_DIRECTORY}
    5454  REGEX "\\.svn$|_svn$|CMakeLists.txt|InstallScript.cmake" EXCLUDE
    5555)
    5656# External directory
    5757INSTALL(
    58   DIRECTORY ${EXTERNAL_MEDIA_DIRECTORY}/
    59   DESTINATION ${MEDIA_INSTALL_DIRECTORY}
     58  DIRECTORY ${EXTERNAL_DATA_DIRECTORY}/
     59  DESTINATION ${DATA_INSTALL_DIRECTORY}
    6060  REGEX "\\.svn$|_svn$|resources\\.oxr" EXCLUDE
    6161)
    6262# Configure the install scripts (variables not available during installation)
    63 CONFIGURE_FILE(MediaInstallScript.cmake ${CMAKE_CURRENT_BINARY_DIR}/MediaInstallScript.cmake @ONLY)
     63CONFIGURE_FILE(DataInstallScript.cmake ${CMAKE_CURRENT_BINARY_DIR}/DataInstallScript.cmake @ONLY)
    6464# Join both resources.oxr files
    65 INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/MediaInstallScript.cmake)
     65INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/DataInstallScript.cmake)
  • code/branches/resource2/media/DataInstallScript.cmake

    r5644 r5645  
    2929
    3030# Write some comment
    31 FILE(APPEND @MEDIA_INSTALL_DIRECTORY@/resources.oxr "\n\n\n <!-- ----------------------------------------- -->")
    32 FILE(APPEND @MEDIA_INSTALL_DIRECTORY@/resources.oxr     "\n <!-- Content from the external media directory -->")
    33 FILE(APPEND @MEDIA_INSTALL_DIRECTORY@/resources.oxr     "\n <!-- ----------------------------------------- -->\n\n")
     31FILE(APPEND @DATA_INSTALL_DIRECTORY@/resources.oxr "\n\n\n <!-- ---------------------------------------- -->")
     32FILE(APPEND @DATA_INSTALL_DIRECTORY@/resources.oxr     "\n <!-- Content from the external data directory -->")
     33FILE(APPEND @DATA_INSTALL_DIRECTORY@/resources.oxr     "\n <!-- ---------------------------------------- -->\n\n")
    3434
    3535# Append the external file
    36 FILE(READ   @EXTERNAL_MEDIA_DIRECTORY@/resources.oxr _external_file)
    37 FILE(APPEND @MEDIA_INSTALL_DIRECTORY@/resources.oxr ${_external_file})
     36FILE(READ   @EXTERNAL_DATA_DIRECTORY@/resources.oxr _external_file)
     37FILE(APPEND @DATA_INSTALL_DIRECTORY@/resources.oxr ${_external_file})
Note: See TracChangeset for help on using the changeset viewer.