From dc40f244704f6d90b7178b863ce34c901a473c91 Mon Sep 17 00:00:00 2001 From: totoro Date: Thu, 11 Feb 2021 17:00:04 +0900 Subject: [PATCH] update to xlib with renamed files and references --- hayamiki_generator.1.19.aproj | 899 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ hayamiki_generator.aproj | 861 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- hayamiki_generator.ide | 28 ---------------------------- hayamiki_generator1.19.ide | 34 ++++++++++++++++++++++++++++++++++ hayamiki_lib | 2 +- hayamiki_web_controller.aproj | 283 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------- hayamiki_web_controller.ide | 2 +- src/generation/cxm_lib_menu.anubis | 2 +- src/generation/files.anubis | 5 +++-- src/generation/header.anubis | 10 +++++----- src/generation/html.anubis | 4 ++-- src/generation/web_args.anubis | 1 + src/web_controller/database/generated/fs_file.anubis | 10 +++++----- src/web_controller/hayamiki.anubis | 14 +++++++------- src/web_controller/hayamiki_plugin.anubis | 4 ++-- src/web_controller/hkc_files_management.anubis | 2 +- xlib | 2 +- 17 files changed, 1206 insertions(+), 957 deletions(-) create mode 100644 hayamiki_generator.1.19.aproj delete mode 100644 hayamiki_generator.aproj delete mode 100644 hayamiki_generator.ide create mode 100644 hayamiki_generator1.19.ide diff --git a/hayamiki_generator.1.19.aproj b/hayamiki_generator.1.19.aproj new file mode 100644 index 0000000..d5d27ba --- /dev/null +++ b/hayamiki_generator.1.19.aproj @@ -0,0 +1,899 @@ + + + {89372B21-80FA-4EB8-B17C-072EB55713D6} + Debug + AnyCPU + Exe + model_manager + hayamiki + src\main.anubis + ./%3b./src + False + False + False + C:\anubis\1.19\ + + + bin\Debug\ + True + Full + False + + + bin\Release\ + False + None + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/hayamiki_generator.aproj b/hayamiki_generator.aproj deleted file mode 100644 index 78bafc2..0000000 --- a/hayamiki_generator.aproj +++ /dev/null @@ -1,861 +0,0 @@ - - - {89372B21-80FA-4EB8-B17C-072EB55713D6} - Debug - AnyCPU - Exe - model_manager - hayamiki - src\main.anubis - ./%3b./src - False - False - False - C:\anubis\1.19\ - - - bin\Debug\ - True - Full - False - - - bin\Release\ - False - None - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hayamiki_generator.ide b/hayamiki_generator.ide deleted file mode 100644 index 2d1374a..0000000 --- a/hayamiki_generator.ide +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -# SharpDevelop 1.0.12.108 -Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_generator", "hayamiki_generator.aproj", "7E37A20A-56EA-4128-88F5-FE55B0F5CB45" -EndProject -Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_ds_types", "hayamiki_ds_types.aproj", "{06BE5572-9B4A-4F41-A01E-84C730A8F4E4}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {89372B21-80FA-4EB8-B17C-072EB55713D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89372B21-80FA-4EB8-B17C-072EB55713D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89372B21-80FA-4EB8-B17C-072EB55713D6}.Release|Any CPU.Build.0 = Release|Any CPU - {89372B21-80FA-4EB8-B17C-072EB55713D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Debug|Any CPU.Build.0 = Debug|Any CPU - 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Debug|Any CPU.ActiveCfg = Debug|Any CPU - 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Release|Any CPU.Build.0 = Release|Any CPU - 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Release|Any CPU.ActiveCfg = Release|Any CPU - {06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Release|Any CPU.Build.0 = Release|Any CPU - {06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/hayamiki_generator1.19.ide b/hayamiki_generator1.19.ide new file mode 100644 index 0000000..dd9e0e0 --- /dev/null +++ b/hayamiki_generator1.19.ide @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +# SharpDevelop 1.0.12.108 +Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_generator.1.19", "hayamiki_generator.1.19.aproj", "7E37A20A-56EA-4128-88F5-FE55B0F5CB45" +EndProject +Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_ds_types", "hayamiki_ds_types.aproj", "{06BE5572-9B4A-4F41-A01E-84C730A8F4E4}" +EndProject +Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_web_controller", "hayamiki_web_controller.aproj", "{90372B21-80FA-4EB8-B17C-072EB55713D7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {89372B21-80FA-4EB8-B17C-072EB55713D6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89372B21-80FA-4EB8-B17C-072EB55713D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89372B21-80FA-4EB8-B17C-072EB55713D6}.Release|Any CPU.Build.0 = Release|Any CPU + {89372B21-80FA-4EB8-B17C-072EB55713D6}.Release|Any CPU.ActiveCfg = Release|Any CPU + 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Debug|Any CPU.Build.0 = Debug|Any CPU + 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Debug|Any CPU.ActiveCfg = Debug|Any CPU + 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Release|Any CPU.Build.0 = Release|Any CPU + 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Release|Any CPU.ActiveCfg = Release|Any CPU + {06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Release|Any CPU.Build.0 = Release|Any CPU + {06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {90372B21-80FA-4EB8-B17C-072EB55713D7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90372B21-80FA-4EB8-B17C-072EB55713D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {90372B21-80FA-4EB8-B17C-072EB55713D7}.Release|Any CPU.Build.0 = Release|Any CPU + {90372B21-80FA-4EB8-B17C-072EB55713D7}.Release|Any CPU.ActiveCfg = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/hayamiki_lib b/hayamiki_lib index 1c5d203..e7921b1 160000 --- a/hayamiki_lib +++ b/hayamiki_lib @@ -1 +1 @@ -Subproject commit 1c5d20365995cae3582c4a7a1f01c58f7e5e170b +Subproject commit e7921b1c144d92e56e878ed564c665e091907b3e diff --git a/hayamiki_web_controller.aproj b/hayamiki_web_controller.aproj index e78c4a8..5ee4ce1 100644 --- a/hayamiki_web_controller.aproj +++ b/hayamiki_web_controller.aproj @@ -11,7 +11,7 @@ False False False - C:\Program Files (x86)\Anubis\1.14\ + C:\anubis\1.19\ bin\Debug\ @@ -32,6 +32,7 @@ + @@ -81,6 +82,22 @@ + + + + + + + + + + + + + + + + @@ -174,12 +191,21 @@ + + + + + + + + + - + @@ -191,6 +217,22 @@ + + + + + + + + + + + + + + + + @@ -198,6 +240,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -313,6 +387,7 @@ + @@ -530,68 +605,68 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -603,8 +678,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -643,12 +742,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -772,6 +961,10 @@ + + + + @@ -790,10 +983,18 @@ + + + + + + + + @@ -805,6 +1006,8 @@ + + @@ -835,6 +1038,8 @@ + + @@ -848,8 +1053,6 @@ - - diff --git a/hayamiki_web_controller.ide b/hayamiki_web_controller.ide index 8ebc6e6..dd9e0e0 100644 --- a/hayamiki_web_controller.ide +++ b/hayamiki_web_controller.ide @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 # SharpDevelop 1.0.12.108 -Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_generator", "hayamiki_generator.aproj", "7E37A20A-56EA-4128-88F5-FE55B0F5CB45" +Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_generator.1.19", "hayamiki_generator.1.19.aproj", "7E37A20A-56EA-4128-88F5-FE55B0F5CB45" EndProject Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_ds_types", "hayamiki_ds_types.aproj", "{06BE5572-9B4A-4F41-A01E-84C730A8F4E4}" EndProject diff --git a/src/generation/cxm_lib_menu.anubis b/src/generation/cxm_lib_menu.anubis index c0bab35..06758e3 100644 --- a/src/generation/cxm_lib_menu.anubis +++ b/src/generation/cxm_lib_menu.anubis @@ -81,7 +81,7 @@ public define Maybe(One) * Time: "+_Int_to_ISO_8601_time(now)+" */ -transmit xlib/web/CXM_making_a_web_site.anubis +transmit xlib/web/making_a_web_site.anubis transmit xlib/web/widgets/menu.anubis public define List(Menu_Item) diff --git a/src/generation/files.anubis b/src/generation/files.anubis index 0665bea..227cf13 100644 --- a/src/generation/files.anubis +++ b/src/generation/files.anubis @@ -254,8 +254,9 @@ define Maybe(One) //process. We serialize the database model and make SHA1 of the result. This result is stored in file hayamiki.ini //in root of destination_dir - - println("\nHayamiki Generator"); + with cur_dir = get_current_directory, + println("\nHayamiki Generator 1.19"); + println("current dir :"+cur_dir); println("Destination dir: "+destination_dir); with ini = loadIniFile(destination_dir+"/hayamiki.ini"), diff --git a/src/generation/header.anubis b/src/generation/header.anubis index f5732b9..9240643 100644 --- a/src/generation/header.anubis +++ b/src/generation/header.anubis @@ -52,11 +52,11 @@ public define Maybe(One) */ transmit tools/basis.anubis -transmit xlib/web/CXM_making_a_web_site.anubis -transmit xlib/web/CXM_common.anubis -transmit xlib/web/CXM_web_dump.anubis -transmit xlib/web/CXM_web_arg_utils.anubis -transmit xlib/web/CXM_json.anubis +transmit xlib/web/making_a_web_site.anubis +transmit xlib/web/common.anubis +transmit xlib/web/web_dump.anubis +transmit xlib/web/web_arg_utils.anubis +transmit xlib/web/json.anubis transmit xlib/web/widgets/icons_set.anubis transmit data_base/sqlite.anubis transmit data_base/db_tools.anubis diff --git a/src/generation/html.anubis b/src/generation/html.anubis index 42a1a04..e8615f9 100644 --- a/src/generation/html.anubis +++ b/src/generation/html.anubis @@ -8,8 +8,8 @@ read system/string.anubis read tools/basis.anubis -read xlib/web/CXM_making_a_web_site.anubis -read xlib/web/CXM_web_action.anubis +read xlib/web/making_a_web_site.anubis +read xlib/web/web_action.anubis read hayamiki_lib/types/hayamiki.anubis read icons.anubis diff --git a/src/generation/web_args.anubis b/src/generation/web_args.anubis index 6de7aab..0cdcb05 100644 --- a/src/generation/web_args.anubis +++ b/src/generation/web_args.anubis @@ -264,6 +264,7 @@ public define Maybe(One) " List(Web_arg) lwa,\n"+ " String __prefix__\n"+ " )=\n"+ //head of the definition + " (List(SQLite3_update_field))\n"+ _generate_extract_web_arg_to_update_field(columns)+ //all editable components of the type "\n.\n") is //end of the function { diff --git a/src/web_controller/database/generated/fs_file.anubis b/src/web_controller/database/generated/fs_file.anubis index eca25ab..9f97a7d 100644 --- a/src/web_controller/database/generated/fs_file.anubis +++ b/src/web_controller/database/generated/fs_file.anubis @@ -7,11 +7,11 @@ */ transmit tools/basis.anubis -transmit xlib/web/CXM_making_a_web_site.anubis -transmit xlib/web/CXM_common.anubis -transmit xlib/web/CXM_web_dump.anubis -transmit xlib/web/CXM_web_arg_utils.anubis -transmit xlib/web/CXM_json.anubis +transmit xlib/web/making_a_web_site.anubis +transmit xlib/web/common.anubis +transmit xlib/web/web_dump.anubis +transmit xlib/web/web_arg_utils.anubis +transmit xlib/web/json.anubis transmit xlib/web/widgets/icons_set.anubis transmit data_base/sqlite.anubis transmit data_base/db_tools.anubis diff --git a/src/web_controller/hayamiki.anubis b/src/web_controller/hayamiki.anubis index 8bfe5cd..8d8f410 100644 --- a/src/web_controller/hayamiki.anubis +++ b/src/web_controller/hayamiki.anubis @@ -32,19 +32,19 @@ read system/convert.anubis //read utils.anubis read locale/L3LanguageInfo.anubis -read xlib/web/CXM_common.anubis -read xlib/web/CXM_web_arg_utils.anubis +read xlib/web/common.anubis +read xlib/web/web_arg_utils.anubis read xlib/web/controllers_web_site.anubis -read xlib/web/CXM_multihost_http_server.anubis -read xlib/web/CXM_form.anubis -read xlib/web/CXM_json.anubis -read xlib/web/CXM_web_dump.anubis +read xlib/web/multihost_http_server.anubis +read xlib/web/form.anubis +read xlib/web/json.anubis +read xlib/web/web_dump.anubis read xlib/web/widgets/left_menu.anubis //read database/users.anubis read xlib/web/widgets/css_helper.anubis -read xlib/web/CXM_page_message.anubis +read xlib/web/page_message.anubis //read app/app_constants.anubis //read config/app_config.anubis diff --git a/src/web_controller/hayamiki_plugin.anubis b/src/web_controller/hayamiki_plugin.anubis index c3144d5..8df94a1 100644 --- a/src/web_controller/hayamiki_plugin.anubis +++ b/src/web_controller/hayamiki_plugin.anubis @@ -29,12 +29,12 @@ define Maybe(HTML_Partial_Content) . global define WEB_Plugin - hayamiki_web_plugin_1_14_lib + hayamiki_web_plugin_1_19_lib = web_plugin( "HAYAMIKI", "BASE", - "1.14.0", + "1.19.0", _Int_to_ISO_8601_datetime(to_Int(__TIME__)), plugin_get_controller, plugin_get_typed_content diff --git a/src/web_controller/hkc_files_management.anubis b/src/web_controller/hkc_files_management.anubis index aeb1a08..a77edd7 100644 --- a/src/web_controller/hkc_files_management.anubis +++ b/src/web_controller/hkc_files_management.anubis @@ -11,7 +11,7 @@ read xlib/web/controllers_web_site.anubis read database/generated/fs_file.anubis read xlib/web_controllers/language/language_management.anubis read xlib/web_controllers/fs/fs_core.anubis -read xlib/web/CXM_json.anubis +read xlib/web/json.anubis define DB_id get_new_hkc_id_from_fs diff --git a/xlib b/xlib index 949610f..bbf52ca 160000 --- a/xlib +++ b/xlib @@ -1 +1 @@ -Subproject commit 949610f9d1d08e5d9af777975857a7b1d79962cd +Subproject commit bbf52ca41a0f8173bea54da731144147982f2580 -- libgit2 0.21.4