Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2019-03-28 16:57:11 -0400
committerThomas Wolf2019-03-30 05:12:57 -0400
commit3e21135e58aec717501289eba03cb7feabcb5709 (patch)
tree7c027e80c0d31fade6b29060799ed026d8c85f73
parentb1506e2a5fccfdebaf47a96e9b5d3c0aecfa34d7 (diff)
downloadegit-3e21135e58aec717501289eba03cb7feabcb5709.tar.gz
egit-3e21135e58aec717501289eba03cb7feabcb5709.tar.xz
egit-3e21135e58aec717501289eba03cb7feabcb5709.zip
[releng] Add dependency from source to binary feature
Adapt the version.sh script to also replace this version number. The script now handles all feature.xml files the same way. Bug: 545906 Change-Id: I8a7f422f2c2ab0034a3921281b8cddb2412fa08d Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
-rw-r--r--org.eclipse.egit.source-feature/feature.xml4
-rwxr-xr-xtools/version.sh44
2 files changed, 11 insertions, 37 deletions
diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml
index 57f7ea6b7..41d2e95ab 100644
--- a/org.eclipse.egit.source-feature/feature.xml
+++ b/org.eclipse.egit.source-feature/feature.xml
@@ -25,6 +25,10 @@
<discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/>
</url>
+ <requires>
+ <import feature="org.eclipse.egit" version="5.4.0" match="equivalent"/>
+ </requires>
+
<plugin
id="org.eclipse.egit.core.source"
download-size="0"
diff --git a/tools/version.sh b/tools/version.sh
index 6b52d0083..8b65b0c6a 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -112,42 +112,9 @@ perl -pi~ -e '
s/(org.eclipse.jgit;bundle-version="\[)[^"]*(\)")/${1}'"$JGIT_V,$JGIT_N"'${2}/;
' $(git ls-files | grep META-INF/MANIFEST.MF)
-perl -pi~ -e '
- if ($ARGV ne $old_argv) {
- $seen_version = 0;
- $old_argv = $ARGV;
- }
- if (!$seen_version) {
- $seen_version = 1 if (!/<\?xml/ &&
- s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/);
- }
- s/(feature="org.eclipse.jgit.ssh.apache" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/;
- ' org.eclipse.egit-feature/feature.xml
-
-perl -pi~ -e '
- if ($ARGV ne $old_argv) {
- $seen_version = 0;
- $old_argv = $ARGV;
- }
- if (!$seen_version) {
- $seen_version = 1 if (!/<\?xml/ &&
- s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/);
- }
- s/(feature="org.eclipse.egit" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/;
- ' org.eclipse.egit.mylyn-feature/feature.xml
-
-perl -pi~ -e '
- if ($ARGV ne $old_argv) {
- $seen_version = 0;
- $old_argv = $ARGV;
- }
- if (!$seen_version) {
- $seen_version = 1 if (!/<\?xml/ &&
- s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/);
- }
- s/(plugin="org.eclipse.egit.core" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/;
- s/(plugin="org.eclipse.egit.ui" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/;
- ' org.eclipse.egit.gitflow-feature/feature.xml
+# Replace version numbers in feature.xml files. The first version is replaced by the full OSGi version.
+# Versions in dependencies in the <requires> section for EGit/JGit features or plugins are set to the
+# simple version numbers.
perl -pi~ -e '
if ($ARGV ne $old_argv) {
@@ -158,7 +125,10 @@ perl -pi~ -e '
$seen_version = 1 if (!/<\?xml/ &&
s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/);
}
- s/(feature="org.eclipse.jgit" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/;
+ s/(feature="org.eclipse.jgit[^"]*" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/;
+ s/(plugin="org.eclipse.jgit[^"]*" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/;
+ s/(feature="org.eclipse.egit[^"]*" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/;
+ s/(plugin="org.eclipse.egit[^"]*" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/;
' $(git ls-files | grep feature.xml)
perl -pi~ -e '

Back to the top