Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11931 from jefferyto/django1-remove-common-package

Browse source 
django1: Remove common package
This commit is contained in:
Rosen Penev 2020-04-22 15:35:24 -07:00 committed by GitHub
commit b79df90ea0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/python/django/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django PKG_NAME:=django
PKG_VERSION:=3.0.5 PKG_VERSION:=3.0.5
PKG_RELEASE:=2 PKG_RELEASE:=3
PYPI_NAME:=Django PYPI_NAME:=Django
PKG_HASH:=d4666c2edefa38c5ede0ec1655424c56dc47ceb04b6d8d62a7eac09db89545c1 PKG_HASH:=d4666c2edefa38c5ede0ec1655424c56dc47ceb04b6d8d62a7eac09db89545c1
@ -30,7 +30,7 @@ define Package/python3-django
TITLE:=The web framework for perfectionists with deadlines. TITLE:=The web framework for perfectionists with deadlines.
URL:=https://www.djangoproject.com/ URL:=https://www.djangoproject.com/
DEPENDS:= +python3 +python3-pytz +python3-sqlparse +python3-asgiref DEPENDS:= +python3 +python3-pytz +python3-sqlparse +python3-asgiref
CONFLICTS:=python3-django1 python-django1-common CONFLICTS:=python3-django1
PROVIDES:=django PROVIDES:=django
endef endef

30
lang/python/django1/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django1 PKG_NAME:=django1
PKG_VERSION:=1.11.29 PKG_VERSION:=1.11.29
PKG_RELEASE:=3 PKG_RELEASE:=4
PYPI_NAME:=Django PYPI_NAME:=Django
PKG_HASH:=4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c PKG_HASH:=4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c
@ -23,20 +23,15 @@ include ../pypi.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk include ../python3-package.mk
define Package/django1/Default define Package/python3-django1
SUBMENU:=Python SUBMENU:=Python
SECTION:=lang SECTION:=lang
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=The web framework for perfectionists with deadlines. TITLE:=The web framework for perfectionists with deadlines.
URL:=https://www.djangoproject.com/ URL:=https://www.djangoproject.com/
endef
define Package/python3-django1
$(call Package/django1/Default)
DEPENDS:= \ DEPENDS:= \
+python3 \ +python3 \
+python3-pytz \ +python3-pytz
+python-django1-common
PROVIDES:=django PROVIDES:=django
endef endef
@ -44,25 +39,12 @@ define Package/python3-django1/description
The web framework for perfectionists with deadlines (LTS 1.11 series). The web framework for perfectionists with deadlines (LTS 1.11 series).
endef endef
define Package/python-django1-common define Py3Package/python3-django1/install
$(call Package/django1/Default)
endef
define Package/python-django1-common/description
The web framework for perfectionists with deadlines (LTS 1.11 series).
.
This package contains files common to both Python 2.7 and Python 3.
endef
Py3Package/python3-django1/install:=:
define Package/python-django1-common/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) ./files/django-admin $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/django-admin.py \
$(1)/usr/bin/django-admin
endef endef
$(eval $(call Py3Package,python3-django1)) $(eval $(call Py3Package,python3-django1))
$(eval $(call BuildPackage,python3-django1)) $(eval $(call BuildPackage,python3-django1))
$(eval $(call BuildPackage,python3-django1-src)) $(eval $(call BuildPackage,python3-django1-src))
$(eval $(call BuildPackage,python-django1-common))

23
lang/python/django1/files/django-admin
View file

@ -1,23 +0,0 @@
#!/bin/sh
shell_code=''' '
# shell code
if command -v python3.8 > /dev/null && test -e /usr/lib/python3.8/site-packages/django/bin/django-admin.pyc
then
exec python3.8 "$0" "$@"
elif command -v python2.7 > /dev/null && test -e /usr/lib/python2.7/site-packages/django/bin/django-admin.pyc
then
exec python2.7 "$0" "$@"
else
echo "Cannot find installed version of python-django1 or python3-django1." >&2
exit 1
fi
python_code='''
# python code
# ONLY use DOUBLE quotes <"> after this line
from django.core import management
if __name__ == "__main__":
management.execute_from_command_line()
# End of Python code. Do not modify this line. #'