Skip to content

Commit

Permalink
remove out-dated sections, fix including vagrant section
Browse files Browse the repository at this point in the history
  • Loading branch information
landam committed Aug 17, 2018
1 parent 80ff37f commit f92050d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 41 deletions.
2 changes: 2 additions & 0 deletions administrator-manual/installation/docker.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.. _docker:

Deployment of server application in Docker containers
=====================================================

Expand Down
49 changes: 8 additions & 41 deletions other.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,47 +56,6 @@ Gisquick QGIS plugin
https://github.com/gislab-npo/gisquick-qgis-plugin, see
:doc:`./administrator-manual/installation/plugin`. Gisquick
documentation https://github.com/gislab-npo/gisquick-doc

------
Mobile
------

GIS.lab Mobile is represented by dedicated hybrid Android client interface
built on top of the same code base as web interface with native user interface.

-----------
Development
-----------

.. include:: installation/vagrant.rst

---------
Packaging
---------

* Gisquick application

.. code:: sh
$ cd /vagrant/server \
&& \
python ./setup.py sdist
* GIS.lab Mobile

.. code:: sh
$ nvm use stable
$ export ANDROID_HOME=/home/vagrant/dev/apps/android-sdk-linux \
PATH=$PATH:/home/vagrant/dev/apps/android-sdk-linux/tools:/home/vagrant/dev/apps/android-sdk-linux/platform-tools \
ANDROID_BUILD=ant \
&& \
cd /vagrant/clients/mobile/cordova-app \
&& \
cordova build android
.. todo:: |todo| Add instructions how to clean environment before build.

-------
License
Expand All @@ -105,3 +64,11 @@ License
`GNU General Public License
<https://github.com/gislab-npo/gisquick/blob/master/LICENSE>`__ version 2 or
later

------------------------------------------
Alternative deploying method using Vagrant
------------------------------------------

See :ref:`docker` for recommended deployment procedure.

.. include:: administrator-manual/installation/vagrant.rst

0 comments on commit f92050d

Please sign in to comment.