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

bug 5890: Changed all of the build stuff to work better with git

Browse Source
This commit is contained in:
Alex Huang 2010-08-11 11:16:29 -07:00
parent e6c41146f7
commit 621a37b6c8
3 changed files with 20 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
build.xml
View File

@ -11,76 +11,32 @@
<dirname property="base.dir" file="${ant.file.Cloud.com Cloud Stack Build Dispatch}"/>
<condition property="build.dir" value="${base.dir}/build" else="${base.dir}/build"> <!-- silly no-op -->
<condition property="build-cloud.properties.file" value="${base.dir}/build/override/build-cloud.properties" else="${base.dir}/build/build-cloud.properties">
<available file="${base.dir}/build/override/build-cloud.properties" />
</condition>
<property file="${build-cloud.properties.file}"/>
<property name="premium.name" value="cloudstack-proprietary"/>
<property name="premium.dir" location="${base.dir}/${premium.name}"/>
<condition property="build.dir" value="${base.dir}/build" else="${premium.dir}/build"> <!-- silly no-op -->
<and>
<available file="cloudstack-proprietary/build/build-cloud-premium.xml"/>
<available file="${premium.dir}/build"/>
<not>
<isset property="OSS"/>
</not>
</and>
</condition>
<condition property="build-cloud.properties.file" value="${build.dir}/override/build-cloud.properties" else="${build.dir}/build-cloud.properties">
<available file="${build.dir}/override/build-cloud.properties" />
</condition>
<property file="${build-cloud.properties.file}"/>
<property name="dist.dir" location="${base.dir}/dist"/>
<property name="target.dir" location="${base.dir}/target"/>
<condition property="build.file" value="cloudstack-proprietary/build/build-cloud-premium.xml" else="${build.dir}/build-cloud.xml">
<and>
<available file="cloudstack-proprietary/build/build-cloud-premium.xml"/>
<not>
<isset property="OSS"/>
</not>
</and>
</condition>
<condition property="package.file" value="cloudstack-proprietary/build/package-premium.xml" else="${build.dir}/package.xml">
<and>
<available file="cloudstack-proprietary/build/package-premium.xml"/>
<not>
<isset property="OSS"/>
</not>
</and>
</condition>
<condition property="developer.file" value="cloudstack-proprietary/build/developer-premium.xml" else="${build.dir}/developer.xml">
<and>
<available file="cloudstack-proprietary/build/developer-premium.xml"/>
<not>
<isset property="OSS"/>
</not>
</and>
</condition>
<condition property="docs.file" value="cloudstack-proprietary/build/build-docs-premium.xml" else="${build.dir}/build-docs.xml">
<and>
<available file="cloudstack-proprietary/build/build-docs-premium.xml"/>
<not>
<isset property="OSS"/>
</not>
</and>
</condition>
<condition property="test.file" value="cloudstack-proprietary/build/build-tests-premium.xml" else="${build.dir}/build-tests.xml">
<and>
<available file="cloudstack-proprietary/build/build-tests-premium.xml"/>
<not>
<isset property="OSS"/>
</not>
</and>
</condition>
<import file="${base.dir}/cloudstack-proprietary/plugins/zynga/build.xml" optional='true'/>
<import file="${build.file}" optional="false"/>
<import file="${docs.file}" optional="true"/>
<import file="${test.file}" optional="true"/>
<import file="${package.file}" optional="true"/>
<import file="${developer.file}" optional="true"/>
<import file="${build.dir}/build-cloud.xml" optional="false"/>
<import file="${build.dir}/build-docs.xml" optional="true"/>
<import file="${build.dir}/build-test.xml" optional="true"/>
<import file="${build.dir}/package.xml" optional="true"/>
<import file="${build.dir}/developer.xml" optional="true"/>
</project>
</project>

2
build/build-cloud.xml Normal file → Executable file
View File

@ -61,7 +61,7 @@
<property name="dep.cache.dir" location="${target.dir}/dep-cache" />
<property name="build.log" location="${target.dir}/ant_verbose.txt" />
<property name="proprietary.dir" location="${base.dir}/cloudstack-proprietary" />
<property name="proprietary.dir" location="${base.dir}/${premium.name}" />
<property name="thirdparty.dir" location="${proprietary.dir}/thirdparty" />
<property name="deps.dir" location="${base.dir}/deps" />

4
build/build.number
View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Sat Aug 07 12:54:57 PDT 2010
build.number=927
#Wed Aug 11 10:59:05 PDT 2010
build.number=930