apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make inclusion of cloud-vmware.jar in systemvm.iso conditional

Browse Source
This commit is contained in:
Hugo Trippaers 2012-08-24 16:03:22 +02:00
parent e3f2cf908a
commit b1d52c4404
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/build-cloud.properties
View File

@ -23,3 +23,4 @@ build.type=developer
target.compat.version=1.6 target.compat.version=1.6
source.compat.version=1.6 source.compat.version=1.6
branding.name=default branding.name=default
ssvm.include.vmware.jar=true

13
build/package.xml
View File

@ -123,7 +123,7 @@
</zip> </zip>
</target> </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}"> <exec executable="${mkisofs}" dir="${dist.dir}">
<arg value="-quiet"/> <arg value="-quiet"/>
<arg value="-r"/> <arg value="-r"/>
@ -225,8 +225,6 @@
<include name="${utils.jar}" /> <include name="${utils.jar}" />
<include name="${core.jar}" /> <include name="${core.jar}" />
<include name="${api.jar}" /> <include name="${api.jar}" />
<include name="${vmware-base.jar}" />
<include name="${vmware.jar}" />
</zipfileset> </zipfileset>
<zipfileset dir="${console-proxy.dist.dir}" filemode="555"/> <zipfileset dir="${console-proxy.dist.dir}" filemode="555"/>
<zipfileset dir="${scripts.dir}/storage/secondary" prefix="scripts/storage/secondary" filemode="555"> <zipfileset dir="${scripts.dir}/storage/secondary" prefix="scripts/storage/secondary" filemode="555">
@ -236,6 +234,15 @@
</zip> </zip>
</target> </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"> <target name="package-docs" depends="-init-package">
<delete file="${dist.dir}/docs.zip" /> <delete file="${dist.dir}/docs.zip" />
<zip destfile="${dist.dir}/docs.zip" compress="false"> <zip destfile="${dist.dir}/docs.zip" compress="false">