Generate dist media in "media" directory.

To make it fit better with the installed media layout.
This commit is contained in:
Erik Ogenvik 2014-11-23 10:14:25 +01:00
parent c5f28e4cbb
commit 2fdceeb64a
3 changed files with 5 additions and 4 deletions

View file

@ -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)/* $(datadir)/ember/media/
cp -ar $(ourtempdir)/ember-media-$(VERSION)/media $(datadir)/ember/media/
#clean up
rm -rf $(ourtempdir)

View file

@ -124,11 +124,12 @@ OPTIONS
startdir = os.getcwd()
src_media_dir = sys.argv[1]
src_assets_dir = os.path.join(src_media_dir, "assets")
dest_media_dir = sys.argv[2]
#Place the resulting media in a subdirectory called "media"
dest_media_dir = os.path.join(sys.argv[2], "media")
dest_assets_dir = os.path.join(dest_media_dir, "assets")
if not os.path.exists(dest_media_dir):
os.mkdir(dest_media_dir)
os.makedirs(dest_media_dir)
#First copy all directories that we should just provide unchanged
copytree(os.path.join(src_media_dir, "assets_external/caelum"), os.path.join(dest_media_dir, "assets_external/caelum"))

View file

@ -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.py $1 ${PWD}/media-dev 256
scripts/make_dist_media.py $1 ${PWD}/media-dev 256
rsync -uavz --password-file rsyncpasswd media-dev/media/* amber.worldforge.org::media-dev-update