From 53abd221766b15223f8ece1f12d485678aa1a06c Mon Sep 17 00:00:00 2001 From: Daniel Pavel Date: Wed, 24 Jul 2013 11:06:58 +0200 Subject: [PATCH] packaging: add compiled locale files --- packaging/build_deb.sh | 1 + packaging/debian/solaar.install | 1 + setup.py | 26 ++++++++++++++++++-------- tools/clean.sh | 4 ++++ 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/packaging/build_deb.sh b/packaging/build_deb.sh index a2efb4ca..8ef210c1 100755 --- a/packaging/build_deb.sh +++ b/packaging/build_deb.sh @@ -47,6 +47,7 @@ fi export TMPDIR="$(/bin/mktemp --directory --tmpdir debbuild-$P_NAME-$P_VERSION-$USER-XXXXXX)" +./tools/po-compile.sh python2.7 setup.py sdist --formats=gztar --quiet /bin/tar --extract --gunzip --file "$SDIST_FILE" --directory "$DIST_DIR" test -d "$BUILD_DIR" diff --git a/packaging/debian/solaar.install b/packaging/debian/solaar.install index 8b571a87..8c9f6148 100644 --- a/packaging/debian/solaar.install +++ b/packaging/debian/solaar.install @@ -1,5 +1,6 @@ usr/bin/ usr/share/solaar/ +usr/share/locale/ usr/share/icons/hicolor/scalable/apps/ usr/share/applications/ usr/share/applications/solaar.desktop etc/xdg/autostart/ diff --git a/setup.py b/setup.py index 2af7ae49..cbd7fcca 100755 --- a/setup.py +++ b/setup.py @@ -24,6 +24,23 @@ if 'install' in sys.argv: del sys, backup_path_0 + +def _data_files(): + from os.path import dirname as _dirname + + yield 'share/solaar/icons', _glob('share/solaar/icons/solaar*.svg') + yield 'share/solaar/icons', _glob('share/solaar/icons/light_*.png') + yield 'share/icons/hicolor/scalable/apps', ['share/solaar/icons/solaar.svg'] + + for mo in _glob('share/locale/*/LC_MESSAGES/solaar.mo'): + yield _dirname(mo), [mo] + + yield 'share/applications', ['share/applications/solaar.desktop'] + yield autostart_path, ['share/applications/solaar.desktop'] + + del _dirname + + setup(name=NAME.lower(), version=__version__, description='Linux devices manager for the Logitech Unifying Receiver.', @@ -55,13 +72,6 @@ battery status. package_dir={'': 'lib'}, packages=['hidapi', 'logitech_receiver', 'solaar', 'solaar.ui'], - - data_files=[('share/solaar/icons', _glob('share/solaar/icons/solaar*.svg')), - ('share/solaar/icons', _glob('share/solaar/icons/light_*.png')), - ('share/icons/hicolor/scalable/apps', ['share/solaar/icons/solaar.svg']), - ('share/applications', ['share/applications/solaar.desktop']), - (autostart_path, ['share/applications/solaar.desktop']), - ], - + data_files=list(_data_files()), scripts=_glob('bin/*'), ) diff --git a/tools/clean.sh b/tools/clean.sh index a43fa8f3..4a1a0732 100755 --- a/tools/clean.sh +++ b/tools/clean.sh @@ -1,5 +1,9 @@ #!/bin/sh cd "$(dirname "$0")/.." + find . -type f -name '*.py[co]' -delete find . -type d -name '__pycache__' -delete + +/bin/rm --force po/*~ +/bin/rm --force --recursive share/locale/