Skip to content

Commit

Permalink
Native firefox works
Browse files Browse the repository at this point in the history
r9284
  • Loading branch information
tebeka committed Jul 7, 2010
1 parent 31ab04f commit 2b3d7b5
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 5 deletions.
4 changes: 1 addition & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ recursive-include common/test/py *.py
recursive-include chrome/src/py *.py
recursive-include chrome/src/py *.zip
recursive-include chrome/test/py *.py
recursive-include firefox/src/py *.py
recursive-include firefox/src/py *.zip
recursive-include firefox/src/py *.xpi
recursive-include firefox/src/py *.py *.xpi
recursive-include firefox/test/py *.py
recursive-include jobbie/src/py *.py
recursive-include jobbie/test/py *.py
Expand Down
21 changes: 19 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
from setuptools import setup
from setuptools.command.install import install

from os.path import dirname, join
from os.path import dirname, join, isfile
from shutil import copy
import re
import sys

Expand Down Expand Up @@ -64,11 +65,25 @@ def revision():
match = re.search("\d+", svn_rev)
return match and match.group() or "unknown"

def copy_ff_xpi():
ff_xpi = join("build", "firefox", "webdriver.xpi")
if not isfile(ff_xpi):
return 0
ff_dir = join("firefox", "src", "py")
copy(ff_xpi, ff_dir)

return 1


if sys.version_info >= (3,):
src_root = setup_python3()
else:
src_root = "."

# FIXME: We silently fail since on sdist this will work and on install will
# fail, find a better way
copy_ff_xpi()

setup(
cmdclass={'install': install},
name='selenium',
Expand Down Expand Up @@ -107,7 +122,9 @@ def revision():
'selenium.chrome_tests',
'selenium.remote_tests',
'selenium.selenium'],

package_data = {
'selenium.firefox':['*.xpi']
},
include_package_data=True,
install_requires=['distribute'],
zip_safe=False,
Expand Down

0 comments on commit 2b3d7b5

Please sign in to comment.