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
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
Jean-Paul Smets
slapos
Commits
25c5fba2
Commit
25c5fba2
authored
Oct 05, 2012
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into grid-computing
parents
a780ff12
5f09e283
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
60 deletions
+22
-60
component/git/buildout.cfg
component/git/buildout.cfg
+2
-2
component/python-setuptools/buildout.cfg
component/python-setuptools/buildout.cfg
+1
-1
component/rpm2cpio/buildout.cfg
component/rpm2cpio/buildout.cfg
+1
-1
slapos/recipe/template.py
slapos/recipe/template.py
+0
-46
software/slapos-testing/instance.cfg
software/slapos-testing/instance.cfg
+14
-0
software/slapos-testing/software.cfg
software/slapos-testing/software.cfg
+4
-10
No files found.
component/git/buildout.cfg
View file @
25c5fba2
...
...
@@ -12,8 +12,8 @@ parts =
[git]
recipe = hexagonit.recipe.cmmi
url = http://git-core.googlecode.com/files/git-1.7.1
0.4
.tar.gz
md5sum =
68319d593d051ef76c26e945bbd2d7a
c
url = http://git-core.googlecode.com/files/git-1.7.1
2
.tar.gz
md5sum =
ceb1a6b17a3e33bbc70eadf8fce5876
c
configure-options =
--with-curl=${curl:location}
--with-openssl=${openssl:location}
...
...
component/python-setuptools/buildout.cfg
View file @
25c5fba2
...
...
@@ -2,7 +2,7 @@
parts = python-setuptools
[setuptools-download]
recipe = slapos.recipe.download
recipe = slapos.recipe.
build:
download
filename = setuptools-0.6c11-py2.7.egg
url = http://pypi.python.org/packages/2.7/s/setuptools/${:filename}
md5sum = fe1f997bc722265116870bc7919059ea
...
...
component/rpm2cpio/buildout.cfg
View file @
25c5fba2
...
...
@@ -4,5 +4,5 @@ parts =
[rpm2cpio]
recipe = slapos.recipe.build:download
url = http
://ruda.googlecode.com/hg-history/2989f0531de63872cc7327590798d1898ac91246/rpm
/rpm2cpio.py
url = http
s://raw.github.com/ruda/rpm2cpio/e196173f1f6b746463b7398e381b94a42edfa345
/rpm2cpio.py
md5sum = c5bb6227d99e1ff5df880f997cbed2e3
slapos/recipe/template.py
deleted
100644 → 0
View file @
a780ff12
##############################################################################
#
# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly adviced to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 3
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import
os
from
slapos.recipe.librecipe
import
GenericBaseRecipe
class
Recipe
(
GenericBaseRecipe
):
def
install
(
self
):
mapping
=
self
.
options
.
copy
()
for
key
in
(
'output'
,
'template'
,
'recipe'
,
'mode'
):
if
key
in
mapping
:
del
mapping
[
key
]
with
open
(
self
.
options
[
'output'
],
'w'
)
as
output
,
\
open
(
self
.
options
[
'template'
],
'r'
)
as
template
:
output
.
write
(
template
.
read
()
%
mapping
)
if
'mode'
in
self
.
options
:
os
.
chmod
(
self
.
options
[
'output'
],
int
(
self
.
options
[
'mode'
],
8
))
return
[
self
.
options
[
'output'
],
]
software/slapos-testing/instance.cfg
View file @
25c5fba2
[buildout]
parts =
slapos-test-runner
sh-environment
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
...
...
@@ -49,3 +50,16 @@ environment = environment
CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib
PYTHONPATH = ${python-setuptools:location}
[sh-environment]
# Section exposes testing default environment as sh file. It is thus easy
# to directly develop and test the egg inside of this instance.
recipe = collective.recipe.template
input = inline:
export PATH="$${slapos-test-runner:prepend-path}:$PATH"
export CPPFLAGS="$${environment:CPPFLAGS}"
export LDFLAGS="$${environment:LDFLAGS}"
export PYTHONPATH="$${environment:PYTHONPATH}"
export PS1="[slapos-testing env Active] $PS1"
output = $${create-directory:bin}/environment.sh
mode = 755
software/slapos-testing/software.cfg
View file @
25c5fba2
...
...
@@ -24,24 +24,18 @@ eggs =
${lxml-python:egg}
erp5.util
slapos.cookbook
collective.recipe.template
entry-points =
runTestSuite=erp5.util.testsuite:runTestSuite
scripts =
runTestSuite
[erp5.util-repository]
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
forbid-download-cache = true
repository = http://git.erp5.org/repos/erp5.git
branch = master
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
forbid-download-cache = true
repository = http://git.erp5.org/repos/slapos.git
branch =
slapos-testing
branch =
master
[slapos.core-repository]
recipe = slapos.recipe.build:gitclone
...
...
@@ -67,7 +61,7 @@ branch = master
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
md5sum =
d7dbd5da07c1170d0b80199d99f932eb
md5sum =
75588537faf3d42c14867229c68a3978
output = ${buildout:directory}/template.cfg
mode = 640
...
...
@@ -77,7 +71,7 @@ Werkzeug = 0.8.3
buildout-versions = 1.7
erp5.util = 0.4.7
hexagonit.recipe.cmmi = 1.6
lxml =
3.0alpha2
lxml =
2.3.6
meld3 = 0.6.8
plone.recipe.command = 1.1
slapos.cookbook = 0.65
...
...
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