diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-05-30 15:39:06 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-05-30 15:39:06 +0300 |
| commit | 6b3151d68e954ba219f577ee8ab261f4033c3265 (patch) | |
| tree | 27ad8be6066d292d2f2cba5dc06fdfae2e8ecf00 | |
| parent | 2b03c7b53cca18e4aaebd2832b9a6cd4b8699076 (diff) | |
| download | vaadin-framework-6b3151d68e954ba219f577ee8ab261f4033c3265.tar.gz vaadin-framework-6b3151d68e954ba219f577ee8ab261f4033c3265.zip | |
Support for additional build time non-Ivy JARs in build.xml .
| -rw-r--r-- | build/build.xml | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index b0cdea39e5..97f7c1c274 100644 --- a/build/build.xml +++ b/build/build.xml @@ -26,9 +26,26 @@ <target name="init-deps" depends="common.init-deps" > <property name="ivy.resolved" value="1" /> <ivy:resolve file="build/ivy/ivy.xml" resolveid="common" conf="ss.compile, cs.compile, ss.test.compile"/> - <ivy:cachepath pathid="compile.classpath.server-side" conf="ss.compile"/> - <ivy:cachepath pathid="compile.classpath.client-side" conf="cs.compile"/> - <ivy:cachepath pathid="compile.classpath.server-side-tests" conf="ss.test.compile"/> + <ivy:cachepath pathid="ivy.compile.classpath.server-side" conf="ss.compile"/> + <ivy:cachepath pathid="ivy.compile.classpath.client-side" conf="cs.compile"/> + <ivy:cachepath pathid="ivy.compile.classpath.server-side-tests" conf="ss.test.compile"/> + <!-- Extra JARs for custom builds - taken into account before JARs from Ivy. --> + <!-- Note that this should not be used for permanent build dependencies. --> + <path id="additional.jar.path"> + <fileset dir="build" includes="lib/**/*.jar" ></fileset> + </path> + <path id="compile.classpath.server-side"> + <path refid="additional.jar.path" /> + <path refid="ivy.compile.classpath.server-side" /> + </path> + <path id="compile.classpath.client-side"> + <path refid="additional.jar.path" /> + <path refid="ivy.compile.classpath.client-side" /> + </path> + <path id="compile.classpath.server-side-tests"> + <path refid="additional.jar.path" /> + <path refid="ivy.compile.classpath.server-side-tests" /> + </path> </target> <!-- Clean results - - - - - - - - - - - - - - - - - - - - - - - - - --> |