From 345ff2a7905efe011ba7630841af0304cd97dd08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 29 Nov 2017 10:35:26 +0100 Subject: [PATCH] Move miss placed project.yaml.mako remark. --- doc/integrator/upgrade_application.rst.mako | 26 +++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/doc/integrator/upgrade_application.rst.mako b/doc/integrator/upgrade_application.rst.mako index 3206781017..b4471d83b7 100644 --- a/doc/integrator/upgrade_application.rst.mako +++ b/doc/integrator/upgrade_application.rst.mako @@ -56,18 +56,7 @@ has changed with GMF 2.1. See :ref:`integrator_intranet` and update your code ac Updating the application code ----------------------------- -Verify that you have in your ``project.yaml.mako`` file the following ``template_vars``: ``package``, ``srid``, ``extent``, ``apache_vhost``, for example: - -.. code:: yaml - - ... - template_vars: - package: ${'$'}{package} - srid: ${'$'}{srid} - extent: 489246, 78873, 837119, 296543 - apache_vhost: - -Then run: +To upgrade your application code from the remote repository run: .. prompt:: bash @@ -83,6 +72,19 @@ Upgrading an application In the ``setup.py`` be sure not to specify a ``c2cgeoportal`` version, because it will prevent the installation of the new ``c2cgeoportal`` egg. +Verify that you have in your ``project.yaml.mako`` file the following ``template_vars``: +``package``, ``srid``, ``extent``, ``apache_vhost``, for example: + +.. code:: yaml + + ... + template_vars: + package: ${'$'}{package} + srid: ${'$'}{srid} + extent: 489246, 78873, 837119, 296543 + apache_vhost: + + We consider that your makefile is named ``.mk``, if it is not the case add in your Makefile ``UPGRADE_MAKE_FILE = ``