Revision: 3218
Author: janne.t.harkonen
Date: Thu May 6 04:58:31 2010
Log: Enable installation from source with Jython on Windows
http://code.google.com/p/robotframework/source/detail?r=3218
Modified:
/trunk/install.py
/trunk/robot_postinstall.py
/trunk/setup.py
=======================================
--- /trunk/install.py Thu May 6 04:20:27 2010
+++ /trunk/install.py Thu May 6 04:58:31 2010
@@ -74,9 +74,11 @@
runners = ['pybot', 'jybot', 'rebot']
if os.name == 'java':
runners.remove('pybot')
+ if os.sep == '\\':
+ runners = [ r + '.bat' for r in runners]
for name in runners:
- if os.sep == '\\':
- _remove(os.path.join(sys.prefix, 'Scripts', name+'.bat'))
+ if os.sep == '\\' and os.name != 'java':
+ _remove(os.path.join(sys.prefix, 'Scripts', name))
elif os.name == 'java':
_remove(os.path.join(sys.prefix, 'bin', name))
else:
=======================================
--- /trunk/robot_postinstall.py Thu May 6 03:16:03 2010
+++ /trunk/robot_postinstall.py Thu May 6 04:58:31 2010
@@ -107,7 +107,7 @@
return os.path.dirname(os.path.abspath(robot.__file__))
def _update_scripts(scripts, script_dir, robot_dir,
python_exe=sys.executable):
- print 'Creating Robot Framework start-up scripts...'
+ print 'Creating Robot Framework runner scripts...'
print 'Installation directory:', robot_dir
if os.name != 'java':
jython_exe, how_found = _find_jython()
=======================================
--- /trunk/setup.py Thu May 6 03:16:03 2010
+++ /trunk/setup.py Thu May 6 04:58:31 2010
@@ -56,7 +56,7 @@
if 'bdist_wininst' in sys.argv:
inst_scripts = [ script+'.bat' for script in inst_scripts ]
inst_scripts.append('robot_postinstall.py')
- elif os.name == 'nt':
+ elif os.sep == '\\':
inst_scripts = [ script+'.bat' for script in inst_scripts ]
if 'bdist_egg' in sys.argv:
