widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands-website/simplified-installation-instructions into lp:widelands-website.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands-website/simplified-installation-instructions/+merge/140767

Further simplified instructions for setting up the website as outlined in https://code.launchpad.net/~hjd/widelands-website/updated-installation-instructions/+merge/138862.

I am aware the --no-site-packages option is deprecated now that this is the default behavior, but it just prints a warning if included and I think it will be fine to keep this for at least a while longer.
-- 
https://code.launchpad.net/~hjd/widelands-website/simplified-installation-instructions/+merge/140767
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands-website/simplified-installation-instructions into lp:widelands-website.

=== modified file 'README.txt'
--- README.txt	2012-12-08 18:54:55 +0000
+++ README.txt	2012-12-19 20:33:21 +0000
@@ -23,20 +23,21 @@
 
 This will make sure that your virtual environment is not tainted with python
 packages from your global site packages. Very important!
-Now, we create our environment and download the website::
+Now, we create and activate our environment:: 
 
    $ virtualenv --no-site-packages wlwebsite
    $ cd wlwebsite
+   $ source bin/activate
+
+Next, we download the website source code::
+
    $ mkdir code
    $ cd code
    $ bzr branch lp:widelands-website widelands
+   $ cd widelands
 
 All fine and good. Now we have to install all the third party modules the
-website needs. We use pip for that. But first, we have to change into our
-local environment::
-
-   $ cd .. # Now, we are in the root dir of our environemnt
-   $ source bin/activate
+website needs. We use pip for that.
 
 Installation of the third party libraries should be easy, given you have
 development tools installed and in your path. The two difficult packages are
@@ -44,17 +45,13 @@
 or add your global site dir to your PYTHONPATH. 
 Installation via pip should work like this::
 
-   $ pip install -r code/widelands/pip_requirements.txt
+   $ pip install -r pip_requirements.txt
 
 This will take a while. If no errors are shown we should be fine. 
 
 Setting up the website
 ----------------------
 
-Go back into the widelands bzr directory::
-
-   $ cd code/widelands
-
 Setting your local paths
 ^^^^^^^^^^^^^^^^^^^^^^^^