summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Poignant <oliver@poignant.se>2016-04-24 22:53:39 +0200
committerOliver Poignant <oliver@poignant.se>2016-04-24 22:53:39 +0200
commit8385a257e819ecce38a371453a6438548f629cb6 (patch)
treecb0c3b85777af2878b928c019009ed04a0a7a70b
parent2ecf5591001682587aa36c829a41d88efeb9eff7 (diff)
downloadGit-Auto-Deploy-8385a257e819ecce38a371453a6438548f629cb6.zip
Git-Auto-Deploy-8385a257e819ecce38a371453a6438548f629cb6.tar.gz
Git-Auto-Deploy-8385a257e819ecce38a371453a6438548f629cb6.tar.bz2
Creation of separate packages for different ubuntu distros
-rw-r--r--Makefile45
-rwxr-xr-xplatforms/debian/scripts/create-debian-package.sh5
-rw-r--r--setup.py2
3 files changed, 36 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index a470fd7..2d0377b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,11 @@ prefix = /opt/Git-Auto-Deploy/
PYTHON ?= python2
-# Default debian dist (override using make <target> DIST=<debian dist>)
-DIST=trusty
+# Debian distos to create packages for
+DISTROS= \
+ xenial \
+ trusty \
+ precise
# Package name and version
PACKAGE_NAME=$(shell python setup.py --name)
@@ -43,25 +46,37 @@ clean-deb:
# Usage: make deb-source [DIST=<debian dist>]
deb-source: clean-deb
- # Make a debian source package using stdeb
- python setup.py --command-packages=stdeb.command sdist_dsc -x platforms/debian/stdeb.cfg --dist-dir dist/deb --debian-version $(DIST) --suite $(DIST)
- # Copy debian package config files
- cp -vr platforms/debian/stdeb/* dist/deb/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian/
+ @- $(foreach DIST,$(DISTROS), \
+ echo "Creating deb source package for dist $(DIST)" ; \
+ echo "Make a debian source package using stdeb" ; \
+ python setup.py --command-packages=stdeb.command sdist_dsc -x platforms/debian/stdeb.cfg --dist-dir dist/deb --debian-version $(DIST) --suite $(DIST) --upstream-version-suffix "~$(DIST)" ; \
+ echo "Copy debian package config files" ; \
+ cp -vr platforms/debian/stdeb/* dist/deb/$(PACKAGE_NAME)-$(PACKAGE_VERSION)~$(DIST)/debian/ ; \
+ )
deb: clean-deb deb-source
- # Build .deb package (without signing)
- cd dist/deb/$(PACKAGE_NAME)-$(PACKAGE_VERSION); \
- dpkg-buildpackage -rfakeroot -uc -us
+ @- $(foreach DIST,$(DISTROS), \
+ echo "Creating unsigned deb package for dist $(DIST)" ; \
+ echo "Build .deb package (without signing)" ; \
+ cd dist/deb/$(PACKAGE_NAME)-$(PACKAGE_VERSION)~$(DIST) ; \
+ dpkg-buildpackage -rfakeroot -uc -us ; \
+ cd ../../../ ; \
+ )
signed-deb: clean-deb deb-source
- # Build .deb package (signed)
- cd dist/deb/$(PACKAGE_NAME)-$(PACKAGE_VERSION); \
- debuild -S -sa
+ @- $(foreach DIST,$(DISTROS), \
+ echo "Creating signed deb package for dist $(DIST)" ; \
+ echo "Build .deb package (signed)" ; \
+ cd dist/deb/$(PACKAGE_NAME)-$(PACKAGE_VERSION)~$(DIST) ; \
+ debuild -S -sa ; \
+ cd ../../../ ; \
+ )
upload-deb: clean-deb signed-deb
- # Upload signed debian package to ppa
- #cd dist/deb/$(PACKAGE_NAME)-$(PACKAGE_VERSION); \
- dput ppa:olipo186/$(PACKAGE_NAME) dist/deb/$(PACKAGE_NAME)_$(PACKAGE_VERSION)-$(DIST)_source.changes
+ @- $(foreach DIST,$(DISTROS), \
+ echo "Upload signed debian package to ppa for dist $(DIST)" ; \
+ dput ppa:olipo186/$(PACKAGE_NAME) dist/deb/$(PACKAGE_NAME)_$(PACKAGE_VERSION)~$(DIST)-$(DIST)_source.changes ; \
+ )
#initsystem:
diff --git a/platforms/debian/scripts/create-debian-package.sh b/platforms/debian/scripts/create-debian-package.sh
index d103416..86a9daa 100755
--- a/platforms/debian/scripts/create-debian-package.sh
+++ b/platforms/debian/scripts/create-debian-package.sh
@@ -1,8 +1,13 @@
#!/usr/bin/env bash
#
+# DEPRECATED: Use make instead
+#
# This script compiles a binary Debian package (.deb)
#
+echo "DEPRECATED: Use make instead"
+exit
+
# Get current path
ORIGINAL_CWD=`pwd -P`
diff --git a/setup.py b/setup.py
index 1e9a70e..2f4121a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
setup(name='git-auto-deploy',
- version='0.2.3',
+ version='0.2.3.1',
url='https://github.com/olipo186/Git-Auto-Deploy',
author='Oliver Poignant',
author_email='oliver@poignant.se',