Merge branch 'erp5' into erp5-z2.13

component/curl/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [curl]
 recipe = hexagonit.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.29.0.tar.bz2
-md5sum = fa5f37f38a8042020e292ce7ec5341ce
+url = http://curl.haxx.se/download/curl-7.30.0.tar.bz2
+md5sum = 0db5ec03a5001b42a2edc03bf63b5ceb
 configure-options =
   --disable-static
   --disable-ldap

component/perl-SGML-Parser-OpenSP/buildout.cfg

@@ -16,7 +16,8 @@ depends =
 url = http://search.cpan.org/CPAN/authors/id/B/BJ/BJOERN/SGML-Parser-OpenSP-0.994.tar.gz
 md5sum = b1ee0244e9daa4d37f28cf32c4753691
 configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+  ${perl:location}/bin/perl Makefile.PL \
+  INC=-I${opensp:location}/include \
+  LIBS="-lstdc++ -L${opensp:location}/lib -losp"
 make-options =
-  INC=-I${opensp:location}/include
-  OTHERLDFLAGS="-L${opensp:location}/lib -Wl,-rpath=${opensp:location}/lib"
+  OTHERLDFLAGS="-Wl,-rpath=${opensp:location}/lib"

component/perl/buildout.cfg

@@ -25,7 +25,7 @@ depends =
   ${gdbm:version}
 version = 5.16.3
 # increase revision when we need to rebuild binary libraries.
-revision = 1
+revision = 2
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
 md5sum = 025102de0e4a597cf541e57da80c6aa3
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}

component/phantomjs/buildout.cfg

+[buildout]
+extends =
+  ../fontconfig/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../dash/buildout.cfg
+parts =
+  phantomjs
+
+[phantomjs]
+recipe = slapos.recipe.build
+slapos_promise =
+  file:phantomjs-slapos
+
+depends =
+  ${liberation-fonts:location}
+  ${ipaex-fonts:location}
+
+x86 = https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-i686.tar.bz2 2e94dcad7660d24309abe01011461693
+x86-64 = https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-x86_64.tar.bz2 8075fa873d8741c7ae9093c80a589a1f
+
+script =
+  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
+  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
+  workdir = guessworkdir(extract_dir)
+  self.copyTree(workdir, "%(location)s")
+  wrapper_location = os.path.join("%(location)s", "phantomjs-slapos")
+  wrapper = open(wrapper_location, 'w')
+  wrapper.write("""#!${dash:location}/bin/dash
+  cd %(location)s
+  export LD_LIBRARY_PATH=%(location)s:${freetype:location}/lib/:${fontconfig:location}/lib/:${libexpat:location}/lib
+  export PATH=${fontconfig:location}/bin:$PATH
+  exec %(location)s/bin/phantomjs $*""")
+  wrapper.flush()
+  wrapper.close()
+  os.chmod(wrapper_location, 0755)
\ No newline at end of file

component/python-setuptools/buildout.cfg

@@ -7,6 +7,7 @@ download-only = true
 filename = setuptools-0.6c11-py2.7.egg
 url = http://pypi.python.org/packages/2.7/s/setuptools/${:filename}
 md5sum = fe1f997bc722265116870bc7919059ea
+mode = 0644
 
 [python-setuptools]
 # Hack to manually install setuptools outside of the Buildout environment.
@@ -19,4 +20,5 @@ environment = export PATH=${python2.7:location}/bin:$PATH; export PYTHONPATH=${:
 stop-on-error = true
 recipe = plone.recipe.command
 update = true
-command = ${:environment} (mkdir ${:location}; sh ${setuptools-download:location}/${setuptools-download:filename} --install-dir ${:location}) || (rm -fr ${:location}; exit 1)
+# chmod is a hack, but the mode of hexagonit.recipe.download above didn't worked yet (there was new version recently)
+command = ${:environment} (mkdir ${:location}; chmod 644 ${setuptools-download:location}/${setuptools-download:filename} ; sh ${setuptools-download:location}/${setuptools-download:filename} --install-dir ${:location}) || (rm -fr ${:location}; exit 1)

slapos/recipe/check_page_content/template/check_page_content.in

@@ -3,7 +3,7 @@
 # BEWARE: It will be overwritten automatically
 
 URL="%(url)s"
-MATCH='%(match)s"
+MATCH="%(match)s"
 
 if [ -z $URL ]; then
   echo "No URL specified." >&2

slapos/recipe/wrapper.py

@@ -35,6 +35,7 @@ class Recipe(GenericBaseRecipe):
         wrapper_path = self.options['wrapper-path']
         wait_files = self.options.get('wait-for-files')
         environment = self.options.get('environment')
+        parameters_extra = self.options.get('parameters_extra')
 
         if not wait_files and not environment:
           # Create a simple wrapper as shell script
@@ -42,6 +43,7 @@ class Recipe(GenericBaseRecipe):
              name=wrapper_path,
              command=command_line[0],
              parameters=command_line[1:],
+             parameters_extra=parameters_extra,
           )]
 
         # More complex needs: create a Python script as wrapper

