Merge branch 'kirr'

Conflicts:
	buildout.cfg

buildout.cfg

 [buildout]
 extends =
-  slapos/stack/slapos.cfg
-  slapos/component/ruby/buildout.cfg
+    slapos/stack/slapos.cfg
+    slapos/component/ruby/buildout.cfg
+    slapos/component/postgresql/buildout.cfg
+
 
 parts =
     python2.7
-    ruby-2.1
+    ruby2.1
+#   ruby
     git
+    postgresql
+
+
+    ktestbin
+
+# TODO becomes autodependency
+    bundler-4gitlab
+
+    gitlab-shell/vendor
+    gitlab/vendor/bundle
 
-    fluentd
 
+#   gems
 
-# slapos/software/helloworld/software.cfg
-# slapos/component/python-2.7/buildout.cfg
+#extends = https://lab.nexedi.cn/kirr/slapos/raw/master/software/helloworld/software.cfg
+#extends = /home/kirr/src/wendelin/slapos/slapos/software/helloworld/software.cfg
 
 
-[fluentd]
+[ktest]
+recipe  = zc.recipe.egg:develop
+egg     = ktest
+setup   = ktest/
+
+[ktestbin]
+recipe  = zc.recipe.egg:scripts
+eggs    = ${ktest:egg}
+
+
+[gems]
 recipe  = rubygemsrecipe
-ruby-executable = ${ruby-2.1:location}/bin/ruby
+#ruby-executable = ${ruby:location}/bin/ruby
+ruby-executable = ${ruby2.1:location}/bin/ruby
+
+# XXX vvv does not work
+# location= ${buildout:gems-directory}
+
 gems    = fluentd
+
+
+
+[bundler-4gitlab]
+recipe  = rubygemsrecipe
+ruby-executable = ${ruby2.1:location}/bin/ruby
+#ruby-executable = ${ruby:location}/bin/ruby
+gems    = bundler
+
+# bin installed here
+bundle  = ${buildout:bin-directory}/bundle
+
+# install together with all dependencies of gitlab
+# ( reason: rubygemsrecipe hardcodes PATH inside generated bin/* and it is
+#   impossible to adjust it later )
+environment =
+  PATH    = ${postgresql:location}/bin:%(PATH)s
+  CPPFLAGS= -I${postgresql:location}/include
+  LDFLAGS = -L${postgresql:location}/lib -Wl,-rpath=${postgresql:location}/lib
+
+
+
+[gitlab-repository]
+recipe  = slapos.recipe.build:gitclone
+repository = https://gitlab.com/gitlab-org/gitlab-ce.git
+revision  = v7.10.4-0-g337225a4fcfa9674e2528cb6d41c46556bba9dfa
+location = ${buildout:parts-directory}/gitlab
+git-executable = ${git:location}/bin/git
+
+
+[gitlab-shell-repository]
+recipe  = slapos.recipe.build:gitclone
+repository = https://gitlab.com/gitlab-org/gitlab-shell.git
+# FIXME pin gitlab-shell version properly (wrt gitlab)
+revision = v2.6.3-0-g4d30c0c
+location = ${buildout:parts-directory}/gitlab-shell
+git-executable = ${git:location}/bin/git
+
+
+
+# ? gmp
+# ssl
+# icu (charlock_holmes)
+# ffi (ffi)
+# libpq (pg)
+# libssh2 (rugged)
+# libgpg-error (rugged) ?
+# krb5 (ominauth-kerberos -> timfel-krb5-auth)
+# [gitlab-build-env]
+# PATH    = ${postgresql:location}/bin:%(PATH)s
+# CPPFLAGS= -I${postgresql:location}/include
+# LDFLAGS = -L${postgresql:location}/lib -Wl,-rpath=${postgresql:location}/lib
+
+# FIXME installed(gitlab) is registered as parts/gitlab-shell  (not parts/gitlab-shell/vendor/bundle)
+[gitlab/vendor/bundle]
+recipe  = slapos.recipe.cmmi
+path    = ${gitlab-repository:location}
+bundle  = cd ${:path} && ${bundler-4gitlab:bundle}
+
+configure-command = true
+make-binary = 
+make-targets= ${:bundle} install --deployment --without mysql development test
+
+# # propagate location
+# location = ${gitlab-repository:location}
+
+# environment-section = gitlab-build-env
+
+
+
+[gitlab-shell/vendor]
+#recipe  = plone.recipe.command
+#command = cd ${:path} && ${bundler-4gitlab:bundle} install --deployment
+recipe  = slapos.recipe.cmmi
+# TODO --without ...
+path    = ${gitlab-shell-repository:location}
+bundle  = cd ${:path} && ${bundler-4gitlab:bundle}
+
+#configure-command = ${:bundle} config --local build.pg -- --with-pg-config=${postgresql:location}/bin_pg_config
+configure-command = true
+make-binary = 
+make-targets= echo PATH: $PATH && ${:bundle} install --deployment
+
+#--without mysql development test
+
+# propagate location
+# XXX ok?
+#location = ${gitlab-shell-repository:location}/vendor/bundle
+
+environment-section = gitlab-build-env
+
+
+
+
+# [buildout]
+# gems-directory  = gemsAAA   # XXX = good idea?
+
+[versions]
+rubygemsrecipe  = 0.2.1
+plone.recipe.command = 1.1