You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/01/27 14:41:03 UTC
[15/17] git commit: Make maven use mkisofs or genisoimage depending
on what is available
Make maven use mkisofs or genisoimage depending on what is available
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7d40a7e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7d40a7e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7d40a7e5
Branch: refs/heads/javelin
Commit: 7d40a7e500f5451e2c450e30fa520bc278ded088
Parents: 6c527ff
Author: Noa Resare <no...@spotify.com>
Authored: Sun Jan 27 04:48:47 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Sun Jan 27 04:48:47 2013 -0800
----------------------------------------------------------------------
console-proxy/pom.xml | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7d40a7e5/console-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml
index 2526503..0e12db0 100644
--- a/console-proxy/pom.xml
+++ b/console-proxy/pom.xml
@@ -25,6 +25,9 @@
<artifactId>cloudstack</artifactId>
<version>4.1.0-SNAPSHOT</version>
</parent>
+ <properties>
+ <mkisofs>mkisofs</mkisofs>
+ </properties>
<dependencies>
<dependency>
<groupId>log4j</groupId>
@@ -167,6 +170,19 @@
</plugins>
</build>
<profiles>
+ <!-- Debian will never distribute mkisofs due to licensing issues.
+ Fortunately genisoimage is a work-alike -->
+ <profile>
+ <id>genisoimage</id>
+ <activation>
+ <file>
+ <exists>/usr/bin/genisoimage</exists>
+ </file>
+ </activation>
+ <properties>
+ <mkisofs>genisoimage</mkisofs>
+ </properties>
+ </profile>
<profile>
<id>vmware</id>
<activation>
@@ -209,7 +225,7 @@
</execution>
</executions>
<configuration>
- <executable>mkisofs</executable>
+ <executable>${mkisofs}</executable>
<workingDirectory>dist</workingDirectory>
<arguments>
<argument>-quiet</argument>