LICENSE @@ -4,13 +4,12 @@ A cross-platform accessibility API inspection library and service. import sys, os from distutils.core import setup, Command, DistutilsOptionError from distutils.archive_util import make_archive -import distutils.command +import distutils.command, distutils.command.sdist import shutil -import specular +import specular, specular.speclenium options = {} - class _include_selenium: user_options = [('selenium=', 'S', 'Selenium JAR file to include')] def initialize_options(self): @@ -18,14 +17,28 @@ class _include_selenium: def finalize_options(self): if self.distribution.data_files is None: self.distribution.data_files = [] - self.distribution.data_files.append(('', [self.selenium])) + print 'appending', self.selenium + self.distribution.dist_files.append(('', [self.selenium])) +class standalone(distutils.command.sdist.sdist, _include_selenium): + user_options = distutils.command.sdist.sdist.user_options + \ + _include_selenium.user_options + def initialize_options(self): + _include_selenium.initialize_options(self) + distutils.command.sdist.sdist.initialize_options(self) + print self.distribution.dist_files + def finalize_options(self): + distutils.command.sdist.sdist.finalize_options(self) + def read_manifest(self): + distutils.command.sdist.sdist.read_manifest(self) + self.filelist.append(self.selenium) + try: import py2exe except ImportError: # Not on windows or no py2exe, no biggie. - extras = {} + extras = {'cmdclass' : {'standalone' : standalone}} else: class standalone_win32(py2exe.build_exe.py2exe, _include_selenium): user_options = py2exe.build_exe.py2exe.user_options + \ @@ -42,7 +55,7 @@ else: py2exe.build_exe.py2exe.finalize_options(self) if self.zip: self.base_name = \ - self.distribution.get_fullname().lower() + self.distribution.get_fullname() self.archive_dir = os.path.join(self.dist_dir, self.base_name) self.base_dir = self.dist_dir self.dist_dir = self.archive_dir @@ -58,12 +71,13 @@ else: shutil.rmtree(self.archive_dir) print 'Deleted', self.archive_dir - extras = {'options' : {'bdist_win32_standalone' : + extras = {'options' : {'standalone_win32' : {'includes' : 'twisted.web.resource'}}, 'console' : [{'script' : 'speclenium', "icon_resources" : [(1, "pixmaps/speclenium-logo.ico")]}], - 'cmdclass' : {'standalone_win32' : standalone_win32}} + 'cmdclass' : {'standalone_win32' : standalone_win32, + 'standalone' : standalone}} classifiers = [ @@ -91,4 +105,5 @@ setup(name=__doc__.split('\n')[0], classifiers=classifiers, version=specular.__version__, packages=["specular", "specular.speclenium"], - scripts=["speclenium"], **extras) + scripts=["speclenium"], + data_files=[('', ['LICENSE'])], **extras) setup.py @@ -30,8 +30,8 @@ # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. -from twisted.internet import gtk2reactor -gtk2reactor.install() +from twisted.internet import glib2reactor +glib2reactor.install() from twisted.internet import reactor from twisted.web import xmlrpc, server import pyatspi specular/speclenium/speclenium_atspi.py @@ -62,7 +62,6 @@ class RadioTest(unittest.TestCase): if 'notfound' not in e: success = True break - print 'retrying', i self.failUnless( success, 'Did not recieve a state-changed event after radio button toggle') tests/radio_test.py @@ -2,8 +2,8 @@ configs = { 'windows' : { 'host' : '11.0.0.2', 'browsers' : { - 'firefox3' : '*chrome', - 'safari' : '*safari C:\Documents and Settings\Eitan\Desktop\webkit-nightly\Safari.exe' + 'firefox3' : '*chrome' +# 'safari' : '*safari C:\Documents and Settings\Eitan\Desktop\webkit-nightly\Safari.exe' } }, 'linux' : { tests/settings.py cfcd465ea5a747569254c63da28de2489a5776dd Eitan Isaacson eitan@ascender.com http://github.com/eeejay/specular/commit/9f60ddfa6954fa709eaead7aff5c4875f2b6ac01 9f60ddfa6954fa709eaead7aff5c4875f2b6ac01 2008-09-03T16:44:44-07:00 2008-09-03T16:44:44-07:00 Another day bc86c3c9954d830104da0374db6ca07d64fb4378 Eitan Isaacson eitan@ascender.com