diff options
Diffstat (limited to 'debian/cdbs/1/class/python-sugar.mk')
-rw-r--r-- | debian/cdbs/1/class/python-sugar.mk | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/debian/cdbs/1/class/python-sugar.mk b/debian/cdbs/1/class/python-sugar.mk index 31bab61..166db9e 100644 --- a/debian/cdbs/1/class/python-sugar.mk +++ b/debian/cdbs/1/class/python-sugar.mk @@ -30,7 +30,7 @@ include debian/cdbs/1/class/python-vars.mk include $(_cdbs_rules_path)/debhelper.mk$(_cdbs_makefile_suffix) # Declare Build-Deps for packages using this file -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-sugar, python-sugar-toolkit, unzip +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-sugar, python-sugar-toolkit (>= 0.82.5), unzip # FIXME: Resolve DEB_PYTHON_PACKAGES in build targets only ifeq (,$(cdbs_python_pkg_check)$(DEB_PYTHON_ARCH_PACKAGES)) ifneq (, $(cdbs_python_compile_version)) @@ -42,52 +42,58 @@ else CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11) endif ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.6) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2) else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.5.6) endif -# Files or `find -name`-compatible search patterns to add to temp MANIFEST -#DEB_PYTHON_SUGAR_MANIFEST = *.py *.po *.pot *.svg +DEB_PYTHON_SUGAR_PACKAGES = $(filter sugar-%-activity, $(DEB_PACKAGES)) -DEB_PYTHON_SUGAR_MANIFEST_REGEX = -DEB_PYTHON_SUGAR_MANIFEST_IGNORE_REGEX = ^debian/.* +# TODO: Move this to buildvars.mk +cdbs_pkgsrcdir = $(if $(DEB_PKGSRCDIR_$(cdbs_curpkg)),$(DEB_PKGSRCDIR_$(cdbs_curpkg)),$(DEB_SRCDIR)) -cdbs_python_sugar_manifest_files_tmp = $(patsubst %,-or -name '%',$(DEB_PYTHON_SUGAR_MANIFEST)) -cdbs_python_sugar_manifest_files = $(wordlist 2, $(words $(cdbs_python_sugar_manifest_files_tmp)), $(cdbs_python_sugar_manifest_files_tmp)) +pre-build:: + mkdir -p debian/stamps-configure -common-configure-arch common-configure-indep:: common-configure-impl -common-configure-impl:: - $(if $(DEB_PYTHON_SUGAR_MANIFEST),i=$(DEB_SRCDIR)/MANIFEST; if [ -e $$i ] && [ ! -e $$i.cdbs-orig ]; then mv $$i $$i.cdbs-orig; fi) - $(if $(DEB_PYTHON_SUGAR_MANIFEST),cd $(DEB_SRCDIR) && find * -type f $(cdbs_python_sugar_manifest_files) $(if $(DEB_PYTHON_SUGAR_MANIFEST_REGEX),-regex '$(DEB_PYTHON_SUGAR_MANIFEST_REGEX)') $(if $(DEB_PYTHON_SUGAR_MANIFEST_IGNORE_REGEX),-not -regex '$(DEB_PYTHON_SUGAR_MANIFEST_IGNORE_REGEX))' > MANIFEST) - -$(patsubst %,build/%,$(DEB_PACKAGES)) :: build/%: +$(patsubst %,build/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: build/%: + [ ! -e $(cdbs_pkgsrcdir)/MANIFEST ] || [ -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || mv $(cdbs_pkgsrcdir)/MANIFEST $(cdbs_pkgsrcdir)/MANIFEST.upstream + egrep -v '^locale/.*/(.*\.mo|activity\.linfo)$$' $(cdbs_pkgsrcdir)/MANIFEST.upstream > $(cdbs_pkgsrcdir)/MANIFEST for pythonver in $(cdbs_python_build_versions); do \ - /usr/bin/python$$ver setup.py dist; \ + /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py build; \ + done + -IFS="`printf '\n'`" find "$(cdbs_pkgsrcdir)/locale" -type f \( -name '*.mo' -or -name 'activity.linfo' \) | while read path; do \ + echo "$$path" | sed 's!^$(cdbs_pkgsrcdir)/!!' >> $(cdbs_pkgsrcdir)/MANIFEST; \ done -$(patsubst %,install/%,$(DEB_PACKAGES)) :: install/%: +$(patsubst %,install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: install/%: mkdir -p $(DEB_DESTDIR)usr/share/sugar/activities for pythonver in $(cdbs_python_build_versions); do \ - /usr/bin/python$$ver setup.py install $(DEB_DESTDIR)usr; \ + LANG=C /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py install --prefix="$(DEB_DESTDIR)/usr"; \ done -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: +$(patsubst %,binary-install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: binary-install/%: ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) $(DEB_PYTHON_PRIVATE_MODULES_DIRS_$(cdbs_curpkg)) else dh_pycentral -p$(cdbs_curpkg) endif -clean:: - for pythonver in $(cdbs_python_build_versions); do \ - /usr/bin/python$$ver setup.py clean; \ - done - $(if $(DEB_PYTHON_SUGAR_MANIFEST),i=$(DEB_SRCDIR)/MANIFEST; if test -e $$i.cdbs-orig ; then mv -f $$i.cdbs-orig $$i; fi) +reverse-config:: $(patsubst %,cleanpythonsugar-reverse-config/%,$(DEB_PYTHON_SUGAR_PACKAGES)) +$(patsubst %,cleanpythonsugar-reverse-config/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: cleanpythonsugar-reverse-config/% : + [ ! -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || mv -f $(cdbs_pkgsrcdir)/MANIFEST.upstream $(cdbs_pkgsrcdir)/MANIFEST + +clean:: $(patsubst %,cleanpythonsugar/%,$(DEB_PYTHON_SUGAR_PACKAGES)) ifeq (, $(cdbs_selected_pycompat)) echo "$(cdbs_pycompat)" >debian/pycompat endif # use pycompat +$(patsubst %,cleanpythonsugar/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: cleanpythonsugar/% : + -IFS="`printf '\n'`" find "$(cdbs_pkgsrcdir)/locale" -type f \( -name '*.mo' -or -name 'activity.linfo' \) | while read path; do \ + rm -f "$$path"; \ + rmdir --ignore-fail-on-non-empty "`dirname "$$path"`"; \ + done + -rmdir --ignore-fail-on-non-empty "$(cdbs_pkgsrcdir)/locale" + ## TODO: Drop this when DEB_PYTHON_PACKAGES is only resolved in build targets pre-build clean:: $(cdbs_python_pkgresolve_check) |