diff options
| -rwxr-xr-x | build/ide.xml | 47 | ||||
| -rwxr-xr-x | build/ivy-ide.xml | 23 | ||||
| -rw-r--r-- | common.xml | 1 | ||||
| -rw-r--r-- | gwt-files.xml | 13 |
4 files changed, 44 insertions, 40 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> diff --git a/common.xml b/common.xml index 163ce8827d..57d96664f0 100644 --- a/common.xml +++ b/common.xml @@ -6,6 +6,7 @@ </tstamp> <dirname property="vaadin.basedir" file="${ant.file.common}" /> + <property name="gwt.basedir" location="${vaadin.basedir}/../gwt" /> <property file="${vaadin.basedir}/build.properties" /> <property name="modules.to.publish.to.maven" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes" /> diff --git a/gwt-files.xml b/gwt-files.xml index 33aba795ef..cc4b4a1e96 100644 --- a/gwt-files.xml +++ b/gwt-files.xml @@ -3,7 +3,8 @@ <project name="GWT files for Vaadin" basedir="."> <include file="common.xml" as="common" /> - <property name="gwt.lib.dir" location="${vaadin.basedir}/../gwt-libs" /> + <property name="gwt.lib.dir" location="${gwt.basedir}/build/lib" /> + <property name="gwt.eclipse.basedir" location="${gwt.basedir}/eclipse" /> <property name="gwt.user.jar" location="${gwt.lib.dir}/gwt-user.jar" /> <property name="gwt.dev.jar" location="${gwt.lib.dir}/gwt-dev.jar" /> @@ -15,11 +16,6 @@ <available file="${gwt.elemental.jar}" property="gwt.elemental.jar.found" /> <available file="${gwt.codeserver.jar}" property="gwt.codeserver.jar.found" /> - <fail unless="gwt.dev.jar.found" message="Could not find gwt-dev.jar at ${gwt.dev.jar}" /> - <fail unless="gwt.user.jar.found" message="Could not find gwt-user.jar at ${gwt.user.jar}" /> - <fail unless="gwt.elemental.jar.found" message="Could not find gwt-elemental.jar at ${gwt.elemental.jar}" /> - <fail unless="gwt.codeserver.jar.found" message="Could not find gwt-codeserver.jar at ${gtw.codeserver.jar}" /> - <property name="gwt.unpack.dir" location="${vaadin.basedir}/build/gwt" /> <property name="gwt.user.jar.files" location="${gwt.unpack.dir}/gwt-user.jar" /> @@ -28,6 +24,11 @@ <property name="gwt.codeserver.jar.files" location="${gwt.unpack.dir}/gwt-codeserver.jar" /> <target name="unpack.gwt"> + <fail unless="gwt.dev.jar.found" message="Could not find gwt-dev.jar at ${gwt.dev.jar}" /> + <fail unless="gwt.user.jar.found" message="Could not find gwt-user.jar at ${gwt.user.jar}" /> + <fail unless="gwt.elemental.jar.found" message="Could not find gwt-elemental.jar at ${gwt.elemental.jar}" /> + <fail unless="gwt.codeserver.jar.found" message="Could not find gwt-codeserver.jar at ${gwt.codeserver.jar}" /> + <delete dir="${gwt.unpack.dir}" /> <mkdir dir="${gwt.user.jar.files}" /> |