diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2016-01-14 14:15:49 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2016-01-27 12:09:02 +0100 |
| commit | 840de9bb48b37508e11fc0514761161e7cd0f9ef (patch) | |
| tree | 2be322c04c238096923b2216a48249afa5d52bd7 /Makefile | |
| parent | 7dae5c09d5a6bf084661511bef4811223da64252 (diff) | |
| download | freeipa-840de9bb48b37508e11fc0514761161e7cd0f9ef.tar.gz freeipa-840de9bb48b37508e11fc0514761161e7cd0f9ef.tar.xz freeipa-840de9bb48b37508e11fc0514761161e7cd0f9ef.zip | |
Split ipa-client/ into ipaclient/ (Python library) and client/ (C, scripts)
Make ipaclient a Python library like ipapython, ipalib, etc.
Use setup.py instead of autotools for installing it.
Move C client tools, Python scripts, and man pages, to client/.
Remove old, empty or outdated, boilerplate files (NEWS, README, AUTHORS).
Remove /setup-client.py (ipalib/setup.py should be used instead).
Update Makefiles and the spec file accordingly.
https://fedorahosted.org/freeipa/ticket/5638
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 39 |
1 files changed, 21 insertions, 18 deletions
@@ -3,8 +3,9 @@ include VERSION -SUBDIRS=asn1 daemons install ipapython ipalib ipa-client -CLIENTDIRS=ipapython ipa-client asn1 +SUBDIRS=asn1 daemons install ipapython ipalib +CLIENTDIRS=ipapython client asn1 +CLIENTPYDIRS=ipaclient ipaplatform PRJ_PREFIX=freeipa @@ -75,7 +76,9 @@ client: client-autogen @for subdir in $(CLIENTDIRS); do \ (cd $$subdir && $(MAKE) all) || exit 1; \ done - cd ipaplatform && $(PYTHON) setup.py build + @for subdir in $(CLIENTPYDIRS); do \ + (cd $$subdir && $(PYTHON) setup.py build); \ + done check: bootstrap-autogen server tests @for subdir in $(SUBDIRS); do \ @@ -90,13 +93,13 @@ bootstrap-autogen: version-update client-autogen client-autogen: version-update cd asn1; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi - cd ipa-client; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi + cd client; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi cd install; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi tests-man-autogen: version-update cd ipatests/man; if [ ! -e Makefile ]; then ../../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi -install: all server-install tests-install +install: all server-install tests-install client-install @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ done @@ -106,13 +109,13 @@ client-install: client client-dirs (cd $$subdir && $(MAKE) install) || exit 1; \ done cd install/po && $(MAKE) install || exit 1; - if [ "$(DESTDIR)" = "" ]; then \ - $(PYTHON) setup-client.py install; \ - (cd ipaplatform && $(PYTHON) setup.py install); \ - else \ - $(PYTHON) setup-client.py install --root $(DESTDIR); \ - (cd ipaplatform && $(PYTHON) setup.py install --root $(DESTDIR)); \ - fi + @for subdir in $(CLIENTPYDIRS); do \ + if [ "$(DESTDIR)" = "" ]; then \ + (cd $$subdir && $(PYTHON) setup.py install); \ + else \ + (cd $$subdir && $(PYTHON) setup.py install --root $(DESTDIR)); \ + fi \ + done client-dirs: @if [ "$(DESTDIR)" != "" ] ; then \ @@ -149,6 +152,8 @@ version-update: release-update > ipapython/version.py sed -e s/__VERSION__/$(IPA_VERSION)/ ipatests/setup.py.in \ > ipatests/setup.py + sed -e s/__VERSION__/$(IPA_VERSION)/ ipaclient/setup.py.in \ + > ipaclient/setup.py sed -e s/__NUM_VERSION__/$(IPA_NUM_VERSION)/ install/ui/src/libs/loader.js.in \ > install/ui/src/libs/loader.js perl -pi -e "s:__API_VERSION__:$(IPA_API_VERSION_MAJOR).$(IPA_API_VERSION_MINOR):" install/ui/src/libs/loader.js @@ -161,10 +166,8 @@ version-update: release-update perl -pi -e "s:__NUM_VERSION__:$(IPA_NUM_VERSION):" daemons/ipa-version.h perl -pi -e "s:__DATA_VERSION__:$(IPA_DATA_VERSION):" daemons/ipa-version.h - sed -e s/__VERSION__/$(IPA_VERSION)/ -e s/__RELEASE__/$(IPA_RPM_RELEASE)/ \ - ipa-client/ipa-client.spec.in > ipa-client/ipa-client.spec - sed -e s/__VERSION__/$(IPA_VERSION)/ ipa-client/version.m4.in \ - > ipa-client/version.m4 + sed -e s/__VERSION__/$(IPA_VERSION)/ client/version.m4.in \ + > client/version.m4 if [ "$(SUPPORTED_PLATFORM)" != "" ]; then \ sed -e s/__PLATFORM__/$(SUPPORTED_PLATFORM)/ \ @@ -220,7 +223,7 @@ archive-cleanup: tarballs: local-archive -mkdir -p dist/sources # tar up clean sources - cd dist/$(TARBALL_PREFIX)/ipa-client; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean + cd dist/$(TARBALL_PREFIX)/client; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean cd dist/$(TARBALL_PREFIX)/daemons; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean cd dist/$(TARBALL_PREFIX)/install; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean cd dist; tar cfz sources/$(TARBALL) $(TARBALL_PREFIX) @@ -289,7 +292,7 @@ maintainer-clean: clean rm -fr $(RPMBUILD) dist build cd daemons && $(MAKE) maintainer-clean cd install && $(MAKE) maintainer-clean - cd ipa-client && $(MAKE) maintainer-clean + cd client && $(MAKE) maintainer-clean cd ipapython && $(MAKE) maintainer-clean rm -f version.m4 rm -f freeipa.spec |