Reviewers: skybrian, cromwellian,
https://gwt-code-reviews.appspot.com/1727808/diff/1/build.xml
File build.xml (left):
https://gwt-code-reviews.appspot.com/1727808/diff/1/build.xml#oldcode57
build.xml:57: <gwt.ant dir="dev/codeserver" />
See http://gwt-code-reviews.appspot.com/1729805/diff/1/build.xml for the
rationale.
Description:
Integrate Elemental to the build and deploy as Maven artifact
Please review this at https://gwt-code-reviews.appspot.com/1727808/
Affected files:
M build.xml
M distro-source/build.xml
M maven/lib-gwt.sh
A maven/poms/gwt/gwt-elemental/pom-template.xml
Index: build.xml
diff --git a/build.xml b/build.xml
index
ad7b34a7e3c3851d8bb87f49a69f5d142c76ff31..b6a8f516c5db3303c3a5ad26ee91377d8bda8cab
100755
--- a/build.xml
+++ b/build.xml
@@ -38,6 +38,7 @@
<call-subproject subproject="dev" subtarget="build" />
<call-subproject subproject="codeserver" subtarget="build" />
<call-subproject subproject="user" subtarget="build" />
+ <call-subproject subproject="elemental" subtarget="build" />
<call-subproject subproject="requestfactory" subtarget="build" />
<call-subproject subproject="servlet" subtarget="build" />
<call-subproject subproject="jni" subtarget="build" />
@@ -54,7 +55,6 @@
<target name="dev" description="[subdir] Builds (or runs ${target} if
set) all the dev libraries">
<call-subproject subproject="buildtools" subtarget="build" />
<gwt.ant dir="dev" />
- <gwt.ant dir="dev/codeserver" />
</target>
<target name="codeserver" description="[subdir] Builds (or runs
${target} if set) only the SuperDevMode">
@@ -67,6 +67,11 @@
<gwt.ant dir="user" />
</target>
+ <target name="elemental" description="[subdir] Builds (or runs ${target}
if set) only the elemental library">
+ <call-subproject subproject="user" subtarget="build"/>
+ <gwt.ant dir="elemental" />
+ </target>
+
<target name="soyc" description="[subdir] Builds (or runs ${target} if
set) only the soyc library">
<call-subproject subproject="dev" subtarget="build"/>
<call-subproject subproject="user" subtarget="build"/>
@@ -110,6 +115,7 @@
<call-subproject subproject="dev" subtarget="build"/>
<call-subproject subproject="codeserver" subtarget="build"/>
<call-subproject subproject="user" subtarget="build"/>
+ <call-subproject subproject="elemental" subtarget="build"/>
<call-subproject subproject="requestfactory" subtarget="build"/>
<call-subproject subproject="servlet" subtarget="build"/>
<call-subproject subproject="tools" subtarget="build"/>
@@ -122,6 +128,7 @@
<call-subproject subproject="dev" subtarget="checkstyle" />
<call-subproject subproject="codeserver" subtarget="checkstyle" />
<call-subproject subproject="user" subtarget="checkstyle" />
+ <call-subproject subproject="elemental" subtarget="checkstyle" />
<call-subproject subproject="requestfactory" subtarget="checkstyle" />
<call-subproject subproject="servlet" subtarget="checkstyle" />
<call-subproject subproject="tools" subtarget="checkstyle" />
@@ -134,6 +141,7 @@
<call-subproject subproject="dev" subtarget="test" />
<call-subproject subproject="codeserver" subtarget="test" />
<call-subproject subproject="user" subtarget="test" />
+ <call-subproject subproject="elemental" subtarget="test" />
<call-subproject subproject="requestfactory" subtarget="test" />
<call-subproject subproject="servlet" subtarget="test" />
<call-subproject subproject="tools" subtarget="test" />
Index: distro-source/build.xml
diff --git a/distro-source/build.xml b/distro-source/build.xml
index
791aef689c1fa7c3d9e220b18ae149ea1ce9d648..08b1147170dbe2e870abccc1267f94c28d051a03
100755
--- a/distro-source/build.xml
+++ b/distro-source/build.xml
@@ -28,6 +28,7 @@
<zipfileset file="${gwt.build.lib}/gwt-soyc-vis.jar"
prefix="${project.distname}" />
<zipfileset file="${gwt.build.lib}/gwt-api-checker.jar"
prefix="${project.distname}" />
<zipfileset file="${gwt.build.lib}/requestfactory*.jar"
prefix="${project.distname}" />
+ <zipfileset file="${gwt.build.lib}/gwt-elemental.jar"
prefix="${project.distname}" />
<!-- jni libs-->
<zipfileset dir="${gwt.build.jni}/windows"
prefix="${project.distname}" />
Index: maven/lib-gwt.sh
diff --git a/maven/lib-gwt.sh b/maven/lib-gwt.sh
index
c8f54124c7beaa8da412cf00ffdfbf6464dc5e03..a3f217a299124b7a33cc2c45cab1fef210478005
100644
--- a/maven/lib-gwt.sh
+++ b/maven/lib-gwt.sh
@@ -93,7 +93,7 @@ function maven-gwt() {
zip -d $GWT_EXTRACT_DIR/requestfactory-${i}.jar org/json/*
done
- for i in dev user servlet codeserver
+ for i in dev user servlet codeserver elemental
do
CUR_FILE=`ls $GWT_EXTRACT_DIR/gwt-${i}.jar`
@@ -122,7 +122,7 @@ function maven-gwt() {
# push parent poms
maven-deploy-file $mavenRepoUrl $mavenRepoId $pomDir/gwt/pom.xml
$pomDir/gwt/pom.xml
- for i in dev user servlet codeserver
+ for i in dev user servlet codeserver elemental
do
CUR_FILE=`ls $GWT_EXTRACT_DIR/gwt-${i}.jar`
gwtPomFile=$pomDir/gwt/gwt-$i/pom.xml
Index: maven/poms/gwt/gwt-elemental/pom-template.xml
diff --git a/maven/poms/gwt/gwt-elemental/pom-template.xml
b/maven/poms/gwt/gwt-elemental/pom-template.xml
new file mode 100644
index
0000000000000000000000000000000000000000..cf94ed362079b4e99f56751ac0fcb051225f7afd
--- /dev/null
+++ b/maven/poms/gwt/gwt-elemental/pom-template.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt</artifactId>
+ <version>${gwtVersion}</version>
+ </parent>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-elemental</artifactId>
+ <packaging>jar</packaging>
+ <version>${gwtVersion}</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <version>${gwtVersion}</version>
+ </dependency>
+ </dependencies>
+</project>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
