You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2012/08/24 16:03:37 UTC
[1/2] git commit: Make inclusion of cloud-vmware.jar in systemvm.iso
conditional
Updated Branches:
refs/heads/master d05106053 -> b1d52c440
Make inclusion of cloud-vmware.jar in systemvm.iso conditional
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b1d52c44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b1d52c44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b1d52c44
Branch: refs/heads/master
Commit: b1d52c4404a69ead94bbb01ff38f6707d72b0841
Parents: e3f2cf9
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Aug 24 16:03:22 2012 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Aug 24 16:03:22 2012 +0200
----------------------------------------------------------------------
build/build-cloud.properties | 1 +
build/package.xml | 13 ++++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1d52c44/build/build-cloud.properties
----------------------------------------------------------------------
diff --git a/build/build-cloud.properties b/build/build-cloud.properties
index 552de7f..be67a36 100755
--- a/build/build-cloud.properties
+++ b/build/build-cloud.properties
@@ -23,3 +23,4 @@ build.type=developer
target.compat.version=1.6
source.compat.version=1.6
branding.name=default
+ssvm.include.vmware.jar=true
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1d52c44/build/package.xml
----------------------------------------------------------------------
diff --git a/build/package.xml b/build/package.xml
index 83b5837..f3435f8 100755
--- a/build/package.xml
+++ b/build/package.xml
@@ -123,7 +123,7 @@
</zip>
</target>
- <target name="package-oss-systemvm-iso" depends="-init-package, package-oss-systemvm, build-systemvm-patch">
+ <target name="package-oss-systemvm-iso" depends="-init-package, package-oss-systemvm, update-oss-systemvm-with-vmware, build-systemvm-patch">
<exec executable="${mkisofs}" dir="${dist.dir}">
<arg value="-quiet"/>
<arg value="-r"/>
@@ -225,8 +225,6 @@
<include name="${utils.jar}" />
<include name="${core.jar}" />
<include name="${api.jar}" />
- <include name="${vmware-base.jar}" />
- <include name="${vmware.jar}" />
</zipfileset>
<zipfileset dir="${console-proxy.dist.dir}" filemode="555"/>
<zipfileset dir="${scripts.dir}/storage/secondary" prefix="scripts/storage/secondary" filemode="555">
@@ -236,6 +234,15 @@
</zip>
</target>
+ <target name="update-oss-systemvm-with-vmware" depends="-init-package" if="ssvm.include.vmware.jar">
+ <zip destfile="${dist.dir}/systemvm.zip" duplicate="preserve" update="true">
+ <zipfileset dir="${jar.dir}" >
+ <include name="${vmware.jar}" />
+ <include name="${vmware-base.jar}" />
+ </zipfileset>
+ </zip>
+ </target>
+
<target name="package-docs" depends="-init-package">
<delete file="${dist.dir}/docs.zip" />
<zip destfile="${dist.dir}/docs.zip" compress="false">