Gems build ok

buildout.cfg

@@ -67,13 +67,15 @@ 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:${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-#  CPPFLAGS= -I${postgresql:location}/include -I${icu:location}/include
-#  LDFLAGS = -L${postgresql:location}/lib -Wl,-rpath=${postgresql:location}/lib -L${icu:location}/lib -Wl,-rpath=${icu:location}/lib
+# install together with dependencies of gitlab, which we cannot specify using
+#   --with-... gem option
+# ( reason: rubygemsrecipe hardcodes PATH inside generated bin/* and it is
+#   impossible to adjust it later )
+#
+# Rugged needs: cmake, pkgconfig
+environment =
+  PATH    = ${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+
 
 
 
@@ -82,7 +84,7 @@ bundle  = ${buildout:bin-directory}/bundle
 [gitlab-repository]
 recipe  = slapos.recipe.build:gitclone
 repository = https://gitlab.com/gitlab-org/gitlab-ce.git
-revision  = v7.11.2-0-gdac18e7728013a77410e926a1e64225703754a2d
+revision = v7.11.2-0-gdac18e7728013a77410e926a1e64225703754a2d
 location = ${buildout:parts-directory}/gitlab
 git-executable = ${git:location}/bin/git
 
@@ -96,59 +98,40 @@ 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
-
-# ??? still true ? -> FIXME installed(gitlab) is registered as parts/gitlab-shell  (not parts/gitlab-shell/vendor/bundle)
+# build needed-by-gitlab gems via bundler
 [gitlab/vendor/bundle]
 recipe  = slapos.recipe.cmmi
 path    = ${gitlab-repository:location}
-#bundle  = cd ${:path} && ${bundler-4gitlab:bundle}
 bundle  = ${bundler-4gitlab:bundle}
 
-configure-command = true
+configure-command = cd ${:path} &&
+    ${:bundle} config --local build.charlock_holmes --with-icu-dir=${icu:location}  &&
+    ${:bundle} config --local build.pg  --with-pg-config=${postgresql:location}/bin/pg_config
+
 make-binary =
 make-targets= cd ${:path} &&
-    ${:bundle} config --local build.charlock_holmes --with-icu-dir=${icu:location}  &&
-    ${:bundle} install --deployment --without mysql kerberos development test
+    ${:bundle} install --deployment  --without development test  mysql kerberos
 
 # # propagate location
 # location = ${gitlab-repository:location}
 
-# environment-section = gitlab-build-env
-
-
 
+# build needed-by-gitlab-shell gems via bundler
+# ( there is not vendor/ dir in gitlab-shell, so to avoid having buildout error
+#   on mkdir vendor/bundle, this part name is just /vendor )
 [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}
+bundle  = ${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
+make-targets= cd ${:path} &&
+    ${:bundle} install --deployment  --without development test
 
-# propagate location
-# XXX ok?
-#location = ${gitlab-shell-repository:location}/vendor/bundle
 
-# environment-section = gitlab-build-env
+# # propagate location
+# location = ${gitlab-shell-repository:location}/vendor/bundle