mmo-ref/ember
1
0
Fork 0
mirror of https://github.com/worldforge/ember synced 2026-08-13 16:23:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove references to obsolete media download targets.

Browse source
This commit is contained in:
Erik Ogenvik 2023-10-30 21:04:11 +01:00
parent 013e47e195
commit dbda5f0a07
3 changed files with 1 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/cmake.yml vendored
View file

@ -90,11 +90,6 @@ jobs:
mkdir -p ~/install/usr
cmake --preset $PROFILE_CONAN . -DCMAKE_INSTALL_PREFIX=~/install/usr
- name: Download media
if: runner.os != 'Windows'
shell: bash
run: cmake --build --preset $PROFILE_CONAN --target media-download
- name: Build
shell: bash
run: cmake --build --preset $PROFILE_CONAN

53
CMakeLists.txt
View file

@ -369,10 +369,6 @@ install(FILES ${SOUND_DEFINITION_FILES} DESTINATION ${CMAKE_INSTALL_FULL_DATADIR
# man files
install(FILES docs/man/man1/ember.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
set(MEDIA_DIR media-${MEDIA_VERSION})
set(MEDIAREPO_DIR ${PROJECT_SOURCE_DIR}/mediarepo)
set(MEDIAREPO_PROCESSED_DIR ${CMAKE_BINARY_DIR}/ember-media-${MEDIA_VERSION})
find_package(Subversion)
find_package(Python3 COMPONENTS Interpreter)
find_program(RSYNC_CMD NAMES rsync)
@ -390,55 +386,6 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
)
endif ()
add_custom_target(media-download)
if (RSYNC_CMD)
add_custom_command(
TARGET media-download
COMMAND ${CMAKE_COMMAND} -E echo "I will now use rsync to install the media from amber.worldforge.org into ${MEDIA_DIR}."
COMMAND ${CMAKE_COMMAND} -E make_directory ${MEDIA_DIR}
COMMAND rsync -rtzu --delete amber.worldforge.org::ember-media/ember-media-${MEDIA_VERSION}/ ${MEDIA_DIR}
COMMAND ${CMAKE_COMMAND} -E echo "Copying ${MEDIA_DIR}/media to ${CMAKE_INSTALL_FULL_DATADIR}/ember/media."
COMMAND ${CMAKE_COMMAND} -E copy_directory ${MEDIA_DIR}/media ${CMAKE_INSTALL_FULL_DATADIR}/ember/media
COMMAND ${CMAKE_COMMAND} -E echo "Done."
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
else (RSYNC_CMD)
add_custom_command(
TARGET media-download
COMMAND ${CMAKE_COMMAND} -E echo "Could not find the Rsync command. The target 'media-download' is disabled."
)
endif (RSYNC_CMD)
add_custom_target(mediarepo-checkout)
if (Subversion_FOUND)
add_custom_command(
TARGET mediarepo-checkout
COMMAND ${CMAKE_COMMAND} -E echo "Using Subversion to checkout https://svn.worldforge.org:886/svn/media/trunk to ${MEDIAREPO_DIR}/trunk."
COMMAND ${CMAKE_COMMAND} -E make_directory ${MEDIAREPO_DIR}
COMMAND ${Subversion_SVN_EXECUTABLE} co https://svn.worldforge.org:886/svn/media/trunk ${MEDIAREPO_DIR}/trunk
)
else (Subversion_FOUND)
add_custom_command(
TARGET mediarepo-checkout
COMMAND ${CMAKE_COMMAND} -E echo "Could not find the Subversion command 'svn'. The target 'mediarepo-checkout' is disabled."
)
endif (Subversion_FOUND)
add_custom_target(mediarepo-process)
if (Python3_Interpreter_FOUND)
add_custom_command(
TARGET mediarepo-process
COMMAND ${CMAKE_COMMAND} -E echo "Processing media in ${MEDIAREPO_DIR}/trunk and placing it in ${MEDIAREPO_PROCESSED_DIR}."
COMMAND ${Python3_EXECUTABLE} ${CMAKE_BINARY_DIR}/scripts/make_dist_media.py ${MEDIAREPO_DIR}/trunk ${MEDIAREPO_PROCESSED_DIR}
)
else (Python3_Interpreter_FOUND)
add_custom_command(
TARGET mediarepo-process
COMMAND ${CMAKE_COMMAND} -E echo "Could not find the Python command 'python'. The target 'mediarepo-process' is disabled."
)
endif (Python3_Interpreter_FOUND)
# Doxygen support, exports a "dox" target.
find_package(Doxygen)

4
README.md
View file

@ -23,7 +23,7 @@ The simplest way to install all required dependencies is by using [Conan](https:
conan remote add worldforge https://artifactory.ogenvik.org/artifactory/api/conan/conan
conan install . --build missing -c tools.system.package_manager:mode=install -c tools.system.package_manager:sudo=True
cmake --preset conan-release -DCMAKE_INSTALL_PREFIX=./build/install/release
cmake --build --preset conan-release -j --target all --target install --target media-download
cmake --build --preset conan-release -j --target all --target install
```
Alternatively you can use the [Hammer](http://wiki.worldforge.org/wiki/Hammer_Script "The Hammer script") tool to
@ -31,8 +31,6 @@ compile Ember.
This is script provided by the Worldforge project which will download and install all of the required libraries and
components used by Worldforge.
The ```make media-download``` target will fetch all of the needed media files from the net. Rsync is required.
### Tests
The test suite can be built and run using the ```check``` target. For example: