diff --git a/.gitignore b/.gitignore
index bd223ae..e9714c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ labo/
/documentation/hayamiki.png
/documentation/hayamiki.svg
/ds_files/densaku.ini
+generated/
diff --git a/densaku_lib b/densaku_lib
index 303d4c8..dd62769 160000
--- a/densaku_lib
+++ b/densaku_lib
@@ -1 +1 @@
-Subproject commit 303d4c8378f055aaf76e81699eb69948759e03e1
+Subproject commit dd627694ab77709ce0e33eeac09e6ee3ebba9204
diff --git a/hayamiki_ds_types.anubis b/hayamiki_ds_types.anubis
index 7ce9deb..38a51d0 100644
--- a/hayamiki_ds_types.anubis
+++ b/hayamiki_ds_types.anubis
@@ -14,14 +14,14 @@ read hayamiki_lib/ds_files/ds_types.anubis
global define One
- hayamiki_lib_ds
+ hayamiki_1_14_lib_ds
(
List(String) args
) =
- if load_ds_generator is
+ if load_ds_generator_1_14 is
{
failure then println("Densaku generator can't be load"),
success(ds_gen) then forget(ds_gen.generate_type_files(hayamiki_lib_types_description, [], "ds_files/"))
}.
-execute anbexec hayamiki_lib_ds // generate the file
+execute anbexec hayamiki_1_14_lib_ds // generate the file
diff --git a/hayamiki_ds_types.aproj b/hayamiki_ds_types.aproj
index 08b0a28..8f99c76 100644
--- a/hayamiki_ds_types.aproj
+++ b/hayamiki_ds_types.aproj
@@ -5,7 +5,7 @@
AnyCPU
Exe
hayamiki_ds_types
- hayamiki_ds_types
+ hayamiki_1_14_ds_types
hayamiki_ds_types.anubis
./
diff --git a/hayamiki_generator.aproj b/hayamiki_generator.aproj
index 21f905c..e3646e6 100644
--- a/hayamiki_generator.aproj
+++ b/hayamiki_generator.aproj
@@ -27,105 +27,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -553,12 +454,155 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -704,32 +748,16 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -786,5 +814,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hayamiki_lib b/hayamiki_lib
index a64900e..f9fd3a1 160000
--- a/hayamiki_lib
+++ b/hayamiki_lib
@@ -1 +1 @@
-Subproject commit a64900e4b5e04eaf0850b5d9cf65bd1558eb4912
+Subproject commit f9fd3a1bf6706094fb2050a2ab138f0b38cac84d
diff --git a/src/generation/files.anubis b/src/generation/files.anubis
index 6d51617..b420ca6 100644
--- a/src/generation/files.anubis
+++ b/src/generation/files.anubis
@@ -291,6 +291,6 @@ define Maybe(One)
global define HK_Generator_API
- hk_gen =
+ hk_gen_1_14 =
hk_api(generate_model_files).
diff --git a/src/generation/html.anubis b/src/generation/html.anubis
index 33a451d..42a1a04 100644
--- a/src/generation/html.anubis
+++ b/src/generation/html.anubis
@@ -8,8 +8,8 @@
read system/string.anubis
read tools/basis.anubis
-read calexium_lib/web/CXM_making_a_web_site.anubis
-read calexium_lib/web/CXM_web_action.anubis
+read xlib/web/CXM_making_a_web_site.anubis
+read xlib/web/CXM_web_action.anubis
read hayamiki_lib/types/hayamiki.anubis
read icons.anubis
diff --git a/src/generation/icons.anubis b/src/generation/icons.anubis
index 7d8f07e..998ea46 100644
--- a/src/generation/icons.anubis
+++ b/src/generation/icons.anubis
@@ -6,7 +6,7 @@
* © David RENÉ
*/
-read calexium_lib/web/widgets/icons_set.anubis
+read xlib/web/widgets/icons_set.anubis
read hayamiki_lib/model/columns.anubis
read hayamiki_lib/model/icons.anubis
diff --git a/src/main.anubis b/src/main.anubis
index a30e0cc..465dcd0 100644
--- a/src/main.anubis
+++ b/src/main.anubis
@@ -21,11 +21,11 @@ read model.3.0.0.anubis
read system/muscle.anubis
global define One
- hayamiki
+ hayamiki_1_14
(
List(String) args
) =
- if load_hk_generator is
+ if load_hk_generator_1_14 is
{
failure then println("Hayamiki generator can't be load"),
success(hk_gen) then forget(hk_gen.generate_model_files(the_database_description, "", true))
diff --git a/src/web_controller/hayamiki_plugin.anubis b/src/web_controller/hayamiki_plugin.anubis
index 4ce6e7e..c3144d5 100644
--- a/src/web_controller/hayamiki_plugin.anubis
+++ b/src/web_controller/hayamiki_plugin.anubis
@@ -29,7 +29,7 @@ define Maybe(HTML_Partial_Content)
.
global define WEB_Plugin
- hayamiki_web_plugin_lib
+ hayamiki_web_plugin_1_14_lib
=
web_plugin(
"HAYAMIKI",
diff --git a/xlib b/xlib
index 6f6feb0..b223a43 160000
--- a/xlib
+++ b/xlib
@@ -1 +1 @@
-Subproject commit 6f6feb0696be82594640c4faa812d13c57eb8ce7
+Subproject commit b223a43c317ad9b16d77a16c12af6403cb032e8b
--
libgit2 0.21.4