mirror of
https://github.com/worldforge/ember
synced 2026-08-13 16:23:06 -04:00
Removed "media/shared" level from media path.
This simplifies the directory structure. Now all assets are placed directly in PREFIX/share/ember, with the media repo assets in the subdirectory "media".
This commit is contained in:
Erik Ogenvik
parent
40221b57be
commit
6f2ef5225f
13 changed files with 49 additions and 57 deletions
|
|
@ -35,7 +35,7 @@ releasemedia:
|
|||
#unpack to our temporary directory
|
||||
tar -jxf $(ourtempdir)/ember-media-$(VERSION).tar.bz2 -C $(ourtempdir)
|
||||
#move to the correct location
|
||||
cp -r $(ourtempdir)/ember-media-$(VERSION)/media/shared/* $(datadir)/ember/media/shared/
|
||||
cp -r $(ourtempdir)/ember-media-$(VERSION)/* $(datadir)/ember/media/
|
||||
#clean up
|
||||
rm -rf $(ourtempdir)
|
||||
|
||||
|
|
|
|||
|
|
@ -11,19 +11,19 @@ dist-hook:
|
|||
(cd $(top_srcdir)/data && tar cf - `find . -name \*.xsd` | ( cd $(current) && cd $(distdir) && tar xf -))
|
||||
|
||||
install-data-local:
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/media/shared/data
|
||||
(cd $(top_srcdir)/data && tar cf - `find . -name \*.modeldef`) | (cd $(DESTDIR)$(datadir)/ember/media/shared/data && tar xpf -)
|
||||
# (cd $(top_srcdir)/data && tar cf - `find . -name \*.modeldef.xml`) | (cd $(DESTDIR)$(datadir)/ember/media/shared/data && tar xpf -)
|
||||
# (cd $(top_srcdir)/data && tar cf - `find . -name \*.entitymap`) | (cd $(DESTDIR)$(datadir)/ember/media/shared/data && tar xf -)
|
||||
(cd $(top_srcdir)/data && tar cf - `find . -name \*.entitymap.xml`) | (cd $(DESTDIR)$(datadir)/ember/media/shared/data && tar xpf -)
|
||||
(cd $(top_srcdir)/data && tar cf - `find . -name \*.terrain`) | (cd $(DESTDIR)$(datadir)/ember/media/shared/data && tar xpf -)
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/data
|
||||
(cd $(top_srcdir)/data && tar cf - `find . -name \*.modeldef`) | (cd $(DESTDIR)$(datadir)/ember/data && tar xpf -)
|
||||
# (cd $(top_srcdir)/data && tar cf - `find . -name \*.modeldef.xml`) | (cd $(DESTDIR)$(datadir)/ember/data && tar xpf -)
|
||||
# (cd $(top_srcdir)/data && tar cf - `find . -name \*.entitymap`) | (cd $(DESTDIR)$(datadir)/ember/data && tar xf -)
|
||||
(cd $(top_srcdir)/data && tar cf - `find . -name \*.entitymap.xml`) | (cd $(DESTDIR)$(datadir)/ember/data && tar xpf -)
|
||||
(cd $(top_srcdir)/data && tar cf - `find . -name \*.terrain`) | (cd $(DESTDIR)$(datadir)/ember/data && tar xpf -)
|
||||
|
||||
uninstall-local:
|
||||
find $(DESTDIR)$(datadir)/ember/media/shared/data -name \*.modeldef | xargs rm -f
|
||||
# find $(DESTDIR)$(datadir)/ember/media/shared/data -name \*.modeldef.xml | xargs rm -f
|
||||
# find $(DESTDIR)$(datadir)/ember/media/shared/data -name \*.entitymap | xargs rm
|
||||
find $(DESTDIR)$(datadir)/ember/media/shared/data -name \*.entitymap.xml | xargs rm -f
|
||||
find $(DESTDIR)$(datadir)/ember/media/shared/data -name \*.terrain | xargs rm -f
|
||||
find $(DESTDIR)$(datadir)/ember/data -name \*.modeldef | xargs rm -f
|
||||
# find $(DESTDIR)$(datadir)/ember/data -name \*.modeldef.xml | xargs rm -f
|
||||
# find $(DESTDIR)$(datadir)/ember/data -name \*.entitymap | xargs rm
|
||||
find $(DESTDIR)$(datadir)/ember/data -name \*.entitymap.xml | xargs rm -f
|
||||
find $(DESTDIR)$(datadir)/ember/data -name \*.terrain | xargs rm -f
|
||||
|
||||
check-local:
|
||||
@set -e; for rule in `find $(top_srcdir)/data -name \*.modeldef -or -name \*.modeldef.xml` ; do \
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@
|
|||
#updates amber with the needed media. This will only work for me (Erik Ogenvik) since only I know the password (as found in rsyncpasswd)
|
||||
#usage: ./refresh-amber-media-dev.sh <media svn directory>
|
||||
|
||||
sh ${PWD}/scripts/make_dist_media.sh $1 ${PWD}/media-dev 256
|
||||
sh ${PWD}/scripts/make_dist_media.py $1 ${PWD}/media-dev 256
|
||||
rsync -uavz --password-file rsyncpasswd media-dev/media/* amber.worldforge.org::media-dev-update
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ noinst_LIBRARIES = libCEGUI.a
|
|||
libCEGUI_a_SOURCES = CEGUILogger.cpp RenderedColourStringTextComponent.cpp ColouredRenderedStringParser.cpp SDLNativeClipboardProvider.cpp
|
||||
noinst_HEADERS = CEGUILogger.h RenderedColourStringTextComponent.h ColouredRenderedStringParser.h SDLNativeClipboardProvider.h
|
||||
|
||||
ceguifontsdir = $(datadir)/ember/media/shared/gui/cegui/datafiles/fonts
|
||||
ceguiimagesetsdir = $(datadir)/ember/media/shared/gui/cegui/datafiles/imagesets
|
||||
ceguilayoutsdir = $(datadir)/ember/media/shared/gui/cegui/datafiles/layouts
|
||||
ceguischemesdir = $(datadir)/ember/media/shared/gui/cegui/datafiles/schemes
|
||||
ceguiconfigdir = $(datadir)/ember/media/shared/gui/cegui/datafiles/configs
|
||||
ceguilooknfeeldir = $(datadir)/ember/media/shared/gui/cegui/datafiles/looknfeel
|
||||
ceguischemadir = $(datadir)/ember/media/shared/gui
|
||||
ceguifontsdir = $(datadir)/ember/gui/cegui/datafiles/fonts
|
||||
ceguiimagesetsdir = $(datadir)/ember/gui/cegui/datafiles/imagesets
|
||||
ceguilayoutsdir = $(datadir)/ember/gui/cegui/datafiles/layouts
|
||||
ceguischemesdir = $(datadir)/ember/gui/cegui/datafiles/schemes
|
||||
ceguiconfigdir = $(datadir)/ember/gui/cegui/datafiles/configs
|
||||
ceguilooknfeeldir = $(datadir)/ember/gui/cegui/datafiles/looknfeel
|
||||
ceguischemadir = $(datadir)/ember/gui
|
||||
|
||||
dist_ceguifonts_DATA = datafiles/fonts/DejaVuSans-Bold-8.xml datafiles/fonts/DejaVuSans-Bold-10.xml datafiles/fonts/DejaVuSans-14.xml datafiles/fonts/DejaVuSans-10.xml datafiles/fonts/DejaVuSans-8.xml datafiles/fonts/DejaVuSans-6.xml datafiles/fonts/DejaVuSans-7.xml
|
||||
dist_ceguiimagesets_DATA = datafiles/imagesets/Imageset.xsd datafiles/imagesets/iconset_standard.imageset datafiles/imagesets/iconset_mason.imageset datafiles/imagesets/EmberLook.imageset datafiles/imagesets/status_main.imageset datafiles/imagesets/compass.imageset datafiles/imagesets/splash.imageset
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ void OgreResourceLoader::unloadUnusedResources()
|
|||
|
||||
bool OgreResourceLoader::addSharedMedia(const std::string& path, const std::string& type, const std::string& section, bool recursive)
|
||||
{
|
||||
static const std::string& sharedMediaPath = EmberServices::getSingleton().getConfigService().getSharedMediaDirectory();
|
||||
static const std::string& sharedMediaPath = EmberServices::getSingleton().getConfigService().getSharedDataDirectory();
|
||||
|
||||
return addResourceDirectory(sharedMediaPath + path, type, section, recursive, true, true);
|
||||
}
|
||||
|
|
@ -151,8 +151,8 @@ bool OgreResourceLoader::addResourceDirectory(const std::string& path, const std
|
|||
void OgreResourceLoader::loadBootstrap()
|
||||
{
|
||||
//Add the "assets" directory, which contains most of the assets
|
||||
addUserMedia("assets", "EmberFileSystem", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, true);
|
||||
addSharedMedia("assets", "EmberFileSystem", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, true);
|
||||
addUserMedia("media/assets", "EmberFileSystem", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, true);
|
||||
addSharedMedia("media/assets", "EmberFileSystem", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, true);
|
||||
}
|
||||
|
||||
void OgreResourceLoader::loadGui()
|
||||
|
|
@ -181,8 +181,8 @@ void OgreResourceLoader::loadGeneral()
|
|||
addSharedMedia("sounddefinitions", "EmberFileSystem", "SoundDefinitions", true);
|
||||
|
||||
//The Caelum component
|
||||
addUserMedia("assets_external/caelum", "EmberFileSystem", "Caelum", true);
|
||||
addSharedMedia("assets_external/caelum", "EmberFileSystem", "Caelum", true);
|
||||
addUserMedia("media/assets_external/caelum", "EmberFileSystem", "Caelum", true);
|
||||
addSharedMedia("media/assets_external/caelum", "EmberFileSystem", "Caelum", true);
|
||||
|
||||
//Entity recipes
|
||||
addUserMedia("entityrecipes", "EmberFileSystem", "EntityRecipes", true);
|
||||
|
|
|
|||
|
|
@ -39,16 +39,8 @@ class FileSystemArchiveFactory;
|
|||
|
||||
@brief Loads resources into the Ogre resource system.
|
||||
|
||||
The main role of this class is to load the resource locations as defined in resources.cfg into the Ogre resource system.
|
||||
The main role of this class is to define and load the resources into the Ogre resource system.
|
||||
|
||||
The format for the resource.cfg file is:
|
||||
Sections/resource groups are defined in brackets, such as [General] or [Gui].
|
||||
Each entry in a resource group first specifies the type of resource container, which for now should in pretty much all cases be "EmberFileSystem".
|
||||
The value in brackets following the type of location (for example "EmberFileSystem[user]") tells Ember in which places it should look.
|
||||
"user" means that Ember will look in these locations:
|
||||
* <ember home directory>/user-media. On a standard linux install this is ~/.ember/user-media . This directory allows the user to add his/her own media, thus overriding the default media. Everytime media is saved from within Ember (for example when editing a model through the Model Editor) the media is saved here.
|
||||
* <ember home directory>/<ember media dir>. The name of the media directory is set in ember.conf. In most cases this is "ember-media-<version>". So for version 0.5.2 it's "~/.ember/ember-media-0.5.2". The contents of this directory is copied from PREFIX/share/ember/media/user at installation time, and then updated through wfut every time. The idea with this directory is to let it be updated through wfut. The user should never edit this media since it will be overwritten by wfut. Use the "user-media" directory instead.
|
||||
"shared" means that Ember will look for the media in PREFIX/shared/ember/media/shared only. This is media that is static and shared by all users on the system, and which won't be updated through wfut.
|
||||
If a directory contains a file named "norecurse" (it can be empty) Ember won't recurse further into it
|
||||
*/
|
||||
class OgreResourceLoader : public ConsoleObject {
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ dist-hook:
|
|||
(cd $(top_srcdir)/src/components/ogre/authoring/entityrecipes && tar cf - `find . -name \*.xsd` | ( cd $(current) && cd $(distdir) && tar xf -))
|
||||
|
||||
install-data-local:
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/media/shared/entityrecipes
|
||||
(cd $(top_srcdir)/src/components/ogre/authoring/entityrecipes && tar cf - `find . -name \*.entityrecipe`) | (cd $(DESTDIR)$(datadir)/ember/media/shared/entityrecipes && tar xpf -)
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/entityrecipes
|
||||
(cd $(top_srcdir)/src/components/ogre/authoring/entityrecipes && tar cf - `find . -name \*.entityrecipe`) | (cd $(DESTDIR)$(datadir)/ember/entityrecipes && tar xpf -)
|
||||
|
||||
uninstall-local:
|
||||
find $(DESTDIR)$(datadir)/ember/media/shared/entityrecipes -name \*.entityrecipe | xargs rm -f
|
||||
find $(DESTDIR)$(datadir)/ember/entityrecipes -name \*.entityrecipe | xargs rm -f
|
||||
|
||||
check-local:
|
||||
@set -e; for rule in `find $(top_srcdir)/src/components/ogre/authoring/entityrecipes -name \*.entityrecipe -or -name \*.entityrecipe.xml` ; do \
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ dist-hook:
|
|||
# (cd $(top_srcdir)/src/components/ogre/sounddefinitions && tar cf - `find . -name \*.sounddef.xml` | ( cd $(current) && cd $(distdir) && tar xf -))
|
||||
|
||||
install-data-local:
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/media/shared/sounddefinitions
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/sounddefinitions
|
||||
|
||||
uninstall-local:
|
||||
find $(DESTDIR)$(datadir)/ember/media/shared/sounddefinitions -name \*.sounddef | xargs rm -f
|
||||
# find $(DESTDIR)$(datadir)/ember/media/shared/sounddefinitions -name \*.sounddef.xml | xargs rm -f
|
||||
find $(DESTDIR)$(datadir)/ember/sounddefinitions -name \*.sounddef | xargs rm -f
|
||||
# find $(DESTDIR)$(datadir)/ember/sounddefinitions -name \*.sounddef.xml | xargs rm -f
|
||||
|
||||
check-local:
|
||||
@set -e; for rule in `find $(top_srcdir)/src/components/ogre/sounddefinitions \*.sounddef -or -name \*.sounddef.xml` ; do \
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ dist-hook:
|
|||
(cd $(top_srcdir)/src/components/ogre/widgets && tar cf - `find . -name \*.lua` | ( cd $(current) && cd $(distdir) && tar xf -))
|
||||
|
||||
install-data-local:
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/media/shared/gui/cegui/datafiles/layouts/
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/media/shared/scripting/lua
|
||||
(cd $(top_srcdir)/src/components/ogre/widgets && tar cf - `find . -name \*.layout`) | (cd $(DESTDIR)$(datadir)/ember/media/shared/gui/cegui/datafiles/layouts && tar xpf -)
|
||||
(cd $(top_srcdir)/src/components/ogre/widgets && tar cf - `find . -name \*.lua`) | (cd $(DESTDIR)$(datadir)/ember/media/shared/scripting/lua && tar xpf -)
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/gui/cegui/datafiles/layouts/
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/scripting/lua
|
||||
(cd $(top_srcdir)/src/components/ogre/widgets && tar cf - `find . -name \*.layout`) | (cd $(DESTDIR)$(datadir)/ember/gui/cegui/datafiles/layouts && tar xpf -)
|
||||
(cd $(top_srcdir)/src/components/ogre/widgets && tar cf - `find . -name \*.lua`) | (cd $(DESTDIR)$(datadir)/ember/scripting/lua && tar xpf -)
|
||||
|
||||
uninstall-local:
|
||||
find $(DESTDIR)$(datadir)/ember/media/shared/gui/cegui/datafiles/layouts/ -name \*.layout | xargs rm -f
|
||||
find $(DESTDIR)$(datadir)/ember/media/shared/scripting/lua/ -name \*.lua | xargs rm -f
|
||||
find $(DESTDIR)$(datadir)/ember/gui/cegui/datafiles/layouts/ -name \*.layout | xargs rm -f
|
||||
find $(DESTDIR)$(datadir)/ember/scripting/lua/ -name \*.lua | xargs rm -f
|
||||
|
||||
SUBDIRS = adapters representations
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ dist-hook:
|
|||
(cd $(top_srcdir)/src/components/ogre/widgets/adapters/atlas; tar cf - `find . -name \*.layout` | ( cd $(current); cd $(distdir); tar xf -))
|
||||
|
||||
install-data-local:
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/
|
||||
(cd $(top_srcdir)/src/components/ogre/widgets/adapters/atlas && tar cf - `find . -name \*.layout`) | (cd $(DESTDIR)$(datadir)/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas && tar xpf -)
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/gui/cegui/datafiles/layouts/adapters/atlas/
|
||||
(cd $(top_srcdir)/src/components/ogre/widgets/adapters/atlas && tar cf - `find . -name \*.layout`) | (cd $(DESTDIR)$(datadir)/ember/gui/cegui/datafiles/layouts/adapters/atlas && tar xpf -)
|
||||
|
||||
uninstall-local:
|
||||
find $(DESTDIR)$(datadir)/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas -name \*.layout | xargs rm
|
||||
find $(DESTDIR)$(datadir)/ember/gui/cegui/datafiles/layouts/adapters/atlas -name \*.layout | xargs rm
|
||||
|
||||
|
|
@ -6,13 +6,13 @@ dist-hook:
|
|||
(cd $(top_srcdir)/src/components/ogre/widgets && tar cf - `find . -name \*.lua` | ( cd $(current) && cd $(distdir) && tar xf -))
|
||||
|
||||
install-data-local:
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/media/shared/gui/cegui/datafiles/layouts/
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/media/shared/scripting/lua
|
||||
(cd $(top_srcdir)/src/components/ogre/widgets && tar cf - `find . -name \*.layout`) | (cd $(DESTDIR)$(datadir)/ember/media/shared/gui/cegui/datafiles/layouts && tar xpf -)
|
||||
(cd $(top_srcdir)/src/components/ogre/widgets && tar cf - `find . -name \*.lua`) | (cd $(DESTDIR)$(datadir)/ember/media/shared/scripting/lua && tar xpf -)
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/gui/cegui/datafiles/layouts/
|
||||
mkdir -p $(DESTDIR)$(datadir)/ember/scripting/lua
|
||||
(cd $(top_srcdir)/src/components/ogre/widgets && tar cf - `find . -name \*.layout`) | (cd $(DESTDIR)$(datadir)/ember/gui/cegui/datafiles/layouts && tar xpf -)
|
||||
(cd $(top_srcdir)/src/components/ogre/widgets && tar cf - `find . -name \*.lua`) | (cd $(DESTDIR)$(datadir)/ember/scripting/lua && tar xpf -)
|
||||
|
||||
uninstall-local:
|
||||
find $(DESTDIR)$(datadir)/ember/media/shared/gui/cegui/datafiles/layouts/ -name \*.layout | xargs rm -f
|
||||
find $(DESTDIR)$(datadir)/ember/media/shared/scripting/lua/ -name \*.lua | xargs rm -f
|
||||
find $(DESTDIR)$(datadir)/ember/gui/cegui/datafiles/layouts/ -name \*.layout | xargs rm -f
|
||||
find $(DESTDIR)$(datadir)/ember/scripting/lua/ -name \*.lua | xargs rm -f
|
||||
|
||||
SUBDIRS = bindings
|
||||
|
|
|
|||
|
|
@ -376,7 +376,7 @@ void Application::initializeServices()
|
|||
mServices->getScriptingService().registerScriptingProvider(luaProvider);
|
||||
Lua::ConnectorBase::setState(luaProvider->getLuaState());
|
||||
|
||||
mScriptingResourceProvider = new FileResourceProvider(mServices->getConfigService().getSharedMediaDirectory() + "/scripting/");
|
||||
mScriptingResourceProvider = new FileResourceProvider(mServices->getConfigService().getSharedDataDirectory() + "/scripting/");
|
||||
mServices->getScriptingService().setResourceProvider(mScriptingResourceProvider);
|
||||
|
||||
oldSignals[SIGSEGV] = signal(SIGSEGV, shutdownHandler);
|
||||
|
|
|
|||
|
|
@ -527,7 +527,7 @@ namespace Ember
|
|||
|
||||
const std::string& ConfigService::getSharedMediaDirectory() const
|
||||
{
|
||||
static std::string path ( getSharedDataDirectory() + "/media/shared/" );
|
||||
static std::string path ( getSharedDataDirectory() + "/media/" );
|
||||
return path;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue