From 7fdb7665f718227f98cc5ec3a9bc4a880225e2b9 Mon Sep 17 00:00:00 2001 From: Egeyar Date: Mon, 27 May 2019 13:17:33 +0000 Subject: Support released versions from Git branches * Do not assume a release has a tarball if src_release is set to "n". * Do not assume versions in repositories are all experimental. * Allow versions to define their default repository_branch, repository_cset, repository_subdir and bootstrap. * Do not expect mirrors, archive_filename, archive_dirname, archive_formats and signature_format from a version if src_release is set to "n". * Add version_number to allow version names to be different than the version number. When given, use version_number to compare against the milestones. Signed-off-by: Egeyar Bagcioglu --- bootstrap | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'bootstrap') diff --git a/bootstrap b/bootstrap index c014abf8..7015f543 100755 --- a/bootstrap +++ b/bootstrap @@ -574,6 +574,9 @@ enter_fork() info[pkg_name]=${fork} info[pkg_label]=${fork} info[mirrors]= + info[src_release]= + info[src_devel]= + info[src_custom]= info[archive_filename]='@{pkg_name}-@{version}' info[archive_dirname]='@{pkg_name}-@{version}' info[versionlocked]= @@ -646,7 +649,11 @@ enter_milestone() info[ms]=${ms} if [ -n "${info[ver]}" ]; then - info[version_cmp_milestone]=`cmp_versions ${info[ver]} ${info[ms]}` + if [ -n "${info[version_number]}" ]; then + info[version_cmp_milestone]=`cmp_versions ${info[version_number]} ${info[ms]}` + else + info[version_cmp_milestone]=`cmp_versions ${info[ver]} ${info[ms]}` + fi fi } -- cgit v1.2.3