Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Thomas Leymonerie
slapos.buildout
Commits
e1194b1e
Commit
e1194b1e
authored
Jan 31, 2013
by
Jim Fulton
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #53 from reinout/fix-distutilsscripts-on-windows
Fixed filename of distutils-scripts on windows. Fixes #52
parents
7c9f4f39
1c711155
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+2
-3
src/zc/buildout/easy_install.txt
src/zc/buildout/easy_install.txt
+12
-0
No files found.
src/zc/buildout/easy_install.py
View file @
e1194b1e
...
@@ -33,7 +33,6 @@ import subprocess
...
@@ -33,7 +33,6 @@ import subprocess
import
sys
import
sys
import
tempfile
import
tempfile
import
zc.buildout
import
zc.buildout
import
zipimport
_oprp
=
getattr
(
os
.
path
,
'realpath'
,
lambda
path
:
path
)
_oprp
=
getattr
(
os
.
path
,
'realpath'
,
lambda
path
:
path
)
def
realpath
(
path
):
def
realpath
(
path
):
...
@@ -1022,8 +1021,6 @@ base = os.path.dirname(os.path.abspath(os.path.realpath(__file__)))
...
@@ -1022,8 +1021,6 @@ base = os.path.dirname(os.path.abspath(os.path.realpath(__file__)))
"""
"""
def
_script
(
module_name
,
attrs
,
path
,
dest
,
arguments
,
initialization
,
rsetup
):
def
_script
(
module_name
,
attrs
,
path
,
dest
,
arguments
,
initialization
,
rsetup
):
generated
=
[]
script
=
dest
if
is_win32
:
if
is_win32
:
dest
+=
'-script.py'
dest
+=
'-script.py'
...
@@ -1042,6 +1039,8 @@ def _script(module_name, attrs, path, dest, arguments, initialization, rsetup):
...
@@ -1042,6 +1039,8 @@ def _script(module_name, attrs, path, dest, arguments, initialization, rsetup):
def
_distutils_script
(
path
,
dest
,
script_content
,
initialization
,
rsetup
):
def
_distutils_script
(
path
,
dest
,
script_content
,
initialization
,
rsetup
):
if
is_win32
:
dest
+=
'-script.py'
lines
=
script_content
.
splitlines
(
True
)
lines
=
script_content
.
splitlines
(
True
)
if
not
(
'#!'
in
lines
[
0
])
and
(
'python'
in
lines
[
0
]):
if
not
(
'#!'
in
lines
[
0
])
and
(
'python'
in
lines
[
0
]):
...
...
src/zc/buildout/easy_install.txt
View file @
e1194b1e
...
@@ -912,6 +912,18 @@ Buildout also installs those:
...
@@ -912,6 +912,18 @@ Buildout also installs those:
>>> ls(distbin)
>>> ls(distbin)
- distutilsscript
- distutilsscript
Like for console_scripts, the output is a list of the scripts
generated. Likewise, on windows two files, an ``.exe`` and a script with
``-script.py`` appended, are generated:
>>> import os, sys
>>> if sys.platform == 'win32':
... scripts == [os.path.join(distbin, 'distutilsscript.exe'),
... os.path.join(distbin, 'distutilsscript-script.py')]
... else:
... scripts == [os.path.join(distbin, 'distutilsscript')]
True
It also works for zipped eggs:
It also works for zipped eggs:
>>> distdir2 = tmpdir('distutilsscriptdir2')
>>> distdir2 = tmpdir('distutilsscriptdir2')
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment