diff options
| -rw-r--r-- | BKUApplet/pom.xml | 18 | ||||
| -rw-r--r-- | BKUAppletExt/pom.xml | 18 | ||||
| -rw-r--r-- | BKULocal/pom.xml | 18 | ||||
| -rw-r--r-- | BKUOnline/pom.xml | 18 | ||||
| -rw-r--r-- | BKUWebStart/pom.xml | 20 |
5 files changed, 71 insertions, 21 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> diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml index d210b254..1376fb85 100644 --- a/BKUAppletExt/pom.xml +++ b/BKUAppletExt/pom.xml @@ -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> diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml index b631691a..ab9d22c5 100644 --- a/BKULocal/pom.xml +++ b/BKULocal/pom.xml @@ -201,8 +201,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> @@ -224,9 +224,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> diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml index b8cd1a3d..1d89703c 100644 --- a/BKUOnline/pom.xml +++ b/BKUOnline/pom.xml @@ -320,8 +320,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> @@ -343,9 +343,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> 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> |