update eol distros list, make lunar active version and add M-Turtle f…

…or future version
ros-infrastructure · Jan 23, 2017 · 10eb7cd · 10eb7cd
1 parent b9ab8dc
commit 10eb7cd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/custom/js/rosversion.js b/custom/js/rosversion.js
@@ -54,7 +54,7 @@ function toggleDocStatus()
 }
 
 $(document).ready(function() {
-  var activedistro = "kinetic"; //CHANGE THIS LINE TO CHANGE THE DISTRO DISPLAYED BY DEFAULT
+  var activedistro = "lunar"; //CHANGE THIS LINE TO CHANGE THE DISTRO DISPLAYED BY DEFAULT
   var url_distro = getURLParameter('distro');
   if (url_distro) {
     activedistro=url_distro;

diff --git a/macro/PackageHeader.py b/macro/PackageHeader.py
@@ -7,7 +7,7 @@
 generates_headings = True
 dependencies = []
 
-hidden_distros = ['boxturtle', 'cturtle', 'diamondback', 'electric', 'fuerte', 'groovy', 'unstable']
+hidden_distros = ['boxturtle', 'cturtle', 'diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'unstable']
 
 for hidden_distro in hidden_distros if hidden_distro in distro_names:
     distro_names.remove(hidden_distro)

diff --git a/macro/StackHeader.py b/macro/StackHeader.py
@@ -8,7 +8,7 @@
 generates_headings = True
 dependencies = []
 
-hidden_distros = ['boxturtle', 'cturtle', 'diamondback', 'electric', 'fuerte', 'groovy', 'unstable']
+hidden_distros = ['boxturtle', 'cturtle', 'diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'unstable']
 
 for hidden_distro in hidden_distros if hidden_distro in distro_names:
     distro_names.remove(hidden_distro)

diff --git a/macro/Version.py b/macro/Version.py
@@ -47,11 +47,10 @@
 def execute(macro, args):
     if args:
         version = str(args)
-        if version.lower() == 'lunar':
-            # TODO Change when l-turtle name is decided
+        if version.lower() == 'm-turtle':
             return ('<span style="background-color:#FFFF00; '
                     'font-weight:bold; padding: 3px;">'
-                    'Expected in Lunar</span>')
+                    'Expected in M-Turtle</span>')
         else:
             return ('<span style="background-color:#FFFF00; '
                     'font-weight:bold; padding: 3px;">'

diff --git a/macro/macroutils.py b/macro/macroutils.py
@@ -11,9 +11,9 @@
 
 NETWORK_TIMEOUT = 3
 
-distro_names = ['boxturtle', 'cturtle', 'diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'indigo', 'jade', 'kinetic', 'unstable']
-distro_names_indexed = ['diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'indigo', 'jade', 'kinetic', 'unstable'] #boxturtle and cturtle not indexed
-distro_names_buildfarm = ['indigo', 'jade', 'kinetic']
+distro_names = ['boxturtle', 'cturtle', 'diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'indigo', 'jade', 'kinetic', 'lunar', 'unstable']
+distro_names_indexed = ['diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'indigo', 'jade', 'kinetic', 'lunar', 'unstable'] #boxturtle and cturtle not indexed
+distro_names_buildfarm = ['indigo', 'jade', 'kinetic', 'lunar']
 
 doc_url = "http://docs.ros.org/"