From aa2ed9bbad8c8e1ea4ef9aaf2db526e5884a90ce Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 29 Jan 2014 09:14:34 +0100
Subject: [PATCH] Fixed #1177 and #1209: Added new requirments for portable:
 setuptools (pkg_resources) and jsonfield.

---
 extras/win32-portable/create_portable.txt |  2 +-
 extras/win32-portable/prepare_portable.py | 34 +++++++++++++----------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/extras/win32-portable/create_portable.txt b/extras/win32-portable/create_portable.txt
index 959ac27eb..e7eda72e2 100644
--- a/extras/win32-portable/create_portable.txt
+++ b/extras/win32-portable/create_portable.txt
@@ -7,7 +7,7 @@ How to create a new portable Windows distribution of OpenSlides:
 
 2. Install all required python packages (see requirements_production.txt):
 
-       easy_install -Z django django-mptt beautifulsoup4 bleach pillow reportlab sockjs_tornado tornado django-haystack whoosh
+       easy_install -Z django django-mptt beautifulsoup4 bleach jsonfield pillow reportlab setuptools sockjs_tornado tornado django-haystack whoosh
 
 
 3. Install pywin32 from binary installer:
diff --git a/extras/win32-portable/prepare_portable.py b/extras/win32-portable/prepare_portable.py
index 65364fea2..95a7bf026 100755
--- a/extras/win32-portable/prepare_portable.py
+++ b/extras/win32-portable/prepare_portable.py
@@ -43,6 +43,15 @@ LIBEXCLUDE = [
 
 
 SITE_PACKAGES = {
+    "beautifulsoup4": {
+        "copy": ["bs4"],
+    },
+    "bleach": {
+        "copy": ["bleach"],
+    },
+    "html5lib": {
+        "copy": ["html5lib"],
+    },
     "django": {
         "copy": ["django"],
         "exclude": [
@@ -60,9 +69,18 @@ SITE_PACKAGES = {
             r"^django/contrib/webdesign/",
         ]
     },
+    "django-haystack": {
+        "copy": ["haystack"],
+    },
     "django-mptt": {
         "copy": ["mptt"],
     },
+    "jsonfield": {
+        "copy": ["jsonfield"],
+    },
+    "pillow": {
+        "copy": ["PIL"],
+    },
     "reportlab": {
         "copy": [
             "reportlab",
@@ -72,8 +90,8 @@ SITE_PACKAGES = {
             "sgmlop.pyd",
         ],
     },
-    "pillow": {
-        "copy": ["PIL"],
+    "setuptools": {
+        "copy": ["pkg_resources.py"],
     },
     "sockjs-tornado": {
         "copy": ["sockjs"],
@@ -81,18 +99,6 @@ SITE_PACKAGES = {
     "tornado": {
         "copy": ["tornado"],
     },
-    "beautifulsoup4": {
-        "copy": ["bs4"],
-    },
-    "bleach": {
-        "copy": ["bleach"],
-    },
-    "html5lib": {
-        "copy": ["html5lib"],
-    },
-    "django-haystack": {
-        "copy": ["haystack"],
-    },
     "whoosh": {
         "copy": ["whoosh"],
     },