Thomas Broyer has uploaded a new change for review.
https://gwt-review.googlesource.com/2500
Change subject: Removes api-checker reference JARs from the source tree.
......................................................................
Removes api-checker reference JARs from the source tree.
Now expects them in GWT_TOOLS.
Change-Id: I3d5a585fb57cfd959504109df35279b3c9c56879
---
M build.xml
D tools/api-checker/reference/README
D tools/api-checker/reference/createApiCheckerReferenceJars.sh
D tools/api-checker/reference/gwt-dev-modified.jar
D tools/api-checker/reference/gwt-user-modified.jar
5 files changed, 3 insertions(+), 46 deletions(-)
diff --git a/build.xml b/build.xml
index c783631..6312554 100755
--- a/build.xml
+++ b/build.xml
@@ -32,6 +32,8 @@
<property name="gwt.apicheck.config"
location="tools/api-checker/config/gwt25_26userApi.conf"/>
+ <property name="gwt.apicheck.referencelibs"
+
value="${gwt.tools}/api-checker-reference/2.5.1/gwt-dev.jar:${gwt.tools}/api-checker-reference/2.5.1/gwt-user.jar"/>
<target name="buildonly"
description="[action] Minimal one-platform devel build, without
distro packaging">
@@ -206,7 +208,7 @@
<pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
</classpath>
<arg value="-refJar"/>
- <arg
path="${gwt.root}/tools/api-checker/reference/gwt-dev-modified.jar:${gwt.root}/tools/api-checker/reference/gwt-user-modified.jar"/>
+ <arg path="${gwt.apicheck.referencelibs}"/>
<arg value="-configFile"/>
<arg file="${gwt.apicheck.config}"/>
<arg value="-logLevel"/>
diff --git a/tools/api-checker/reference/README
b/tools/api-checker/reference/README
deleted file mode 100644
index ebf6477..0000000
--- a/tools/api-checker/reference/README
+++ /dev/null
@@ -1,10 +0,0 @@
-gwt-dev.jar and gwt-user.jar were extracted from
http://google-web-toolkit.googlecode.com/files/gwt-2.5.1-rc1.zip
-
-Steps:
-1. Unzip the GWT zip file
-2. Copy gwt-dev.jar and gwt-user.jar into this directory
-3. Delete gwt-dev-modified.jar and gwt-user-modified.jar from this
directory
-4. run ./createApiCheckerReferenceJars.sh
- - Ignore the benign error about finding com/google/web. The directory
only exists in gwt-user.
-5. Delete gwt-dev.jar and gwt-user.jar from this directory
-6. Commit the new gwt-dev-modified.jar and gwt-user-modified.jar
diff --git a/tools/api-checker/reference/createApiCheckerReferenceJars.sh
b/tools/api-checker/reference/createApiCheckerReferenceJars.sh
deleted file mode 100755
index eb38787..0000000
--- a/tools/api-checker/reference/createApiCheckerReferenceJars.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-showhelp() {
- echo >&2 "usage: ./createModifiedJars.sh"
- echo >&2 "(1) checks for the existence of gwt-dev.jar and gwt-user.jar"
- echo >&2 "(2) creates gwt-dev-modified.jar and gwt-user-modified.jar (to
be used by api-checker) by only including .java files in com/google/gwt"
- exit 1
-}
-
-for file in gwt-dev.jar gwt-user.jar
-do
- if [ ! -f $file ]
- then
- echo "[$file] not found - Aborting"
- showhelp
- fi
-done
-
-# unpack files in a temporary dir, create a new jar file with only .java
files in com/google/gwt
-for file in gwt-dev.jar gwt-user.jar
-do
- TEMP_DIR=tmp
- rm -rf ${TEMP_DIR}
- mkdir ${TEMP_DIR}
- cd ${TEMP_DIR}
- jar -xf ../${file}
- MODIFIED_FILE=gwt-user-modified.jar
- if [ $file != gwt-user.jar ]
- then
- MODIFIED_FILE=gwt-dev-modified.jar
- fi
- jar -cf ../${MODIFIED_FILE} `find com/google/gwt -name *.java` `find
com/google/web -name *.java`
- cd ..
- rm -rf ${TEMP_DIR}
-done
diff --git a/tools/api-checker/reference/gwt-dev-modified.jar
b/tools/api-checker/reference/gwt-dev-modified.jar
deleted file mode 100644
index 18ab2bb..0000000
--- a/tools/api-checker/reference/gwt-dev-modified.jar
+++ /dev/null
Binary files differ
diff --git a/tools/api-checker/reference/gwt-user-modified.jar
b/tools/api-checker/reference/gwt-user-modified.jar
deleted file mode 100644
index 5a4a5c8..0000000
--- a/tools/api-checker/reference/gwt-user-modified.jar
+++ /dev/null
Binary files differ
--
To view, visit
https://gwt-review.googlesource.com/2500
To unsubscribe, visit
https://gwt-review.googlesource.com/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d5a585fb57cfd959504109df35279b3c9c56879
Gerrit-PatchSet: 1
Gerrit-Project: gwt
Gerrit-Branch: master
Gerrit-Owner: Thomas Broyer <
t.br...@gmail.com>