Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2016-04-08 22:43:01 +0000
committerMatthias Sohn2016-04-08 22:59:55 +0000
commitd7cad7caa9d977d8413e3519b759cc9d87e34b64 (patch)
treeba895ca5d68a4d1e9b5d83050fc65116a3e9ede6 /tools/version.sh
parent590a63fafedb3dbb6d90a98e17a626f716f5c21f (diff)
downloadegit-d7cad7caa9d977d8413e3519b759cc9d87e34b64.tar.gz
egit-d7cad7caa9d977d8413e3519b759cc9d87e34b64.tar.xz
egit-d7cad7caa9d977d8413e3519b759cc9d87e34b64.zip
Fix version.sh
- don't change version of license-feature in org.eclipse.egit.mylyn-feature/feature.xml - update version of imported plugins org.eclipse.egit.core and org.eclipse.egit.ui in org.eclipse.egit.gitflow-feature/feature.xml - update version of required bundle org.eclipse.jgit in org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF Change-Id: Ie890bf8fcf3c90350c3b9336b9a897981c6e8d64 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'tools/version.sh')
-rwxr-xr-xtools/version.sh18
1 files changed, 16 insertions, 2 deletions
diff --git a/tools/version.sh b/tools/version.sh
index 0612e0442b..11406c2182 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -106,6 +106,7 @@ perl -pi~ -e '
s/(org.eclipse.egit.*;version=")[^"[(]*(")/${1}'"$EGIT_V"'${2}/;
s/(org.eclipse.egit.*;version="\[)[^"]*(\)")/${1}'"$EGIT_V,$EGIT_N"'${2}/;
s/(org.eclipse.jgit.*;version="\[)[^"]*(\)")/${1}'"$JGIT_V,$JGIT_N"'${2}/;
+ s/(org.eclipse.jgit;bundle-version="\[)[^"]*(\)")/${1}'"$JGIT_V,$JGIT_N"'${2}/;
' $(git ls-files | grep META-INF/MANIFEST.MF)
perl -pi~ -e '
@@ -113,8 +114,8 @@ perl -pi~ -e '
$seen_version = 0;
$old_argv = $ARGV;
}
- if ($seen_version < 2) {
- $seen_version++ if (!/<\?xml/ &&
+ if (!$seen_version) {
+ $seen_version = 1 if (!/<\?xml/ &&
s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/);
}
s/(feature="org.eclipse.egit" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/;
@@ -129,6 +130,19 @@ perl -pi~ -e '
$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
+
+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" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/;
' $(git ls-files | grep feature.xml)

Back to the top