From ce818c5958759bb6ad7d13c61959479b4d524c20 Mon Sep 17 00:00:00 2001
From: Nicolas Wavrant <nicolas.wavrant@tiolive.com>
Date: Thu, 3 Oct 2013 16:31:25 +0200
Subject: [PATCH] cloud9-component: now use the git version (last commit: sept
 19th 2013) with nodejs v0.8

---
 component/cloud9/buildout.cfg | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/component/cloud9/buildout.cfg b/component/cloud9/buildout.cfg
index dbe3692ae..cebd0c214 100644
--- a/component/cloud9/buildout.cfg
+++ b/component/cloud9/buildout.cfg
@@ -14,13 +14,6 @@ parts =
 [cloud9]
 <= cloud9-git
 
-[node-sm]
-recipe = slapos.recipe.build:npm
-packages = sm@0.2.11
-node = nodejs
-environment =
-  PATH=${nodejs:location}/bin:%(PATH)s
-
 [cloud9-stable]
 # Online IDE written in javascript/node.js
 # URL : c9.io
@@ -32,25 +25,11 @@ commit = 5d18344936baf1d86b0fa5fc2c690051b4c77cb2
 repository = https://github.com/ajaxorg/cloud9.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 git-binary = ${git:location}/bin/git
-npm-binary = ${nodejs-0.4:location}/bin/node ${npm:location}/bin/npm
-command = export GIT_SSL_NO_VERIFY=true; export HOME=${:location}; (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${:git-binary} submodule update --init && cd support/jsdav && PATH=${nodejs-0.4:location}/bin:$PATH LDFLAGS=-L${libxml2:location}/lib ${:npm-binary} install) || (rm -fr ${:location}; exit 1)
+npm-binary = ${nodejs-0.8:location}/bin/node ${nodejs-0.8:location}/bin/npm
+command = export GIT_SSL_NO_VERIFY=true; export HOME=${:location}; (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${:git-binary} submodule update --init && cd support/jsdav && PATH=${nodejs-0.8:location}/bin:$PATH LDFLAGS=-L${libxml2:location}/lib ${:npm-binary} install) || (rm -fr ${:location}; exit 1)
 update-command =
 executable = ${:location}/bin/cloud9.js
 
-[cloud9-session-directory.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-filename = cloud9-session-directory.patch
-download-only = true
-md5sum = 5dc8cc28447ed3747b8a53c768d872aa
-
-[cloud9-socket.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-filename = cloud9-socket.patch
-download-only = true
-#md5sum = 5dc8cc28447ed3747b8a53c768d872aa
-
 [cloud9-git]
 # Online IDE written in javascript/node.js
 # URL : c9.io
@@ -58,11 +37,12 @@ download-only = true
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
 recipe = plone.recipe.command
 stop-on-error = true
-commit = f7d102bc225c922f116d2cea52a746d64343ea59
+commit = 696a7dc34fbd943147fe2388a8ebb070e7f4024f
 repository = https://github.com/ajaxorg/cloud9.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${:location};
-command = ${:environment} (git clone --quiet ${:repository} ${:location} && cd ${:location} && git reset --hard ${:commit} && ${node-sm:location}/node_modules/.bin/sm install && patch -p1 < ${cloud9-session-directory.patch:location}/${cloud9-session-directory.patch:filename} && ${node-sm:location}/node_modules/.bin/sm install && patch -p1 < ${cloud9-socket.patch:location}/${cloud9-socket.patch:filename}) || (rm -fr ${:location}; exit 1)
+npm-binary = ${nodejs-0.8:location}/bin/node ${nodejs-0.8:location}/bin/npm
+environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs:location}/bin:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${:location};
+command = ${:environment} (git clone --quiet ${:repository} ${:location} && cd ${:location} && git reset --hard ${:commit} && ${cloud9-git:npm-binary} install ${:location}) || (rm -fr ${:location}; exit 1)
 update-command =
 executable = ${:location}/server.js
 
-- 
2.30.9