Return-Path: 
 <cloudstack-commits-return-9483-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 33370EA32
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Tue, 29 Jan 2013 21:25:21 +0000 (UTC)
Received: (qmail 93934 invoked by uid 500); 29 Jan 2013 21:25:16 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 93853 invoked by uid 500); 29 Jan 2013 21:25:16 -0000
Mailing-List: contact cloudstack-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-commits@incubator.apache.org>
List-Id: <cloudstack-commits.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-commits@incubator.apache.org
Received: (qmail 93512 invoked by uid 99); 29 Jan 2013 21:25:16 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jan 2013 21:25:15 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id CC1ED827190; Tue, 29 Jan 2013 21:25:15 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bfederle@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [18/51] [abbrv] git commit: Make maven use mkisofs or genisoimage
 depending on what is available
Message-Id: <20130129212515.CC1ED827190@tyr.zones.apache.org>
Date: Tue, 29 Jan 2013 21:25:15 +0000 (UTC)

Make maven use mkisofs or genisoimage depending on what is available

Signed-off-by: Rohit Yadav <bhaisaab@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/ui-plugins
Commit: 7d40a7e500f5451e2c450e30fa520bc278ded088
Parents: 6c527ff
Author: Noa Resare <noa@spotify.com>
Authored: Sun Jan 27 04:48:47 2013 -0800
Committer: Rohit Yadav <bhaisaab@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>