[game-data-packager] 01/01: provide an upstream 'make install', use it in Debian & Fedora builds
Alexandre Detiste
detiste-guest at moszumanska.debian.org
Fri Nov 20 09:43:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
detiste-guest pushed a commit to branch master
in repository game-data-packager.
commit 0c625260d6712441e3a5ee67e2f38bcea384cf09
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date: Fri Nov 20 09:58:44 2015 +0100
provide an upstream 'make install', use it in Debian & Fedora builds
---
Makefile | 33 +++++++++++++++++++++++++-
debian/game-data-packager.install | 13 ----------
game_data_packager/games/__init__.py | 1 +
game_data_packager/paths.py | 1 +
tools/game-data-packager.spec | 46 +++++++++++-------------------------
5 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/Makefile b/Makefile
index 5e39183..ab456d4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
DIRS := ./out
GDP_MIRROR ?= localhost
+bindir := /usr/games
PYFLAKES3 := $(shell if [ -x /usr/bin/pyflakes3 ] ; then echo pyflakes3 ; \
elif [ -x /usr/bin/pyflakes3k ] ; then echo pyflakes3k ; \
else echo python3-pyflakes ; \
@@ -112,6 +113,36 @@ check:
LC_ALL=C GDP_UNINSTALLED=1 PYTHONPATH=. python3 tools/check_syntax.py
LC_ALL=C GDP_UNINSTALLED=1 PYTHONPATH=. python3 tools/check_equivalence.py
+install: default
+ echo DESTDIR: $(DESTDIR)
+ mkdir -p $(DESTDIR)$(bindir)
+ install -m0755 out/game-data-packager $(DESTDIR)$(bindir)
+
+ # messing with "cp -r / chmod / find" is a bit overkill here
+ mkdir -p $(DESTDIR)/usr/share/games/game-data-packager/game_data_packager/games
+ install -m0644 game_data_packager/*.py $(DESTDIR)/usr/share/games/game-data-packager/game_data_packager
+ install -m0644 game_data_packager/games/*.py $(DESTDIR)/usr/share/games/game-data-packager/game_data_packager/games
+
+ mkdir -p $(DESTDIR)/usr/share/games/game-data-packager
+ install -m0644 out/*.copyright $(DESTDIR)/usr/share/games/game-data-packager/
+ install -m0644 out/*.png $(DESTDIR)/usr/share/games/game-data-packager/
+ install -m0644 out/*.svgz $(DESTDIR)/usr/share/games/game-data-packager/
+ install -m0644 out/bash_completion $(DESTDIR)/usr/share/games/game-data-packager/
+ install -m0644 out/changelog.gz $(DESTDIR)/usr/share/games/game-data-packager/
+ install -m0644 out/copyright $(DESTDIR)/usr/share/games/game-data-packager/
+ install -m0644 out/vfs.zip $(DESTDIR)/usr/share/games/game-data-packager/
+
+ mkdir -p $(DESTDIR)/usr/share/bash-completion/completions
+ install -m0644 data/bash-completion/game-data-packager $(DESTDIR)/usr/share/bash-completion/completions/
+
+ mkdir -p $(DESTDIR)/etc/game-data-packager
+ install -m0644 etc/game-data-packager.conf $(DESTDIR)/etc/
+ install -m0644 etc/*-mirrors $(DESTDIR)/etc/game-data-packager/
+
+ mkdir -p $(DESTDIR)/usr/share/applications
+ install -m0755 runtime/doom2-masterlevels.py $(DESTDIR)$(bindir)/doom2-masterlevels
+ install -m0644 runtime/doom2-masterlevels.desktop $(DESTDIR)/usr/share/applications/
+
# Requires additional setup, so not part of "make check"
manual-check:
install -d tmp/
@@ -125,4 +156,4 @@ html: $(DIRS) $(json)
LC_ALL=C GDP_UNINSTALLED=1 PYTHONPATH=. python3 -m tools.babel
rsync out/index.html alioth.debian.org:/var/lib/gforge/chroot/home/groups/pkg-games/htdocs/game-data/ -e ssh -v
-.PHONY: default clean check manual-check html
+.PHONY: default clean check manual-check install html
diff --git a/debian/game-data-packager.install b/debian/game-data-packager.install
index 8f14389..f771123 100644
--- a/debian/game-data-packager.install
+++ b/debian/game-data-packager.install
@@ -1,15 +1,2 @@
-out/game-data-packager usr/games
-data/bash-completion/game-data-packager usr/share/bash-completion/completions
-etc/game-data-packager.conf etc
-etc/*-mirrors etc/game-data-packager
-game_data_packager usr/share/games/game-data-packager
out/*.control.in usr/share/games/game-data-packager
-out/*.copyright usr/share/games/game-data-packager
-out/*.png usr/share/games/game-data-packager
-out/*.svgz usr/share/games/game-data-packager
out/*.preinst.in usr/share/games/game-data-packager
-out/bash_completion usr/share/games/game-data-packager
-out/changelog.gz usr/share/games/game-data-packager
-out/copyright usr/share/games/game-data-packager
-out/vfs.zip usr/share/games/game-data-packager
-runtime/doom2-masterlevels.desktop usr/share/applications
diff --git a/game_data_packager/games/__init__.py b/game_data_packager/games/__init__.py
index 4652741..a89e833 100644
--- a/game_data_packager/games/__init__.py
+++ b/game_data_packager/games/__init__.py
@@ -1 +1,2 @@
+#!/usr/bin/python3
# encoding=utf-8
diff --git a/game_data_packager/paths.py b/game_data_packager/paths.py
index 2991ed4..a8b869a 100644
--- a/game_data_packager/paths.py
+++ b/game_data_packager/paths.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
# encoding=utf-8
import os
diff --git a/tools/game-data-packager.spec b/tools/game-data-packager.spec
index 9ea1c20..248da00 100644
--- a/tools/game-data-packager.spec
+++ b/tools/game-data-packager.spec
@@ -52,40 +52,22 @@ show it's description.
%build
make %{?_smp_mflags}
-echo 'GAME_PACKAGE_VERSION = """%{version}"""' > game_data_packager/version.py
-echo 'FORMAT = "rpm"' >> game_data_packager/version.py
-echo 'BINDIR = "usr/bin"' >> game_data_packager/version.py
-echo 'ASSETS = "usr/share"' >> game_data_packager/version.py
-rm game_data_packager/util_arch.py
-rm game_data_packager/util_deb.py
%install
-install -D out/game-data-packager $RPM_BUILD_ROOT/usr/bin/game-data-packager
-
-install -D data/bash-completion/game-data-packager $RPM_BUILD_ROOT/usr/share/bash-completion/completions/game-data-packager
-
-mkdir -p $RPM_BUILD_ROOT/etc/game-data-packager/
-install -m0644 etc/game-data-packager.conf $RPM_BUILD_ROOT/etc/
-install -m0644 etc/*-mirrors $RPM_BUILD_ROOT/etc/game-data-packager/
-
-mkdir -p $RPM_BUILD_ROOT/usr/share/games/game-data-packager/
-cp -Rv game_data_packager $RPM_BUILD_ROOT/usr/share/games/game-data-packager/
-chmod 755 $RPM_BUILD_ROOT/usr/share/games/game-data-packager/game_data_packager/*.py
-chmod 755 $RPM_BUILD_ROOT/usr/share/games/game-data-packager/game_data_packager/games/*.py
-install -m0644 out/*.copyright $RPM_BUILD_ROOT/usr/share/games/game-data-packager/
-install -m0644 out/*.png $RPM_BUILD_ROOT/usr/share/games/game-data-packager/
-install -m0644 out/*.svgz $RPM_BUILD_ROOT/usr/share/games/game-data-packager/
-install -m0644 out/bash_completion $RPM_BUILD_ROOT/usr/share/games/game-data-packager/
-install -m0644 out/changelog.gz $RPM_BUILD_ROOT/usr/share/games/game-data-packager/
-install -m0644 out/copyright $RPM_BUILD_ROOT/usr/share/games/game-data-packager/
-install -m0644 out/vfs.zip $RPM_BUILD_ROOT/usr/share/games/game-data-packager/
-
-mkdir -p $RPM_BUILD_ROOT/usr/share/man/man6/
-install -m0644 doc/game-data-packager.* $RPM_BUILD_ROOT/usr/share/man/man6/
-install -m0644 doc/doom2-masterlevels.* $RPM_BUILD_ROOT/usr/share/man/man6/
-
-install -D runtime/doom2-masterlevels.py $RPM_BUILD_ROOT/usr/bin/doom2-masterlevels
-install -D runtime/doom2-masterlevels.desktop $RPM_BUILD_ROOT/usr/share/applications/doom2-masterlevels.desktop
+make DESTDIR=$RPM_BUILD_ROOT bindir=/usr/bin install
+VERSION_PY=$RPM_BUILD_ROOT/usr/share/games/game-data-packager/game_data_packager/version.py
+echo '#!/usr/bin/python3' > $VERSION_PY
+echo 'GAME_PACKAGE_VERSION = """%{version}"""' >> $VERSION_PY
+echo 'FORMAT = "rpm"' >> $VERSION_PY
+echo 'BINDIR = "usr/bin"' >> $VERSION_PY
+echo 'ASSETS = "usr/share"' >> $VERSION_PY
+rm $RPM_BUILD_ROOT/usr/share/games/game-data-packager/game_data_packager/util_arch.py
+rm $RPM_BUILD_ROOT/usr/share/games/game-data-packager/game_data_packager/util_deb.py
+chmod 755 $RPM_BUILD_ROOT/usr/share/games/game-data-packager/game_data_packager/*.py
+chmod 755 $RPM_BUILD_ROOT/usr/share/games/game-data-packager/game_data_packager/games/*.py
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man6
+install -m0644 doc/game-data-packager.6 $RPM_BUILD_ROOT/usr/share/man/man6
+install -m0644 doc/doom2-masterlevels.6 $RPM_BUILD_ROOT/usr/share/man/man6
%clean
make clean
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git
More information about the Pkg-games-commits
mailing list