diff options
| author | Artur Signell <artur@vaadin.com> | 2013-02-13 16:39:04 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-02-25 11:36:37 +0200 |
| commit | 5e6f1bf03e4eb23592f9c3ba29fd0dc68512088e (patch) | |
| tree | 226939c349f095777aeb05cfd7f9e31cb9e5c18f /build | |
| parent | c30c566e8130a030411c9f6d4609f6d738873d6a (diff) | |
| download | vaadin-framework-5e6f1bf03e4eb23592f9c3ba29fd0dc68512088e.tar.gz vaadin-framework-5e6f1bf03e4eb23592f9c3ba29fd0dc68512088e.zip | |
Made build process easier for Eclipse users (#9998)
Change-Id: I486817a75c86292f9637523e9a6808107af49e75
Diffstat (limited to 'build')
| -rwxr-xr-x | build/ide.xml | 47 | ||||
| -rwxr-xr-x | build/ivy-ide.xml | 23 |
2 files changed, 36 insertions, 34 deletions
diff --git a/build/ide.xml b/build/ide.xml index a095e9265c..5b27488d59 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -1,24 +1,48 @@ <?xml version="1.0"?> <project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" name="Build script for IDE users" basedir=".." default="theme-and-default-widgetset"> - <!-- FIXME, should use 7.0-SNAPSHOT of client compiler --> + <include file="${basedir}/gwt-files.xml" /> + + <property name="gwt.dev.classes" location="${gwt.eclipse.basedir}/dev/bin" /> + <property name="gwt.user.classes" location="${gwt.eclipse.basedir}/user/bin" /> + <property name="gwt.dev.src" location="${gwt.basedir}/dev/core/src" /> + <property name="gwt.dev.super.src" location="${gwt.basedir}/dev/core/super" /> + <property name="gwt.user.src" location="${gwt.basedir}/user/src" /> + <property name="gwt.user.super.src" location="${gwt.basedir}/user/super" /> + <property name="work.dir" location="work" /> - <property name="gwt.root" location="${basedir}/../trunk" /> - <property name="gwt.lib.dir" location="${gwt.root}/build/lib" /> - <property name="gwt.user.jar" location="${gwt.lib.dir}/gwt-user.jar" /> - <property name="gwt.dev.jar" location="${gwt.lib.dir}/gwt-dev.jar" /> <property name="theme-version" location="9.9.9.INTERNAL-DEBUG-BUILD" /> - <echo>Using gwt-dev.jar from ${gwt.dev.jar}</echo> + <echo>Using gwt files from ${gwt.user.classes} and ${gwt.dev.classes}</echo> - <ivy:resolve file="build/ivy-ide.xml" /> - <ivy:cachepath pathid="ivy.deps" conf="default" /> + <ivy:resolve file="client-compiler/ivy.xml" conf="ide" /> + <ivy:cachepath pathid="client-compiler.deps" conf="ide" /> + <ivy:resolve file="server/ivy.xml" conf="ide" /> + <ivy:cachepath pathid="server.deps" conf="ide" /> + <ivy:resolve file="client/ivy.xml" conf="ide" /> + <ivy:cachepath pathid="client.deps" conf="ide" /> + <ivy:resolve file="shared/ivy.xml" conf="ide" /> + <ivy:cachepath pathid="shared.deps" conf="ide" /> + <ivy:resolve file="uitest/ivy.xml" conf="ide" /> + <ivy:cachepath pathid="uitest.deps" conf="ide" /> + <ivy:resolve file="theme-compiler/ivy.xml" conf="ide" /> + <ivy:cachepath pathid="theme-compiler.deps" conf="ide" /> <path id="classpath"> <path location="bin" /> <path location="build/classes" /> - <pathelement location="${gwt.user.jar}" /> - <pathelement location="${gwt.dev.jar}" /> - <path refid="ivy.deps" /> + <path location="${gwt.user.classes}" /> + <path location="${gwt.user.src}" /> + <path location="${gwt.user.super.src}" /> + <path location="${gwt.dev.classes}" /> + <path location="${gwt.dev.super.src}" /> + <path location="${gwt.dev.src}" /> + <path refid="client-compiler.deps" /> + <path refid="theme-compiler.deps" /> + <path refid="server.deps" /> + <path refid="shared.deps" /> + <path refid="uitest.deps" /> + <path refid="client.deps" /> + <path location="theme-compiler/src" /> <path location="server/src" /> <path location="shared/src" /> <path location="uitest/src" /> @@ -93,6 +117,7 @@ <jvmarg value="-Xss8M" /> <jvmarg value="-XX:MaxPermSize=256M" /> <jvmarg value="-Djava.awt.headless=true" /> + <jvmarg value="-Dgwt.usearchives=false" /> </java> </target> diff --git a/build/ivy-ide.xml b/build/ivy-ide.xml deleted file mode 100755 index 85d157857a..0000000000 --- a/build/ivy-ide.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ivy-module version="2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"> - - <info organisation="com.vaadin" module="vaadin-ide" - revision="0.0.1.ide" /> - - <configurations> - <conf name="default" /> - </configurations> - <publications> - </publications> - <dependencies defaultconf="default" defaultconfmapping="default->default"> - <dependency org="javax.validation" name="validation-api" - rev="1.0.0.GA" conf="default -> default,sources" /> - <dependency org="commons-cli" name="commons-cli" rev="1.2" /> - <dependency org="org.apache.commons" name="commons-jexl" - rev="2.1.1" /> - - </dependencies> - -</ivy-module> |