stopgap to fix the RPM issues created by the plugins Patch by Hugo Trippaers https://reviews.apache.org/r/5697/
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/de04b8cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/de04b8cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/de04b8cb Branch: refs/heads/regions Commit: de04b8cb793d92ce252a8771eb6edabd06a9b53e Parents: 8aa2b55 Author: David Nalley <[email protected]> Authored: Mon Jul 2 13:31:38 2012 -0400 Committer: David Nalley <[email protected]> Committed: Mon Jul 2 13:31:38 2012 -0400 ---------------------------------------------------------------------- cloud.spec | 13 +++++++++++++ wscript_build | 1 + wscript_configure | 2 +- 3 files changed, 15 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/de04b8cb/cloud.spec ---------------------------------------------------------------------- diff --git a/cloud.spec b/cloud.spec index 83af1e6..f4ca068 100644 --- a/cloud.spec +++ b/cloud.spec @@ -414,6 +414,19 @@ fi %{_javadir}/%{name}-server.jar %{_javadir}/%{name}-vmware-base.jar %{_javadir}/%{name}-ovm.jar +%{_javadir}/%{name}-dp-user-concentrated-pod.jar +%{_javadir}/%{name}-dp-user-dispersing.jar +%{_javadir}/%{name}-host-allocator-random.jar +%{_javadir}/%{name}-plugin-f5.jar +%{_javadir}/%{name}-plugin-netscaler.jar +%{_javadir}/%{name}-plugin-ovs.jar +%{_javadir}/%{name}-plugin-srx.jar +%{_javadir}/%{name}-storage-allocator-random.jar +%{_javadir}/%{name}-user-authenticator-ldap.jar +%{_javadir}/%{name}-user-authenticator-md5.jar +%{_javadir}/%{name}-user-authenticator-plaintext.jar +%{_javadir}/%{name}-vmware.jar +%{_javadir}/%{name}-xen.jar %config(noreplace) %{_sysconfdir}/%{name}/server/* %files agent-scripts http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/de04b8cb/wscript_build ---------------------------------------------------------------------- diff --git a/wscript_build b/wscript_build index 4c4f1e4..e8e9c36 100644 --- a/wscript_build +++ b/wscript_build @@ -351,6 +351,7 @@ def build_xml_api_description (): install_path="${CLIDIR}" ) + bld.install_as("${PYTHONDIR}/cloud_utils.py", 'python/lib/cloud_utils.py') bld.install_files("${PYTHONDIR}/cloudtool", 'cloud-cli/cloudtool/*') bld.install_files("${PYTHONDIR}/cloudutils", 'python/lib/cloudutils/*') bld.install_as("${PYTHONDIR}/cloudapis.py", 'cloud-cli/cloudapis/cloud.py') http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/de04b8cb/wscript_configure ---------------------------------------------------------------------- diff --git a/wscript_configure b/wscript_configure index 832fe67..0ccf40a 100644 --- a/wscript_configure +++ b/wscript_configure @@ -288,7 +288,7 @@ depsclasspath = [ in_javadir(_basename(x)) for x in _glob(_join(conf.srcdir,"dep conf.env.DEPSCLASSPATH = pathsep.join(depsclasspath) # the MS classpath points to JARs required to run the management server -msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras core-extras vmware-base ovm".split() ] +msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras core-extras vmware-base ovm dp-user-concentrated-pod dp-user-dispersing host-allocator-random plugin-f5 plugin-netscaler plugin-ovs plugin-srx storage-allocator-random user-authenticator-ldap user-authenticator-md5 user-authenticator-plaintext vmware xen".split() ] conf.env.MSCLASSPATH = pathsep.join(msclasspath) # the agent and simulator classpaths point to JARs required to run these two applications
