Add GWT Incubator to site-packages
Signed-off-by: James Ren <jamesren@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@4433 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/frontend/client/.classpath b/frontend/client/.classpath
index f95a1b7..59ef238 100644
--- a/frontend/client/.classpath
+++ b/frontend/client/.classpath
@@ -5,5 +5,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="lib" path="/usr/local/lib/gwt/gwt-user.jar"/>
+ <classpathentry kind="lib" path="/usr/local/lib/gwt/gwt-incubator.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/frontend/client/AfeClient-shell b/frontend/client/AfeClient-shell
index cda2b43..04293e8 100755
--- a/frontend/client/AfeClient-shell
+++ b/frontend/client/AfeClient-shell
@@ -1,4 +1,4 @@
#!/bin/sh
APPDIR=`dirname $0`;
GWTDIR=`$APPDIR/gwt_dir`;
-java -cp "$APPDIR/src:$APPDIR/bin:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-linux.jar" com.google.gwt.dev.HostedMode -ea -startupUrl http://localhost:8000/afe/server/autotest.AfeClient/AfeClient.html "$@" autotest.AfeClient
+java -cp "$APPDIR/src:$APPDIR/bin:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-linux.jar:$GWTDIR/gwt-incubator.jar" com.google.gwt.dev.HostedMode -ea -startupUrl http://localhost:8000/afe/server/autotest.AfeClient/AfeClient.html "$@" autotest.AfeClient
diff --git a/frontend/client/AfeClient.launch b/frontend/client/AfeClient.launch
index f01d7e4..464a570 100644
--- a/frontend/client/AfeClient.launch
+++ b/frontend/client/AfeClient.launch
@@ -12,6 +12,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/AfeClient/src" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento project="AfeClient"/> </runtimeClasspathEntry> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-dev-linux.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-incubator.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.HostedMode"/>
diff --git a/frontend/client/EmbeddedTkoClient-shell b/frontend/client/EmbeddedTkoClient-shell
index cfcee7a..9239fff 100755
--- a/frontend/client/EmbeddedTkoClient-shell
+++ b/frontend/client/EmbeddedTkoClient-shell
@@ -1,4 +1,4 @@
#!/bin/sh
APPDIR=`dirname $0`;
GWTDIR=`$APPDIR/gwt_dir`;
-java -cp "$APPDIR/src:$APPDIR/bin:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-linux.jar" com.google.gwt.dev.HostedMode -ea -startupUrl http://localhost:8000/new_tko/server/autotest.EmbeddedTkoClient/EmbeddedTkoClientTest.html "$@" autotest.EmbeddedTkoClient
+java -cp "$APPDIR/src:$APPDIR/bin:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-linux.jar:$GWTDIR/gwt-incubator.jar" com.google.gwt.dev.HostedMode -ea -startupUrl http://localhost:8000/new_tko/server/autotest.EmbeddedTkoClient/EmbeddedTkoClientTest.html "$@" autotest.EmbeddedTkoClient
diff --git a/frontend/client/EmbeddedTkoClient.launch b/frontend/client/EmbeddedTkoClient.launch
index 9472ef9..0d8e2d0 100644
--- a/frontend/client/EmbeddedTkoClient.launch
+++ b/frontend/client/EmbeddedTkoClient.launch
@@ -12,6 +12,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/AfeClient/src" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento project="AfeClient"/> </runtimeClasspathEntry> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-dev-linux.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-incubator.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.HostedMode"/>
diff --git a/frontend/client/TestPlannerClient-compile b/frontend/client/TestPlannerClient-compile
new file mode 100755
index 0000000..409fce8
--- /dev/null
+++ b/frontend/client/TestPlannerClient-compile
@@ -0,0 +1,7 @@
+#!/bin/sh
+APPDIR=`dirname $0`;
+GWTDIR=`$APPDIR/gwt_dir`;
+java -Xmx512M \
+ -cp "$APPDIR/src:$APPDIR/bin:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-linux.jar" \
+ -Djava.awt.headless=true \
+ com.google.gwt.dev.Compiler -war "$APPDIR/www" "$@" autotest.TestPlannerClient
diff --git a/frontend/client/TestPlannerClient-shell b/frontend/client/TestPlannerClient-shell
new file mode 100755
index 0000000..f3222d9
--- /dev/null
+++ b/frontend/client/TestPlannerClient-shell
@@ -0,0 +1,4 @@
+#!/bin/sh
+APPDIR=`dirname $0`;
+GWTDIR=`$APPDIR/gwt_dir`;
+java -cp "$APPDIR/src:$APPDIR/bin:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-linux.jar:$GWTDIR/gwt-incubator.jar" com.google.gwt.dev.HostedMode -ea -startupUrl http://localhost:8000/afe/server/autotest.TestPlannerClient/TestPlannerClient.html "$@" autotest.TestPlannerClient
diff --git a/frontend/client/TestPlannerClient.launch b/frontend/client/TestPlannerClient.launch
new file mode 100644
index 0000000..55e37c4
--- /dev/null
+++ b/frontend/client/TestPlannerClient.launch
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/AfeClient"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="AfeClient" path="1" type="4"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/AfeClient/src" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento project="AfeClient"/> </runtimeClasspathEntry> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-dev-linux.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-incubator.jar" path="3" type="2"/> "/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.HostedMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-ea -startupUrl http://localhost:8000/afe/server/autotest.TestPlannerClient/TestPlannerClient.html autotest.TestPlannerClient"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="AfeClient"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M"/>
+</launchConfiguration>
diff --git a/frontend/client/TkoClient-shell b/frontend/client/TkoClient-shell
index 56e6895..51aee4e 100755
--- a/frontend/client/TkoClient-shell
+++ b/frontend/client/TkoClient-shell
@@ -1,4 +1,4 @@
#!/bin/sh
APPDIR=`dirname $0`;
GWTDIR=`$APPDIR/gwt_dir`;
-java -cp "$APPDIR/src:$APPDIR/bin:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-linux.jar" com.google.gwt.dev.HostedMode -ea -startupUrl http://localhost:8000/new_tko/server/autotest.TkoClient/TkoClient.html "$@" autotest.TkoClient
+java -cp "$APPDIR/src:$APPDIR/bin:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-linux.jar:$GWTDIR/gwt-incubator.jar" com.google.gwt.dev.HostedMode -ea -startupUrl http://localhost:8000/new_tko/server/autotest.TkoClient/TkoClient.html "$@" autotest.TkoClient
diff --git a/frontend/client/TkoClient.launch b/frontend/client/TkoClient.launch
index fa8ddd1..8508189 100644
--- a/frontend/client/TkoClient.launch
+++ b/frontend/client/TkoClient.launch
@@ -12,6 +12,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/AfeClient/src" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento project="AfeClient"/> </runtimeClasspathEntry> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-dev-linux.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-incubator.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.HostedMode"/>
diff --git a/utils/compile_gwt_clients.py b/utils/compile_gwt_clients.py
index a02666c..0619dfa 100755
--- a/utils/compile_gwt_clients.py
+++ b/utils/compile_gwt_clients.py
@@ -15,7 +15,8 @@
_COMPILE_LINE = ('java -Xmx512M '
'-cp "%(app_dir)s/src:%(app_dir)s/bin:%(gwt_dir)s/gwt-user.jar'
- ':%(gwt_dir)s/gwt-dev-linux.jar" '
+ ':%(gwt_dir)s/gwt-dev-linux.jar'
+ ':%(gwt_dir)s/gwt-incubator.jar" '
'-Djava.awt.headless=true com.google.gwt.dev.Compiler '
'-war "%(compile_dir)s" %(extra_args)s %(project_client)s')
diff --git a/utils/external_packages.py b/utils/external_packages.py
index 0db307d..889a8aa 100644
--- a/utils/external_packages.py
+++ b/utils/external_packages.py
@@ -106,7 +106,7 @@
try:
module = __import__(self.module_name)
except ImportError, e:
- logging.info('Could not import %s.', self.module_name)
+ logging.info("%s isn't present. Will install.", self.module_name)
return True
self.installed_version = self._get_installed_version_from_module(module)
logging.info('imported %s version %s.', self.module_name,
@@ -709,7 +709,7 @@
return match.group(1) != self.version
- def build_and_install(self, install_dir):
+ def _build_and_install(self, install_dir):
os.chdir(install_dir)
self._extract_compressed_package()
extracted_dir = self.local_filename[:-len('.tar.bz2')]
@@ -720,5 +720,29 @@
return True
+# This requires GWT to already be installed, so it must be declared after
+# GwtPackage
+class GwtIncubatorPackage(ExternalPackage):
+ version = 'march-02-2009'
+ local_filename = 'gwt-incubator.jar'
+ remote_filename = 'gwt-incubator-%s.jar' % version
+ urls = ('http://google-web-toolkit-incubator.googlecode.com/files/'
+ + remote_filename,)
+ hex_sum = 'adc4c5c96e832b33885fa6dfec8399f7c13413c7'
+ module_name = None # Not a Python module
+
+
+ def is_needed(self, install_dir):
+ gwt_dir = os.path.join(install_dir, GwtPackage.name)
+ assert os.path.exists(gwt_dir)
+ return not os.path.exists(os.path.join(gwt_dir, self.local_filename))
+
+
+ def _build_and_install(self, install_dir):
+ dest = os.path.join(install_dir, GwtPackage.name, self.local_filename)
+ shutil.copyfile(self.verified_package, dest)
+ return True
+
+
if __name__ == '__main__':
sys.exit(main())