diff options
| author | Artur Signell <artur.signell@itmill.com> | 2009-10-27 09:20:23 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2009-10-27 09:20:23 +0000 |
| commit | 9038e011644a7e8aa42fce44beec5743cff8ff5d (patch) | |
| tree | de6ce7737ba63db719019d4882890e933f46ec94 /build | |
| parent | a2d7fc6e3dea19b10b871ae7726a925038ae6f3a (diff) | |
| download | vaadin-framework-9038e011644a7e8aa42fce44beec5743cff8ff5d.tar.gz vaadin-framework-9038e011644a7e8aa42fce44beec5743cff8ff5d.zip | |
Reorganized lib hierarchy for #3298. Fixed build script to use the new hierarchy.
svn changeset:9394/svn branch:6.2
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/build/build.xml b/build/build.xml index aaf903f0c1..2eb66e0ef0 100644 --- a/build/build.xml +++ b/build/build.xml @@ -249,15 +249,9 @@ <path id="compile.classpath"> <pathelement path="build/lib/servlet.jar" /> <pathelement path="build/external/fileupload/classes" /> - <pathelement path="lib/reservr/gwt-maps.jar" /> - <pathelement path="lib/jetty/jetty-6.1.7.jar" /> - <pathelement path="lib/jetty/jetty-util-6.1.7.jar" /> - <pathelement path="lib/portlet/portal-kernel.jar" /> - <pathelement path="lib/portlet/portal-service.jar" /> - <pathelement path="lib/portlet/portlet.jar" /> - <pathelement path="lib/appengine/appengine-api.jar" /> - <pathelement path="lib/test/junit-4.5.jar" /> - <pathelement path="lib/test/easymock-2.5/easymock-2.5.jar" /> + <pathelement path="lib/core/**/*.jar" /> + <pathelement path="lib/demo/**/*.jar" /> + <pathelement path="lib/tests/**/*.jar" /> </path> <path id="compile.classpath.server-side"> <path refid="compile.classpath"/> @@ -775,17 +769,17 @@ <!-- copy 3rd part libraries used by demo --> <copy todir="${output-dir}/WebContent/demo/lib"> - <fileset dir="lib"> - <include name="reservr/**/*" /> + <fileset dir="lib/demo"> + <include name="gwt-maps/**/*" /> </fileset> </copy> <copy todir="${output-dir}/WebContent/demo/lib"> - <fileset dir="lib"> + <fileset dir="lib/core"> <include name="jetty/**/*" /> </fileset> </copy> <copy todir="${output-dir}/WebContent/demo/lib"> - <fileset dir="lib"> + <fileset dir="lib/core"> <include name="portlet/**/*" /> </fileset> </copy> @@ -962,10 +956,10 @@ </target> <target name="compile-widgetset-reserver"> - <condition property="googlemaps-jar" value="${output-dir}/WebContent/demo/lib/reservr/gwt-maps.jar"> - <available file="${output-dir}/WebContent/demo/lib/reservr/gwt-maps.jar" /> + <condition property="googlemaps-jar" value="${output-dir}/WebContent/demo/lib/gwt-maps/gwt-maps.jar"> + <available file="${output-dir}/WebContent/demo/lib/gwt-maps/gwt-maps.jar" /> </condition> - <condition property="googlemaps-jar" value="lib/reservr/gwt-maps.jar"> + <condition property="googlemaps-jar" value="lib/gwt-maps/gwt-maps.jar"> <available file="lib/reservr/gwt-maps.jar" /> </condition> <java classname="com.google.gwt.dev.Compiler" failonerror="yes" fork="yes" maxmemory="512m"> @@ -1109,10 +1103,7 @@ <!-- add sources --> <fileset dir="${result-path}/src/core"> <patternset> - <exclude name="${toolkit-package}/demo/**" /> - <exclude name="${toolkit-package}/tests/**"/> <exclude name="${toolkit-package}/launcher/**" /> - <exclude name="${toolkit-package}/automatedtests/**" /> </patternset> </fileset> <fileset dir="${output-dir}/WebContent"> |