Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Leo Le Bouter
slapos
Commits
dfe62195
Commit
dfe62195
authored
Aug 15, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'slaprunner'
parents
320a228b
05855cef
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
16 deletions
+16
-16
component/nodejs/buildout.cfg
component/nodejs/buildout.cfg
+4
-5
slapos/recipe/slaprunner/__init__.py
slapos/recipe/slaprunner/__init__.py
+3
-2
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+9
-9
No files found.
component/nodejs/buildout.cfg
View file @
dfe62195
...
@@ -3,7 +3,6 @@ extends =
...
@@ -3,7 +3,6 @@ extends =
../git/buildout.cfg
../git/buildout.cfg
../pkgconfig/buildout.cfg
../pkgconfig/buildout.cfg
../openssl/buildout.cfg
../openssl/buildout.cfg
../python-2.7/buildout.cfg
../zlib/buildout.cfg
../zlib/buildout.cfg
parts =
parts =
...
@@ -12,14 +11,14 @@ parts =
...
@@ -12,14 +11,14 @@ parts =
[nodejs]
[nodejs]
# Server-side Javascript.
# Server-side Javascript.
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
url = http://nodejs.org/dist/v0.6.
19/node-v0.6.19
.tar.gz
url = http://nodejs.org/dist/v0.6.
21/node-v0.6.21
.tar.gz
md5sum =
f5669a9717422b811c6bad1cc961b1e5
md5sum =
0da985a0bf820400af92363b9f453fe4
configure-options =
configure-options =
--openssl-includes=${openssl:location}/include
--openssl-includes=${openssl:location}/include
--openssl-libpath=${openssl:location}/lib
--openssl-libpath=${openssl:location}/lib
environment =
environment =
HOME=${buildout:parts-directory}/${:_buildout_section_name_}
HOME=${buildout:parts-directory}/${:_buildout_section_name_}
PATH=${pkgconfig:location}/bin:
${python2.7:location}/bin:
%(PATH)s
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
CPPFLAGS=-I${zlib:location}/include
CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
...
@@ -32,7 +31,7 @@ configure-options =
...
@@ -32,7 +31,7 @@ configure-options =
--openssl-includes=${openssl:location}/include
--openssl-includes=${openssl:location}/include
--openssl-libpath=${openssl:location}/lib
--openssl-libpath=${openssl:location}/lib
environment =
environment =
PATH=${pkgconfig:location}/bin:
${python2.7:location}/bin:
%(PATH)s
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
CPPFLAGS=-I${zlib:location}/include
CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
...
...
slapos/recipe/slaprunner/__init__.py
View file @
dfe62195
...
@@ -82,8 +82,9 @@ class Recipe(GenericBaseRecipe):
...
@@ -82,8 +82,9 @@ class Recipe(GenericBaseRecipe):
PATH
=
os
.
path
.
dirname
(
self
.
options
[
'git-binary'
])
+
':'
+
os
.
environ
[
'PATH'
],
PATH
=
os
.
path
.
dirname
(
self
.
options
[
'git-binary'
])
+
':'
+
os
.
environ
[
'PATH'
],
GIT_SSH
=
self
.
options
[
'ssh_client'
]
GIT_SSH
=
self
.
options
[
'ssh_client'
]
)
)
launch_args
=
[
self
.
options
[
'slaprunner'
].
strip
(),
config_file
]
launch_args
=
[
self
.
options
[
'slaprunner'
].
strip
(),
config_file
,
'--debug'
]
if
self
.
optionIsTrue
(
'debug'
,
default
=
False
):
launch_args
.
append
(
'--debug'
)
wrapper
=
self
.
createPythonScript
(
self
.
options
[
'wrapper'
],
wrapper
=
self
.
createPythonScript
(
self
.
options
[
'wrapper'
],
'slapos.recipe.librecipe.execute.executee'
,
'slapos.recipe.librecipe.execute.executee'
,
...
...
software/slaprunner/software.cfg
View file @
dfe62195
...
@@ -70,17 +70,17 @@ slapos.cookbook = 0.60
...
@@ -70,17 +70,17 @@ slapos.cookbook = 0.60
slapos.libnetworkcache = 0.12
slapos.libnetworkcache = 0.12
slapos.recipe.build = 0.10.2
slapos.recipe.build = 0.10.2
slapos.recipe.template = 2.4.1
slapos.recipe.template = 2.4.1
slapos.toolbox = 0.28
slapos.toolbox = 0.28
.1
smmap = 0.8.2
smmap = 0.8.2
z3c.recipe.scripts = 1.0.1
z3c.recipe.scripts = 1.0.1
# Required by:
# Required by:
# slapos.core==0.27
# slapos.core==0.27
# slapos.toolbox==0.28
# slapos.toolbox==0.28
.1
Flask = 0.9
Flask = 0.9
# Required by:
# Required by:
# slapos.toolbox==0.28
# slapos.toolbox==0.28
.1
GitPython = 0.3.2.RC1
GitPython = 0.3.2.RC1
# Required by:
# Required by:
...
@@ -92,11 +92,11 @@ PyXML = 0.8.4
...
@@ -92,11 +92,11 @@ PyXML = 0.8.4
Sphinx = 1.1.3
Sphinx = 1.1.3
# Required by:
# Required by:
# slapos.toolbox==0.28
# slapos.toolbox==0.28
.1
atomize = 0.1.1
atomize = 0.1.1
# Required by:
# Required by:
# slapos.toolbox==0.28
# slapos.toolbox==0.28
.1
feedparser = 5.1.2
feedparser = 5.1.2
# Required by:
# Required by:
...
@@ -109,7 +109,7 @@ inotifyx = 0.2.0
...
@@ -109,7 +109,7 @@ inotifyx = 0.2.0
# Required by:
# Required by:
# slapos.core==0.27
# slapos.core==0.27
# slapos.toolbox==0.28
# slapos.toolbox==0.28
.1
# xml-marshaller==0.9.7
# xml-marshaller==0.9.7
lxml = 2.3.5
lxml = 2.3.5
...
@@ -122,18 +122,18 @@ netaddr = 0.7.7
...
@@ -122,18 +122,18 @@ netaddr = 0.7.7
netifaces = 0.8
netifaces = 0.8
# Required by:
# Required by:
# slapos.toolbox==0.28
# slapos.toolbox==0.28
.1
paramiko = 1.7.7.2
paramiko = 1.7.7.2
# Required by:
# Required by:
# slapos.toolbox==0.28
# slapos.toolbox==0.28
.1
psutil = 0.6.0
psutil = 0.6.0
# Required by:
# Required by:
# slapos.cookbook==0.60
# slapos.cookbook==0.60
# slapos.core==0.27
# slapos.core==0.27
# slapos.libnetworkcache==0.12
# slapos.libnetworkcache==0.12
# slapos.toolbox==0.28
# slapos.toolbox==0.28
.1
# supervisor==3.0a12
# supervisor==3.0a12
# zc.buildout==1.6.0-dev-SlapOS-006
# zc.buildout==1.6.0-dev-SlapOS-006
# zc.recipe.egg==1.3.2
# zc.recipe.egg==1.3.2
...
...
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