incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From frankzh...@apache.org
Subject git commit: Change OVM script deploy target in line with Alex re-packaging change fix RPM build, don't install cloud-console-proxy.jar as there is not such package anymore
Date Wed, 20 Jun 2012 17:45:13 GMT
Updated Branches:
  refs/heads/master bc94948e0 -> a2d49bef6


Change OVM script deploy target in line with Alex re-packaging change
fix RPM build, don't install cloud-console-proxy.jar as there is not such package anymore


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a2d49bef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a2d49bef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a2d49bef

Branch: refs/heads/master
Commit: a2d49bef69dd14496be2eba8585659cf7b0cf446
Parents: bc94948
Author: frank <frank.zhang@citrix.com>
Authored: Wed Jun 20 10:45:56 2012 -0700
Committer: frank <frank.zhang@citrix.com>
Committed: Wed Jun 20 10:45:56 2012 -0700

----------------------------------------------------------------------
 build/developer.xml               |    8 +-------
 plugins/hypervisors/ovm/build.xml |   14 +++++++++++---
 wscript_build                     |    4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a2d49bef/build/developer.xml
----------------------------------------------------------------------
diff --git a/build/developer.xml b/build/developer.xml
index 127581e..4d466b7 100755
--- a/build/developer.xml
+++ b/build/developer.xml
@@ -36,8 +36,6 @@
   <property name="unittest.target.dir" location="${unittest.dir}/classes"/>
   <property name="unittest.jar.dir" location="${unittest.dir}/jar"/>
   <property name="ovm.dir" location="${base.dir}/ovm" />
-  <property name="ovm-scripts.dir" location="${ovm.dir}/scripts" />
-
   
   <!-- directories for api doc -->
   <property name="api.docs.dir" location="${dist.dir}/apidocs" />
@@ -163,11 +161,7 @@
   </target>
     
   <target name="deploy-ovm" >
-      <copy todir="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/scripts">
-          <fileset dir="${ovm-scripts.dir}">
-              <include name="**/*"/>
-          </fileset>
-      </copy>
+  	<ant antfile="${base.dir}/plugins/hypervisors/ovm/build.xml" target="deploy-ovm"/>
   </target>
 
   <target name="deploy-server" depends="deploy-common, deploy-ovm, deploy-awsapi" >

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a2d49bef/plugins/hypervisors/ovm/build.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/build.xml b/plugins/hypervisors/ovm/build.xml
index e63b049..8113d72 100755
--- a/plugins/hypervisors/ovm/build.xml
+++ b/plugins/hypervisors/ovm/build.xml
@@ -76,7 +76,7 @@
   <property name="deps.dir" location="${top.dir}/deps" />
   
   <property name="ovm.jar" value="cloud-ovm.jar" />
-  <property name="ovm-scripts.dir" location="${ovm.base.dir}/scripts" />
+  <property name="ovm-scripts.dir" location="${base.dir}/plugins/hypervisors/ovm/scripts"
/>
 	
   <import file="${build.dir}/build-common.xml"/>
 
@@ -102,8 +102,16 @@
   </path>
 	
   <!-- This section needs to be replaced by some kind of dependency library-->
-	
-	
+
+  <target name="deploy-ovm" >
+      <echo level="info" message="Copying OVM scripts from ${ovm-scripts.dir} to ${server.deploy.to.dir}/webapps/client/WEB-INF/lib/scripts"
/>
+      <copy todir="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/scripts">
+          <fileset dir="${ovm-scripts.dir}">
+              <include name="**/*"/>
+          </fileset>
+      </copy>
+  </target>
+
   <target name="init" description="Initialize binaries directory">
   	<mkdir dir="${classes.dir}/${ovm.jar}"/>
   	<mkdir dir="${jar.dir}"/>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a2d49bef/wscript_build
----------------------------------------------------------------------
diff --git a/wscript_build b/wscript_build
index 610a7d3..4c4f1e4 100644
--- a/wscript_build
+++ b/wscript_build
@@ -77,7 +77,7 @@ def build_jars ():
 			"cloud-servlet-api.jar", "cloud-commons-logging-1.1.1.jar",
 			"cloud-ws-commons-util-1.0.2.jar",
 			"cloud-commons-collections-3.2.1.jar", "vmware*.jar", "cloud-secstorage-extras.jar",
-			"cloud-agent-simulator.jar", "cloud-awsapi.jar", "cloud-test.jar", "cloud-wsdl4j.jar"]
+			"cloud-agent-simulator.jar", "cloud-awsapi.jar", "cloud-test.jar", "cloud-wsdl4j.jar",
"cloud-console-proxy.jar"]
 
 	for a in jars_str:
 		if _basename (a).startswith ("cloud-") \
@@ -356,7 +356,7 @@ def build_xml_api_description ():
 	bld.install_as("${PYTHONDIR}/cloudapis.py", 'cloud-cli/cloudapis/cloud.py')
 
 def build_ovm():
-	start_path = bld.path.find_dir("ovm/scripts")
+	start_path = bld.path.find_dir("plugins/hypervisors/ovm/scripts")
 	bld.substitute('**',"${AGENTLIBDIR}/scripts",chmod=0755, cwd=start_path)
 
 def build_test():


Mime
View raw message