removing F5 from default build
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/69871d04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/69871d04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/69871d04 Branch: refs/heads/deps-ctrl Commit: 69871d04fbc9dbff7748236dddb10767b0a41e5b Parents: 75f009c Author: David Nalley <[email protected]> Authored: Fri Jul 27 20:01:52 2012 -0400 Committer: David Nalley <[email protected]> Committed: Fri Jul 27 20:01:52 2012 -0400 ---------------------------------------------------------------------- build/build-cloud-plugins.xml | 5 +++-- build/build-cloud.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/69871d04/build/build-cloud-plugins.xml ---------------------------------------------------------------------- diff --git a/build/build-cloud-plugins.xml b/build/build-cloud-plugins.xml index c16474d..8791c4a 100755 --- a/build/build-cloud-plugins.xml +++ b/build/build-cloud-plugins.xml @@ -279,14 +279,15 @@ <!-- ===================== Network Elements ===================== --> - <target name="compile-network-elements" depends="compile-netscaler, compile-f5, compile-srx, compile-ovs, compile-elb, compile-nicira-nvp" description="Compile all network elements"/> - <target name="build-network-elements" depends="build-netscaler, build-f5, build-srx, build-ovs, build-elb, build-nicira-nvp" description="build all network elements"/> + <target name="compile-network-elements" depends="compile-netscaler, compile-srx, compile-ovs, compile-elb, compile-nicira-nvp" description="Compile all network elements"/> + <target name="build-network-elements" depends="build-netscaler, build-srx, build-ovs, build-elb, build-nicira-nvp" description="build all network elements"/> <target name="compile-netscaler" depends="-init, compile-server" description="Compile NetScaler plugin"> <ant antfile="${base.dir}/plugins/network-elements/netscaler/build.xml" target="build"/> </target> <target name="build-netscaler" depends="compile-netscaler"/> + <!-- Because F5 library is licensed under the GPL and necessary for compilation it is turned off by default --> <target name="compile-f5" depends="-init, compile-server" description="Compile F5 plugin"> <ant antfile="${base.dir}/plugins/network-elements/f5/build.xml" target="build"/> </target> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/69871d04/build/build-cloud.xml ---------------------------------------------------------------------- diff --git a/build/build-cloud.xml b/build/build-cloud.xml index b8ad09e..0f1bdea 100755 --- a/build/build-cloud.xml +++ b/build/build-cloud.xml @@ -479,7 +479,7 @@ <target name="build-servers" depends="-init, build-server" /> - <target name="build-opensource" depends="-init, build-server, build-agent, build-scripts, build-ui, build-console-proxy, build-ovm, package-oss-systemvm-iso, build-netscaler, build-f5, build-srx, build-dp-user-dispersing, build-dp-user-concentrated-pod, build-host-allocator-random, build-user-authenticator-ldap"> + <target name="build-opensource" depends="-init, build-server, build-agent, build-scripts, build-ui, build-console-proxy, build-ovm, package-oss-systemvm-iso, build-netscaler, build-srx, build-dp-user-dispersing, build-dp-user-concentrated-pod, build-host-allocator-random, build-user-authenticator-ldap"> <copy overwrite="true" todir="${dist.dir}"> <fileset dir="${base.dir}/build/deploy/"> <include name="deploy-agent.sh" />
