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

more crap to fix git

Browse Source
This commit is contained in:
Alex Huang 2010-08-11 16:23:46 -07:00
parent c49cdb21d8
commit eb28cbca63
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build.xml
View File

@ -18,11 +18,11 @@
<property file="${build-cloud.properties.file}"/> <property file="${build-cloud.properties.file}"/>
<property name="premium.name" value="cloudstack-proprietary"/> <property name="premium.name" value="cloudstack-proprietary"/>
<property name="premium.dir" location="${base.dir}/${premium.name}"/> <property name="premium.base.dir" location="${base.dir}/${premium.name}"/>
<condition property="build.dir" value="${base.dir}/build" else="${premium.dir}/build"> <!-- silly no-op --> <condition property="my.build.dir" value="${premium.base.dir}/build" else="${base.dir}/build">
<and> <and>
<available file="${premium.dir}/build"/> <available file="${premium.base.dir}/build"/>
<not> <not>
<isset property="OSS"/> <isset property="OSS"/>
</not> </not>
@ -33,10 +33,9 @@
<property name="dist.dir" location="${base.dir}/dist"/> <property name="dist.dir" location="${base.dir}/dist"/>
<property name="target.dir" location="${base.dir}/target"/> <property name="target.dir" location="${base.dir}/target"/>
<import file="${build.dir}/build-cloud.xml" optional="false"/> <import file="${my.build.dir}/build-cloud.xml" optional="false"/>
<import file="${build.dir}/build-docs.xml" optional="true"/> <import file="${my.build.dir}/build-docs.xml" optional="true"/>
<import file="${build.dir}/build-test.xml" optional="true"/> <import file="${my.build.dir}/build-test.xml" optional="true"/>
<import file="${build.dir}/package.xml" optional="true"/> <import file="${my.build.dir}/package.xml" optional="true"/>
<import file="${build.dir}/developer.xml" optional="true"/> <import file="${my.build.dir}/developer.xml" optional="true"/>
</project>
</project>

1
build/build-common.xml
View File

@ -44,6 +44,7 @@
<depend srcdir="@{top.dir}/src" destdir="${classes.dir}/@{jar.name}" cache="${dep.cache.dir}" /> <depend srcdir="@{top.dir}/src" destdir="${classes.dir}/@{jar.name}" cache="${dep.cache.dir}" />
<echo message="Compiling @{top.dir}/src"/>
<javac srcdir="@{top.dir}/src" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" destdir="${classes.dir}/@{jar.name}" source="${source.compat.version}" target="${target.compat.version}" includeantruntime="false" compiler="javac1.6"> <javac srcdir="@{top.dir}/src" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" destdir="${classes.dir}/@{jar.name}" source="${source.compat.version}" target="${target.compat.version}" includeantruntime="false" compiler="javac1.6">
<!-- compilerarg line="-processor com.cloud.annotation.LocalProcessor -processorpath ${base.dir}/tools/src -Xlint:all"/ --> <!-- compilerarg line="-processor com.cloud.annotation.LocalProcessor -processorpath ${base.dir}/tools/src -Xlint:all"/ -->
<!-- compilerarg line="-processor com.cloud.utils.LocalProcessor -processorpath ${base.dir}/utils/src -Xlint:all"/ --> <!-- compilerarg line="-processor com.cloud.utils.LocalProcessor -processorpath ${base.dir}/utils/src -Xlint:all"/ -->