From 638c729dce1a37555b74b61b56ff64eb66dac438 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Wed, 28 Nov 2012 19:20:43 +0100 Subject: [PATCH 1/2] fixed manage.py for windows --- manage.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/manage.py b/manage.py index 5ddfd35aa..af82b6f37 100644 --- a/manage.py +++ b/manage.py @@ -8,9 +8,10 @@ """ import os, sys +from django.core.management import execute_from_command_line +from openslides.main import get_user_config_path, setup_django_environment if __name__ == "__main__": - sys.path.append(os.path.join(os.path.expanduser('~'), '.config', 'openslides')) - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") - from django.core.management import execute_from_command_line + setup_django_environment( + get_user_config_path('openslides', 'settings.py')) execute_from_command_line(sys.argv) From b9ab6502c1a74a252c3e82fb8129d9f7d5fe5a0b Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Thu, 29 Nov 2012 16:39:51 +0100 Subject: [PATCH 2/2] Updated the INSTALL.txt for windows with pypi --- INSTALL.txt | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index 8a4cdad95..f8bbc6f3d 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -129,24 +129,20 @@ II. Installation on GNU/Linux and MacOSX using the sources virtual environment (see 4.) before starting the server (see 6.). -III. Installation on Windows (32/64bit) ---------------------------------------- +III. Installation on Windows (32bit) using the Python Package Index (PyPI) +----------------------------------------------------------------------------- -NOTE: There is a portable version of OpenSlides for Windows which does not -required any install steps! If there is a reason that you can not use the +NOTE: There is a portable version of OpenSlides for Windows which does not +required any install steps! If there is a reason that you can not use the portable version you should run the following install steps. 1. Install requirements: - OpenSlides requires following programs, which should be + The OpenSlides install requires following programs, which should be installed first: + Python Programming Language 2 (>= 2.5), + Setuptools - + ReportLab Toolkit - + Python Imaging Library (PIL) - + Django - + django-mptt a) Download and run 32bit MSI installer from http://www.python.org/: @@ -163,33 +159,18 @@ portable version you should run the following install steps. http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe - d) Install ReportLab Toolkit, Python Imaging Library (PIL), Django - and django-mptt: + + 2. Install OpenSlides: Open command line (cmd) and run: - easy_install django django-mptt reportlab pil - - If you use a 64bit version of Python, you have to install reportlab - and PIL manually - without using easy_install. - - 2. Get OpenSlides: - - a) Download latest OpenSlides release from http://openslides.org. - - OR - - b) Clone development version from OpenSlides' github repository - https://github.com/OpenSlides/OpenSlides. This requires Git, - see http://git-scm.com/. - - Open command line (cmd) and run: - - git clone git://github.com/OpenSlides/OpenSlides.git + easy_install openslides 3. Start OpenSlides server and open URL in your default browser: - python start.py + Open command line (cmd) and run: + + openslides If you run this script the first time a new database and the admin account are created. Please change the password after @@ -198,4 +179,4 @@ portable version you should run the following install steps. Username: admin Password: admin - Use 'python start.py --help' to show all start options. + Use 'openslides --help' to show all start options.