Skip to content
This repository has been archived by the owner on Nov 13, 2022. It is now read-only.

Commit

Permalink
setup: drop data_files setting
Browse files Browse the repository at this point in the history
  • Loading branch information
benoit-pierre committed May 27, 2017
1 parent 95bd22a commit 2ee3ec7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
2 changes: 2 additions & 0 deletions archlinux/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ check() {
package() {
cd "$pkgname-$pkgver"
python setup.py install --root="$pkgdir"
install -vDm644 -t "${pkgdir}/usr/share/pixmaps" plover/assets/plover.png
install -vDm644 -t "${pkgdir}/usr/share/applications" application/plover.desktop
chmod og+rX -R "$pkgdir"
}

Expand Down
8 changes: 3 additions & 5 deletions linux/appimage/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,9 @@ python='appdir_python'
# Install Plover and dependencies.
bootstrap_dist "$wheel"

# Note: those will re-appear in their respective
# locations when creating the AppImage...
# ¯\_(ツ)_/¯
run mv "$appdir/usr/share/applications/plover.desktop" "$appdir/plover.desktop"
run mv "$appdir/usr/share/pixmaps/plover.png" "$appdir/plover.png"
# Add desktop integration.
run cp 'application/plover.desktop' "$appdir/plover.desktop"
run cp 'plover/assets/plover.png' "$appdir/plover.png"

# Trim the fat.
run "$python" -m utils.trim "$appdir" linux/appimage/blacklist.txt
Expand Down
2 changes: 2 additions & 0 deletions rpm/package.spec
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ env PYTHONPATH="$PWD/.deps" %{__python3} setup.py compile_catalog build_ui build

%install
env PYTHONPATH="$PWD/.deps" %py3_install
install -vDm644 -t "%{buildroot}/usr/share/pixmaps" plover/assets/plover.png
install -vDm644 -t "%{buildroot}/usr/share/applications" application/plover.desktop

%check
env PYTHONPATH="$PWD/.deps" %{__python3} setup.py test
Expand Down
4 changes: 0 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,4 @@ def run(self):
options=options,
cmdclass=cmdclass,
extras_require=extras_require,
data_files=[
('share/applications', ['application/plover.desktop']),
('share/pixmaps', ['plover/assets/plover.png']),
],
)

0 comments on commit 2ee3ec7

Please sign in to comment.