diff options
Diffstat (limited to 'tools/version.sh')
| -rwxr-xr-x | tools/version.sh | 18 |
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) |