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
Rafael Monnerat
slapos.buildout
Commits
1ba552fa
Commit
1ba552fa
authored
Sep 04, 2009
by
Reinout van Rees
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Further documentation update and cleanup of comments
parent
7b3330d9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
10 deletions
+16
-10
doc/tutorial.txt
doc/tutorial.txt
+2
-2
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+7
-4
src/zc/buildout/easy_install.txt
src/zc/buildout/easy_install.txt
+7
-4
No files found.
doc/tutorial.txt
View file @
1ba552fa
...
@@ -863,8 +863,8 @@ Installing scripts
...
@@ -863,8 +863,8 @@ Installing scripts
If a distribution doesn't use setuptools, it may not declare it's entry
If a distribution doesn't use setuptools, it may not declare it's entry
points. In that case, you can specify entry points in the recipe data.
points. In that case, you can specify entry points in the recipe data.
Buildout *does
attempt* to detect distutils-style scripts without an entry
Buildout *does
* detect distutils-style scripts without an entry point in
point
and will generate a script for them when found.
case the egg is unzipped
and will generate a script for them when found.
Script initialization
Script initialization
=====================
=====================
...
...
src/zc/buildout/easy_install.py
View file @
1ba552fa
...
@@ -932,16 +932,20 @@ def scripts(reqs, working_set, executable, dest,
...
@@ -932,16 +932,20 @@ def scripts(reqs, working_set, executable, dest,
if
isinstance
(
req
,
str
):
if
isinstance
(
req
,
str
):
req
=
pkg_resources
.
Requirement
.
parse
(
req
)
req
=
pkg_resources
.
Requirement
.
parse
(
req
)
dist
=
working_set
.
find
(
req
)
dist
=
working_set
.
find
(
req
)
# entry points
#
regular console_scripts
entry points
for
name
in
pkg_resources
.
get_entry_map
(
dist
,
'console_scripts'
):
for
name
in
pkg_resources
.
get_entry_map
(
dist
,
'console_scripts'
):
entry_point
=
dist
.
get_entry_info
(
'console_scripts'
,
name
)
entry_point
=
dist
.
get_entry_info
(
'console_scripts'
,
name
)
entry_points
.
append
(
entry_points
.
append
(
(
name
,
entry_point
.
module_name
,
(
name
,
entry_point
.
module_name
,
'.'
.
join
(
entry_point
.
attrs
))
'.'
.
join
(
entry_point
.
attrs
))
)
)
# distutils scripts
#
"old-style"
distutils scripts
if
os
.
path
.
isdir
(
dist
.
location
):
if
os
.
path
.
isdir
(
dist
.
location
):
# TODO: what about zipped eggs?
# The metadata on scripts is not retained by
# distutils/setuptools, except by placing the original scripts
# in /EGG-INFO/scripts/. os.listdir() is used to detect them.
# Zipped eggs would need unpacking for this to work, which is
# too resource intensive, so zipped eggs are not supported.
scripts_dir
=
os
.
path
.
join
(
dist
.
location
,
'EGG-INFO'
,
'scripts'
)
scripts_dir
=
os
.
path
.
join
(
dist
.
location
,
'EGG-INFO'
,
'scripts'
)
if
os
.
path
.
exists
(
scripts_dir
):
if
os
.
path
.
exists
(
scripts_dir
):
for
name
in
os
.
listdir
(
scripts_dir
):
for
name
in
os
.
listdir
(
scripts_dir
):
...
@@ -1075,7 +1079,6 @@ def _distutils_script(path, dest, original_file, executable, initialization, rse
...
@@ -1075,7 +1079,6 @@ def _distutils_script(path, dest, original_file, executable, initialization, rse
# The script doesn't follow distutil's rules. Ignore it.
# The script doesn't follow distutil's rules. Ignore it.
return
[]
return
[]
original_content
=
''
.
join
(
lines
[
1
:])
original_content
=
''
.
join
(
lines
[
1
:])
# TODO: does this work OK with non-ascii characters?
contents
=
distutils_script_template
%
dict
(
contents
=
distutils_script_template
%
dict
(
python
=
_safe_arg
(
executable
),
python
=
_safe_arg
(
executable
),
path
=
path
,
path
=
path
,
...
...
src/zc/buildout/easy_install.txt
View file @
1ba552fa
...
@@ -929,10 +929,10 @@ Buildout also installs those:
...
@@ -929,10 +929,10 @@ Buildout also installs those:
>>> ls(distbin)
>>> ls(distbin)
- distutilsscript
- distutilsscript
Distutils copies the s
pecified script files verbatim, apart from a line at the
Distutils copies the s
cript files verbatim, apart from a line at the top that
top that looks like ``#!/usr/bin/python``, which gets replaced by the actual
looks like ``#!/usr/bin/python``, which gets replaced by the actual python
python interpreter. Buildout does the same, but additionally also adds the
interpreter. Buildout does the same, but additionally also adds the sys.path
sys.path
like for the console_scripts:
like for the console_scripts:
>>> cat(distbin, 'distutilsscript')
>>> cat(distbin, 'distutilsscript')
#!/usr/local/bin/python2.4
#!/usr/local/bin/python2.4
...
@@ -948,6 +948,9 @@ sys.path like for the console_scripts:
...
@@ -948,6 +948,9 @@ sys.path like for the console_scripts:
Due to the nature of distutils scripts, buildout cannot pass arguments as
Due to the nature of distutils scripts, buildout cannot pass arguments as
there's no specific method to pass them to.
there's no specific method to pass them to.
A second restriction is that scripts are only detected if the eggs are
unzipped. Unzipping all zipped eggs for detecting old-style distutils scripts
is a bit wasteful.
Handling custom build options for extensions provided in source distributions
Handling custom build options for extensions provided in source distributions
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
...
...
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