diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -116,10 +116,14 @@
os.chdir(os.path.join('src', 'browser'))
# we must have only certain package in the path, so we create a tmp dir to link only what we need
tmp_dir = tempfile.mkdtemp()
- import sat, sat_frontends, libervia
+ import sat, sat_frontends
os.symlink(os.path.dirname(sat.__file__), os.path.join(tmp_dir,"sat")) # FIXME: only work on unixes
os.symlink(os.path.dirname(sat_frontends.__file__), os.path.join(tmp_dir,"sat_frontends")) # FIXME: only work on unixes
- os.symlink(os.path.dirname(libervia.__file__), os.path.join(tmp_dir,"libervia")) # FIXME: only work on unixes
+ if ENV_LIBERVIA_INSTALL:
+ os.symlink(os.path.dirname(libervia.__file__), os.path.join(tmp_dir,"libervia")) # FIXME: only work on unixes
+ else:
+ libervia_files = os.path.abspath("../../src")
+ os.symlink(libervia_files, os.path.join(tmp_dir,"libervia")) # FIXME: only work on unixes
for module in ('libervia_main', 'libervia_test'):
build_args = ['pyjsbuild', module] + (['-d'] if JS_DEBUG in install_opt else []) + ['--no-compile-inplace', '-I', tmp_dir, '-o', self.pyjamas_output_dir]
result = subprocess.call(build_args)
@@ -168,7 +172,8 @@
return
self.copy_data_files()
self.custom_auto_options()
- self.custom_create_links()
+ if ENV_LIBERVIA_INSTALL:
+ self.custom_create_links()
def confirm(self, message):
"""Ask the user for a confirmation"""
@@ -279,6 +284,7 @@
install_opt = os.environ.get(ENV_LIBERVIA_INSTALL, "").split()
if not NO_PREINSTALL_OPT in install_opt: # user can force preinstall skipping
preinstall_check(install_opt)
+ ENV_LIBERVIA_INSTALL=install_opt
setup(name=NAME,
version='0.6.1.1',
@@ -302,6 +308,6 @@
for root, dirs, files in os.walk(C.THEMES_DIR)],
scripts=[],
zip_safe=False,
- install_requires=['sat', 'twisted', 'txJSON-RPC==0.3.1', 'zope.interface', 'pyopenssl', 'jinja2', 'shortuuid'],
+ install_requires=['sat', 'twisted', 'txJSON-RPC<5', 'zope.interface', 'pyopenssl', 'jinja2', 'shortuuid'],
cmdclass={'install': CustomInstall},
)