Downloading packages using new framework

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

2 files changed, 108 insertions, 60 deletions

diff --git a/maintainer/gen-versions.sh b/maintainer/gen-versions.sh
index cd994326..325715a2 100755
--- a/maintainer/gen-versions.sh
+++ b/maintainer/gen-versions.sh
@@ -428,7 +428,6 @@ check_obsolete_experimental()
 enter_fork()
 {
     local fork="${1}"
-    local -A dflt_branch=( [git]="master" [svn]="/trunk" )
     local versions
     local only_obsolete only_experimental
 
@@ -436,7 +435,8 @@ enter_fork()
     info[obsolete]=
     info[experimental]=
     info[repository]=
-    info[repository_cset]=HEAD
+    info[repository_branch]=
+    info[repository_cset]=
     info[fork]=${fork}
     info[name]=${fork}
     info[mirrors]=
@@ -453,8 +453,7 @@ enter_fork()
 
     if [ -n "${info[repository]}" ]; then
         info[vcs]=${info[repository]%% *}
-        info[repository_url]=${info[repository]##* }
-        info[repository_dflt_branch]=${dflt_branch[${info[vcs]}]}
+        info[repository_url]=${info[repository]#* }
     fi
     info[versionlocked]=`kconfigize "${info[versionlocked]}"`
 
diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index 9343f18c..b3e8a905 100644
--- a/maintainer/kconfig-versions.template
+++ b/maintainer/kconfig-versions.template
@@ -1,30 +1,36 @@
 #
 # DO NOT EDIT! This file is automatically generated.
 #
+
+# The component directory name
+config @@masterpfx@@_DIR_NAME
+    string
+    default "@@master@@"
+
 #!if [ "@@nforks@@" -ge 2 ]
 
 choice
-	bool "Show @@master@@ versions from"
+    bool "Show @@master@@ versions from"
 
 #!foreach fork
 config @@masterpfx@@_USE_@@originpfx@@
-	bool "@@origin@@"
+    bool "@@origin@@"
 #!if [ -n "@@only_obsolete@@" ]
-	depends on OBSOLETE
+    depends on OBSOLETE
 #!end-if
 #!if [ -n "@@only_experimental@@" ]
-	depends on EXPERIMENTAL
+    depends on EXPERIMENTAL
 #!end-if
-	help
+    help
 @@originhelp@@
 
 #!end-foreach
 endchoice
 
 config @@masterpfx@@_USE
-	string
+    string
 #!foreach fork
-	default "@@pfx@@" if @@masterpfx@@_USE_@@originpfx@@
+    default "@@pfx@@" if @@masterpfx@@_USE_@@originpfx@@
 #!end-foreach
 
 #!end-if
@@ -34,78 +40,121 @@ config @@masterpfx@@_USE
 if @@masterpfx@@_USE_@@originpfx@@
 #!end-if
 
+config @@pfx@@_PKG_NAME
+    string
+    default "@@name@@"
+
 #!// If a project makes official releases, using "bleeding edge"
 #!// from a development repository is experimental. However, there
 #!// are projects that consider its HEAD a "rolling release". For
 #!// those, checking out from a repository is the regular method.
-#!if [ -n "@@all_versions@@" ]
-if EXPERIMENTAL
-#!end-if
 choice
-	bool "Source of @@name@@"
+    bool "Source of @@name@@"
 
 #!if [ -n "@@all_versions@@" ]
 config @@pfx@@_SRC_RELEASE
-	bool "Released tarball"
-	help
-	  Download a released tarball.
+    bool "Released tarball"
+    help
+      Download a released tarball.
 
 #!end-if
-#!if [ -n "@@repository@@" ]
 config @@pfx@@_SRC_DEVEL
-	bool "Vendor repository"
-	help
-	  Check out from vendor repository at:
-	  @@repository_url@@
+    bool "Vendor/custom repository"
+#!if [ -n "@@all_versions@@" ]
+    depends on EXPERIMENTAL
+#!end-if
+    help
+      Check out from a repository.
+#!if [ -n "@@repository@@" ]
+      Default is the vendor repository at @@repository_url@@
+#!end-if
 
 if @@pfx@@_SRC_DEVEL
 
+choice
+    bool "VCS type"
+#!if [ -n "@@repository@@" ]
+    default @@pfx@@_DEVEL_VCS_@@vcs@@
+#!end-if
+    help
+      Version control system from which the sources will be checked out.
+      The default value points to the development repository for @@name@@.
+
+config @@pfx@@_DEVEL_VCS_git
+    bool "Git"
+
+config @@pfx@@_DEVEL_VCS_svn
+    bool "Subversion"
+
+config @@pfx@@_DEVEL_VCS_hg
+    bool "Mercurial"
+
+config @@pfx@@_DEVEL_VCS_cvs
+    bool "CVS"
+
+endchoice
+
 config @@pfx@@_DEVEL_VCS
-	string
-	default "@@vcs@@"
+    string
+    default "git" if @@pfx@@_DEVEL_VCS_git
+    default "svn" if @@pfx@@_DEVEL_VCS_svn
+    default "hg" if @@pfx@@_DEVEL_VCS_hg
+    default "cvs" if @@pfx@@_DEVEL_VCS_cvs
 
 config @@pfx@@_DEVEL_URL
-	string
-	default "@@repository_url@@"
+    string "Repository URL"
+#!if [ -n "@@repository@@" ]
+    default "@@repository_url@@"
+#!end-if
+    help
+      Repository URL.
+
+      For CVS, enter both the value of CVS root and the module name, separated
+      by a space.
 
 config @@pfx@@_DEVEL_BRANCH
-	string "Branch to check out"
-	default "@@repository_dflt_branch@@"
-	help
-	  Git: branch to be checked out
-	  Subversion: directories to append to the repository URL.
+    string "Branch/tag to check out"
+    default "@@repository_branch@@"
+    help
+      Git/CVS: branch/tag to be checked out
+      Subversion: directories to append to the repository URL (i.e. branch or tag)
+      Mercurial: official guide recommends using separate repositories to maintain
+      stable branches. You likely need to change the repository URL, rather than
+      enter anything here.
 
 config @@pfx@@_DEVEL_REVISION
-	string "Revision/changeset"
-	default "@@repository_cset@@"
-	help
-	  Commit ID or revision ID to check out.
+    string "Revision/changeset"
+    default "@@repository_cset@@"
+    help
+      Commit ID or revision ID to check out.
+      Git: enter the commit ID to check out a commit.
+      CVS: enter the date in "YYYY/MM/DD HH:MM:SS" format (UTC) to check out certain date.
+      Subversion: enter the revision.
 
 endif
 
-#!end-if
 config @@pfx@@_SRC_CUSTOM
-	bool "Custom location"
-	depends on EXPERIMENTAL
-	help
-	  Custom directory or tarball.
+    bool "Custom location"
+    depends on EXPERIMENTAL
+    help
+      Custom directory or tarball.
 
 if @@pfx@@_SRC_CUSTOM
 
 config @@pfx@@_CUSTOM_LOCATION
-	string "Custom source location"
-	help
-	  Path to the directory or tarball with the sources.
+    string "Custom source location"
+    help
+      Path to the directory or tarball with the sources.
 
 endif
 
 endchoice
-#!if [ -n "@@all_versions@@" ]
-endif
 
-config @@pfx@@_MIRRORS_ARRAY
+#!if [ -n "@@all_versions@@" ]
+config @@pfx@@_MIRRORS
     string
     default "@@mirrors@@"
+
 #!end-if
 
 #!// Below, we explicitly select all milestones to which a given version
@@ -117,7 +166,7 @@ config @@pfx@@_MIRRORS_ARRAY
 #!//
 #!if [ -n "@@all_versions@@" -a -z "@@versionlocked@@" ]
 choice
-	bool "Version of @@name@@"
+    bool "Version of @@name@@"
     help
       For a released version, select the version of @@name@@ to download
       and build. For sources out of the vendor repository or from a custom
@@ -136,16 +185,16 @@ config @@pfx@@_VERY_NEW
 
 #!foreach version
 config @@pfx@@_V_@@kcfg@@
-	bool "@@ver@@@@ver_postfix@@"
+    bool "@@ver@@@@ver_postfix@@"
 #!if [ "@@obsolete@@" = "yes" ]
-	depends on OBSOLETE
+    depends on OBSOLETE
 #!end-if
 #!if [ "@@experimental@@" = "yes" ]
-	depends on EXPERIMENTAL
+    depends on EXPERIMENTAL
 #!end-if
 #!foreach milestone
 #!if [ "@@version_cmp_milestone@@" -ge 0 ]
-	select @@masterpfx@@_@@ms_kcfg@@_or_later
+    select @@masterpfx@@_@@ms_kcfg@@_or_later
 #!end-if
 #!if [ "@@version_cmp_milestone@@" -gt 0 ]
     depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_older
@@ -176,23 +225,23 @@ config @@pfx@@_V_@@kcfg@@
 #!end-foreach
 #!end-if
 
-#!if [ "@@nforks@@" -ge 2 ]
-endif
-#!end-if
-
 config @@pfx@@_VERSION
-	string
+    string
 #!foreach version
-	default "@@ver@@" if @@pfx@@_V_@@kcfg@@
+    default "@@ver@@" if @@pfx@@_V_@@kcfg@@
 #!end-foreach
-	default "unknown"
+    default "unknown"
+
+#!if [ "@@nforks@@" -ge 2 ]
+endif
+#!end-if
 
 #!end-foreach
 
 #!foreach milestone
 #!// Milestones selected by a chosen version of this package
 config @@masterpfx@@_@@ms_kcfg@@_or_later
-	bool
+    bool
 
 #!// Milestone requirements selected by other packages that restrict
 #!// the choices in this package