diff options
| author | Michael DeHaan <michael.dehaan@gmail.com> | 2012-04-19 15:56:46 -0700 |
|---|---|---|
| committer | Michael DeHaan <michael.dehaan@gmail.com> | 2012-04-19 15:56:46 -0700 |
| commit | 4f0ed20295e9d0a8c4ce9c1008cec8ec5f76dce7 (patch) | |
| tree | 9f6c2e72dc3ff00968d86e764c12ef6fca72a3be | |
| parent | 3a0c5c0b7bea22b66079bd7f8539063c15cac807 (diff) | |
| parent | 516df5f64fa12b33282848e3598031abcd6b0312 (diff) | |
| download | ansible-4f0ed20295e9d0a8c4ce9c1008cec8ec5f76dce7.tar.gz | |
Merge pull request #182 from tbielawa/moveManifest
Move manifest
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | packaging/distutils/MANIFEST.in (renamed from MANIFEST.in) | 1 | ||||
| -rw-r--r-- | packaging/distutils/setup.py (renamed from setup.py) | 0 | ||||
| -rw-r--r-- | packaging/rpm/ansible.spec | 6 |
4 files changed, 13 insertions, 5 deletions
@@ -16,6 +16,11 @@ RPMVERSION := $(shell awk '/Version/{print $$2; exit}' < $(RPMSPEC) | cut -d "%" RPMRELEASE := $(shell awk '/Release/{print $$2; exit}' < $(RPMSPEC) | cut -d "%" -f1) RPMDIST = $(shell rpm --eval '%dist') RPMNVR = "$(NAME)-$(RPMVERSION)-$(RPMRELEASE)$(RPMDIST)" +# Python distutils options +DUDIR = packaging/distutils +DUSETUP = $(DUDIR)/setup.py +DUMANIFEST = $(DUDIR)/MANIFEST.in + all: clean python @@ -65,15 +70,15 @@ clean: rm -rf MANIFEST rpm-build python: - python setup.py build + python $(DUSETUP) build install: mkdir -p /usr/share/ansible cp ./library/* /usr/share/ansible/ - python setup.py install + python $(DUSETUP) install sdist: clean - python ./setup.py sdist + python ./$(DUSETUP) sdist -t $(DUMANIFEST) rpmcommon: sdist @mkdir -p rpm-build diff --git a/MANIFEST.in b/packaging/distutils/MANIFEST.in index 60bc97f187..4765bd548d 100644 --- a/MANIFEST.in +++ b/packaging/distutils/MANIFEST.in @@ -1,5 +1,6 @@ include README.md packaging/rpm/ansible.spec include examples/hosts +include packaging/distutils/setup.py recursive-include docs * recursive-include library * include Makefile diff --git a/setup.py b/packaging/distutils/setup.py index 4b0f74b3bf..4b0f74b3bf 100644 --- a/setup.py +++ b/packaging/distutils/setup.py diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index 9a394d5135..bd1350e73d 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -2,6 +2,8 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %endif +%define _dusetup packaging/distutils/setup.py + Name: ansible Release: 1%{?dist} @@ -33,10 +35,10 @@ are transferred to managed machines automatically. %setup -q %build -%{__python} setup.py build +%{__python} %{_dusetup} build %install -%{__python} setup.py install -O1 --root=$RPM_BUILD_ROOT +%{__python} %{_dusetup} install -O1 --root=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/ansible/ cp examples/hosts $RPM_BUILD_ROOT/etc/ansible/ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/ |