Add GWT Incubator to site-packages Signed-off-by: James Ren <[email protected]>
Index: autotest/frontend/client/AfeClient-shell =================================================================== --- autotest/frontend/client/AfeClient-shell (revision 4415) +++ autotest/frontend/client/AfeClient-shell (working copy) @@ -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 Index: autotest/frontend/client/EmbeddedTkoClient.launch =================================================================== --- autotest/frontend/client/EmbeddedTkoClient.launch (revision 4415) +++ autotest/frontend/client/EmbeddedTkoClient.launch (working copy) @@ -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"/> Index: autotest/frontend/client/.classpath =================================================================== --- autotest/frontend/client/.classpath (revision 4415) +++ autotest/frontend/client/.classpath (working copy) @@ -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> Index: autotest/frontend/client/TkoClient-shell =================================================================== --- autotest/frontend/client/TkoClient-shell (revision 4415) +++ autotest/frontend/client/TkoClient-shell (working copy) @@ -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 Index: autotest/frontend/client/AfeClient.launch =================================================================== --- autotest/frontend/client/AfeClient.launch (revision 4415) +++ autotest/frontend/client/AfeClient.launch (working copy) @@ -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"/> Index: autotest/frontend/client/TestPlannerClient-shell =================================================================== --- autotest/frontend/client/TestPlannerClient-shell (revision 0) +++ autotest/frontend/client/TestPlannerClient-shell (revision 0) @@ -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
Property changes on: autotest/frontend/client/TestPlannerClient-shell ___________________________________________________________________ Added: svn:executable + * Index: autotest/frontend/client/TestPlannerClient-compile =================================================================== --- autotest/frontend/client/TestPlannerClient-compile (revision 0) +++ autotest/frontend/client/TestPlannerClient-compile (revision 0) @@ -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 Property changes on: autotest/frontend/client/TestPlannerClient-compile ___________________________________________________________________ Added: svn:executable + * Index: autotest/frontend/client/TkoClient.launch =================================================================== --- autotest/frontend/client/TkoClient.launch (revision 4415) +++ autotest/frontend/client/TkoClient.launch (working copy) @@ -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"/> Index: autotest/frontend/client/TestPlannerClient.launch =================================================================== --- autotest/frontend/client/TestPlannerClient.launch (revision 0) +++ autotest/frontend/client/TestPlannerClient.launch (revision 0) @@ -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> Index: autotest/frontend/client/EmbeddedTkoClient-shell =================================================================== --- autotest/frontend/client/EmbeddedTkoClient-shell (revision 4415) +++ autotest/frontend/client/EmbeddedTkoClient-shell (working copy) @@ -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 Index: autotest/utils/compile_gwt_clients.py =================================================================== --- autotest/utils/compile_gwt_clients.py (revision 4415) +++ autotest/utils/compile_gwt_clients.py (working copy) @@ -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') Index: autotest/utils/external_packages.py =================================================================== --- autotest/utils/external_packages.py (revision 4415) +++ autotest/utils/external_packages.py (working copy) @@ -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())
_______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
