From 14ba868df4ca9b62bb99499532271109c2e4c998 Mon Sep 17 00:00:00 2001 From: Andy Kittner Date: Mon, 27 Aug 2012 20:24:41 +0200 Subject: [PATCH] Treat openslides the same way as other packages OpenSlides will now be copied from (and to) site-packages in the same way as it's dependencies --- extras/win32-portable/prepare_portable.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/extras/win32-portable/prepare_portable.py b/extras/win32-portable/prepare_portable.py index 574a4cfba..04c1e0cc7 100644 --- a/extras/win32-portable/prepare_portable.py +++ b/extras/win32-portable/prepare_portable.py @@ -45,10 +45,6 @@ LIBEXCLUDE = [ r"^unittest/", ] -OPENSLIDES_EXCLUDE = [ - r"^openslides/settings.py" -] - SITE_PACKAGES = { "django": { @@ -84,7 +80,10 @@ SITE_PACKAGES = { "pil": { # NOTE: PIL is a special case, see copy_pil "copy": [], - } + }, + "openslides": { + "copy" : ["openslides"], + }, } PY_DLLS = [ @@ -302,9 +301,6 @@ def main(): collect_lib(libdir, odir) collect_site_packages(sitedir, os.path.join(odir, "site-packages")) - exclude = get_pkg_exclude("openslides", OPENSLIDES_EXCLUDE) - copy_dir_exclude(exclude, ".", "openslides", odir) - if not compile_openslides_launcher(): sys.stdout.write("Using prebuild openslides.exe\n")