Switch comp.libs/tools and debug to new framework.

Signed-off-by: Alexey Neyman <stilor@att.net>

3 files changed, 22 insertions, 12 deletions

diff --git a/maintainer/gen-kconfig.sh b/maintainer/gen-kconfig.sh
index 364844d..4066fbb 100755
--- a/maintainer/gen-kconfig.sh
+++ b/maintainer/gen-kconfig.sh
@@ -106,7 +106,6 @@ gen_choice() {
         if [ -f "${file}.2" ]; then
             printf '\n'
             printf 'if %s_%s\n' "${cfg_prefix}" "${_entry}"
-            printf 'comment "%s other options"\n' "${entry}"
             printf 'source "%s.2"\n' "${file}"
             printf 'endif\n'
         fi
diff --git a/maintainer/gen-versions.sh b/maintainer/gen-versions.sh
index 83a2eb5..726251f 100755
--- a/maintainer/gen-versions.sh
+++ b/maintainer/gen-versions.sh
@@ -186,8 +186,8 @@ run_template()
 config_dir=config/versions
 template=maintainer/kconfig-versions.template
 
-declare -A pkg_forks pkg_milestones
-declare -a pkg_masters pkg_nforks pkg_all
+declare -A pkg_forks pkg_milestones pkg_nforks
+declare -a pkg_masters pkg_all
 
 # Convert the argument to a Kconfig-style macro
 kconfigize()
@@ -385,7 +385,7 @@ find_forks()
     else
         pkg_nforks[${1}]=$[pkg_nforks[${1}]+1]
         pkg_forks[${1}]="${1}${pkg_forks[${1}]}"
-	pkg_milestones[${1}]=`sort_versions ${info[milestones]}`
+        pkg_milestones[${1}]=`sort_versions ${info[milestones]}`
         pkg_masters+=( "${1}" )
     fi
 }
@@ -406,10 +406,13 @@ enter_fork()
     # Set defaults
     info[obsolete]=
     info[experimental]=
+    info[repository]=
+    info[repository_cset]=HEAD
+    info[fork]=${fork}
+    info[name]=${fork}
 
     eval `read_package_desc ${fork}`
 
-    info[name]=${fork}
     info[pfx]=`kconfigize ${fork}`
     info[originpfx]=`kconfigize ${info[origin]}`
     if [ -r "packages/${info[origin]}.help" ]; then
@@ -455,6 +458,10 @@ set_latest_milestone()
 
 enter_version()
 {
+    local -A ver_postfix=( \
+        [,yes,,]=" (OBSOLETE)" \
+        [,,yes,]=" (EXPERIMENTAL)" \
+        [,yes,yes,]=" (OBSOLETE,EXPERIMENTAL)" )
     local version="${1}"
     local tmp milestone
 
@@ -462,9 +469,11 @@ enter_version()
     info[obsolete]=
     info[experimental]=
 
-    eval `read_version_desc ${info[name]} ${version}`
+    eval `read_version_desc ${info[fork]} ${version}`
     info[ver]=${version}
     info[kcfg]=`kconfigize ${version}`
+    info[ver_postfix]=${ver_postfix[,${info[obsolete]},${info[experimental]},]}
+
     # TBD do we need "prev" version?
     tmp=" ${info[all_versions]} "
     tmp=${tmp##* ${version} }
diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index 9a04f57..c6d001e 100644
--- a/maintainer/kconfig-versions.template
+++ b/maintainer/kconfig-versions.template
@@ -1,8 +1,8 @@
 #
 # DO NOT EDIT! This file is automatically generated.
 #
-
 #!if [ "@@nforks@@" -ge 2 ]
+
 choice
 	bool "Show @@master@@ versions from"
 
@@ -90,7 +90,7 @@ config @@pfx@@_DEVEL_BRANCH
 
 config @@pfx@@_DEVEL_REVISION
 	string "Revision/changeset"
-	default "HEAD"
+	default "@@repository_cset@@"
 	help
 	  Commit ID or revision ID to check out.
 
@@ -106,12 +106,13 @@ config @@pfx@@_CUSTOM_LOCATION
 
 endif
 
+#!if [ -n "@@all_versions@@" ]
 choice
 	bool "Version of @@name@@"
 
 #!foreach version
 config @@pfx@@_V_@@kcfg@@
-	bool "@@ver@@"
+	bool "@@ver@@@@ver_postfix@@"
 #!if [ "@@obsolete@@" = "yes" ]
 	depends on OBSOLETE
 #!end-if
@@ -119,11 +120,12 @@ config @@pfx@@_V_@@kcfg@@
 	depends on EXPERIMENTAL
 #!end-if
 #!if [ -n "@@milestone@@" ]
-	select @@masterpfx@@_MS_@@milestone@@
+	select @@masterpfx@@_@@milestone@@_or_later
 #!end-if
 
 #!end-foreach
 endchoice
+#!end-if
 
 #!if [ "@@nforks@@" -ge 2 ]
 endif
@@ -139,10 +141,10 @@ config @@pfx@@_VERSION
 #!end-foreach
 
 #!foreach milestone
-config @@masterpfx@@_MS_@@ms_kcfg@@
+config @@masterpfx@@_@@ms_kcfg@@_or_later
 	bool
 #!if [ -n "@@ms_prev@@" ]
-	select @@masterpfx@@_MS_@@ms_prev@@
+	select @@masterpfx@@_@@ms_prev@@_or_later
 #!end-if
 
 #!end-foreach