cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move packaging related things out of the root directory:

Browse source 
Distutils MANIFEST.in, setup.py -> packaging/distutils/ directory.
This commit is contained in:
Tim Bielawa 2012-04-19 13:42:44 -04:00
parent 4578b17213
commit 516df5f64f
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -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) RPMRELEASE := $(shell awk '/Release/{print $$2; exit}' < $(RPMSPEC) | cut -d "%" -f1)
RPMDIST = $(shell rpm --eval '%dist') RPMDIST = $(shell rpm --eval '%dist')
RPMNVR = "$(NAME)-$(RPMVERSION)-$(RPMRELEASE)$(RPMDIST)" RPMNVR = "$(NAME)-$(RPMVERSION)-$(RPMRELEASE)$(RPMDIST)"
# Python distutils options
DUDIR = packaging/distutils
DUSETUP = $(DUDIR)/setup.py
DUMANIFEST = $(DUDIR)/MANIFEST.in
all: clean python all: clean python
@ -65,15 +70,15 @@ clean:
rm -rf MANIFEST rpm-build rm -rf MANIFEST rpm-build
python: python:
python setup.py build python $(DUSETUP) build
install: install:
mkdir -p /usr/share/ansible mkdir -p /usr/share/ansible
cp ./library/* /usr/share/ansible/ cp ./library/* /usr/share/ansible/
python setup.py install python $(DUSETUP) install
sdist: clean sdist: clean
python ./setup.py sdist python ./$(DUSETUP) sdist -t $(DUMANIFEST)
rpmcommon: sdist rpmcommon: sdist
@mkdir -p rpm-build @mkdir -p rpm-build

1
MANIFEST.in → packaging/distutils/MANIFEST.in
View file

@ -1,5 +1,6 @@
include README.md packaging/rpm/ansible.spec include README.md packaging/rpm/ansible.spec
include examples/hosts include examples/hosts
include packaging/distutils/setup.py
recursive-include docs * recursive-include docs *
recursive-include library * recursive-include library *
include Makefile include Makefile

0
setup.py → packaging/distutils/setup.py
View file

6
packaging/rpm/ansible.spec
View file

@ -2,6 +2,8 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%endif %endif
%define _dusetup packaging/distutils/setup.py
Name: ansible Name: ansible
Release: 1%{?dist} Release: 1%{?dist}
@ -33,10 +35,10 @@ are transferred to managed machines automatically.
%setup -q %setup -q
%build %build
%{__python} setup.py build %{__python} %{_dusetup} build
%install %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/ mkdir -p $RPM_BUILD_ROOT/etc/ansible/
cp examples/hosts $RPM_BUILD_ROOT/etc/ansible/ cp examples/hosts $RPM_BUILD_ROOT/etc/ansible/
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/