summaryrefslogtreecommitdiff
path: root/BKUApplet
diff options
context:
space:
mode:
Diffstat (limited to 'BKUApplet')
-rw-r--r--BKUApplet/pom.xml18
1 files changed, 14 insertions, 4 deletions
diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 46243b9d..b8acfdac 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -192,8 +192,8 @@
<profile>
<!--
This profile is here for triggering when another scm than svn is
- used (for example git). Instead of getting the version build number
- from svn we will use the build date and the user name.
+ used (for example git). Try to get the associated svn revision
+ from git-svn.
-->
<id>buildnumber-git</id>
<activation>
@@ -215,9 +215,19 @@
</goals>
<configuration>
<source>
- def gitSvnProc = ["sh", "-c", "git svn info | awk '/Revision:/ { print \$2 }'"].execute()
+ def shell = "sh"
+ def param = "-c"
+ if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) {
+ shell = "cmd"
+ param = "/c"
+ }
+ def gitSvnProc = [shell, param, "git svn info | grep Revision:"].execute()
gitSvnProc.waitFor()
- project.properties['gitSvnRev'] = gitSvnProc.in.text.trim()
+ def svnref = "unknown"
+ def out = gitSvnProc.in.text.split(" ")
+ if (out.size() == 2)
+ svnref = out[1].trim()
+ project.properties['gitSvnRev'] = svnref
</source>
</configuration>
</execution>