From 5f2676269145e33513494c7984098874127bb8b6 Mon Sep 17 00:00:00 2001
From: Stephan Geulette <s.geulette@imio.be>
Date: Mon, 1 Jun 2026 15:38:34 +0200
Subject: [PATCH 1/2] DMS-1204 base files

---
 CHANGES.txt      |  8 +++++++-
 buildout-dev.cfg | 11 +++++++++++
 buildout.cfg     |  2 +-
 sources-prod.cfg | 16 ++++++++++++++++
 version.txt      |  2 +-
 5 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100755 buildout-dev.cfg

diff --git a/CHANGES.txt b/CHANGES.txt
index 4fc73020..63e997f0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,13 @@
 Changelog
 =========
 
-3.1.4 (unreleased)
+3.1.5 (unreleased)
+------------------
+
+- Refactored buildout to handle dev by default and kept buildout-main for prod. buildout.cfg is written by puppet with this last one.
+  [sgeulette]
+
+3.1.4 (2026-05-29)
 ------------------
 
 - Upgraded collective.classification.folder 1.3.0
diff --git a/buildout-dev.cfg b/buildout-dev.cfg
new file mode 100755
index 00000000..3be81968
--- /dev/null
+++ b/buildout-dev.cfg
@@ -0,0 +1,11 @@
+[buildout]
+# Add the config name you want to use in the extends attribute: dev.cfg, prod.cfg, ...
+extends =
+    base.cfg
+    port.cfg
+    amqp.cfg
+#    prod.cfg
+#    sources.cfg  was renamed as sources-dev.cfg and included in dev.cfg
+    dev.cfg
+#    dev-zeo.cfg
+    test.cfg
diff --git a/buildout.cfg b/buildout.cfg
index fb211921..87ff020e 100755
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,7 +1,7 @@
 [buildout]
 # Add the config name you want to use in the extends attribute: dev.cfg, prod.cfg, ...
 extends =
-    buildout-main.cfg
+    buildout-dev.cfg
 #    solr.cfg
 #    ldap.cfg
 #    rest.cfg
diff --git a/sources-prod.cfg b/sources-prod.cfg
index 3ed31e5d..b4a0e9ce 100644
--- a/sources-prod.cfg
+++ b/sources-prod.cfg
@@ -1,2 +1,18 @@
 # To be used in buildout.cfg in production to fix really revisions
+[buildout]
+auto-checkout +=
+    collective.dms.basecontent
+    imio.esign
+    imio.fpaudit
+    imio.pm.wsclient
+    imio.zamqp.dms
+
 [sources]
+collective.dms.basecontent = git ${remotes:collective}/collective.dms.basecontent.git pushurl=${remotes:collective_push}/collective.dms.basecontent.git rev=424cb5b25c86f8ed737de98491bb7d616a54ed80
+collective.documentviewer = git ${remotes:sge}/collective.documentviewer.git pushurl=${remotes:sge_push}/collective.documentviewer.git rev=170b27518fc99b167023456430504a0a6a76293b
+imio.dms.mail = git ${remotes:imio}/imio.dms.mail.git pushurl=${remotes:imio_push}/imio.dms.mail.git rev=6b16629e08135ce2fde2414b9577f9577883aacc
+imio.esign = git ${remotes:imio}/imio.esign.git pushurl=${remotes:imio_push}/imio.esign.git rev=9971ef49b5f2d588c11a4ef4dedd5beff6f17317
+imio.fpaudit = git ${remotes:imio}/imio.fpaudit.git pushurl=${remotes:imio_push}/imio.fpaudit.git rev=d01ed5af8769370bc762b63839e6e855b9701b9e
+imio.pm.wsclient = git ${remotes:imio}/imio.pm.wsclient.git pushurl=${remotes:imio_push}/imio.pm.wsclient.git rev=5adbc3b994d459ef14b4ae1c56928a3bd0e454fa
+imio.zamqp.dms = git ${remotes:imio}/imio.zamqp.dms.git pushurl=${remotes:imio_push}/imio.zamqp.dms.git rev=ce1eec6d79defbf85e651e938bc0ec340d2e17ba
+Products.CPUtils = git ${remotes:imio}/Products.CPUtils pushurl=${remotes:imio_push}/Products.CPUtils rev=965e3be3f2ad32d2fe6f72c77cdf19f32669127d
diff --git a/version.txt b/version.txt
index fbe9ee4e..e94017a5 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.0-1.dev0
+3.1.5.dev0

From fa3aa6806cd1d221e9f56b8e5d31371d1aadb4cf Mon Sep 17 00:00:00 2001
From: Stephan Geulette <s.geulette@imio.be>
Date: Mon, 1 Jun 2026 15:59:15 +0200
Subject: [PATCH 2/2] Separated buildout-main in dev and prod

---
 buildout-dev.cfg => buildout-main-dev.cfg | 2 --
 buildout-main.cfg                         | 6 +-----
 buildout.cfg                              | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)
 rename buildout-dev.cfg => buildout-main-dev.cfg (68%)

diff --git a/buildout-dev.cfg b/buildout-main-dev.cfg
similarity index 68%
rename from buildout-dev.cfg
rename to buildout-main-dev.cfg
index 3be81968..57cd0095 100755
--- a/buildout-dev.cfg
+++ b/buildout-main-dev.cfg
@@ -4,8 +4,6 @@ extends =
     base.cfg
     port.cfg
     amqp.cfg
-#    prod.cfg
-#    sources.cfg  was renamed as sources-dev.cfg and included in dev.cfg
     dev.cfg
 #    dev-zeo.cfg
     test.cfg
diff --git a/buildout-main.cfg b/buildout-main.cfg
index 3be81968..9bf3deb9 100755
--- a/buildout-main.cfg
+++ b/buildout-main.cfg
@@ -4,8 +4,4 @@ extends =
     base.cfg
     port.cfg
     amqp.cfg
-#    prod.cfg
-#    sources.cfg  was renamed as sources-dev.cfg and included in dev.cfg
-    dev.cfg
-#    dev-zeo.cfg
-    test.cfg
+    prod.cfg
diff --git a/buildout.cfg b/buildout.cfg
index 87ff020e..56bc0da6 100755
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,7 +1,7 @@
 [buildout]
 # Add the config name you want to use in the extends attribute: dev.cfg, prod.cfg, ...
 extends =
-    buildout-dev.cfg
+    buildout-main-dev.cfg
 #    solr.cfg
 #    ldap.cfg
 #    rest.cfg