--- a/install.py Sat Feb 19 16:08:37 2011 +0100
+++ b/install.py Sun Feb 20 12:18:35 2011 +0100
@@ -32,6 +32,7 @@
progLanguages = ["Python", "Ruby"]
sourceDir = "eric"
configName = 'eric5config.py'
+useStart = True
# Define blacklisted versions of the prerequisites
BlackLists = {
@@ -79,6 +80,7 @@
print(" -x don't perform dependency checks (use on your own risk)")
print(" -c don't cleanup old installation first")
print(" -z don't compile the installed python files")
+ print(" -s don't use the 'start' variant of the Windows batch script")
print()
print("The file given to the -f option must be valid Python code defining a")
print("dictionary called 'cfg' with the keys 'ericDir', 'ericPixDir', 'ericIconDir',")
@@ -162,21 +164,28 @@
application (boolean)
@return the platform specific name of the wrapper
"""
+ global useStart
+
# all kinds of Windows systems
if sys.platform.startswith("win"):
wname = wfile + ".bat"
if isGuiScript:
+ if useStart:
+ start = "start "
+ else:
+ start = ""
wrapper = \
'''@echo off\r\n''' \
'''set PYDIR=%~dp0\r\n''' \
- '''start "%PYDIR%\\pythonw.exe"''' \
- ''' "%PYDIR%\\Lib\\site-packages\\eric5\\{0}.pyw"''' \
- ''' %1 %2 %3 %4 %5 %6 %7 %8 %9\r\n'''.format(wfile)
+ '''{0}"%PYDIR%\\pythonw.exe"''' \
+ ''' "%PYDIR%\\Lib\\site-packages\\eric5\\{1}.pyw"''' \
+ ''' %1 %2 %3 %4 %5 %6 %7 %8 %9\r\n'''.format(
+ start, wfile)
else:
wrapper = \
'''@"{0}\\python" "{1}\\{2}.py"''' \
''' %1 %2 %3 %4 %5 %6 %7 %8 %9\r\n'''.format(
- platBinDir, pydir, wfile)
+ platBinDir, pydir, wfile)
# Mac OS X
elif sys.platform == "darwin":
@@ -788,7 +797,7 @@
# Parse the command line.
global progName, modDir, doCleanup, doCompile, distDir, cfg, apisDir
- global sourceDir, configName
+ global sourceDir, configName, useStart
progName = os.path.basename(argv[0])
@@ -832,6 +841,8 @@
exit(6)
except:
cfg = {}
+ elif opt == "-s":
+ useStart = False
installFromSource = not os.path.isdir(sourceDir)
if installFromSource:
