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

Change OVM script deploy target in line with Alex re-packaging change

Browse Source 
fix RPM build, don't install cloud-console-proxy.jar as there is not such package anymore
This commit is contained in:
frank 2012-06-20 10:45:56 -07:00
parent bc94948e06
commit a2d49bef69
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/developer.xml
View File

@ -36,8 +36,6 @@
<property name="unittest.target.dir" location="${unittest.dir}/classes"/> <property name="unittest.target.dir" location="${unittest.dir}/classes"/>
<property name="unittest.jar.dir" location="${unittest.dir}/jar"/> <property name="unittest.jar.dir" location="${unittest.dir}/jar"/>
<property name="ovm.dir" location="${base.dir}/ovm" /> <property name="ovm.dir" location="${base.dir}/ovm" />
<property name="ovm-scripts.dir" location="${ovm.dir}/scripts" />
<!-- directories for api doc --> <!-- directories for api doc -->
<property name="api.docs.dir" location="${dist.dir}/apidocs" /> <property name="api.docs.dir" location="${dist.dir}/apidocs" />
@ -163,11 +161,7 @@
</target> </target>
<target name="deploy-ovm" > <target name="deploy-ovm" >
<copy todir="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/scripts"> <ant antfile="${base.dir}/plugins/hypervisors/ovm/build.xml" target="deploy-ovm"/>
<fileset dir="${ovm-scripts.dir}">
<include name="**/*"/>
</fileset>
</copy>
</target> </target>
<target name="deploy-server" depends="deploy-common, deploy-ovm, deploy-awsapi" > <target name="deploy-server" depends="deploy-common, deploy-ovm, deploy-awsapi" >

10
plugins/hypervisors/ovm/build.xml
View File

@ -76,7 +76,7 @@
<property name="deps.dir" location="${top.dir}/deps" /> <property name="deps.dir" location="${top.dir}/deps" />
<property name="ovm.jar" value="cloud-ovm.jar" /> <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"/> <import file="${build.dir}/build-common.xml"/>
@ -103,6 +103,14 @@
<!-- This section needs to be replaced by some kind of dependency library--> <!-- 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"> <target name="init" description="Initialize binaries directory">
<mkdir dir="${classes.dir}/${ovm.jar}"/> <mkdir dir="${classes.dir}/${ovm.jar}"/>

4
wscript_build
View File

@ -77,7 +77,7 @@ def build_jars ():
"cloud-servlet-api.jar", "cloud-commons-logging-1.1.1.jar", "cloud-servlet-api.jar", "cloud-commons-logging-1.1.1.jar",
"cloud-ws-commons-util-1.0.2.jar", "cloud-ws-commons-util-1.0.2.jar",
"cloud-commons-collections-3.2.1.jar", "vmware*.jar", "cloud-secstorage-extras.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: for a in jars_str:
if _basename (a).startswith ("cloud-") \ 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') bld.install_as("${PYTHONDIR}/cloudapis.py", 'cloud-cli/cloudapis/cloud.py')
def build_ovm(): 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) bld.substitute('**',"${AGENTLIBDIR}/scripts",chmod=0755, cwd=start_path)
def build_test(): def build_test():