software/jio/instance.cfg.in

+#############################
+#
+# Deploy jio instance
+#
+#############################
+[buildout]
+parts =
+  test-runner
+  phantomjs-wrapper
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+# Create all needed directories, depending on your needs
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+script = $${:etc}/run/
+service = $${:etc}/service
+promise = $${:etc}/promise/
+bin = $${buildout:directory}/bin/
+
+[download-source]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+
+# Local development
+[jio]
+<= download-source
+repository = ${jio-repository:location}
+
+[test-runner]
+recipe = slapos.cookbook:egg_test
+run-test-suite = $${directory:bin}/runTestSuite
+run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
+test-list =
+  $${jio:location}
+prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin:${buildout:bin-directory}
+environment = 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 -L${fontconfig:location}/lib -L${libexpat:location}/lib -L${freetype:location}/lib
+PYTHONPATH = ${python-setuptools:location}
+LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:location}/lib:${fontconfig:location}/lib:${libexpat:location}/lib:${freetype:location}/lib
+
+[phantomjs-wrapper]
+recipe = slapos.cookbook:wrapper
+command-line = ${phantomjs:location}/bin/phantomjs
+wrapper-path = $${directory:bin}/phantomjs
+parameters_extra = true
\ No newline at end of file

software/jio/software.cfg

+[buildout]
+
+extends = 
+  ../../stack/slapos.cfg
+  ../../component/git/buildout.cfg
+  ../../component/phantomjs/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/python-setuptools/buildout.cfg
+
+# Local development
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
+parts =
+  slapos.cookbook-repository
+  slapos-cookbook
+  template
+  phantomjs
+  eggs
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.cookbook
+  erp5.util
+  collective.recipe.template
+entry-points =
+  runTestSuite=erp5.util.testsuite:runTestSuite
+scripts =
+  runTestSuite
+
+# Local development until new egg is published (extra parameters to slapos.cookbook:wrapper
+[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 = master
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg.in
+output = ${buildout:directory}/instance.cfg
+# MD5 checksum can be skipped for development, but must be filled for production
+md5sum = 1ef1bc6a3fb81300ce7139c512af96d7
+mode = 0644
+
+[jio-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/jio.git
+branch = master
+
+[versions]
+Jinja2 = 2.6
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+collective.recipe.template = 1.10
+erp5.util = 0.4.34
+hexagonit.recipe.cmmi = 2.0
+lxml = 3.1.1
+meld3 = 0.6.10
+plone.recipe.command = 1.1
+psutil = 0.6.1
+slapos.cookbook = 0.76.0
+slapos.recipe.build = 0.11.6
+slapos.recipe.template = 2.4.2
+
+# Required by:
+# slapos.core==0.35.1
+Flask = 0.9
+
+# Required by:
+# slapos.cookbook==0.76.0
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.76.0
+netaddr = 0.7.10
+
+# Required by:
+# slapos.core==0.35.1
+netifaces = 0.8
+
+# Required by:
+# slapos.core==0.35.1
+pyflakes = 0.6.1
+
+# Required by:
+# slapos.cookbook==0.76.0
+pytz = 2013b
+
+# Required by:
+# collective.recipe.template==1.10
+# erp5.util==0.4.33
+# hexagonit.recipe.download==1.6nxd002
+# slapos.cookbook==0.76.0
+# slapos.core==0.35.1
+# supervisor==3.0b1
+# zc.buildout==1.6.0-dev-SlapOS-010
+# zope.interface==4.0.5
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.76.0
+slapos.core = 0.35.1
+
+# Required by:
+# slapos.core==0.35.1
+supervisor = 3.0b1
+
+# Required by:
+# slapos.core==0.35.1
+unittest2 = 0.5.1
+
+# Required by:
+# slapos.cookbook==0.76.0
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.core==0.35.1
+zope.interface = 4.0.5

stack/erp5/buildout.cfg

@@ -372,6 +372,7 @@ initialization =
   sys.path[:0] = sum((
     glob.glob(os.path.join(x, 'Products', '*', 'tests'))
     for x in os.getenv('INSERT_PRODUCTS_PATH', '').split(os.pathsep)), [])
+  os.environ['CGI_PATH'] = '${w3-validator:location}/httpd/cgi-bin'
 
 [test_suite_runner]
 # XXX: Workaround for fact ERP5Type is not an distribution and does not

stack/slapos.cfg

@@ -3,7 +3,7 @@
 
 [buildout]
 # Developers need to add explicitely this part in their software profile
-parts = slapos-cookbook
+# parts = slapos-cookbook
 
 # Generate list of automatically chosen eggs version
 extensions +=