Merge lp:~widelands-dev/widelands-website/widelands_trunk_binaries into lp:widelands-website

[kaputtnik]

Change the PATH variable to include widelands/trunk.

In conjunction with

https://code.launchpad.net/~widelands-dev/widelands/move_website_binaries/+merge/319231

this branch makes it possible to upload a map on the local website.

[lp:~widelands-dev/widelands-website/widelands_trunk_binaries]

454. By kaputtnik on 2017-04-05

adjusted the README.txt; fixed a typo

455. By kaputtnik on 2017-04-05

merged with trunk

[GunChleoc (gunchleoc)]

LGTM - 2 tiny nits.

review: Approve

[SirVer (sirver)]

review: Approve

[lp:~widelands-dev/widelands-website/widelands_trunk_binaries]

456. By kaputtnik on 2017-04-11

wording

[kaputtnik (franku)]

Thanks for proofreading and approval.

Merged and deployed.

=== modified file 'README.txt'
--- README.txt	2017-01-21 13:01:18 +0000
+++ README.txt	2017-04-11 05:32:47 +0000
@@ -58,10 +58,10 @@
 This will take a while. If no errors are shown we should be fine.
 
 Setting up the website
-----------------------
+======================
 
 Setting your local paths
-^^^^^^^^^^^^^^^^^^^^^^^^
+------------------------
 
 Copy or symlink the two files settings_local.py.sample and
 local_urls.py.sample to settings_local.py and local_urls.py. Take a look at
@@ -72,7 +72,7 @@
    $ ln -s local_settings.py.sample local_settings.py
 
 Setting up the database
-^^^^^^^^^^^^^^^^^^^^^^^
+-----------------------
 
 Now creating the tables in the database:
 
@@ -90,7 +90,7 @@
 resembles the widelands homepage quite closely. All content is missing though.
 
 Some important settings
-^^^^^^^^^^^^^^^^^^^^^^^
+-----------------------
 
 Go to http://localhost:8000/admin. Log in with your super user and go to the
 following table:
@@ -100,7 +100,7 @@
 Now everything should work.
 
 Accessing the website from other machines
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+-----------------------------------------
 
 When starting the server as described above, the website will by default
 only be available from the machine it is running on. If you wish to access
@@ -113,8 +113,27 @@
 See also https://docs.djangoproject.com/en/dev/ref/django-admin/#examples-of-using-different-ports-and-addresses
 for further details.
 
+Dependencies between website and widelands source code
+======================================================
+
+Some parts of the website need access to the source code of widelands:
+
+* Online help/Encyclopedia
+* Possibility to upload a map onto the local website
+* Source code documentation
+
+You will need the widelands source code for this, see
+
+https://wl.widelands.org/wiki/BzrPrimer/
+
+After the source code is downloaded, adjust the path of 
+
+WIDELANDS_SVN_DIR
+
+in local_settings.py to the path where the widelands source code is found.
+
 Setting up the online help / encyclopedia
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+-----------------------------------------
 
 You will need graphviz to generate the graphs for the online help. On Ubuntu run:
 
@@ -129,13 +148,9 @@
    $ ./manage.py update_help_pdf
 
 Setting up widelands source code documentation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You will need the widelands source code for this, see
-
-https://wl.widelands.org/wiki/BzrPrimer/
-
-Change to the directory doc/sphinx/ of the source code and run
+----------------------------------------------
+
+Change to the directory doc/sphinx/ of the widelands source code and run
 
    $ ./extract_rst.py
 
@@ -155,6 +170,14 @@
 
 Open http://localhost:8000/docs/wl/ to test if everything is working.
 
+Uploading a map to the local website
+------------------------------------
+
+Compile the widelands binaries by using the compile.sh script
+
+   $ ./compile.sh
+
+Now you should be able to upload a map onto your local website.
 
 Contact
 =======

=== modified file 'local_settings.py.sample'
--- local_settings.py.sample	2017-01-21 19:22:57 +0000
+++ local_settings.py.sample	2017-04-11 05:32:47 +0000
@@ -5,7 +5,12 @@
 
 STATIC_MEDIA_PATH = os.path.join(bd, 'media')
 MEDIA_ROOT = os.path.join(bd, 'media/')
+
+# If you are using the developer version of widelands from Launchpad
+# set WIDELANDS_SVN_DIR to the correct path. See also:
+# https://wl.widelands.org/wiki/BzrPrimer/
 WIDELANDS_SVN_DIR = "/path/to/widelands/trunk/"
+os.environ['PATH'] = WIDELANDS_SVN_DIR + ':' + os.environ['PATH']
 
 DATABASES = {
    'default': {

=== modified file 'wlmaps/forms.py'
--- wlmaps/forms.py	2016-12-09 10:10:57 +0000
+++ wlmaps/forms.py	2017-04-11 05:32:47 +0000
@@ -10,7 +10,8 @@
 
 from settings import MEDIA_ROOT
 from wlmaps.models import Map
-
+import os
+from settings import WIDELANDS_SVN_DIR
 
 class UploadMapForm(ModelForm):
     """
@@ -55,11 +56,14 @@
 
         try:
             # call map info tool to generate minimap and json info file
+            old_cwd = os.getcwd()
+            os.chdir(WIDELANDS_SVN_DIR)
             check_call(['wl_map_info', saved_file])
 
             # TODO(shevonar): delete file because it will be saved again when
             # the model is saved. File should not be saved twice
             default_storage.delete(saved_file)
+            os.chdir(old_cwd)
         except CalledProcessError:
             self._errors['file'] = self.error_class(
                 ['The map file could not be processed.'])