diff options
| author | tkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2013-11-26 10:35:18 +0000 |
|---|---|---|
| committer | tkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2013-11-26 10:35:18 +0000 |
| commit | 8eb379a8f0e0b35175cd574c26afdae951604dd2 (patch) | |
| tree | 7a8e1553730df3bca14f3d1d414a79b636c060d9 /BKUWebStart | |
| parent | 67a4dae7e7a234cd1361eca74cae72f8b6fdf631 (diff) | |
| download | mocca-8eb379a8f0e0b35175cd574c26afdae951604dd2.tar.gz mocca-8eb379a8f0e0b35175cd574c26afdae951604dd2.tar.bz2 mocca-8eb379a8f0e0b35175cd574c26afdae951604dd2.zip | |
Update git-svn revision parsing for windows
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1224 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'BKUWebStart')
| -rw-r--r-- | BKUWebStart/pom.xml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml index c7882a76..e70114a3 100644 --- a/BKUWebStart/pom.xml +++ b/BKUWebStart/pom.xml @@ -199,7 +199,7 @@ </manifest> <manifestEntries> <mode>development</mode> - <url>${pom.url}</url> + <url>${project.url}</url> <SplashScreen-Image>at/gv/egiz/bku/webstart/splash.png</SplashScreen-Image> </manifestEntries> </archive> @@ -213,8 +213,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> @@ -236,9 +236,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> |