diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-03-31 03:56:24 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-03-31 03:56:24 +0200 |
| commit | 5f3fcf7a7773737fd87c8ff5530fae2286e88927 (patch) | |
| tree | 9337d53244a089f1eef9e4d32fd848cca8049eaf /source4/scripting | |
| parent | 0e77bea165d6db9ca8a138e78f5051234b069789 (diff) | |
| download | samba-5f3fcf7a7773737fd87c8ff5530fae2286e88927.tar.gz samba-5f3fcf7a7773737fd87c8ff5530fae2286e88927.tar.bz2 samba-5f3fcf7a7773737fd87c8ff5530fae2286e88927.zip | |
s4-python: Install external included packages only if they're not present on the system.
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/config.mk | 4 | ||||
| -rwxr-xr-x | source4/scripting/python/samba_external/missing.py | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk index d36e136346..db35669e1a 100644 --- a/source4/scripting/python/config.mk +++ b/source4/scripting/python/config.mk @@ -23,9 +23,9 @@ python_glue_OBJ_FILES = $(pyscriptsrcdir)/pyglue.o $(python_glue_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir) -_PY_FILES = $(shell find $(pyscriptsrcdir)/samba ../lib/subunit/python -type f -name "*.py") +_PY_FILES = $(shell find $(pyscriptsrcdir)/samba -type f -name "*.py") -$(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(subst ../lib/subunit/python,,$(pyfile))),$(pyfile)))) +$(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile)))) PYDOCTOR = pydoctor PYDOCTOR_OPTIONS = --project-name Samba --project-url http://www.samba.org/ \ diff --git a/source4/scripting/python/samba_external/missing.py b/source4/scripting/python/samba_external/missing.py index 082afd8397..d3dd2b9290 100755 --- a/source4/scripting/python/samba_external/missing.py +++ b/source4/scripting/python/samba_external/missing.py @@ -1,11 +1,10 @@ #!/usr/bin/python # work out what python external libraries we need to install - external_libs = { - "dns.resolver": "dnspython", - "subunit": "subunit", - "testtools": "testtools"} + "dns.resolver": "dnspython/dns", + "subunit": "subunit/python/subunit", + "testtools": "testtools/testtools"} list = [] |