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

put comipiling jar files to deps.classpath

Browse Source
This commit is contained in:
frank 2011-08-30 13:58:22 -07:00
parent c9e78299d0
commit 0b010ef9d4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/build-cloud.xml
View File

@ -13,6 +13,7 @@
--> -->
<dirname property="base.dir" file="${ant.file.Cloud Stack}/.." /> <dirname property="base.dir" file="${ant.file.Cloud Stack}/.." />
<property name="build.dir" location="${base.dir}/build" /> <property name="build.dir" location="${base.dir}/build" />
<property name="test.classes.dir" location="${test.target.dir}/classes" />
<!-- Import anything that the user wants to set--> <!-- Import anything that the user wants to set-->
<!-- Import properties files and environment variables here --> <!-- Import properties files and environment variables here -->
@ -62,6 +63,7 @@
<property name="build.log" location="${target.dir}/ant_verbose.txt" /> <property name="build.log" location="${target.dir}/ant_verbose.txt" />
<property name="deps.dir" location="${base.dir}/deps" /> <property name="deps.dir" location="${base.dir}/deps" />
<property name="tools.jar.dir" location="${base.dir}/tools/tooljars" />
<!-- directories for client compilation--> <!-- directories for client compilation-->
<property name="client.dir" location="${base.dir}/client" /> <property name="client.dir" location="${base.dir}/client" />
@ -145,11 +147,18 @@
<path id="src.classpath"> <path id="src.classpath">
</path> </path>
<path id="compile.deps.classpath">
<fileset dir="${tools.jar.dir}" erroronmissingdir="true">
<include name="*.jar" />
</fileset>
</path>
<path id="deps.classpath"> <path id="deps.classpath">
<!--filelist files="${deps.classpath}" /--> <!--filelist files="${deps.classpath}" /-->
<fileset dir="${deps.dir}" erroronmissingdir="false"> <fileset dir="${deps.dir}" erroronmissingdir="false">
<include name="*.jar" /> <include name="*.jar" />
</fileset> </fileset>
<path refid="compile.deps.classpath" />
</path> </path>
<path id="dist.classpath"> <path id="dist.classpath">

8
build/build-tests.xml
View File

@ -26,19 +26,12 @@
<property name="testclient.dir" location="${base.dir}/test" /> <property name="testclient.dir" location="${base.dir}/test" />
<property name="testclient.dist.dir" location="${dist.dir}/test" /> <property name="testclient.dist.dir" location="${dist.dir}/test" />
<property name="tools.dist.dir" location="${dist.dir}/cloudapitools" /> <property name="tools.dist.dir" location="${dist.dir}/cloudapitools" />
<property name="tools.jar.dir" location="${base.dir}/tools/tooljars" />
<property name="test.target.dir" location="${target.dir}/test" /> <property name="test.target.dir" location="${target.dir}/test" />
<property name="test.classes.dir" location="${test.target.dir}/classes" />
<property name="agent-simulator.jar" value="cloud-agent-simulator.jar" /> <property name="agent-simulator.jar" value="cloud-agent-simulator.jar" />
<property name="testclient.jar" value="cloud-test.jar" /> <property name="testclient.jar" value="cloud-test.jar" />
<path id="compile.deps.classpath">
<fileset dir="${tools.jar.dir}" erroronmissingdir="true">
<include name="*.jar" />
</fileset>
</path>
<!-- =================== Agent Simulator ==================== --> <!-- =================== Agent Simulator ==================== -->
<path id="agent-simulator.classpath"> <path id="agent-simulator.classpath">
@ -104,7 +97,6 @@
<path id="testclient.classpath"> <path id="testclient.classpath">
<path refid="deps.classpath" /> <path refid="deps.classpath" />
<path refid="dist.classpath" /> <path refid="dist.classpath" />
<path refid="compile.deps.classpath" />
</path> </path>
<target name="compile-testclient" depends="-init-test, compile-utils" description="Compile the test client."> <target name="compile-testclient" depends="-init-test, compile-utils" description="Compile the test client.">
<echo message="src is ${testclient.dir}"/> <echo message="src is ${testclient.dir}"/>