fixing changelog and documentation configuration for the tag

Author: cvvergara

CMakeLists.txt

@@ -41,7 +41,7 @@ set(POSTGIS_MINIMUM_VERSION "2.0.0")
 
 file(STRINGS "${PGROUTING_SOURCE_DIR}/VERSION" PGROUTING_BUILD_STRING)
 
-set(PGROUTING_GIT_TAG "pgrouting-2.2.0-dev")
+set(PGROUTING_GIT_TAG "pgrouting-2.2.0-alpha")
 #string(REGEX REPLACE "^(.+)-([0-9]+)-g([0-9a-f]+) (.*)$" "\\1" PGROUTING_GIT_TAG ${PGROUTING_BUILD_STRING})
 string(REGEX REPLACE "^(.+)-([0-9]+)-g([0-9a-f]+) (.*)$" "\\2" PGROUTING_GIT_BUILD ${PGROUTING_BUILD_STRING})
 string(REGEX REPLACE "^(.+)-([0-9]+)-g([0-9a-f]+) (.*)$" "\\3" PGROUTING_GIT_HASH ${PGROUTING_BUILD_STRING})

VERSION

@@ -1 +1 @@
-pgrouting-2.2.0-907-gfc0096b develop
+pgrouting-2.2.0-909-ga0b0e3e develop

doc/conf.py.in

@@ -42,7 +42,7 @@ master_doc = 'doc/index'
 
 # General information about the project.
 project = u'pgRouting'
-copyright = u'pgRouting Contributors - Version @PGROUTING_VERSION_STRING@ (@PGROUTING_GIT_BRANCH@)'
+copyright = u'pgRouting Contributors - Version @PGROUTING_VERSION_STRING@ (@PGROUTING_GIT_TAG@)'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -51,7 +51,8 @@ copyright = u'pgRouting Contributors - Version @PGROUTING_VERSION_STRING@ (@PGRO
 # The short X.Y version.
 version = '@PGROUTING_VERSION_STRING@'
 # The full version, including alpha/beta/rc tags.
-release = '@PGROUTING_VERSION_STRING@ (@PGROUTING_GIT_BRANCH@)'
+#release = '@PGROUTING_VERSION_STRING@ (@PGROUTING_GIT_BRANCH@)'
+release = '@PGROUTING_VERSION_STRING@ (@PGROUTING_GIT_TAG@)'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -114,7 +115,7 @@ html_theme_path = ['@SPHINX_THEME_DIR@']
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = "pgRouting Manual (@PGROUTING_VERSION_STRING@-dev)"
+html_title = "pgRouting Manual (@PGROUTING_VERSION_STRING@-alpha)"
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None

doc/index.rst

@@ -177,6 +177,7 @@ Change Log
 
 :ref:`change_log`
 
+   - :ref:`changelog_2_2_0`
    - :ref:`changelog_2_1_0`
    - :ref:`changelog_2_0`
    - :ref:`changelog_1_x`

doc/src/changelog/2_2_0.rst

@@ -18,26 +18,30 @@ With the release of pgRouting 2.2.0 fixes some bugs and issues.
  - To see the issues closed by this release see the `Git closed issues <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A%22Release+2.2.0%22+is%3Aclosed>`_ on Github.
  - For important changes see the following release notes.
 
-..
-
-
 
 Release Notes
 -------------------------------------------------------------------------------
 
 
+Changes for release 2.2.0
+
+
   - Improved:
+
     - pgr_nodeNetwork
 
   - Signature fix
+
     - pgr_dijkstra  -- to match what was documented
 
   - New functions
+
     - pgr_floydWarshall
     - pgr_Johnson
     - pgr_DijkstraCost
 
   - New Proposed functions
+
     - pgr_withPoints
     - pgr_withPointsCost
     - pgr_withPointsDD
@@ -46,6 +50,7 @@ Release Notes
 
 
   - Deprecated functions:
+
     - pgr_apspWarshall  use pgr_floydWarshall instead
     - pgr_apspJohnson   use pgr_Johnson instead
     - pgr_kDijkstraCost use pgr_dijkstraCost instead