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
Gwenaël Samain
slapos
Commits
d3338d6e
Commit
d3338d6e
authored
Jan 16, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'erp5-component' into erp5
parents
a66d0ff3
ca8e08e7
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
60 additions
and
35 deletions
+60
-35
component/graphviz/buildout.cfg
component/graphviz/buildout.cfg
+20
-10
component/libpng/buildout.cfg
component/libpng/buildout.cfg
+4
-4
component/slapos/buildout.cfg
component/slapos/buildout.cfg
+9
-9
software/erp5-util-testing/instance.cfg
software/erp5-util-testing/instance.cfg
+6
-0
software/erp5-util-testing/software.cfg
software/erp5-util-testing/software.cfg
+1
-1
software/slapos-testing/instance.cfg
software/slapos-testing/instance.cfg
+8
-1
software/slapos-testing/software.cfg
software/slapos-testing/software.cfg
+4
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+8
-8
No files found.
component/graphviz/buildout.cfg
View file @
d3338d6e
...
@@ -5,29 +5,30 @@
...
@@ -5,29 +5,30 @@
parts =
parts =
graphviz
graphviz
extends =
extends =
../bzip2/buildout.cfg
../fontconfig/buildout.cfg
../fontconfig/buildout.cfg
../freetype/buildout.cfg
../freetype/buildout.cfg
../libpng/buildout.cfg
../libpng/buildout.cfg
../glib/buildout.cfg
../gtk-2/buildout.cfg
../pkgconfig/buildout.cfg
../pkgconfig/buildout.cfg
../xorg/buildout.cfg
../zlib/buildout.cfg
../zlib/buildout.cfg
[graphviz]
[graphviz]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.
28
.0.tar.gz
url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.
36
.0.tar.gz
md5sum =
8d26c1171f30ca3b1dc1b429f7937e58
md5sum =
1f41664dba0c93109ac8b71216bf2b57
depends =
depends =
${libpng:so_version}
${libpng:so_version}
configure-options =
configure-options =
--with-included-ltdl
--with-included-ltdl
--with-pngincludedir=${libpng:location}/include
--with-pnglibdir=${libpng:location}/lib
--with-zincludedir=${zlib:location}/include
--with-zincludedir=${zlib:location}/include
--with-zlibdir=${zlib:location}/lib
--with-zlibdir=${zlib:location}/lib
--with-freetype2
--with-freetype2
--with-fontconfig
--with-fontconfig
--disable-swig
--disable-swig
--disable-sharp
--disable-sharp
--disable-go
--disable-guile
--disable-guile
--disable-io
--disable-io
--disable-java
--disable-java
...
@@ -42,16 +43,25 @@ configure-options =
...
@@ -42,16 +43,25 @@ configure-options =
--without-x
--without-x
--without-expat
--without-expat
--without-devil
--without-devil
--without-webp
--without-poppler
--without-rsvg
--without-rsvg
--without-ghostscript
--without-ghostscript
--without-visio
--without-visio
--with
out
-pangocairo
--with-pangocairo
--without-lasi
--without-lasi
--without-glitz
--without-glitz
--without-jpeg
--without-gdk
--without-gtk
--without-gts
--without-ann
--without-glade
--without-ming
--without-qt
--without-libgd
--without-glut
--without-glut
environment =
environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${
fontconfig:location}/lib/pkgconfig:${freetype
:location}/lib/pkgconfig
PKG_CONFIG_PATH=${
cairo:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pixman
:location}/lib/pkgconfig
CPPFLAGS=-I${
bzip2:location}/include -I${
zlib:location}/include
CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-L${
bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${
zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
component/libpng/buildout.cfg
View file @
d3338d6e
...
@@ -23,11 +23,11 @@ md5sum = 717caa58e9c71a80820eb38c4f4d6ec3
...
@@ -23,11 +23,11 @@ md5sum = 717caa58e9c71a80820eb38c4f4d6ec3
[libpng15]
[libpng15]
<= libpng-common
<= libpng-common
url = http://download.sourceforge.net/libpng/libpng-1.5.1
6
.tar.xz
url = http://download.sourceforge.net/libpng/libpng-1.5.1
7
.tar.xz
md5sum =
fd85af68f84cbdf549147811006488c1
md5sum =
6509aba334bbd87613d2d353a2af44d6
[libpng]
[libpng]
<= libpng-common
<= libpng-common
url = http://download.sourceforge.net/libpng/libpng-1.6.
6
.tar.xz
url = http://download.sourceforge.net/libpng/libpng-1.6.
8
.tar.xz
md5sum =
3a41dcd58bcac7cc191c2ec80c7fb2ac
md5sum =
51ce71a1642cdde1f4485a7ff82193c0
so_version = 16
so_version = 16
component/slapos/buildout.cfg
View file @
d3338d6e
...
@@ -144,7 +144,7 @@ zc.recipe.egg = 1.3.2
...
@@ -144,7 +144,7 @@ zc.recipe.egg = 1.3.2
# Use own version of h.r.download to be able to open archives not supported by python2.x: .xz
# Use own version of h.r.download to be able to open archives not supported by python2.x: .xz
hexagonit.recipe.download = 1.7nxd002
hexagonit.recipe.download = 1.7nxd002
slapos.core = 1.0.
0
slapos.core = 1.0.
2.1
Jinja2 = 2.7.1
Jinja2 = 2.7.1
MarkupSafe = 0.18
MarkupSafe = 0.18
Pygments = 1.6
Pygments = 1.6
...
@@ -166,33 +166,33 @@ xml-marshaller = 0.9.7
...
@@ -166,33 +166,33 @@ xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
z3c.recipe.scripts = 1.0.1
# Required by:
# Required by:
# slapos.core==1.0.
0
# slapos.core==1.0.
2.1
Flask = 0.10.1
Flask = 0.10.1
# Required by:
# Required by:
# slapos.core==1.0.
0
# slapos.core==1.0.
2.1
bpython = 0.12
bpython = 0.12
# Required by:
# Required by:
# slapos.core==1.0.
0
# slapos.core==1.0.
2.1
cliff = 1.4.5
cliff = 1.4.5
# Required by:
# Required by:
# slapos.core==1.0.
0
# slapos.core==1.0.
2.1
ipython = 1.1.0
ipython = 1.1.0
# Required by:
# Required by:
# slapos.core==1.0.
0
# slapos.core==1.0.
2.1
netifaces = 0.8
netifaces = 0.8
# Required by:
# Required by:
# slapos.core==1.0.
0
# slapos.core==1.0.
2.1
requests = 2.1.0
requests = 2.1.0
# Required by:
# Required by:
# slapos.core==1.0.
0
# slapos.core==1.0.
2.1
supervisor = 3.0
supervisor = 3.0
# Required by:
# Required by:
# slapos.core==1.0.
0
# slapos.core==1.0.
2.1
zope.interface = 4.0.5
zope.interface = 4.0.5
software/erp5-util-testing/instance.cfg
View file @
d3338d6e
[buildout]
[buildout]
parts =
parts =
erp5-util-setup
test-runner
test-runner
sh-environment
sh-environment
...
@@ -24,6 +25,11 @@ git-executable = ${git:location}/bin/git
...
@@ -24,6 +25,11 @@ git-executable = ${git:location}/bin/git
<= download-source
<= download-source
repository = ${erp5-util-repository:location}
repository = ${erp5-util-repository:location}
[erp5-util-setup]
recipe = plone.recipe.command
command = echo "Updating setup...";cd $${erp5-util:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n
update-command = $${:command}
[test-runner]
[test-runner]
recipe = slapos.cookbook:egg_test
recipe = slapos.cookbook:egg_test
run-test-suite = $${create-directory:bin}/runTestSuite
run-test-suite = $${create-directory:bin}/runTestSuite
...
...
software/erp5-util-testing/software.cfg
View file @
d3338d6e
...
@@ -45,7 +45,7 @@ branch = master
...
@@ -45,7 +45,7 @@ branch = master
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
md5sum =
e8b87313667c944567029c61c9c0bd2e
md5sum =
194278f0a65d692bd165a909e6c83148
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 640
mode = 640
...
...
software/slapos-testing/instance.cfg
View file @
d3338d6e
[buildout]
[buildout]
parts =
parts =
slapos.core-setup
slapos-test-runner
slapos-test-runner
sh-environment
sh-environment
...
@@ -24,6 +25,12 @@ git-executable = ${git:location}/bin/git
...
@@ -24,6 +25,12 @@ git-executable = ${git:location}/bin/git
<= download-source
<= download-source
repository = ${slapos.core-repository:location}
repository = ${slapos.core-repository:location}
[slapos.core-setup]
recipe = plone.recipe.command
command = echo "Updating setup...";cd $${slapos.core:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n
update-command = $${:command}
[slapos.recipe.template]
[slapos.recipe.template]
<= download-source
<= download-source
repository = ${slapos.recipe.template-repository:location}
repository = ${slapos.recipe.template-repository:location}
...
...
software/slapos-testing/software.cfg
View file @
d3338d6e
...
@@ -25,6 +25,7 @@ eggs =
...
@@ -25,6 +25,7 @@ eggs =
erp5.util
erp5.util
slapos.cookbook
slapos.cookbook
collective.recipe.template
collective.recipe.template
plone.recipe.command
entry-points =
entry-points =
runTestSuite=erp5.util.testsuite:runTestSuite
runTestSuite=erp5.util.testsuite:runTestSuite
scripts =
scripts =
...
@@ -61,7 +62,7 @@ branch = master
...
@@ -61,7 +62,7 @@ branch = master
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
md5sum =
7a8be25961238f8e11d5de95d2f05598
md5sum =
1330c8ccd1dab485aadba5e688d2b2e1
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 640
mode = 640
...
@@ -106,7 +107,6 @@ Werkzeug = 0.9.4
...
@@ -106,7 +107,6 @@ Werkzeug = 0.9.4
buildout-versions = 1.7
buildout-versions = 1.7
cmd2 = 0.6.7
cmd2 = 0.6.7
collective.recipe.template = 1.10
collective.recipe.template = 1.10
erp5.util = 0.4.36
itsdangerous = 0.23
itsdangerous = 0.23
lxml = 3.3.0beta3
lxml = 3.3.0beta3
meld3 = 0.6.10
meld3 = 0.6.10
...
@@ -130,6 +130,8 @@ bpython = 0.12
...
@@ -130,6 +130,8 @@ bpython = 0.12
# slapos.core==1.0.0
# slapos.core==1.0.0
cliff = 1.5.2
cliff = 1.5.2
erp5.util = 0.4.36
# Required by:
# Required by:
# slapos.cookbook==0.85
# slapos.cookbook==0.85
inotifyx = 0.2.0-1
inotifyx = 0.2.0-1
...
...
stack/erp5/buildout.cfg
View file @
d3338d6e
...
@@ -560,13 +560,13 @@ Products.DCWorkflow = 2.2.4nxd001
...
@@ -560,13 +560,13 @@ Products.DCWorkflow = 2.2.4nxd001
cloudooo = 1.2.5-dev
cloudooo = 1.2.5-dev
# use newer version than specified in ZTK
# use newer version than specified in ZTK
Jinja2 = 2.7.
1
Jinja2 = 2.7.
2
PasteDeploy = 1.5.2
PasteDeploy = 1.5.2
Pygments = 1.6
Pygments = 1.6
argparse = 1.2.1
argparse = 1.2.1
coverage = 3.7.1
coverage = 3.7.1
lxml = 3.2.5
lxml = 3.2.5
mr.developer = 1.2
6
mr.developer = 1.2
7
setuptools = 2.1
setuptools = 2.1
# Known version with works
# Known version with works
...
@@ -645,7 +645,7 @@ five.formlib = 1.0.4
...
@@ -645,7 +645,7 @@ five.formlib = 1.0.4
five.localsitemanager = 2.0.5
five.localsitemanager = 2.0.5
fpconst = 0.7.2
fpconst = 0.7.2
gitdb = 0.5.4
gitdb = 0.5.4
greenlet = 0.4.
1
greenlet = 0.4.
2
hexagonit.recipe.cmmi = 2.0
hexagonit.recipe.cmmi = 2.0
http-parser = 0.8.3
http-parser = 0.8.3
huBarcode = 0.63
huBarcode = 0.63
...
@@ -655,7 +655,7 @@ ipython = 1.1.0
...
@@ -655,7 +655,7 @@ ipython = 1.1.0
meld3 = 0.6.10
meld3 = 0.6.10
netaddr = 0.7.10
netaddr = 0.7.10
netifaces = 0.8_1
netifaces = 0.8_1
paramiko = 1.12.
0
paramiko = 1.12.
1
plone.recipe.command = 1.1
plone.recipe.command = 1.1
ply = 3.4
ply = 3.4
polib = 1.0.3
polib = 1.0.3
...
@@ -664,13 +664,13 @@ pyflakes = 0.7.2
...
@@ -664,13 +664,13 @@ pyflakes = 0.7.2
python-ldap = 2.4.13
python-ldap = 2.4.13
python-magic = 0.4.6
python-magic = 0.4.6
qrcode = 4.0.4
qrcode = 4.0.4
requests = 2.
1
.0
requests = 2.
2
.0
restkit = 4.2.2
restkit = 4.2.2
rtjp-eventlet = 0.3.2
rtjp-eventlet = 0.3.2
slapos.core =
0.35
.1
slapos.core =
1.0.2
.1
slapos.recipe.build = 0.12
slapos.recipe.build = 0.12
slapos.recipe.template = 2.
4.2
slapos.recipe.template = 2.
5
slapos.toolbox = 0.3
3
.1
slapos.toolbox = 0.3
8
.1
smmap = 0.8.2
smmap = 0.8.2
socketpool = 0.5.3
socketpool = 0.5.3
spyne = 2.10.9
spyne = 2.10.9
...
...
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