From 09a82b45ea2f834290e2abd94f3cbc854c324b8e Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Fri, 21 Feb 2025 04:11:24 +0400
Subject: [PATCH] maj wip

---
 {bin_wip => wip}/_merge82      | 0
 {bin_wip => wip}/_rel          | 2 ++
 {bin_wip => wip}/_rel.conf     | 6 ++++++
 {bin_wip => wip}/_rel74        | 0
 {bin_wip => wip}/_rel74.conf   | 1 +
 {bin_wip => wip}/_rel82        | 0
 {bin_wip => wip}/_rel82.conf   | 1 +
 {bin_wip => wip}/donk          | 0
 {bin_wip => wip}/dot-pdeps.yml | 0
 {bin_wip => wip}/npci          | 0
 {bin_wip => wip}/npp           | 0
 {bin_wip => wip}/npu           | 0
 {bin_wip => wip}/pdeps.md      | 0
 13 files changed, 10 insertions(+)
 rename {bin_wip => wip}/_merge82 (100%)
 rename {bin_wip => wip}/_rel (98%)
 rename {bin_wip => wip}/_rel.conf (51%)
 rename {bin_wip => wip}/_rel74 (100%)
 rename {bin_wip => wip}/_rel74.conf (96%)
 rename {bin_wip => wip}/_rel82 (100%)
 rename {bin_wip => wip}/_rel82.conf (96%)
 rename {bin_wip => wip}/donk (100%)
 rename {bin_wip => wip}/dot-pdeps.yml (100%)
 rename {bin_wip => wip}/npci (100%)
 rename {bin_wip => wip}/npp (100%)
 rename {bin_wip => wip}/npu (100%)
 rename {bin_wip => wip}/pdeps.md (100%)

diff --git a/bin_wip/_merge82 b/wip/_merge82
similarity index 100%
rename from bin_wip/_merge82
rename to wip/_merge82
diff --git a/bin_wip/_rel b/wip/_rel
similarity index 98%
rename from bin_wip/_rel
rename to wip/_rel
index e0b0e97..df9b958 100755
--- a/bin_wip/_rel
+++ b/wip/_rel
@@ -8,6 +8,7 @@ FEATURE=wip/
 RELEASE=release-
 MAIN=master
 HOTFIX=hotfix-
+DIST=
 source "$MYDIR/${MYNAME%.sh}.conf"
 
 function init_action() {
@@ -49,6 +50,7 @@ case "$branch" in
 "$RELEASE"*) current=release;;
 "$MAIN") current=main;;
 "$HOTFIX"*) current=hotfix;;
+"$DIST") current=dist;;
 *) ewarn "$branch: branche courante non reconnue";;
 esac
 
diff --git a/bin_wip/_rel.conf b/wip/_rel.conf
similarity index 51%
rename from bin_wip/_rel.conf
rename to wip/_rel.conf
index ce53acd..15d520d 100644
--- a/bin_wip/_rel.conf
+++ b/wip/_rel.conf
@@ -1,7 +1,13 @@
 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
 
+# branches de développement
 DEVELOP=develop
 FEATURE=wip/
+# branche de préparation de release
 RELEASE=release-
+# branche de release
 MAIN=master
+# branche de hotfix
 HOTFIX=hotfix-
+# branche de distribution
+DIST=
diff --git a/bin_wip/_rel74 b/wip/_rel74
similarity index 100%
rename from bin_wip/_rel74
rename to wip/_rel74
diff --git a/bin_wip/_rel74.conf b/wip/_rel74.conf
similarity index 96%
rename from bin_wip/_rel74.conf
rename to wip/_rel74.conf
index aa3d41d..c419c91 100644
--- a/bin_wip/_rel74.conf
+++ b/wip/_rel74.conf
@@ -5,3 +5,4 @@ FEATURE=wip74/
 RELEASE=rel74-
 MAIN=dist74
 HOTFIX=hotf74-
+DIST=
diff --git a/bin_wip/_rel82 b/wip/_rel82
similarity index 100%
rename from bin_wip/_rel82
rename to wip/_rel82
diff --git a/bin_wip/_rel82.conf b/wip/_rel82.conf
similarity index 96%
rename from bin_wip/_rel82.conf
rename to wip/_rel82.conf
index c673fae..5960b15 100644
--- a/bin_wip/_rel82.conf
+++ b/wip/_rel82.conf
@@ -5,3 +5,4 @@ FEATURE=wip82/
 RELEASE=rel82-
 MAIN=dist82
 HOTFIX=hotf82-
+DIST=
diff --git a/bin_wip/donk b/wip/donk
similarity index 100%
rename from bin_wip/donk
rename to wip/donk
diff --git a/bin_wip/dot-pdeps.yml b/wip/dot-pdeps.yml
similarity index 100%
rename from bin_wip/dot-pdeps.yml
rename to wip/dot-pdeps.yml
diff --git a/bin_wip/npci b/wip/npci
similarity index 100%
rename from bin_wip/npci
rename to wip/npci
diff --git a/bin_wip/npp b/wip/npp
similarity index 100%
rename from bin_wip/npp
rename to wip/npp
diff --git a/bin_wip/npu b/wip/npu
similarity index 100%
rename from bin_wip/npu
rename to wip/npu
diff --git a/bin_wip/pdeps.md b/wip/pdeps.md
similarity index 100%
rename from bin_wip/pdeps.md
rename to wip/pdeps.md