You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/06 23:25:51 UTC
[2/15] git commit: add kvm into rpm
add kvm into rpm
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f26929bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f26929bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f26929bf
Branch: refs/heads/4.0
Commit: f26929bf2d4827096b9d3254071a4e8b43577f83
Parents: f57f96f
Author: Edison Su <su...@gmail.com>
Authored: Thu Sep 6 11:41:01 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Sep 6 11:41:01 2012 -0700
----------------------------------------------------------------------
build/build-cloud-plugins.xml | 4 ++--
cloud.spec | 2 ++
wscript_build | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f26929bf/build/build-cloud-plugins.xml
----------------------------------------------------------------------
diff --git a/build/build-cloud-plugins.xml b/build/build-cloud-plugins.xml
index 5a705b9..5b99565 100755
--- a/build/build-cloud-plugins.xml
+++ b/build/build-cloud-plugins.xml
@@ -194,8 +194,8 @@
<!-- ===================== Hypervisors ========================= -->
- <target name="compile-hypervisors" depends="compile-ovm, compile-xen" description="Compile all hypervisors"/>
- <target name="build-hypervisors" depends="build-ovm, build-xen " description="Builds all hypervisors"/>
+ <target name="compile-hypervisors" depends="compile-kvm, compile-ovm, compile-xen" description="Compile all hypervisors"/>
+ <target name="build-hypervisors" depends="build-kvm, build-ovm, build-xen " description="Builds all hypervisors"/>
<target name="compile-kvm" depends="-init, compile-core, compile-agent" description="Compile KVM">
<ant antfile="${base.dir}/plugins/hypervisors/kvm/build.xml" target="build"/>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f26929bf/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index b22bd8c..5691c1e 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -538,6 +538,8 @@ fi
%files agent-libs
%defattr(0644,root,root,0755)
%{_javadir}/%{name}-agent.jar
+%{_javadir}/%{name}-plugin-hypervisor-kvm.jar
+%{_javadir}/libvirt-0.4.8.jar
%files agent
%defattr(0644,root,root,0755)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f26929bf/wscript_build
----------------------------------------------------------------------
diff --git a/wscript_build b/wscript_build
index 92f1fe9..e4d703a 100644
--- a/wscript_build
+++ b/wscript_build
@@ -162,7 +162,7 @@ def build_dependences ():
start_path = bld.path.find_dir ("deps")
- bld.install_files('${JAVADIR}',start_path.ant_glob(["commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar",
+ bld.install_files('${JAVADIR}',start_path.ant_glob(["libvirt-0.4.8.jar", "commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar",
"netscaler-1.0.jar", "netscaler-sdx-1.0.jar", "backport-util-concurrent-3.1.jar", "ehcache-1.5.0.jar", "httpcore-4.0.jar", "log4j-1.2.16.jar", "trilead-ssh2-build213-svnkit-1.3-patch.jar", "cglib-2.2.jar", "xmlrpc-common-3.*.jar",
"xmlrpc-client-3.*.jar", "axis-1.4.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.46.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar", "mail-1.4.jar", "activation-1.1.jar", "mysql-connector-java-5.1.21.jar", "hibernate-jpa-2.0-api-1.0.0.Final.jar", "hibernate-entitymanager-3.5.1-Final.jar", "hibernate-core-3.5.1-Final.jar", "hibernate-commons-annotations-3.2.0.Final.jar", "hibernate-annotations-3.5.1-Final.jar", "asm-3.1.jar", "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path)