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
8
Merge Requests
8
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
4d4be3f0
Commit
4d4be3f0
authored
Aug 27, 2008
by
Georgy Berdyshev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added Jython support.
Signed-off-by:
Georgy Berdyshev - Георгий Бердышев
<
codingmaster@gmail.com
>
parent
9278b9da
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
4 deletions
+23
-4
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+23
-4
No files found.
src/zc/buildout/buildout.py
View file @
4d4be3f0
...
@@ -43,6 +43,11 @@ pkg_resources_loc = pkg_resources.working_set.find(
...
@@ -43,6 +43,11 @@ pkg_resources_loc = pkg_resources.working_set.find(
_isurl
=
re
.
compile
(
'([a-zA-Z0-9+.-]+)://'
).
match
_isurl
=
re
.
compile
(
'([a-zA-Z0-9+.-]+)://'
).
match
is_jython
=
sys
.
platform
.
startswith
(
'java'
)
if
is_jython
:
import
subprocess
class
MissingOption
(
zc
.
buildout
.
UserError
,
KeyError
):
class
MissingOption
(
zc
.
buildout
.
UserError
,
KeyError
):
"""A required option was missing
"""A required option was missing
"""
"""
...
@@ -780,6 +785,10 @@ class Buildout(UserDict.DictMixin):
...
@@ -780,6 +785,10 @@ class Buildout(UserDict.DictMixin):
if
not
__debug__
:
if
not
__debug__
:
args
.
insert
(
0
,
'-O'
)
args
.
insert
(
0
,
'-O'
)
args
.
insert
(
0
,
zc
.
buildout
.
easy_install
.
_safe_arg
(
sys
.
executable
))
args
.
insert
(
0
,
zc
.
buildout
.
easy_install
.
_safe_arg
(
sys
.
executable
))
if
is_jython
:
sys
.
exit
(
subprocess
.
Popen
([
sys
.
executable
]
+
list
(
args
)).
wait
())
else
:
sys
.
exit
(
os
.
spawnv
(
os
.
P_WAIT
,
sys
.
executable
,
args
))
sys
.
exit
(
os
.
spawnv
(
os
.
P_WAIT
,
sys
.
executable
,
args
))
def
_load_extensions
(
self
):
def
_load_extensions
(
self
):
...
@@ -831,6 +840,16 @@ class Buildout(UserDict.DictMixin):
...
@@ -831,6 +840,16 @@ class Buildout(UserDict.DictMixin):
setup
=
setup
,
setup
=
setup
,
__file__
=
setup
,
__file__
=
setup
,
))
))
if
is_jython
:
arg_list
=
list
()
for
a
in
args
:
add_args
.
append
(
zc
.
buildout
.
easy_install
.
_safe_arg
(
a
))
subprocess
.
Popen
([
zc
.
buildout
.
easy_install
.
_safe_arg
(
sys
.
executable
)]
+
list
(
tsetup
)
+
arg_list
).
wait
()
else
:
os
.
spawnl
(
os
.
P_WAIT
,
sys
.
executable
,
zc
.
buildout
.
easy_install
.
_safe_arg
(
sys
.
executable
),
tsetup
,
os
.
spawnl
(
os
.
P_WAIT
,
sys
.
executable
,
zc
.
buildout
.
easy_install
.
_safe_arg
(
sys
.
executable
),
tsetup
,
*
[
zc
.
buildout
.
easy_install
.
_safe_arg
(
a
)
*
[
zc
.
buildout
.
easy_install
.
_safe_arg
(
a
)
for
a
in
args
])
for
a
in
args
])
...
...
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