ENH: make debianstandalone{,-dsc} rules
Moved rules out of debian/rules and avoided need for patching it for standalone builds
This commit is contained in:
parent
4ecbdf10fb
commit
cb23224ba3
3 changed files with 39 additions and 30 deletions
19
Makefile
19
Makefile
|
@ -140,6 +140,25 @@ linuxstandalone-nobuild: Build/Standalone Build/LinuxMkLibs
|
|||
cd tmp/git-annex.linux && find . -type l >> git-annex.MANIFEST
|
||||
cd tmp && tar czf git-annex-standalone-$(shell dpkg --print-architecture).tar.gz git-annex.linux
|
||||
|
||||
# Run this target to build git-annex-standalone*.deb
|
||||
debianstandalone: dpkg-buildpackage-F
|
||||
# Run this target to build git-annex-standalone*.dsc
|
||||
debianstandalone-dsc: dpkg-buildpackage-S
|
||||
|
||||
prep-standalone:
|
||||
$(MAKE) undo-standalone
|
||||
QUILT_PATCHES=debian/patches QUILT_SERIES=series.standalone-build quilt push -a
|
||||
debian/create-standalone-changelog
|
||||
|
||||
undo-standalone:
|
||||
test -e .git
|
||||
git checkout debian/changelog
|
||||
quilt pop -a || true
|
||||
|
||||
dpkg-buildpackage%: prep-standalone
|
||||
umask 022; dpkg-buildpackage -rfakeroot $*
|
||||
$(MAKE) undo-standalone
|
||||
|
||||
OSXAPP_DEST=tmp/build-dmg/git-annex.app
|
||||
OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS/bundle
|
||||
osxapp: Build/Standalone Build/OSXMkLibs
|
||||
|
|
24
debian/patches/standalone-build
vendored
24
debian/patches/standalone-build
vendored
|
@ -6,7 +6,7 @@ Last-Update: 2015-04-20
|
|||
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -89,15 +89,14 @@ Vcs-Git: git://git.kitenet.net/git-annex
|
||||
@@ -87,15 +87,14 @@ Vcs-Git: git://git.kitenet.net/git-annex
|
||||
Homepage: http://git-annex.branchable.com/
|
||||
XS-Testsuite: autopkgtest
|
||||
|
||||
|
@ -28,7 +28,7 @@ Last-Update: 2015-04-20
|
|||
Recommends:
|
||||
lsof,
|
||||
gnupg,
|
||||
@@ -112,7 +111,7 @@ Suggests:
|
||||
@@ -110,7 +109,7 @@ Suggests:
|
||||
bup,
|
||||
tahoe-lafs,
|
||||
libnss-mdns,
|
||||
|
@ -37,7 +37,7 @@ Last-Update: 2015-04-20
|
|||
git-annex allows managing files with git, without checking the file
|
||||
contents into git. While that may seem paradoxical, it is useful when
|
||||
dealing with files larger than git can currently easily handle, whether due
|
||||
@@ -130,3 +129,7 @@ Description: manage files with git, with
|
||||
@@ -128,3 +127,7 @@ Description: manage files with git, with
|
||||
noticing when files are changed, and automatically committing them
|
||||
to git and transferring them to other computers. The git-annex webapp
|
||||
makes it easy to set up and use git-annex this way.
|
||||
|
@ -57,21 +57,3 @@ Last-Update: 2015-04-20
|
|||
+++ b/debian/manpages
|
||||
@@ -0,0 +1 @@
|
||||
+debian/git-annex-standalone/usr/lib/git-annex.linux/usr/share/man/man1/git-annex*
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -8,6 +8,15 @@ export RELEASE_BUILD=1
|
||||
%:
|
||||
dh $@
|
||||
|
||||
+override_dh_auto_build:
|
||||
+ make linuxstandalone
|
||||
+
|
||||
+override_dh_auto_install:
|
||||
+ : # nothing to do, we just need to copy the beast, as instructed in debian/install
|
||||
+
|
||||
+override_dh_fixperms:
|
||||
+ dh_fixperms -Xld-linux
|
||||
+
|
||||
# Run this target to build git-annex-standalone.deb
|
||||
build-standalone:
|
||||
test -e .git
|
||||
|
|
26
debian/rules
vendored
26
debian/rules
vendored
|
@ -2,18 +2,26 @@
|
|||
|
||||
export CABAL=debian/cabal-wrapper
|
||||
|
||||
STANDALONE_BUILD=$(shell grep -qe '^Package: git-annex-standalone' debian/control \
|
||||
&& echo 1 || echo 0)
|
||||
|
||||
# Do use the changelog's version number, rather than making one up.
|
||||
export RELEASE_BUILD=1
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
||||
# Run this target to build git-annex-standalone.deb
|
||||
build-standalone:
|
||||
test -e .git
|
||||
git checkout debian/changelog
|
||||
quilt pop -a || true
|
||||
QUILT_PATCHES=debian/patches QUILT_SERIES=series.standalone-build quilt push -a
|
||||
debian/create-standalone-changelog
|
||||
dpkg-buildpackage -rfakeroot
|
||||
quilt pop -a
|
||||
|
||||
# Standalone build logic/helpers
|
||||
ifeq ($(STANDALONE_BUILD),1)
|
||||
|
||||
override_dh_auto_build:
|
||||
make linuxstandalone
|
||||
|
||||
override_dh_auto_install:
|
||||
: # nothing to do, we just need to copy the beast, as instructed in debian/install
|
||||
|
||||
override_dh_fixperms:
|
||||
dh_fixperms -Xld-linux
|
||||
|
||||
endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue