Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2011-02-11 17:45:28 -0500
committerMatthias Sohn2011-02-11 18:27:28 -0500
commit8219facc760d9783bec175aee11f89b32a9578bd (patch)
tree5e6a200c161b4c60b8bc4f4cacb5eb0ea899d75e
parentc0c1025f18e7be8b508fc2147e317add943ba7eb (diff)
downloadegit-8219facc760d9783bec175aee11f89b32a9578bd.tar.gz
egit-8219facc760d9783bec175aee11f89b32a9578bd.tar.xz
egit-8219facc760d9783bec175aee11f89b32a9578bd.zip
Fix version.sh
Also change sorting in org.eclipse.egit.ui.test/pom.xml to ease finding versions to be changed by version.sh. Change-Id: Ic7518ab2eb65d43c3bdba8f957e82e6700beb95f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.ui.test/pom.xml14
-rwxr-xr-xtools/version.sh39
2 files changed, 45 insertions, 8 deletions
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml
index 16f0daca4..f2bab5e4f 100644
--- a/org.eclipse.egit.ui.test/pom.xml
+++ b/org.eclipse.egit.ui.test/pom.xml
@@ -91,23 +91,23 @@
<dependencies>
<dependency>
<type>p2-installable-unit</type>
- <artifactId>org.eclipse.pde.feature.group</artifactId>
- <version>${platform-version}</version>
+ <artifactId>org.eclipse.egit.feature.group</artifactId>
+ <version>[0.11.0,0.12.0)</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
- <artifactId>org.eclipse.egit.feature.group</artifactId>
+ <artifactId>org.eclipse.jgit.feature.group</artifactId>
<version>[0.11.0,0.12.0)</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
- <artifactId>org.eclipse.cvs.feature.group</artifactId>
- <version>[1.1.2,2.0.0)</version>
+ <artifactId>org.eclipse.pde.feature.group</artifactId>
+ <version>${platform-version}</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
- <artifactId>org.eclipse.jgit.feature.group</artifactId>
- <version>[0.11.0,0.12.0)</version>
+ <artifactId>org.eclipse.cvs.feature.group</artifactId>
+ <version>[1.1.2,2.0.0)</version>
</dependency>
</dependencies>
</configuration>
diff --git a/tools/version.sh b/tools/version.sh
index e97a2b747..e373d7261 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -113,12 +113,26 @@ perl -pi~ -e '
$seen_version = 0;
$old_argv = $ARGV;
}
+ if ($seen_version < 4) {
+ $seen_version++ if (!/<\?xml/ &&
+ s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/);
+ }
+ s/(feature="org.eclipse.egit.core" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/;
+ s/(feature="org.eclipse.egit.ui" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/;
+ s/(feature="org.eclipse.jgit" version=")[^"]*(")/${1}'"$JGIT_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/(feature="org.eclipse.jgit" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/;
- ' org.eclipse.egit-feature/feature.xml
+ ' $(git ls-files | grep feature.xml)
perl -pi~ -e '
s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
@@ -129,6 +143,18 @@ perl -pi~ -e '
$seen_version = 0;
$old_argv = $ARGV;
}
+ if (!$seen_version) {
+ $seen_version = 1 if
+ s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
+ }
+ s{<(egit-version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
+ ' pom.xml
+
+perl -pi~ -e '
+ if ($ARGV ne $old_argv) {
+ $seen_version = 0;
+ $old_argv = $ARGV;
+ }
if ($seen_version < 2) {
$seen_version++ if
s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
@@ -140,6 +166,17 @@ perl -pi~ -e '
$seen_version = 0;
$old_argv = $ARGV;
}
+ if ($seen_version < 3) {
+ $seen_version++ if
+ s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
+ }
+ ' org.eclipse.egit.ui.test/pom.xml
+
+perl -pi~ -e '
+ if ($ARGV ne $old_argv) {
+ $seen_version = 0;
+ $old_argv = $ARGV;
+ }
if (!$seen_version) {
$seen_version = 1 if
s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};

Back to the top