IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Include ipaplatform in client-only build

Browse Source 
https://fedorahosted.org/freeipa/ticket/4533

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
This commit is contained in:
Jan Cholasta 2014-09-17 11:49:51 +02:00 committed by Petr Vobornik
parent 0e2dc70d8e
commit 9fa8cff6da
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -71,6 +71,7 @@ client: client-autogen
@for subdir in $(CLIENTDIRS); do \ @for subdir in $(CLIENTDIRS); do \
(cd $$subdir && $(MAKE) all) || exit 1; \ (cd $$subdir && $(MAKE) all) || exit 1; \
done done
cd ipaplatform && $(PYTHON) setup.py build
bootstrap-autogen: version-update client-autogen bootstrap-autogen: version-update client-autogen
@echo "Building IPA $(IPA_VERSION)" @echo "Building IPA $(IPA_VERSION)"
@ -96,8 +97,10 @@ client-install: client client-dirs
cd install/po && $(MAKE) install || exit 1; cd install/po && $(MAKE) install || exit 1;
if [ "$(DESTDIR)" = "" ]; then \ if [ "$(DESTDIR)" = "" ]; then \
$(PYTHON) setup-client.py install; \ $(PYTHON) setup-client.py install; \
(cd ipaplatform && $(PYTHON) setup.py install); \
else \ else \
$(PYTHON) setup-client.py install --root $(DESTDIR); \ $(PYTHON) setup-client.py install --root $(DESTDIR); \
(cd ipaplatform && $(PYTHON) setup.py install --root $(DESTDIR)); \
fi fi
client-dirs: client-dirs:
@ -164,12 +167,15 @@ version-update: release-update
server: version-update server: version-update
$(PYTHON) setup.py build $(PYTHON) setup.py build
cd ipaplatform && $(PYTHON) setup.py build
server-install: server server-install: server
if [ "$(DESTDIR)" = "" ]; then \ if [ "$(DESTDIR)" = "" ]; then \
$(PYTHON) setup.py install; \ $(PYTHON) setup.py install; \
(cd ipaplatform && $(PYTHON) setup.py install); \
else \ else \
$(PYTHON) setup.py install --root $(DESTDIR); \ $(PYTHON) setup.py install --root $(DESTDIR); \
(cd ipaplatform && $(PYTHON) setup.py install --root $(DESTDIR)); \
fi fi
tests: version-update tests-man-autogen tests: version-update tests-man-autogen

3
freeipa.spec.in
View File

@ -343,6 +343,8 @@ make client-install DESTDIR=%{buildroot}
%find_lang %{gettext_domain} %find_lang %{gettext_domain}
mkdir -p %{buildroot}%{_usr}/share/ipa
%if ! %{ONLY_CLIENT} %if ! %{ONLY_CLIENT}
# Remove .la files from libtool - we don't want to package # Remove .la files from libtool - we don't want to package
# these files # these files
@ -795,6 +797,7 @@ fi
%attr(0644,root,root) %{python_sitearch}/default_encoding_utf8.so %attr(0644,root,root) %{python_sitearch}/default_encoding_utf8.so
%{python_sitelib}/ipapython-*.egg-info %{python_sitelib}/ipapython-*.egg-info
%{python_sitelib}/freeipa-*.egg-info %{python_sitelib}/freeipa-*.egg-info
%{python_sitelib}/ipaplatform-*.egg-info
%{python_sitearch}/python_default_encoding-*.egg-info %{python_sitearch}/python_default_encoding-*.egg-info
%dir %attr(0755,root,root) %{_sysconfdir}/ipa/ %dir %attr(0755,root,root) %{_sysconfdir}/ipa/
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf

3
setup.py
View File

@ -78,9 +78,6 @@ setup(
packages=[ packages=[
'ipalib', 'ipalib',
'ipalib.plugins', 'ipalib.plugins',
'ipaplatform',
'ipaplatform.base',
'ipaplatform.fedora',
'ipaserver', 'ipaserver',
'ipaserver.advise', 'ipaserver.advise',
'ipaserver.advise.plugins', 'ipaserver.advise.plugins',