From: Carl Hetherington Date: Wed, 7 Oct 2015 23:58:32 +0000 (+0100) Subject: Build Linux dcpomatic2 icons on build. X-Git-Tag: v2.4.6~22 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=40fa6662558c21a1b1b3d2fdc35c3092f2df2ccf Build Linux dcpomatic2 icons on build. --- diff --git a/graphics/128x128/dcpomatic2.png b/graphics/128x128/dcpomatic2.png deleted file mode 100644 index 9936b39af..000000000 Binary files a/graphics/128x128/dcpomatic2.png and /dev/null differ diff --git a/graphics/16x16/dcpomatic2.png b/graphics/16x16/dcpomatic2.png deleted file mode 100644 index 3c5a10f2d..000000000 Binary files a/graphics/16x16/dcpomatic2.png and /dev/null differ diff --git a/graphics/22x22/dcpomatic2.png b/graphics/22x22/dcpomatic2.png deleted file mode 100644 index dddb86298..000000000 Binary files a/graphics/22x22/dcpomatic2.png and /dev/null differ diff --git a/graphics/256x256/dcpomatic2.png b/graphics/256x256/dcpomatic2.png deleted file mode 100644 index d12b00efb..000000000 Binary files a/graphics/256x256/dcpomatic2.png and /dev/null differ diff --git a/graphics/32x32/dcpomatic2.png b/graphics/32x32/dcpomatic2.png deleted file mode 100644 index 8cecf08f8..000000000 Binary files a/graphics/32x32/dcpomatic2.png and /dev/null differ diff --git a/graphics/48x48/dcpomatic2.png b/graphics/48x48/dcpomatic2.png deleted file mode 100644 index 07bf2d10b..000000000 Binary files a/graphics/48x48/dcpomatic2.png and /dev/null differ diff --git a/graphics/512x512/dcpomatic2.png b/graphics/512x512/dcpomatic2.png deleted file mode 100644 index 7036de427..000000000 Binary files a/graphics/512x512/dcpomatic2.png and /dev/null differ diff --git a/graphics/512x512/dvdomatic.png b/graphics/512x512/dvdomatic.png deleted file mode 100644 index 65b5012de..000000000 Binary files a/graphics/512x512/dvdomatic.png and /dev/null differ diff --git a/graphics/64x64/dcpomatic2.png b/graphics/64x64/dcpomatic2.png deleted file mode 100644 index 35564a8a2..000000000 Binary files a/graphics/64x64/dcpomatic2.png and /dev/null differ diff --git a/graphics/dcpomatic2.svg b/graphics/dcpomatic2.svg new file mode 100644 index 000000000..c63f8be6a --- /dev/null +++ b/graphics/dcpomatic2.svg @@ -0,0 +1,140 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/logo.svg b/graphics/logo.svg deleted file mode 100644 index c63f8be6a..000000000 --- a/graphics/logo.svg +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/make.sh b/graphics/make.sh deleted file mode 100755 index 9058ef65d..000000000 --- a/graphics/make.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -width=$1 -height=$2 -output=$3 - -inkscape -C -z -e $output -w $width -h $height -D logo.svg diff --git a/graphics/wscript b/graphics/wscript new file mode 100644 index 000000000..54b123379 --- /dev/null +++ b/graphics/wscript @@ -0,0 +1,22 @@ +# +# Copyright (C) 2015 Carl Hetherington +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +def build(bld): + for r in [16, 22, 32, 48, 64, 128, 256, 512]: + bld(rule='inkscape -C -z -e ${TGT} -w %d -h %d -D ${SRC}' % (r, r), source='dcpomatic2.svg', target='%d/dcpomatic2.png' % r) + bld.install_files('${PREFIX}/share/icons/hicolor/%dx%d/apps' % (r, r), '../build/graphics/%d/dcpomatic2.png' % r) diff --git a/wscript b/wscript index 79116ff03..66bedf9e5 100644 --- a/wscript +++ b/wscript @@ -430,8 +430,7 @@ def build(bld): if bld.env.TARGET_OSX: bld.recurse('platform/osx') - for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: - bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'graphics/%s/dcpomatic2.png' % r) + bld.recurse('graphics') if not bld.env.TARGET_WINDOWS: bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/taskbar_icon.png')