mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-22 23:23:30 -06:00
Add placeholders for ipaplatform, ipaserver and ipatests
I also renamed the base directory to pypi and added a new build target pypi_packages. Signed-off-by: Christian Heimes <cheimes@redhat.com> Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
parent
e2b9ea2fd5
commit
acdd1f5978
14
Makefile.am
14
Makefile.am
@ -9,6 +9,7 @@ if WITH_IPATESTS
|
||||
endif
|
||||
|
||||
IPACLIENT_SUBDIRS = ipaclient ipalib ipapython
|
||||
IPA_PLACEHOLDERS = freeipa ipa ipaplatform ipaserver ipatests
|
||||
SUBDIRS = asn1 util client contrib po pypi \
|
||||
$(IPACLIENT_SUBDIRS) ipaplatform $(IPATESTS_SUBDIRS) $(SERVER_SUBDIRS)
|
||||
|
||||
@ -204,7 +205,7 @@ jslint-html:
|
||||
cd $(top_srcdir)/install/html; \
|
||||
jsl -nologo -nosummary -nofilelisting -conf jsl.conf
|
||||
|
||||
.PHONY: bdist_wheel wheel_bundle
|
||||
.PHONY: bdist_wheel wheel_bundle wheel_placeholder pypi_packages
|
||||
WHEELDISTDIR = $(top_builddir)/dist/wheels
|
||||
WHEELBUNDLEDIR = $(top_builddir)/dist/bundle
|
||||
|
||||
@ -215,8 +216,6 @@ $(WHEELBUNDLEDIR):
|
||||
mkdir -p $(WHEELBUNDLEDIR)
|
||||
|
||||
bdist_wheel: $(WHEELDISTDIR)
|
||||
$(MAKE) $(AM_MAKEFLAGS) -C packaging/ipa bdist_wheel || exit 1;
|
||||
$(MAKE) $(AM_MAKEFLAGS) -C packaging/freeipa bdist_wheel || exit 1;
|
||||
for dir in $(IPACLIENT_SUBDIRS); do \
|
||||
$(MAKE) $(AM_MAKEFLAGS) -C $${dir} $@ || exit 1; \
|
||||
done
|
||||
@ -224,6 +223,15 @@ bdist_wheel: $(WHEELDISTDIR)
|
||||
wheel_bundle: $(WHEELBUNDLEDIR) bdist_wheel
|
||||
$(PYTHON) -m pip wheel --wheel-dir $(WHEELBUNDLEDIR) $(WHEELDISTDIR)/*.whl
|
||||
|
||||
wheel_placeholder: $(WHEELDISTDIR)
|
||||
for dir in $(IPA_PLACEHOLDERS); do \
|
||||
$(MAKE) $(AM_MAKEFLAGS) -C $(top_srcdir)/pypi/$${dir} bdist_wheel || exit 1; \
|
||||
done
|
||||
|
||||
pypi_packages: bdist_wheel wheel_placeholder
|
||||
@echo -e "\n\nTo upload packages to PyPI, run:\n"
|
||||
@echo -e " twine upload $(WHEELDISTDIR)/*-$(VERSION)-py2.py3-none-any.whl\n"
|
||||
|
||||
.PHONY:
|
||||
strip-po:
|
||||
$(MAKE) -C po strip-po
|
||||
|
@ -58,5 +58,5 @@ dist-hook: $(top_builddir)/ipasetup.py
|
||||
WHEELDISTDIR = $(top_builddir)/dist/wheels
|
||||
.PHONY: bdist_wheel
|
||||
bdist_wheel: $(top_builddir)/ipasetup.py
|
||||
rm -rf $(WHEELDISTDIR)/$(pkgname)*.whl
|
||||
rm -rf $(WHEELDISTDIR)/$(pkgname)-*.whl
|
||||
$(PYTHON) "$(srcdir)/setup.py" bdist_wheel --dist-dir=$(WHEELDISTDIR)
|
||||
|
@ -487,9 +487,12 @@ AC_CONFIG_FILES([
|
||||
ipaserver/Makefile
|
||||
ipatests/Makefile
|
||||
ipatests/man/Makefile
|
||||
packaging/Makefile
|
||||
packaging/freeipa/Makefile
|
||||
packaging/ipa/Makefile
|
||||
pypi/Makefile
|
||||
pypi/freeipa/Makefile
|
||||
pypi/ipa/Makefile
|
||||
pypi/ipaplatform/Makefile
|
||||
pypi/ipaserver/Makefile
|
||||
pypi/ipatests/Makefile
|
||||
po/Makefile.in
|
||||
po/Makefile.hack
|
||||
util/Makefile
|
||||
|
@ -6,5 +6,8 @@ NULL =
|
||||
|
||||
SUBDIRS = \
|
||||
freeipa \
|
||||
ipa \
|
||||
ipa \
|
||||
ipaplatform \
|
||||
ipaserver \
|
||||
ipatests \
|
||||
$(NULL)
|
3
pypi/ipaplatform/Makefile.am
Normal file
3
pypi/ipaplatform/Makefile.am
Normal file
@ -0,0 +1,3 @@
|
||||
include $(top_srcdir)/Makefile.python.am
|
||||
|
||||
pkginstall = false
|
2
pypi/ipaplatform/README.txt
Normal file
2
pypi/ipaplatform/README.txt
Normal file
@ -0,0 +1,2 @@
|
||||
This is a dummy package for FreeIPA's ipaplatform.
|
||||
|
5
pypi/ipaplatform/ipaplatform/__init__.py
Normal file
5
pypi/ipaplatform/ipaplatform/__init__.py
Normal file
@ -0,0 +1,5 @@
|
||||
#
|
||||
# Copyright (C) 2017 FreeIPA Contributors see COPYING for license
|
||||
#
|
||||
|
||||
raise ImportError("ipaplatform is not yet supported as PyPI package.")
|
6
pypi/ipaplatform/setup.cfg
Normal file
6
pypi/ipaplatform/setup.cfg
Normal file
@ -0,0 +1,6 @@
|
||||
[bdist_wheel]
|
||||
universal = 1
|
||||
|
||||
[aliases]
|
||||
packages = clean --all egg_info bdist_wheel
|
||||
release = packages register upload
|
26
pypi/ipaplatform/setup.py
Executable file
26
pypi/ipaplatform/setup.py
Executable file
@ -0,0 +1,26 @@
|
||||
#
|
||||
# Copyright (C) 2017 FreeIPA Contributors see COPYING for license
|
||||
#
|
||||
"""Dummy package for FreeIPA
|
||||
|
||||
ipaplatform is not yet available as PyPI package.
|
||||
"""
|
||||
|
||||
from os.path import abspath, dirname
|
||||
import sys
|
||||
|
||||
if __name__ == '__main__':
|
||||
# include ../../ for ipasetup.py
|
||||
sys.path.append(dirname(dirname(dirname(abspath(__file__)))))
|
||||
from ipasetup import ipasetup # noqa: E402
|
||||
|
||||
ipasetup(
|
||||
name='ipaplatform',
|
||||
doc = __doc__,
|
||||
packages=[
|
||||
"ipaplatform",
|
||||
],
|
||||
install_requires=[
|
||||
"ipaclient",
|
||||
]
|
||||
)
|
3
pypi/ipaserver/Makefile.am
Normal file
3
pypi/ipaserver/Makefile.am
Normal file
@ -0,0 +1,3 @@
|
||||
include $(top_srcdir)/Makefile.python.am
|
||||
|
||||
pkginstall = false
|
2
pypi/ipaserver/README.txt
Normal file
2
pypi/ipaserver/README.txt
Normal file
@ -0,0 +1,2 @@
|
||||
This is a dummy package for FreeIPA's ipaserver.
|
||||
|
5
pypi/ipaserver/ipaserver/__init__.py
Normal file
5
pypi/ipaserver/ipaserver/__init__.py
Normal file
@ -0,0 +1,5 @@
|
||||
#
|
||||
# Copyright (C) 2017 FreeIPA Contributors see COPYING for license
|
||||
#
|
||||
|
||||
raise ImportError("ipaserver is not yet supported as PyPI package.")
|
6
pypi/ipaserver/setup.cfg
Normal file
6
pypi/ipaserver/setup.cfg
Normal file
@ -0,0 +1,6 @@
|
||||
[bdist_wheel]
|
||||
universal = 1
|
||||
|
||||
[aliases]
|
||||
packages = clean --all egg_info bdist_wheel
|
||||
release = packages register upload
|
26
pypi/ipaserver/setup.py
Executable file
26
pypi/ipaserver/setup.py
Executable file
@ -0,0 +1,26 @@
|
||||
#
|
||||
# Copyright (C) 2017 FreeIPA Contributors see COPYING for license
|
||||
#
|
||||
"""Dummy package for FreeIPA
|
||||
|
||||
ipatests is not yet available as PyPI package.
|
||||
"""
|
||||
|
||||
from os.path import abspath, dirname
|
||||
import sys
|
||||
|
||||
if __name__ == '__main__':
|
||||
# include ../../ for ipasetup.py
|
||||
sys.path.append(dirname(dirname(dirname(abspath(__file__)))))
|
||||
from ipasetup import ipasetup # noqa: E402
|
||||
|
||||
ipasetup(
|
||||
name='ipaserver',
|
||||
doc = __doc__,
|
||||
packages=[
|
||||
"ipaserver",
|
||||
],
|
||||
install_requires=[
|
||||
"ipaclient",
|
||||
]
|
||||
)
|
3
pypi/ipatests/Makefile.am
Normal file
3
pypi/ipatests/Makefile.am
Normal file
@ -0,0 +1,3 @@
|
||||
include $(top_srcdir)/Makefile.python.am
|
||||
|
||||
pkginstall = false
|
2
pypi/ipatests/README.txt
Normal file
2
pypi/ipatests/README.txt
Normal file
@ -0,0 +1,2 @@
|
||||
This is a dummy package for FreeIPA's ipatests.
|
||||
|
5
pypi/ipatests/ipatests/__init__.py
Normal file
5
pypi/ipatests/ipatests/__init__.py
Normal file
@ -0,0 +1,5 @@
|
||||
#
|
||||
# Copyright (C) 2017 FreeIPA Contributors see COPYING for license
|
||||
#
|
||||
|
||||
raise ImportError("ipatests is not yet supported as PyPI package.")
|
6
pypi/ipatests/setup.cfg
Normal file
6
pypi/ipatests/setup.cfg
Normal file
@ -0,0 +1,6 @@
|
||||
[bdist_wheel]
|
||||
universal = 1
|
||||
|
||||
[aliases]
|
||||
packages = clean --all egg_info bdist_wheel
|
||||
release = packages register upload
|
26
pypi/ipatests/setup.py
Executable file
26
pypi/ipatests/setup.py
Executable file
@ -0,0 +1,26 @@
|
||||
#
|
||||
# Copyright (C) 2017 FreeIPA Contributors see COPYING for license
|
||||
#
|
||||
"""Dummy package for FreeIPA
|
||||
|
||||
ipatests is not yet available as PyPI package.
|
||||
"""
|
||||
|
||||
from os.path import abspath, dirname
|
||||
import sys
|
||||
|
||||
if __name__ == '__main__':
|
||||
# include ../../ for ipasetup.py
|
||||
sys.path.append(dirname(dirname(dirname(abspath(__file__)))))
|
||||
from ipasetup import ipasetup # noqa: E402
|
||||
|
||||
ipasetup(
|
||||
name='ipatests',
|
||||
doc = __doc__,
|
||||
packages=[
|
||||
"ipatests",
|
||||
],
|
||||
install_requires=[
|
||||
"ipaclient",
|
||||
]
|
||||
)
|
Loading…
Reference in New Issue
Block a user