Merge remote-tracking branch 'ostcar/windows_manage' into Version_String

This commit is contained in:
Norman Jäckel 2012-12-01 13:16:17 +01:00
commit 343710ad1a
2 changed files with 16 additions and 34 deletions

View File

@ -129,8 +129,8 @@ II. Installation on GNU/Linux and MacOSX using the sources
virtual environment (see 4.) before starting the server (see 6.). 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 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 required any install steps! If there is a reason that you can not use the
@ -139,14 +139,10 @@ portable version you should run the following install steps.
1. Install requirements: 1. Install requirements:
OpenSlides requires following programs, which should be The OpenSlides install requires following programs, which should be
installed first: installed first:
+ Python Programming Language 2 (>= 2.5), + Python Programming Language 2 (>= 2.5),
+ Setuptools + Setuptools
+ ReportLab Toolkit
+ Python Imaging Library (PIL)
+ Django
+ django-mptt
a) Download and run 32bit MSI installer from http://www.python.org/: 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 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: Open command line (cmd) and run:
easy_install django django-mptt reportlab pil easy_install openslides
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
3. Start OpenSlides server and open URL in your default browser: 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 If you run this script the first time a new database and the
admin account are created. Please change the password after admin account are created. Please change the password after
@ -198,4 +179,4 @@ portable version you should run the following install steps.
Username: admin Username: admin
Password: admin Password: admin
Use 'python start.py --help' to show all start options. Use 'openslides --help' to show all start options.

View File

@ -8,9 +8,10 @@
""" """
import os, sys 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__": if __name__ == "__main__":
sys.path.append(os.path.join(os.path.expanduser('~'), '.config', 'openslides')) setup_django_environment(
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") get_user_config_path('openslides', 'settings.py'))
from django.core.management import execute_from_command_line
execute_from_command_line(sys.argv) execute_from_command_line(sys.argv)