From eeab375796bd7611dd0fc0c28040f2d7594b69f8 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Thu, 28 Mar 2019 22:28:47 +0100 Subject: [releng] Fix dependencies between features Add dependencies from source to binary features and enforce the same version. Restrict the dependencies between binary features by version, too. Adapt the version.sh script to properly replace these version numbers. Bug: 545906 Change-Id: I953616e58d27accdf61b49f6435a54895bcbf6da Signed-off-by: Thomas Wolf Signed-off-by: Matthias Sohn --- tools/version.sh | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'tools/version.sh') diff --git a/tools/version.sh b/tools/version.sh index 8b8095db42..80693cdbdb 100755 --- a/tools/version.sh +++ b/tools/version.sh @@ -131,7 +131,8 @@ perl -pi~ -e ' $seen_version = 1 if (!/<\?xml/ && s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/); } - s/(import feature="org\.eclipse\.jgit.*" version=")[^"]*(")/${1}'"$API_V"'${2}/; + s/(import feature="org\.eclipse\.jgit[^"]*" version=")[^"]*(")/${1}'"$API_V"'${2}/; + s/(import plugin="org\.eclipse\.jgit[^"]*" version=")[^"]*(")/${1}'"$API_V"'${2}/; ' org.eclipse.jgit.packaging/org.*.feature/feature.xml perl -pi~ -e ' @@ -139,22 +140,11 @@ perl -pi~ -e ' $seen_version = 0; $old_argv = $ARGV; } - if (!$seen_version) { - $seen_version = 1 if - s{<(version)>.*}{<${1}>'"$POM_V"'}; - } - ' org.eclipse.jgit.packaging/org.*.feature/pom.xml - -perl -pi~ -e ' - if ($ARGV ne $old_argv) { - $seen_version = 0; - $old_argv = $ARGV; - } - if (!$seen_version) { - $seen_version = 1 if + if ($seen_version < 2) { + $seen_version++ if s{<(version)>.*}{<${1}>'"$POM_V"'}; } - ' org.eclipse.jgit.packaging/pom.xml + ' org.eclipse.jgit.packaging/org.*.source.feature/pom.xml perl -pi~ -e ' if ($ARGV ne $old_argv) { @@ -162,7 +152,7 @@ perl -pi~ -e ' $old_argv = $ARGV; } if ($seen_version < 18) { - $seen_version++ if + $seen_version++ if s{<(version)>.*}{<${1}>'"$POM_V"'}; } ' org.eclipse.jgit.coverage/pom.xml -- cgit v1.2.3