diff options
| author | joerg <joerg@pkgsrc.org> | 2013-03-03 04:54:25 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-03-03 04:54:25 +0000 |
| commit | 937e905201d693bbbf5b80f0c8105f24f0bdc7b9 (patch) | |
| tree | a3dc2cef6085aecc1649a5b2636ea873f07e5ec7 /databases | |
| parent | dccf8005bd1280d42925b2c3a0c5de29979754a5 (diff) | |
| download | pkgsrc-937e905201d693bbbf5b80f0c8105f24f0bdc7b9.tar.gz | |
mysql-workbench requires C++11 to build with Clang and in turn, should
be free of user-defined string literal syntax.
Diffstat (limited to 'databases')
12 files changed, 1367 insertions, 2 deletions
diff --git a/databases/mysql-workbench/Makefile b/databases/mysql-workbench/Makefile index e009060301e..8c90f044b0f 100644 --- a/databases/mysql-workbench/Makefile +++ b/databases/mysql-workbench/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/03/02 20:33:23 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2013/03/03 04:54:25 joerg Exp $ DISTNAME= mysql-workbench-gpl-5.2.33b-src PKGNAME= ${DISTNAME:S/-gpl//:S/b-src$//} @@ -50,6 +50,11 @@ SUBST_SED.osx-gl= -e 's,-lGL,-framework OpenGL,g' .include "../../graphics/MesaLib/buildlink3.mk" .endif +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +CXXFLAGS+= -std=c++11 +.endif + .include "../../archivers/libzip/buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/boost-headers/buildlink3.mk" diff --git a/databases/mysql-workbench/distinfo b/databases/mysql-workbench/distinfo index 27f611e5f5a..e7ee41f6cc5 100644 --- a/databases/mysql-workbench/distinfo +++ b/databases/mysql-workbench/distinfo @@ -1,14 +1,20 @@ -$NetBSD: distinfo,v 1.7 2012/12/25 21:12:31 joerg Exp $ +$NetBSD: distinfo,v 1.8 2013/03/03 04:54:26 joerg Exp $ SHA1 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 1d47598fb0f956ce1a0c6b1afb462e8d6beeb1ed RMD160 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 60213dd583da6034d5c4f7766b0a7dbafe57100c Size (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 17873523 bytes +SHA1 (patch-backend_wbprivate_model_wb__component__physical.cpp) = 710cfb3f90f1112536d86461291531cdbe25a61b +SHA1 (patch-backend_wbprivate_sqlide_wb__sqlide__module.cpp) = b5f422fb5de8f9853c3536a08ee2470ab17cbe96 SHA1 (patch-backend_wbprivate_workbench_stdafx_h) = 3bfeffdbbf7b8c3922ba514c436cb5a6f92c614b SHA1 (patch-backend_wbprivate_workbench_wb__context.cpp) = c215ac28cf4a1a41eae4dec0eb54c2c14c5b52fb +SHA1 (patch-backend_wbprivate_workbench_wb__model__file.cpp) = 96231a6cc7969a70196a1e4505549d1a75d7f485 +SHA1 (patch-backend_wbprivate_workbench_wb__module.cpp) = 4a7869cf1a223eaa57904801477a258f3c526319 SHA1 (patch-backend_wbpublic_sqlide_sqlide__generics.cpp) = 08df04e135eb45bd7d4f071e40ad7a22b17b6f63 SHA1 (patch-backend_wbpublic_sqlide_var__grid__model.cpp) = b2e6cd40a2d785e904ff0fbafd501eb754aabef4 SHA1 (patch-backend_windows_wbprivate_wr_src_stdafx_h) = a42d1c33c627dd52e73f6841d759be5922950984 +SHA1 (patch-ext_scintilla_gtk_ScintillaGTK.cxx) = 5900ce9f440a59833d3779c6f3700a2b47f74edf SHA1 (patch-frontend_linux_linux_utilities_toolbar_manager.cpp) = cc2ecf41802836c1ce799ebdff26ad89b70f3459 +SHA1 (patch-frontend_linux_workbench_main.cpp) = 0ffcf6695f8aaf52be437d2d9281f788692cccaf SHA1 (patch-library_base_file_utilities.cpp) = af34c32bec2e194b9e8e96c264dd7b036c380978 SHA1 (patch-library_base_international_file.cpp) = 702e1465cbe2eec2b21d5b308e9c1184edb5c03b SHA1 (patch-library_canvas_src_mdc__canvas__view__printing_cpp) = 5c3e6c6f63421aa7aa5972a38e4f5b6d87aba71f @@ -16,11 +22,15 @@ SHA1 (patch-library_canvas_src_mdc__canvas__view_h) = 932e1e744ba0663afa0af3d618 SHA1 (patch-library_canvas_src_stdafx_h) = 2e10af126271958857bdb77ca400d5e2d7e9a9ce SHA1 (patch-library_forms_gtk_lf_panel.h) = b381ffd107e23c1c099f89ff8175b64754d88fa1 SHA1 (patch-library_forms_mforms.cpp) = de621a3d2604ab3b3807758a432cc6762ee30559 +SHA1 (patch-library_grt_src_grtpp__shell.cpp) = f2d31b23c1966d256d9a139cd328742da562654d SHA1 (patch-library_grt_src_grtpp__shell__lua.cpp) = 48b0d96c7a847f444629b921773a1735935b93a2 +SHA1 (patch-library_grt_src_grtpp__shell__lua__help.cpp) = 526f90d787e7fb64fc51a8cd63382e1c9e15b316 SHA1 (patch-library_grt_src_grtpp__shell__python.cpp) = 9aa18665114199d269170f791f83d53f1696042e +SHA1 (patch-library_grt_src_grtpp__shell__python__help.cpp) = 1ae04b2330dc6ce3934da46d32a120b99be77c26 SHA1 (patch-library_grt_src_grtpp__util_cpp) = e3b8a89c8fefd11f37a3ea7123a85857d7c14e31 SHA1 (patch-modules_db_mysql_sqlparser_src_mysql__sql__parser__fe_cpp) = 8424f1e3bafc3cd05799bc43701059cb22245cd0 SHA1 (patch-modules_db_mysql_sqlparser_src_stdafx_h) = 3ac7af043be0dd52fe2634e2ac49682c5d4e51de SHA1 (patch-modules_wb_mysql_import_src_stdafx_h) = f12583b61b29f9ae2ef3aaf30b9281dc67b230df SHA1 (patch-plugins_db_mysql_backend_db__plugin__be_cpp) = 2ab6955e6d769a0b0164ec9a841a1d67101bd935 +SHA1 (patch-plugins_wb.printing_backend_wb__module__printing.cpp) = e50098416688226d2baccd55cf37bafb46c5e608 SHA1 (patch-plugins_wb_printing_backend_stdafx_h) = 490c35fce386d9e3b8bc3f801db0316c712f103c diff --git a/databases/mysql-workbench/patches/patch-backend_wbprivate_model_wb__component__physical.cpp b/databases/mysql-workbench/patches/patch-backend_wbprivate_model_wb__component__physical.cpp new file mode 100644 index 00000000000..9dc7ed864b6 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-backend_wbprivate_model_wb__component__physical.cpp @@ -0,0 +1,23 @@ +$NetBSD: patch-backend_wbprivate_model_wb__component__physical.cpp,v 1.1 2013/03/03 04:54:26 joerg Exp $ + +--- backend/wbprivate/model/wb_component_physical.cpp.orig 2013-02-28 23:01:03.000000000 +0000 ++++ backend/wbprivate/model/wb_component_physical.cpp +@@ -89,12 +89,12 @@ void WBComponentPhysical::load_app_optio + + toolbar= app_ToolbarRef::cast_from( + grt->unserialize(make_path(_wb->get_datadir(),"data/model_option_toolbar_physical_relationship.xml"))); +- _toolbars["main/"WB_TOOL_PREL11_NOID]= toolbar; +- _toolbars["main/"WB_TOOL_PREL1n_NOID]= toolbar; +- _toolbars["main/"WB_TOOL_PREL11]= toolbar; +- _toolbars["main/"WB_TOOL_PREL1n]= toolbar; +- _toolbars["main/"WB_TOOL_PRELnm]= toolbar; +- _toolbars["main/"WB_TOOL_PREL_PICK]= toolbar; ++ _toolbars["main/" WB_TOOL_PREL11_NOID]= toolbar; ++ _toolbars["main/" WB_TOOL_PREL1n_NOID]= toolbar; ++ _toolbars["main/" WB_TOOL_PREL11]= toolbar; ++ _toolbars["main/" WB_TOOL_PREL1n]= toolbar; ++ _toolbars["main/" WB_TOOL_PRELnm]= toolbar; ++ _toolbars["main/" WB_TOOL_PREL_PICK]= toolbar; + + _shortcuts= grt::ListRef<app_ShortcutItem>::cast_from( + grt->unserialize(make_path(_wb->get_datadir(),"data/shortcuts_physical.xml"))); diff --git a/databases/mysql-workbench/patches/patch-backend_wbprivate_sqlide_wb__sqlide__module.cpp b/databases/mysql-workbench/patches/patch-backend_wbprivate_sqlide_wb__sqlide__module.cpp new file mode 100644 index 00000000000..b76e3737019 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-backend_wbprivate_sqlide_wb__sqlide__module.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-backend_wbprivate_sqlide_wb__sqlide__module.cpp,v 1.1 2013/03/03 04:54:26 joerg Exp $ + +--- backend/wbprivate/sqlide/wb_sqlide_module.cpp.orig 2013-02-28 23:08:16.000000000 +0000 ++++ backend/wbprivate/sqlide/wb_sqlide_module.cpp +@@ -23,7 +23,7 @@ grt::ListRef<app_Plugin> WbSqlIdeImpl::g + {\ + plugin= app_PluginRef(grt);\ + plugin->name(Recordset_data_storage::DATA_STORAGE_MODULE_NAME_PREFIX + data_format);\ +- plugin->caption("Get "data_format" data storage");\ ++ plugin->caption("Get " data_format " data storage");\ + plugin->description(desc);\ + plugin->moduleName("WbSqlIde");\ + plugin->moduleFunctionName(Recordset_data_storage::DATA_STORAGE_MODULE_GETTER);\ diff --git a/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_wb__model__file.cpp b/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_wb__model__file.cpp new file mode 100644 index 00000000000..d7d6980e164 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_wb__model__file.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-backend_wbprivate_workbench_wb__model__file.cpp,v 1.1 2013/03/03 04:54:26 joerg Exp $ + +--- backend/wbprivate/workbench/wb_model_file.cpp.orig 2013-02-28 23:16:25.000000000 +0000 ++++ backend/wbprivate/workbench/wb_model_file.cpp +@@ -61,7 +61,7 @@ + #define DB_DIR "@db" + #define DB_FILE "data.db" + +-#define ZIP_FILE_COMMENT DOCUMENT_FORMAT" archive "ZIP_FILE_FORMAT ++#define ZIP_FILE_COMMENT DOCUMENT_FORMAT " archive " ZIP_FILE_FORMAT + + + diff --git a/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_wb__module.cpp b/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_wb__module.cpp new file mode 100644 index 00000000000..8cf886ca5ca --- /dev/null +++ b/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_wb__module.cpp @@ -0,0 +1,106 @@ +$NetBSD: patch-backend_wbprivate_workbench_wb__module.cpp,v 1.1 2013/03/03 04:54:26 joerg Exp $ + +--- backend/wbprivate/workbench/wb_module.cpp.orig 2013-03-02 18:27:50.000000000 +0000 ++++ backend/wbprivate/workbench/wb_module.cpp +@@ -85,7 +85,7 @@ void WorkbenchImpl::set_context(WBContex + #define def_plugin(group, aName, type, aCaption, descr)\ + {\ + app_PluginRef plugin(get_grt());\ +- plugin->name("wb."group"."aName);\ ++ plugin->name("wb." group "." aName);\ + plugin->caption(aCaption);\ + plugin->description(descr);\ + plugin->moduleName("Workbench");\ +@@ -98,7 +98,7 @@ void WorkbenchImpl::set_context(WBContex + #define def_object_plugin(group, klass, aName, aCaption, descr)\ + {\ + app_PluginRef plugin(get_grt());\ +- plugin->name("wb."group"."aName);\ ++ plugin->name("wb." group "." aName);\ + plugin->caption(aCaption);\ + plugin->description(descr);\ + plugin->moduleName("Workbench");\ +@@ -116,7 +116,7 @@ void WorkbenchImpl::set_context(WBContex + #define def_view_plugin(group, aName, aCaption, descr)\ + {\ + app_PluginRef plugin(get_grt());\ +- plugin->name("wb."group"."aName);\ ++ plugin->name("wb." group "." aName);\ + plugin->caption(aCaption);\ + plugin->description(descr);\ + plugin->moduleName("Workbench");\ +@@ -134,7 +134,7 @@ void WorkbenchImpl::set_context(WBContex + #define def_model_plugin(group, aName, aCaption, descr)\ + {\ + app_PluginRef plugin(get_grt());\ +- plugin->name("wb."group"."aName);\ ++ plugin->name("wb." group "." aName);\ + plugin->caption(aCaption);\ + plugin->description(descr);\ + plugin->moduleName("Workbench");\ +@@ -152,7 +152,7 @@ void WorkbenchImpl::set_context(WBContex + #define def_form_model_plugin(group, aName, aCaption, descr)\ + {\ + app_PluginRef plugin(get_grt());\ +- plugin->name("wb."group"."aName);\ ++ plugin->name("wb." group "." aName);\ + plugin->caption(aCaption);\ + plugin->description(descr);\ + plugin->moduleName("Workbench");\ +@@ -170,7 +170,7 @@ void WorkbenchImpl::set_context(WBContex + #define def_form_plugin(group, aName, aCaption, descr)\ + {\ + app_PluginRef plugin(get_grt());\ +- plugin->name("wb."group"."aName);\ ++ plugin->name("wb." group "." aName);\ + plugin->caption(aCaption);\ + plugin->description(descr);\ + plugin->moduleName("Workbench");\ +@@ -185,7 +185,7 @@ void WorkbenchImpl::set_context(WBContex + {\ + app_PluginRef plugin(get_grt());\ + app_PluginInputDefinitionRef pdef(get_grt());\ +- plugin->name("wb."group"."aName);\ ++ plugin->name("wb." group "." aName);\ + plugin->caption(aCaption);\ + plugin->description(descr);\ + plugin->moduleName("Workbench");\ +@@ -201,7 +201,7 @@ void WorkbenchImpl::set_context(WBContex + #define def_model_arg_plugin(group, aName, type, aCaption, descr)\ + {\ + app_PluginRef plugin(get_grt());\ +- plugin->name("wb."group"."aName);\ ++ plugin->name("wb." group "." aName);\ + plugin->caption(aCaption);\ + plugin->description(descr);\ + plugin->moduleName("Workbench");\ +@@ -224,7 +224,7 @@ void WorkbenchImpl::set_context(WBContex + {\ + app_PluginRef plugin(get_grt());\ + app_PluginFileInputRef pdef(get_grt());\ +- plugin->name("wb."group"."aName);\ ++ plugin->name("wb." group "." aName);\ + plugin->caption(aCaption);\ + plugin->description(descr);\ + plugin->moduleName("Workbench");\ +@@ -1127,7 +1127,7 @@ int WorkbenchImpl::debugShowInfo() + #define NATIVE_RENDERER "Native" + #endif + +- grt->send_output(strfmt("MySQL Workbench "EDITION_NAME" for "PLATFORM_NAME" version %i.%i.%i\n", APP_MAJOR_NUMBER, APP_MINOR_NUMBER, APP_RELEASE_NUMBER)); ++ grt->send_output(strfmt("MySQL Workbench " EDITION_NAME " for " PLATFORM_NAME " version %i.%i.%i\n", APP_MAJOR_NUMBER, APP_MINOR_NUMBER, APP_RELEASE_NUMBER)); + + grt->send_output(strfmt("Configuration Directory: %s\n", _wb->get_grt_manager()->get_user_datadir().c_str())); + grt->send_output(strfmt("Data Directory: %s\n", _wb->get_grt_manager()->get_basedir().c_str())); +@@ -1153,9 +1153,9 @@ int WorkbenchImpl::debugShowInfo() + else + { + if (_wb->is_opengl_available()) +- render_mode= ("but "NATIVE_RENDERER" was requested. Using "NATIVE_RENDERER" for rendering."); ++ render_mode= ("but " NATIVE_RENDERER " was requested. Using " NATIVE_RENDERER " for rendering."); + else +- render_mode= ("so "NATIVE_RENDERER" is used for rendering."); ++ render_mode= ("so " NATIVE_RENDERER " is used for rendering."); + } + + grt->send_output(strfmt("Rendering Mode: %s, %s\n", ogl_state, render_mode)); diff --git a/databases/mysql-workbench/patches/patch-ext_scintilla_gtk_ScintillaGTK.cxx b/databases/mysql-workbench/patches/patch-ext_scintilla_gtk_ScintillaGTK.cxx new file mode 100644 index 00000000000..db98df49796 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-ext_scintilla_gtk_ScintillaGTK.cxx @@ -0,0 +1,13 @@ +$NetBSD: patch-ext_scintilla_gtk_ScintillaGTK.cxx,v 1.1 2013/03/03 04:54:26 joerg Exp $ + +--- ext/scintilla/gtk/ScintillaGTK.cxx.orig 2013-02-28 22:22:41.000000000 +0000 ++++ ext/scintilla/gtk/ScintillaGTK.cxx +@@ -1297,7 +1297,7 @@ void ScintillaGTK::AddToPopUp(const char + GtkItemFactoryEntry itemEntry = { + fulllabel, NULL, + menuSig, +- cmd, ++ static_cast<guint>(cmd), + const_cast<gchar *>(label[0] ? "<Item>" : "<Separator>"), + NULL + }; diff --git a/databases/mysql-workbench/patches/patch-frontend_linux_workbench_main.cpp b/databases/mysql-workbench/patches/patch-frontend_linux_workbench_main.cpp new file mode 100644 index 00000000000..751e519df2f --- /dev/null +++ b/databases/mysql-workbench/patches/patch-frontend_linux_workbench_main.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-frontend_linux_workbench_main.cpp,v 1.1 2013/03/03 04:54:26 joerg Exp $ + +--- frontend/linux/workbench/main.cpp.orig 2013-03-02 18:50:58.000000000 +0000 ++++ frontend/linux/workbench/main.cpp +@@ -57,7 +57,7 @@ static Gtk::Window *show_splash() + Gtk::Window *window= new Gtk::Window(Gtk::WINDOW_TOPLEVEL); + window->set_decorated(false); + window->set_default_size(560, 322); +- window->modify_bg_pixmap(Gtk::STATE_NORMAL, std::string(datadir).append("/images/"SPLASH_IMAGE)); ++ window->modify_bg_pixmap(Gtk::STATE_NORMAL, std::string(datadir).append("/images/" SPLASH_IMAGE)); + window->set_position(Gtk::WIN_POS_CENTER); + + Gtk::Fixed *fixed= Gtk::manage(new Gtk::Fixed()); diff --git a/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell.cpp b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell.cpp new file mode 100644 index 00000000000..1dd37f1e4ad --- /dev/null +++ b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-library_grt_src_grtpp__shell.cpp,v 1.1 2013/03/03 04:54:26 joerg Exp $ + +--- library/grt/src/grtpp_shell.cpp.orig 2013-02-28 22:29:52.000000000 +0000 ++++ library/grt/src/grtpp_shell.cpp +@@ -284,7 +284,7 @@ ShellCommand Shell::execute(const std::s + // Automatically convert show to show(grt2Lua(pwd())) + else if (strcmp(cmd, "show") == 0) + { +- preprocessed_cmd= g_strdup_printf("print("MYX_SHELL_CURNODE")\n"); ++ preprocessed_cmd= g_strdup_printf("print(" MYX_SHELL_CURNODE ")\n"); + res= ShellCommandStatement; + } + // Automatically convert show objectname to show(getGlobal("objectname")) diff --git a/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__lua__help.cpp b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__lua__help.cpp new file mode 100644 index 00000000000..d3f2b953c57 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__lua__help.cpp @@ -0,0 +1,820 @@ +$NetBSD: patch-library_grt_src_grtpp__shell__lua__help.cpp,v 1.1 2013/03/03 04:54:26 joerg Exp $ + +--- library/grt/src/grtpp_shell_lua_help.cpp.orig 2013-02-28 22:30:44.000000000 +0000 ++++ library/grt/src/grtpp_shell_lua_help.cpp +@@ -57,7 +57,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + { + "quit", + "Quits the application. Instead of quit the synonym 'exit' can be used.", +- "quit"NL ++ "quit" NL + "exit", + NULL, + NULL, +@@ -66,7 +66,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + { + "exit", + "Quits the application. 'exit' is a synonym for 'quit'.", +- "quit"NL ++ "quit" NL + "exit", + NULL, + NULL, +@@ -78,18 +78,18 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "printed. ls can also be used to list the items stored in a Lua table (-t) or " + "to print information about the available GRT modules.", + "ls [-t luaTable | -m [moduleName] | -s [structName]]", +- "-t Prints a list of all items of the given Lua table."NL +- "luaTable The Lua table to be printed."NL +- "-m Prints a list of all available GRT modules."NL +- "moduleName If a module name is specified, a list of functions the module"NL +- "-s Prints a list of all available GRT structs."NL +- "structName If a struct name is specfiied, a list of member variables"NL ++ "-t Prints a list of all items of the given Lua table." NL ++ "luaTable The Lua table to be printed." NL ++ "-m Prints a list of all available GRT modules." NL ++ "moduleName If a module name is specified, a list of functions the module" NL ++ "-s Prints a list of all available GRT structs." NL ++ "structName If a struct name is specfiied, a list of member variables" NL + " contains is printed.", +- " ls -t grtV"NL +- " Lists all entries of te grtV Lua table."NL +- " ls -m"NL +- " Lists all available GRT modules."NL +- " ls -m Base"NL ++ " ls -t grtV" NL ++ " Lists all entries of te grtV Lua table." NL ++ " ls -m" NL ++ " Lists all available GRT modules." NL ++ " ls -m Base" NL + " Lists the functions of the GRT module 'Base'", + " help cd, help show, help table, help grtM" + }, +@@ -99,17 +99,17 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "the GRT shell prompt and is used for the ls and show shell commands. If cd " + "is called without parameters the current global object path is printed.", + "cd [objectName | .. | path]", +- "objectName The name of the object to change into relative from the"NL +- " current path."NL +- ".. Goes up one object relative to the current path."NL +- "path Absolute (starting with /) or relative path (starting with ./)"NL ++ "objectName The name of the object to change into relative from the" NL ++ " current path." NL ++ ".. Goes up one object relative to the current path." NL ++ "path Absolute (starting with /) or relative path (starting with ./)" NL + " path of the object to make the new current global object.", +- " cd Migration"NL +- " Changes the current global object to ./Migration. If the current"NL +- " global object has been e.g. '/app' it is changed to "NL +- " '/app/Migration'."NL +- " cd .."NL +- " If the current global object has been e.g. '/app/Migration' it is"NL ++ " cd Migration" NL ++ " Changes the current global object to ./Migration. If the current" NL ++ " global object has been e.g. '/app' it is changed to " NL ++ " '/app/Migration'." NL ++ " cd .." NL ++ " If the current global object has been e.g. '/app/Migration' it is" NL + " changed to '/app'.", + " help ls, help show" + }, +@@ -117,14 +117,14 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "show", + "Prints the current global object or the object with the given path.", + "show [path]", +- "path The absolut (starting with /) or relative (starting with ./) path"NL ++ "path The absolut (starting with /) or relative (starting with ./) path" NL + " of the object to print.", +- " cd Migration"NL +- " Changes the current global object to ./Migration. If the current"NL +- " global object has been e.g. '/app' it is changed to "NL +- " '/app/Migration'."NL +- " cd .."NL +- " If the current global object has been e.g. '/app/Migration' it is"NL ++ " cd Migration" NL ++ " Changes the current global object to ./Migration. If the current" NL ++ " global object has been e.g. '/app' it is changed to " NL ++ " '/app/Migration'." NL ++ " cd .." NL ++ " If the current global object has been e.g. '/app/Migration' it is" NL + " changed to '/app'.", + " help ls, help show" + }, +@@ -133,7 +133,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Load and execute a lua script file.", + "run filename", + "filename File that should be loaded and executed.", +- " run scripts/test.lua"NL ++ " run scripts/test.lua" NL + " Runs the script scripts/test.lua.", + NULL + }, +@@ -142,22 +142,22 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Used for fast access to global objects. /path is converted to grtV.getGlobal() " + "and grtV.setGlobal() by the shell's preprocessor. Please note that you cannot " + "use /path in scripts.", +- "/path = var Assigns the Lua variable var to the global object "NL +- " defined by /path."NL +- "//path with spaces/ = var Assigns the Lua variable var to the global object "NL +- " defined by /path if the path contains spaces."NL +- "var = /path Assigns the global object defined by /path to then "NL +- " Lua variable var."NL +- "var = //path with space/ Assigns the global object defined by /path to then "NL ++ "/path = var Assigns the Lua variable var to the global object " NL ++ " defined by /path." NL ++ "//path with spaces/ = var Assigns the Lua variable var to the global object " NL ++ " defined by /path if the path contains spaces." NL ++ "var = /path Assigns the global object defined by /path to then " NL ++ " Lua variable var." NL ++ "var = //path with space/ Assigns the global object defined by /path to then " NL + " Lua variable var whifen the path contains spaces.", + NULL, +- " /test= 27"NL +- " Assigns the number 27 to the global object with the path '/test'."NL +- " //test object/= \"testing\""NL +- " Assigns the string \"testing\" to the global object with the path"NL +- " '/test object'."NL +- " catalog= /migration/srcCatalog"NL +- " Assigns the global object with the path '/migration/srcCatalog'"NL ++ " /test= 27" NL ++ " Assigns the number 27 to the global object with the path '/test'." NL ++ " //test object/= \"testing\"" NL ++ " Assigns the string \"testing\" to the global object with the path" NL ++ " '/test object'." NL ++ " catalog= /migration/srcCatalog" NL ++ " Assigns the global object with the path '/migration/srcCatalog'" NL + " to the Lua variable catalog", + " help ls, help cd" + }, +@@ -241,14 +241,14 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "input", + "Promnts for a keyboard input.", + "input (str)", +- "str String that will be printed before the input prompt"NL, +- " res= input(\"Please enter a number form the list:\")"NL ++ "str String that will be printed before the input prompt" NL, ++ " res= input(\"Please enter a number form the list:\")" NL + " Asks the user to enter a number and stores it in the variable res", + NULL + }, + { + "ipairs", +- "Returns an iterator function, the table t, and 0, so that the construction"NL" for i,v in ipairs(t) do ... end"NL"will iterate over the pairs (1,t[1]), (2,t[2]), ..., up to the first integer key with a nil value in the table.", ++ "Returns an iterator function, the table t, and 0, so that the construction" NL " for i,v in ipairs(t) do ... end" NL "will iterate over the pairs (1,t[1]), (2,t[2]), ..., up to the first integer key with a nil value in the table.", + "ipairs (t)", + NULL, + NULL, +@@ -272,7 +272,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + }, + { + "loadstring", +- "Loads a string as a Lua chunk (without running it). If there are no errors, returns the compiled chunk as a function; otherwise, returns nil plus the error message. The environment of the returned function is the global environment. The optional parameter chunkname is the name to be used in error messages and debug information. To load and run a given string, use the idiom"NL" assert(loadstring(s))()", ++ "Loads a string as a Lua chunk (without running it). If there are no errors, returns the compiled chunk as a function; otherwise, returns nil plus the error message. The environment of the returned function is the global environment. The optional parameter chunkname is the name to be used in error messages and debug information. To load and run a given string, use the idiom" NL " assert(loadstring(s))()", + "loadlib (libname, funcname)", + NULL, + NULL, +@@ -288,7 +288,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + }, + { + "pairs", +- "Returns the next function and the table t (plus a nil), so that the construction"NL" for k,v in pairs(t) do ... end"NL"will iterate over all key-value pairs of table t.", ++ "Returns the next function and the table t (plus a nil), so that the construction" NL " for k,v in pairs(t) do ... end" NL "will iterate over all key-value pairs of table t.", + "pairs (t)", + NULL, + NULL, +@@ -362,8 +362,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "sleep", + "Pauses the execution of the script for ms milliseconds.", + "sleep (ms)", +- "ms Time to sleep in ms."NL, +- " sleep(1000)"NL ++ "ms Time to sleep in ms." NL, ++ " sleep(1000)" NL + " Sleeps for one second.", + NULL + }, +@@ -393,7 +393,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + }, + { + "unpack", +- "Returns all elements from the given list. This function is equivalent to \"NL\" return list[1], list[2], ..., list[n]"NL"except that the above code can be written only for a fixed n. The number n is the size of the list, as defined for the table.getn function.", ++ "Returns all elements from the given list. This function is equivalent to \"NL\" return list[1], list[2], ..., list[n]" NL "except that the above code can be written only for a fixed n. The number n is the size of the list, as defined for the table.getn function.", + "unpack (list)", + NULL, + NULL, +@@ -476,7 +476,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Returns a new generated GUID as lua string.", + "grt.newGuid()", + NULL, +- " print(grt.newGuid())"NL ++ " print(grt.newGuid())" NL + " Prints a new generated GUID.", + NULL + }, +@@ -492,7 +492,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "split", + "Splits the given Lua string based on the separator and puts the tokens into a Lua list.", + "function grt.split(str, sep)", +- "str the string to split"NL ++ "str the string to split" NL + "sep the separator character", + NULL, + NULL +@@ -653,9 +653,9 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Returns a formatted version of its variable number of arguments following the description given in its first argument (which must be a string). The format string follows the same rules as the printf family of standard C functions. The only differences are that the options/modifiers *, l, L, n, p, and h are not supported, and there is an extra option, q. The q option formats a string in a form suitable to be safely read back by the Lua interpreter: The string is written between double quotes, and all double quotes, newlines, and backslashes in the string are correctly escaped when written. The options c, d, E, e, f, g, G, i, o, u, X, and x all expect a number as argument, whereas q and s expect a string. The * modifier can be simulated by building the appropriate format string. For example, \"%*g\" can be simulated with \"%\"..width..\"g\". String values to be formatted with %s cannot contain embedded zeros.", + "string.format (formatstring, e1, e2, ...)", + NULL, +- " string.format('%q', 'a string with \"quotes\" and \n new line')"NL +- " will produce the string:"NL +- "\"a string with \\\"quotes\\\" and \\"NL ++ " string.format('%q', 'a string with \"quotes\" and \n new line')" NL ++ " will produce the string:" NL ++ "\"a string with \\\"quotes\\\" and \\" NL + " new line\"", + NULL + }, +@@ -664,17 +664,17 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Returns an iterator function that, each time it is called, returns the next captures from pattern pat over string s. If pat specifies no captures, then the whole match is produced in each call.", + "string.gfind (s, pat)", + NULL, +- " s = \"hello world from Lua\""NL +- " for w in string.gfind(s, \"%a+\") do"NL +- " print(w)"NL +- " end"NL +- " will iterate over all the words from string s, printing"NL +- " one per line. The next example collects all pairs key=value"NL +- " from the given string into a table:"NL +- " t = {}"NL +- " s = \"from=world, to=Lua\""NL +- " for k, v in string.gfind(s, \"(%w+)=(%w+)\") do"NL +- " t[k] = v"NL ++ " s = \"hello world from Lua\"" NL ++ " for w in string.gfind(s, \"%a+\") do" NL ++ " print(w)" NL ++ " end" NL ++ " will iterate over all the words from string s, printing" NL ++ " one per line. The next example collects all pairs key=value" NL ++ " from the given string into a table:" NL ++ " t = {}" NL ++ " s = \"from=world, to=Lua\"" NL ++ " for k, v in string.gfind(s, \"(%w+)=(%w+)\") do" NL ++ " t[k] = v" NL + " end", + NULL + }, +@@ -683,28 +683,28 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Returns a copy of s in which all occurrences of the pattern pat have been replaced by a replacement string specified by repl. gsub also returns, as a second value, the total number of substitutions made. If repl is a string, then its value is used for replacement. Any sequence in repl of the form %n, with n between 1 and 9, stands for the value of the n-th captured substring (see below). If repl is a function, then this function is called every time a match occurs, with all captured substrings passed as arguments, in order; if the pattern specifies no captures, then the whole match is passed as a sole argument. If the value returned by this function is a string, then it is used as the replacement string; otherwise, the replacement string is the empty string. The optional last parameter n limits the maximum number of substitutions to occur. For instance, when n is 1 only the first occurrence of pat is replaced.", + "string.gsub (s, pat, repl [, n])", + NULL, +- " x = string.gsub(\"hello world\", \"(%w+)\", \"%1 %1\")"NL +- " --> x=\"hello hello world world\""NL ++ " x = string.gsub(\"hello world\", \"(%w+)\", \"%1 %1\")" NL ++ " --> x=\"hello hello world world\"" NL + NL +- " x = string.gsub(\"hello world\", \"(%w+)\", \"%1 %1\", 1)"NL +- " --> x=\"hello hello world\""NL ++ " x = string.gsub(\"hello world\", \"(%w+)\", \"%1 %1\", 1)" NL ++ " --> x=\"hello hello world\"" NL + NL +- " x = string.gsub(\"hello world from Lua\", \"(%w+)%s*(%w+)\", \"%2 %1\")"NL +- " --> x=\"world hello Lua from\""NL ++ " x = string.gsub(\"hello world from Lua\", \"(%w+)%s*(%w+)\", \"%2 %1\")" NL ++ " --> x=\"world hello Lua from\"" NL + NL +- " x = string.gsub(\"home = $HOME, user = $USER\", \"%$(%w+)\", os.getenv)"NL +- " --> x=\"home = /home/roberto, user = roberto\""NL ++ " x = string.gsub(\"home = $HOME, user = $USER\", \"%$(%w+)\", os.getenv)" NL ++ " --> x=\"home = /home/roberto, user = roberto\"" NL + NL +- " x = string.gsub(\"4+5 = $return 4+5$\", \"%$(.-)%$\", function (s)"NL +- " return loadstring(s)()"NL +- " end)"NL +- " --> x=\"4+5 = 9\""NL ++ " x = string.gsub(\"4+5 = $return 4+5$\", \"%$(.-)%$\", function (s)" NL ++ " return loadstring(s)()" NL ++ " end)" NL ++ " --> x=\"4+5 = 9\"" NL + NL +- " local t = {name=\"lua\", version=\"5.0\"}"NL +- " x = string.gsub(\"$name_$version.tar.gz\", \"%$(%w+)\", function (v)"NL +- " return t[v]"NL +- " end)"NL +- " --> x=\"lua_5.0.tar.gz\""NL, ++ " local t = {name=\"lua\", version=\"5.0\"}" NL ++ " x = string.gsub(\"$name_$version.tar.gz\", \"%$(%w+)\", function (v)" NL ++ " return t[v]" NL ++ " end)" NL ++ " --> x=\"lua_5.0.tar.gz\"" NL, + NULL + }, + { +@@ -1028,9 +1028,9 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Opens the given file name in read mode and returns an iterator function that, each time it is called, returns a new line from the file.", + "io.lines ([filename])", + NULL, +- " for line in io.lines(filename) do ... end"NL +- " This construction will iterate over all lines of the file."NL +- " When the iterator function detects the end of file, it returns"NL ++ " for line in io.lines(filename) do ... end" NL ++ " This construction will iterate over all lines of the file." NL ++ " When the iterator function detects the end of file, it returns" NL + " nil (to finish the loop) and automatically closes the file.", + NULL + }, +@@ -1038,14 +1038,14 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "open", + "This function opens a file, in the mode specified in the string mode. It returns a new file handle, or, in case of errors, nil plus an error message. The mode string may also have a b at the end, which is needed in some systems to open the file in binary mode. This string is exactly what is used in the standard C function fopen.", + "io.open (filename [, mode])", +- "filename Name of the file to open."NL +- "mode The mode string can be any of the following:"NL +- " \"r\" read mode (the default);"NL +- " \"w\" write mode;"NL +- " \"a\" append mode;"NL +- " \"r+\" update mode, all previous data is preserved;"NL +- " \"w+\" update mode, all previous data is erased;"NL +- " \"a+\" append update mode, previous data is preserved, writing is"NL ++ "filename Name of the file to open." NL ++ "mode The mode string can be any of the following:" NL ++ " \"r\" read mode (the default);" NL ++ " \"w\" write mode;" NL ++ " \"a\" append mode;" NL ++ " \"r+\" update mode, all previous data is preserved;" NL ++ " \"w+\" update mode, all previous data is erased;" NL ++ " \"a+\" append update mode, previous data is preserved, writing is" NL + " only allowed at the end of file.", + NULL, + NULL +@@ -1123,8 +1123,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Returns an iterator function that, each time it is called, returns a new line from the file.", + "file:lines ()", + NULL, +- " for line in file:lines() do ... end"NL +- " will iterate over all lines of the file. (Unlike io.lines,"NL ++ " for line in file:lines() do ... end" NL ++ " will iterate over all lines of the file. (Unlike io.lines," NL + " this function does not close the file when the loop ends.)", + NULL + }, +@@ -1132,15 +1132,15 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "read", + "Reads the file file, according to the given formats, which specify what to read. For each format, the function returns a string (or a number) with the characters read, or nil if it cannot read data with the specified format. When called without formats, it uses a default format that reads the entire next line.", + "file:read (format1, ...)", +- "format1 The available formats are:"NL +- " \"*n\" reads a number; this is the only format that returns a"NL +- " number instead of a string."NL +- " \"*a\" reads the whole file, starting at the current position."NL +- " On end of file, it returns the empty string."NL +- " \"*l\" reads the next line (skipping the end of line), "NL +- " returning nil on end of file. This is the default format."NL +- " number reads a string with up to that number of characters,"NL +- " returning nil on end of file. If number is zero, it reads"NL ++ "format1 The available formats are:" NL ++ " \"*n\" reads a number; this is the only format that returns a" NL ++ " number instead of a string." NL ++ " \"*a\" reads the whole file, starting at the current position." NL ++ " On end of file, it returns the empty string." NL ++ " \"*l\" reads the next line (skipping the end of line), " NL ++ " returning nil on end of file. This is the default format." NL ++ " number reads a string with up to that number of characters," NL ++ " returning nil on end of file. If number is zero, it reads" NL + " nothing and returns an empty string, or nil on end of file.", + NULL, + NULL +@@ -1149,8 +1149,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "seek", + "Sets and gets the file position, measured from the beginning of the file, to the position given by offset plus a base specified by the string whence. In case of success, function seek returns the final file position, measured in bytes from the beginning of the file. If this function fails, it returns nil, plus a string describing the error. The default value for whence is \"cur\", and for offset is 0. Therefore, the call file:seek() returns the current file position, without changing it; the call file:seek(\"set\") sets the position to the beginning of the file (and returns 0); and the call file:seek(\"end\") sets the position to the end of the file, and returns its size.", + "file:seek ([whence] [, offset])", +- "whence \"set\" base is position 0 (beginning of the file);"NL +- " \"cur\" base is current position;"NL ++ "whence \"set\" base is position 0 (beginning of the file);" NL ++ " \"cur\" base is current position;" NL + " \"end\" base is end of file;", + NULL, + NULL +@@ -1196,8 +1196,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Returns the number of seconds from time t1 to time t2. In Posix, Windows, and some other systems, this value is exactly t2-t1.", + "os.difftime (t2, t1)", + NULL, +- " for line in file:lines() do ... end"NL +- " will iterate over all lines of the file. (Unlike io.lines,"NL ++ " for line in file:lines() do ... end" NL ++ " will iterate over all lines of the file. (Unlike io.lines," NL + " this function does not close the file when the loop ends.)", + NULL + }, +@@ -1213,8 +1213,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "exit", + "Calls the C function exit, with an optional code, to terminate the host program. The default value for code is the success code.", + "os.exit ([code])", +- "whence \"set\" base is position 0 (beginning of the file);"NL +- " \"cur\" base is current position;"NL ++ "whence \"set\" base is position 0 (beginning of the file);" NL ++ " \"cur\" base is current position;" NL + " \"end\" base is end of file;", + NULL, + NULL +@@ -1284,7 +1284,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Clears the given list.", + "grtV.clearList (list)", + "list the GRT list to clear.", +- " grtV.clearList(pluginList)"NL ++ " grtV.clearList(pluginList)" NL + " will clear the list pluginList", + NULL + }, +@@ -1292,10 +1292,10 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "child", + "Returns a child object defined by a subpath.", + "grtV.child (grtObj, path)", +- "grtObj the GRT object that contains the child object."NL ++ "grtObj the GRT object that contains the child object." NL + "path the relative path to the child object.", +- " res= grtV.child(grtV.getGlobal(\"/rdbmsMgmt\"), \"/storedConns/0\")"NL +- " will return the first stored connection from the "NL ++ " res= grtV.child(grtV.getGlobal(\"/rdbmsMgmt\"), \"/storedConns/0\")" NL ++ " will return the first stored connection from the " NL + " global \"/rdbmsMgmt\" object.", + NULL + }, +@@ -1362,8 +1362,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Returns the dict's key with the given index.", + "grtV.getKey (grtDict, index)", + "grtDict The GRT dict to check.", +- " rdbmsMgmt= RdbmsManagement:getManagementInfo()"NL +- " print(grtV.getKey(rdbmsMgmt.rdbms[1].drivers[1].defaultModules, 1))"NL ++ " rdbmsMgmt= RdbmsManagement:getManagementInfo()" NL ++ " print(grtV.getKey(rdbmsMgmt.rdbms[1].drivers[1].defaultModules, 1))" NL + " Prints the first key of the defaultModules dict.", + NULL + }, +@@ -1371,7 +1371,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "getListItemByObjName", + "Returns a list item object based on its name.", + "grtV.getListItemByObjName (grtList, \"name\")", +- "grtList The GRT list to check."NL ++ "grtList The GRT list to check." NL + "name The object name to search", + NULL, + NULL +@@ -1381,8 +1381,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Returns the number of entries in the given list or dict.", + "grtV.getn (grtValue)", + "grtList The GRT list or dict to check.", +- " print(grtV.getn(grtV.getGlobal(\"/rdbmsMgmt/storedConns\")))"NL +- " Returns the number of items in the global"NL ++ " print(grtV.getn(grtV.getGlobal(\"/rdbmsMgmt/storedConns\")))" NL ++ " Returns the number of items in the global" NL + " \"/rdbmsMgmt/storedConns\" list", + NULL + }, +@@ -1390,9 +1390,9 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "getGlobal", + "Returns the global GRT object at the given path. Global objects are referred by a tree that can be accessed from all languages bound to the GRT.", + "grtV.getGlobal (path)", +- "path The path to the global object"NL, +- " grtV.getGlobal(\"/rdbmsMgmt/storedConns/0\")"NL +- " Returns the GRT object at the global path "NL ++ "path The path to the global object" NL, ++ " grtV.getGlobal(\"/rdbmsMgmt/storedConns/0\")" NL ++ " Returns the GRT object at the global path " NL + " \"/rdbmsMgmt/storedConns/0\"", + NULL + }, +@@ -1400,10 +1400,10 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "insert", + "Inserts the given obj into the grtList. If index is ommited, the obj will be inserted at the very end of the list.", + "grtV.insert (grtList, obj [, index])", +- "grtList The GRT list that will hold the obj."NL +- "obj the object to insert."NL ++ "grtList The GRT list that will hold the obj." NL ++ "obj the object to insert." NL + "index optional index of where to insert the obj in the list", +- " grtV.insert(rdbmsMgmt.rdbms, rdbms)"NL ++ " grtV.insert(rdbmsMgmt.rdbms, rdbms)" NL + " appends the rdbms object to the rdbmsMgmt.rdbms list.", + NULL + }, +@@ -1412,10 +1412,10 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Loads and returns a GRT object from a file.", + "grtV.load (filename)", + "filename Filename of the file to load", +- " if grt.fileExists(storedConnsFilename) then"NL +- " rdbmsMgmt.storedConns= grtV.load(storedConnsFilename)"NL +- " end"NL +- " Loads the file with the filename stored in"NL ++ " if grt.fileExists(storedConnsFilename) then" NL ++ " rdbmsMgmt.storedConns= grtV.load(storedConnsFilename)" NL ++ " end" NL ++ " Loads the file with the filename stored in" NL + " storedConnsFilename and assigns it to rdbmsMgmt.storedConns", + NULL + }, +@@ -1423,13 +1423,13 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "newDict", + "Creates a new GRT dict with the optional contentType and contentStructName.", + "grtV.newDict (contentType, contentStructName)", +- "contentType If submitted a typed dict is created and the dict can only"NL +- " hold members of the given type. Possible values are \"int\","NL +- " \"string\", \"real\", \"list\", \"dict\""NL +- "contentStructName If the contentType is \"dict\" a struct name can be defined."NL ++ "contentType If submitted a typed dict is created and the dict can only" NL ++ " hold members of the given type. Possible values are \"int\"," NL ++ " \"string\", \"real\", \"list\", \"dict\"" NL ++ "contentStructName If the contentType is \"dict\" a struct name can be defined." NL + " Only dicts with this struct name can be used as dict members.", +- " obj= grtV.newDict(\"dict\", \"db.Table\")"NL +- " Creates a new dict that can only have dict members of the"NL ++ " obj= grtV.newDict(\"dict\", \"db.Table\")" NL ++ " Creates a new dict that can only have dict members of the" NL + " struct db.Table", + NULL + }, +@@ -1437,25 +1437,25 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "newList", + "Creates a new GRT list with the optional contentType and contentStructName.", + "grtV.newList (contentType, contentStructName)", +- "contentType If submitted a typed list is created and the list can only"NL +- " hold values of the given type. Possible values are \"int\","NL +- " \"string\", \"real\", \"list\", \"dict\""NL +- "contentStructName If the contentType is \"dict\" a struct name can be defined."NL ++ "contentType If submitted a typed list is created and the list can only" NL ++ " hold values of the given type. Possible values are \"int\"," NL ++ " \"string\", \"real\", \"list\", \"dict\"" NL ++ "contentStructName If the contentType is \"dict\" a struct name can be defined." NL + " Only dicts with this struct name can be added to the list.", +- " list= grtV.newList(\"string\")"NL ++ " list= grtV.newList(\"string\")" NL + " Creates a new list that can only hold string values", + NULL + }, + { + "newObj", +- "Creates a new GRT object initialized with the optional given values. All simple values"NL +- "(\"int\", \"string\", \"real\") are initialized and all lists and dicts are created."NL ++ "Creates a new GRT object initialized with the optional given values. All simple values" NL ++ "(\"int\", \"string\", \"real\") are initialized and all lists and dicts are created." NL + "Object references are left null.", + "grtV.newObj (structName[, initValuesDict])", +- "structName Struct name of the object to create"NL +- "initValuesDict A dictionary containing initial values for object fields."NL, +- " rdbmsMgmt= grtV.newObj(\"db.mgmt.Management\", "NL +- " {name=\"rdbmsManagement\", owner=app})"NL ++ "structName Struct name of the object to create" NL ++ "initValuesDict A dictionary containing initial values for object fields." NL, ++ " rdbmsMgmt= grtV.newObj(\"db.mgmt.Management\", " NL ++ " {name=\"rdbmsManagement\", owner=app})" NL + " Create a new object from the struct \"db.mgmt.Management\"", + NULL + }, +@@ -1463,7 +1463,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "remove", + "Removes the list item with the given index.", + "grtV.remove (list, index)", +- "list GRT list to manipulate"NL ++ "list GRT list to manipulate" NL + "index Index of the item to remove", + NULL, + NULL +@@ -1472,7 +1472,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "save", + "Saves the given object to a file.", + "grtV.save (obj, filename)", +- "obj The object to save."NL ++ "obj The object to save." NL + "filename The name of the file to create", + NULL, + NULL +@@ -1481,11 +1481,11 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "setGlobal", + "Assigns the object to the given global path.", + "grtV.setGlobal (path, obj)", +- "path The global path that the object will be assigned to"NL ++ "path The global path that the object will be assigned to" NL + "obj Object that will be assigned to the global path", +- " grtV.setGlobal(\"/rdbmsMgmt\", RdbmsManagement:getManagementInfo())"NL +- " Calls the module function getManagementInfo() and"NL +- " assignes the returned GRT value to the global path"NL ++ " grtV.setGlobal(\"/rdbmsMgmt\", RdbmsManagement:getManagementInfo())" NL ++ " Calls the module function getManagementInfo() and" NL ++ " assignes the returned GRT value to the global path" NL + " \"/rdbmsMgmt\"", + NULL + }, +@@ -1494,8 +1494,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Converts the given GRT value to a Lua value.", + "grtV.toLua (value)", + "value The GRT value to convert", +- " print(grtV.toLua(Base:getOsTypeName()))"NL +- " Calls the module function getOsTypeName() and"NL ++ " print(grtV.toLua(Base:getOsTypeName()))" NL ++ " Calls the module function getOsTypeName() and" NL + " converts the returned GRT string to a Lua string.", + NULL + }, +@@ -1511,7 +1511,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "typeOf", + "Returns the type of a GRT value.", + "typeName= grtV.typeOf (value)", +- "value a GRT value."NL ++ "value a GRT value." NL + "typeName the name of the type: int, real, string, list, dict, object", + NULL, + NULL +@@ -1557,8 +1557,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Returns a Lua table containing all member names of the given struct name.", + "grtS.getMembers (structName)", + "structName The name of the struct", +- " m= grtS.getMembers(\"db.Schema\")"NL +- " ls -t m"NL ++ " m= grtS.getMembers(\"db.Schema\")" NL ++ " ls -t m" NL + " Lists all members of the struct \"db.Schema\"", + NULL + }, +@@ -1566,9 +1566,9 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "getMemberType", + "Returns the type of a member as Lua string.", + "grtS.getMemberType (structName, memberName)", +- "structName The name of the struct"NL ++ "structName The name of the struct" NL + "memberName The name of the member", +- " print(grtS.getMemberType(\"db.Schema\", \"tables\"))"NL ++ " print(grtS.getMemberType(\"db.Schema\", \"tables\"))" NL + " Prints the type of the member tables.", + NULL + }, +@@ -1576,9 +1576,9 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "getMemberContentType", + "Returns the content type of a member as Lua string.", + "grtS.getMemberContentType (structName, memberName)", +- "structName The name of the struct"NL ++ "structName The name of the struct" NL + "memberName The name of the member", +- " print(grtS.getMemberContentType(\"db.Schema\", \"tables\"))"NL ++ " print(grtS.getMemberContentType(\"db.Schema\", \"tables\"))" NL + " Prints the content type of the member tables.", + NULL + }, +@@ -1586,9 +1586,9 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "getMemberContentStruct", + "Returns the content struct name of a member as Lua string.", + "grtS.getMemberContentStruct (structName, memberName)", +- "structName The name of the struct"NL ++ "structName The name of the struct" NL + "memberName The name of the member", +- " print(grtS.getMemberContentStruct(\"db.Schema\", \"tables\"))"NL ++ " print(grtS.getMemberContentStruct(\"db.Schema\", \"tables\"))" NL + " Prints the content struct name of the member tables.", + NULL + }, +@@ -1649,7 +1649,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "Returns all module names in a Lua table. If a extend is passed only modules that extend this module are returned.", + "grtM.get ([extend])", + NULL, +- " modules= grtM.get(\"RdbmsInfo\")"NL ++ " modules= grtM.get(\"RdbmsInfo\")" NL + " Returns all modules that extend \"RdbmsInfo\"", + NULL + }, +@@ -1772,11 +1772,11 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "regExVal", + "Evaluates the given regex against the text and returns the substring with the given subStringIndex", + "grtU.regExVal (text, regex [, subStringIndex])", +- "text The text to search"NL +- "regex The regular expression to use"NL ++ "text The text to search" NL ++ "regex The regular expression to use" NL + "subStringIndex The Substring index to use, 1 if ommited", +- " print(regexVal(\"Int(10,5)\", "NL +- " \"(\\\\w*)\\\\s*(\\\\((\\\\d+)\\\\s*(\\\\,\\\\s*(\\\\d+))?\\\\))?\", 1))"NL ++ " print(regexVal(\"Int(10,5)\", " NL ++ " \"(\\\\w*)\\\\s*(\\\\((\\\\d+)\\\\s*(\\\\,\\\\s*(\\\\d+))?\\\\))?\", 1))" NL + " Prints \"Int\"", + NULL + }, +@@ -1784,8 +1784,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_TEXT h + "replace", + "Replaces occurrences of the 'from' string to 'to' in the give text.", + "grtU.replace (text, from , to)", +- "text The text to work on"NL +- "from The string to search"NL ++ "text The text to work on" NL ++ "from The string to search" NL + "to The string to replace with", + " print(replace(\"hello world\", \"hello\", \"bye\"))", + NULL +@@ -1829,7 +1829,7 @@ static MYX_GRT_SHELL_COMMAND_HELP_GROUP + { + "string", + "String Manipulation", +- "This library provides generic functions for string manipulation, such as finding"NL ++ "This library provides generic functions for string manipulation, such as finding" NL + "and extracting substrings, and pattern matching.", + help_string + }, +@@ -1933,9 +1933,9 @@ static void myx_grt_shell_show_command_h + ul[k]= 0; + + grt->send_output(strfmt(NL +- "%s - %s"NL +- "%s"NL +- "%s"NL ++ "%s - %s" NL ++ "%s" NL ++ "%s" NL + NL, + help_group.group_caption, + help_group.group_name, +@@ -1958,7 +1958,7 @@ static void myx_grt_shell_show_command_h + grt->send_output(dir); + + grt->send_output(strfmt(NL NL +- "Type 'help %s.<command>' to get help on a specific command."NL, ++ "Type 'help %s.<command>' to get help on a specific command." NL, + help_group.group_name)); + + found= 1; +@@ -1979,7 +1979,7 @@ static void myx_grt_shell_show_command_h + ul[k]= '-'; + ul[k]= 0; + +- grt->send_output(strfmt(NL"%s - %s.%s"NL, help_group.group_caption, help_group.group_name, help_text.cmd)); ++ grt->send_output(strfmt(NL"%s - %s.%s" NL, help_group.group_caption, help_group.group_name, help_text.cmd)); + grt->send_output(ul); + grt->send_output(NL); + +@@ -2053,42 +2053,42 @@ void myx_grt_shell_show_help(grt::GRT *g + if(!command || !*command) + { + grt->send_output( +- "Shell Commands (only available in the GRT Shell)"NL +- "--------------"NL +- "help (\\h) Display this help."NL +- "? (\\?) Synonym for 'help'."NL +- "quit (\\q) Exit the shell."NL +- "exit (\\e) Synonym for 'quit'."NL +- "ls List all objects in the current path, modules or tables."NL +- "cd Changes the current globals path"NL +- "show Prints an object"NL +- "run (\\r) Load and execute a lua script file."NL +- //"/path Returns the global object at the given path"NL ++ "Shell Commands (only available in the GRT Shell)" NL ++ "--------------" NL ++ "help (\\h) Display this help." NL ++ "? (\\?) Synonym for 'help'." NL ++ "quit (\\q) Exit the shell." NL ++ "exit (\\e) Synonym for 'quit'." NL ++ "ls List all objects in the current path, modules or tables." NL ++ "cd Changes the current globals path" NL ++ "show Prints an object" NL ++ "run (\\r) Load and execute a lua script file." NL ++ //"/path Returns the global object at the given path" NL + NL +- "Global Functions and Objects"NL +- "----------------------------"NL +- "_G Basic functions with a global scope"NL +- //"grt Library with common used functions for GRT scripting"NL ++ "Global Functions and Objects" NL ++ "----------------------------" NL ++ "_G Basic functions with a global scope" NL ++ //"grt Library with common used functions for GRT scripting" NL + NL +- "Lua Standard Libraries"NL +- "----------------------"NL +- "coroutine Functions for collaborative multithreading"NL +- "string String manipulation functions"NL +- "table Generic functions for table manipulation"NL +- "math Mathematical functions"NL +- "io Input and Output Facilities"NL +- "file File class"NL +- "os Operating System Facilities"NL ++ "Lua Standard Libraries" NL ++ "----------------------" NL ++ "coroutine Functions for collaborative multithreading" NL ++ "string String manipulation functions" NL ++ "table Generic functions for table manipulation" NL ++ "math Mathematical functions" NL ++ "io Input and Output Facilities" NL ++ "file File class" NL ++ "os Operating System Facilities" NL + NL +- "GRT Scripting Libraries"NL +- "-----------------------"NL +- "grtV Library to work with GRT values"NL +- "grtS GRT struct management library"NL +- "grtM Library to return information about GRT modules"NL +-// "grtA GRT agent management library"NL +- "grtU GRT utility function library"NL ++ "GRT Scripting Libraries" NL ++ "-----------------------" NL ++ "grtV Library to work with GRT values" NL ++ "grtS GRT struct management library" NL ++ "grtM Library to return information about GRT modules" NL ++// "grtA GRT agent management library" NL ++ "grtU GRT utility function library" NL + NL +- "Type 'help <command/lib>' to get information about the command or library."NL ++ "Type 'help <command/lib>' to get information about the command or library." NL + ); + } + else diff --git a/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__python__help.cpp b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__python__help.cpp new file mode 100644 index 00000000000..ce610745a20 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp__shell__python__help.cpp @@ -0,0 +1,323 @@ +$NetBSD: patch-library_grt_src_grtpp__shell__python__help.cpp,v 1.1 2013/03/03 04:54:26 joerg Exp $ + +--- library/grt/src/grtpp_shell_python_help.cpp.orig 2013-02-28 22:36:13.000000000 +0000 ++++ library/grt/src/grtpp_shell_python_help.cpp +@@ -36,149 +36,149 @@ struct HelpTopic + + static HelpTopic help_topics[]= { + {"grt", +-" GRT (Generic RunTime) is internal system used by Workbench to hold model"NL +-"document data and allow plugins and modules to interface between each other,"NL +-"with the Workbench application and the model."NL +-" Workbench model data (diagrams, schemas, tables etc) is stored in a hierarchy"NL +-"of objects that can be accessed by any plugin. To allow that, the data is"NL +-"represented in 6 different datatypes that can be accessed from any language"NL +-"supported: integers, doubles, strings, dicts, lists and objects."NL +-" When working from Python, simple data types (integers, doubles and strings) are"NL +-"seen as normal Python values of the corresponding type."NL +-" Lists and dicts are kept in their internal representation but can be mostly"NL +-"treated as Python lists and dicts, meaning you can index lists and get items from"NL +-"dicts with the usual Python syntax (ie aList[0], len(aList), aDict['key'] etc)."NL +-" Objects contain data fields and methods, but the GRT only recognizes objects"NL +-"from a pre-registered class hierarchy. You can see the list of existing classes in"NL +-"the 'grt' module in the 'classes' list or in the Classes tab in the Scripting Shell"NL +-"window."NL +-" Workbench document data is kept in a tree-like structure that you can access and"NL +-"modify from Python. However, it is easy to corrupt a document beyond repair, so be"NL +-"careful when modifying the GRT tree for models and always make backups. Read-only"NL +-"access to the tree is safe and sufficient for many purposes."NL +-NL +-" In Python, the GRT tree root node can be accessed as grt.root"NL +-" Some examples of nodes that can be of interest:"NL +-NL +-" grt.root.wb.doc.physicalModels[0].catalog.schemata"NL +-" list of schemas in the open model"NL +-" grt.root.wb.doc.physicalModels[0].diagrams"NL +-" list of diagrams in the model"NL +-" grt.root.wb.options"NL +-" Workbench options and other state data"NL +-NL +-" While you cannot create new classes in the GRT from Python, you can create"NL +-"modules and plugins that are usable from other Workbench parts, including from"NL +-"other languages. See the corresponding help topics for more information about"NL +-"calling and writing your own modules."NL ++" GRT (Generic RunTime) is internal system used by Workbench to hold model" NL ++"document data and allow plugins and modules to interface between each other," NL ++"with the Workbench application and the model." NL ++" Workbench model data (diagrams, schemas, tables etc) is stored in a hierarchy" NL ++"of objects that can be accessed by any plugin. To allow that, the data is" NL ++"represented in 6 different datatypes that can be accessed from any language" NL ++"supported: integers, doubles, strings, dicts, lists and objects." NL ++" When working from Python, simple data types (integers, doubles and strings) are" NL ++"seen as normal Python values of the corresponding type." NL ++" Lists and dicts are kept in their internal representation but can be mostly" NL ++"treated as Python lists and dicts, meaning you can index lists and get items from" NL ++"dicts with the usual Python syntax (ie aList[0], len(aList), aDict['key'] etc)." NL ++" Objects contain data fields and methods, but the GRT only recognizes objects" NL ++"from a pre-registered class hierarchy. You can see the list of existing classes in" NL ++"the 'grt' module in the 'classes' list or in the Classes tab in the Scripting Shell" NL ++"window." NL ++" Workbench document data is kept in a tree-like structure that you can access and" NL ++"modify from Python. However, it is easy to corrupt a document beyond repair, so be" NL ++"careful when modifying the GRT tree for models and always make backups. Read-only" NL ++"access to the tree is safe and sufficient for many purposes." NL ++NL ++" In Python, the GRT tree root node can be accessed as grt.root" NL ++" Some examples of nodes that can be of interest:" NL ++NL ++" grt.root.wb.doc.physicalModels[0].catalog.schemata" NL ++" list of schemas in the open model" NL ++" grt.root.wb.doc.physicalModels[0].diagrams" NL ++" list of diagrams in the model" NL ++" grt.root.wb.options" NL ++" Workbench options and other state data" NL ++NL ++" While you cannot create new classes in the GRT from Python, you can create" NL ++"modules and plugins that are usable from other Workbench parts, including from" NL ++"other languages. See the corresponding help topics for more information about" NL ++"calling and writing your own modules." NL + NL +-" For practical tips and examples on how to write scripts, see 'scripting'."NL +-" For more information about GRT Objects, see 'objects'"NL ++" For practical tips and examples on how to write scripts, see 'scripting'." NL ++" For more information about GRT Objects, see 'objects'" NL + NL + }, + {"objects", + "" + }, + {"scripting", +-" To execute a Python script against the loaded model, you can simply input it"NL +-"in the Scripting Shell entry box. For doing quick tests and exploring it will be"NL +-"the quickest way. If you have a script file you want to execute, you can execute"NL +-"it through the 'Scripting -> Run Workbench Script File' menu item."NL +-NL +-" If you have a script that is used often or that you want to distribute to other"NL +-"people, you may consider turning it into a plugin. A plugin will be accessible from"NL +-"the Workbench UI in the main menu or in certain context menus for model objects,"NL +-"depending on how you register it. See the 'plugins' section for more info about this."NL +-" You can also put your scripts in a library of plain Python functions, and invoke"NL +-"them from the Scripting Shell. By placing the library in the libraries folder in your"NL +-"user's Workbench data folder (you can see its path printed in the Workbench Shell) it"NL +-"will automatically loaded when Workbench starts. This is a more flexible approach as"NL +-"you can easily pass any kind of argument to your scripts with little coding effort."NL +-NL +-" Samples"NL +-" -------"NL +-" The following are some sample snippets for things you can do in Workbench,"NL +-"to view them type '? keyword'"NL +-NL +-" iter.figures - iterate through figures in the diagram"NL +-" iter.tables - iterate through tables in the 1st schema in the model"NL +-" chcolor - change color of all figures matching some criteria"NL +-" lowercase - rename titles of all tables and columns to lower case only"NL ++" To execute a Python script against the loaded model, you can simply input it" NL ++"in the Scripting Shell entry box. For doing quick tests and exploring it will be" NL ++"the quickest way. If you have a script file you want to execute, you can execute" NL ++"it through the 'Scripting -> Run Workbench Script File' menu item." NL ++NL ++" If you have a script that is used often or that you want to distribute to other" NL ++"people, you may consider turning it into a plugin. A plugin will be accessible from" NL ++"the Workbench UI in the main menu or in certain context menus for model objects," NL ++"depending on how you register it. See the 'plugins' section for more info about this." NL ++" You can also put your scripts in a library of plain Python functions, and invoke" NL ++"them from the Scripting Shell. By placing the library in the libraries folder in your" NL ++"user's Workbench data folder (you can see its path printed in the Workbench Shell) it" NL ++"will automatically loaded when Workbench starts. This is a more flexible approach as" NL ++"you can easily pass any kind of argument to your scripts with little coding effort." NL ++NL ++" Samples" NL ++" -------" NL ++" The following are some sample snippets for things you can do in Workbench," NL ++"to view them type '? keyword'" NL ++NL ++" iter.figures - iterate through figures in the diagram" NL ++" iter.tables - iterate through tables in the 1st schema in the model" NL ++" chcolor - change color of all figures matching some criteria" NL ++" lowercase - rename titles of all tables and columns to lower case only" NL + " " + }, + {"iter.figures", +-"# iterate over figures from a diagram and prints some information about them"NL +-"def iter_figures(diagram):"NL +-" for figure in diagram.figures:"NL +-" print '%s %s (%i,%i)'%(figure.__grtclassname__, figure.name, figure.left, figure.top)"NL ++"# iterate over figures from a diagram and prints some information about them" NL ++"def iter_figures(diagram):" NL ++" for figure in diagram.figures:" NL ++" print '%s %s (%i,%i)'%(figure.__grtclassname__, figure.name, figure.left, figure.top)" NL + NL +-"iter_figures(grt.root.wb.doc.physicalModels[0].diagrams[0])"NL ++"iter_figures(grt.root.wb.doc.physicalModels[0].diagrams[0])" NL + }, + {"iter.tables", +-"# iterate over database tables in a given schema and print columns and foreign keys"NL +-"def iter_tables(schema):"NL +-" for table in schema.tables:"NL +-" print '%s <%s>' % (table.name, table.tableEngine)"NL +-" print 'Columns:'"NL +-" for column in table.columns:"NL +-" print '%s%s : %s' % (column.name, table.isPrimaryKeyColumn(column) and 'PK' or '', column.formattedType())"NL +-" print 'Foreign Keys:'"NL +-" for fk in table.foreignKeys:"NL +-" print '%s' % fk.name"NL ++"# iterate over database tables in a given schema and print columns and foreign keys" NL ++"def iter_tables(schema):" NL ++" for table in schema.tables:" NL ++" print '%s <%s>' % (table.name, table.tableEngine)" NL ++" print 'Columns:'" NL ++" for column in table.columns:" NL ++" print '%s%s : %s' % (column.name, table.isPrimaryKeyColumn(column) and 'PK' or '', column.formattedType())" NL ++" print 'Foreign Keys:'" NL ++" for fk in table.foreignKeys:" NL ++" print '%s' % fk.name" NL + NL +-"iter_tables(grt.root.wb.doc.physicalModels[0].catalog.schemata[0])"NL ++"iter_tables(grt.root.wb.doc.physicalModels[0].catalog.schemata[0])" NL + }, + {"chcolor", +-"# change color of all figures in diagram of a given class"NL +-"def change_color(diagram, klass, new_color):"NL +-" for figure in diagram.figures:"NL +-" if figure.__grtclassname__ == klass:"NL +-" figure.color = new_color"NL ++"# change color of all figures in diagram of a given class" NL ++"def change_color(diagram, klass, new_color):" NL ++" for figure in diagram.figures:" NL ++" if figure.__grtclassname__ == klass:" NL ++" figure.color = new_color" NL + NL +-"change_color(grt.root.wb.doc.physicalModels[0].diagrams[0], 'workbench.physical.TableFigure', '#aa8844')"NL ++"change_color(grt.root.wb.doc.physicalModels[0].diagrams[0], 'workbench.physical.TableFigure', '#aa8844')" NL + }, + {"lowercase", +-"# change name of all tables to lowercase"NL +-"def change_table_names(function, schema=None):"NL +-" if schema is None:"NL +-" schema = grt.root.wb.doc.physicalModels[0].catalog.schemata[0]"NL +-" for table in schema.tables:"NL +-" s = function(table.name)"NL +-" if s != table.name:"NL +-" table.name = s"NL ++"# change name of all tables to lowercase" NL ++"def change_table_names(function, schema=None):" NL ++" if schema is None:" NL ++" schema = grt.root.wb.doc.physicalModels[0].catalog.schemata[0]" NL ++" for table in schema.tables:" NL ++" s = function(table.name)" NL ++" if s != table.name:" NL ++" table.name = s" NL + NL +-"change_table_names(lambda name: name.lower())"NL ++"change_table_names(lambda name: name.lower())" NL + }, + {"modules", +-" In the GRT, modules are libraries with a list of functions that are exported for use"NL +-"by code in other modules, scripts or Workbench itself. Modules can be currently written"NL +-"in C++, Lua and Python but the datatypes used in arguments and return value must be GRT"NL +-"types."NL +-" To export certain functions from a Python source file as a module, you need to do the"NL +-"following:"NL +-"- the file must be placed in the user modules folder. You can see its path in the"NL +-"scripting shell window as 'Looking for user plugins in ...'. You can also install it"NL +-"using the Scripting -> Install Plugin/Module File... menu command."NL +-"- the filename must have the _grt.py suffix (ex: my_modules_grt.py)"NL +-"- define some module metadata using the DefineModule function in the 'wb' module:"NL +-"from wb import *"NL +-"ModuleInfo = DefineModule(name='MyStuff', author='me', version='1.0')"NL +-"- functions to be exported must have their signature declared with the export decorator"NL +-"in the previously created ModuleInfo object:"NL +-"@ModuleInfo.export(grt.INT, grt.STRING)"NL +-"def checkString(s):"NL ++" In the GRT, modules are libraries with a list of functions that are exported for use" NL ++"by code in other modules, scripts or Workbench itself. Modules can be currently written" NL ++"in C++, Lua and Python but the datatypes used in arguments and return value must be GRT" NL ++"types." NL ++" To export certain functions from a Python source file as a module, you need to do the" NL ++"following:" NL ++"- the file must be placed in the user modules folder. You can see its path in the" NL ++"scripting shell window as 'Looking for user plugins in ...'. You can also install it" NL ++"using the Scripting -> Install Plugin/Module File... menu command." NL ++"- the filename must have the _grt.py suffix (ex: my_modules_grt.py)" NL ++"- define some module metadata using the DefineModule function in the 'wb' module:" NL ++"from wb import *" NL ++"ModuleInfo = DefineModule(name='MyStuff', author='me', version='1.0')" NL ++"- functions to be exported must have their signature declared with the export decorator" NL ++"in the previously created ModuleInfo object:" NL ++"@ModuleInfo.export(grt.INT, grt.STRING)" NL ++"def checkString(s):" NL + "..." +-" The arguments to export is a list of GRT type names, starting with the"NL +-"return type of the function, followed by 0 or more argument types. The allowed type"NL +-"names are (note that they are in the grt module, which must be imported):"NL +-" - grt.INT integer values; also used for boolean values"NL +-" - grt.DOUBLE floating point numeric values"NL +-" - grt.STRING UTF-8 or ASCII string data"NL +-" - grt.DICT a key/value dictionary value; keys must be strings"NL +-" - grt.LIST a list of other values. You may specify the type of the contents as"NL +-" a tuple in the form (grt.LIST, <type-or-class>), ex: (grt.LIST, grt.STRING) for a list"NL +-"of strings or (grt.LIST, grt.classes.db_Table) for a list of db.Table objects"NL +-" - grt.OBJECT an instance of a GRT object or a GRT class object, from grt.classes"NL ++" The arguments to export is a list of GRT type names, starting with the" NL ++"return type of the function, followed by 0 or more argument types. The allowed type" NL ++"names are (note that they are in the grt module, which must be imported):" NL ++" - grt.INT integer values; also used for boolean values" NL ++" - grt.DOUBLE floating point numeric values" NL ++" - grt.STRING UTF-8 or ASCII string data" NL ++" - grt.DICT a key/value dictionary value; keys must be strings" NL ++" - grt.LIST a list of other values. You may specify the type of the contents as" NL ++" a tuple in the form (grt.LIST, <type-or-class>), ex: (grt.LIST, grt.STRING) for a list" NL ++"of strings or (grt.LIST, grt.classes.db_Table) for a list of db.Table objects" NL ++" - grt.OBJECT an instance of a GRT object or a GRT class object, from grt.classes" NL + }, + {"plugins", + "" +@@ -191,28 +191,28 @@ void grt_shell_show_python_help(grt::GRT + { + if (!command || !*command) + grt->send_output( +- "Help Topics"NL +- "-----------"NL +- "grt General information about the Workbench runtime"NL +- "scripting Practical information when working on scripts and modules for Workbench"NL +- "wbdata Summary about Workbench model data organization"NL +- "modules Information about Workbench module usage"NL +- "plugins Information about writing Plugins and Modules for Workbench"NL +- "Type '? <topic>' to get help on the topic."NL ++ "Help Topics" NL ++ "-----------" NL ++ "grt General information about the Workbench runtime" NL ++ "scripting Practical information when working on scripts and modules for Workbench" NL ++ "wbdata Summary about Workbench model data organization" NL ++ "modules Information about Workbench module usage" NL ++ "plugins Information about writing Plugins and Modules for Workbench" NL ++ "Type '? <topic>' to get help on the topic." NL + NL +- "Custom Python Modules"NL +- "---------------------"NL +- "grt Module to work with Workbench runtime (grt) objects"NL +- " grt.root The root object in the internal Workbench object hierarchy"NL +- " grt.modules Location where Workbench modules are available"NL +- " grt.classes List of classes known to the GRT system"NL +- "mforms A Module to access the cross-platform UI toolkit used in some Workbench features"NL +- "wb Utility module for creating Workbench plugins"NL ++ "Custom Python Modules" NL ++ "---------------------" NL ++ "grt Module to work with Workbench runtime (grt) objects" NL ++ " grt.root The root object in the internal Workbench object hierarchy" NL ++ " grt.modules Location where Workbench modules are available" NL ++ " grt.classes List of classes known to the GRT system" NL ++ "mforms A Module to access the cross-platform UI toolkit used in some Workbench features" NL ++ "wb Utility module for creating Workbench plugins" NL + NL +- "Type 'help(<module/object/function>)' to get information about a module, object or function."NL +- "'dir(<object>)' will give a quick list of methods an object has."NL +- "For an introductory tutorial on the Python language, visit http://docs.python.org/tutorial/"NL +- "For general Python and library reference documentation, visit http://python.org/doc/"NL ++ "Type 'help(<module/object/function>)' to get information about a module, object or function." NL ++ "'dir(<object>)' will give a quick list of methods an object has." NL ++ "For an introductory tutorial on the Python language, visit http://docs.python.org/tutorial/" NL ++ "For general Python and library reference documentation, visit http://python.org/doc/" NL + ); + else + { diff --git a/databases/mysql-workbench/patches/patch-plugins_wb.printing_backend_wb__module__printing.cpp b/databases/mysql-workbench/patches/patch-plugins_wb.printing_backend_wb__module__printing.cpp new file mode 100644 index 00000000000..7b36cc80db4 --- /dev/null +++ b/databases/mysql-workbench/patches/patch-plugins_wb.printing_backend_wb__module__printing.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-plugins_wb.printing_backend_wb__module__printing.cpp,v 1.1 2013/03/03 04:54:27 joerg Exp $ + +--- plugins/wb.printing/backend/wb_module_printing.cpp.orig 2013-03-02 20:19:58.000000000 +0000 ++++ plugins/wb.printing/backend/wb_module_printing.cpp +@@ -54,7 +54,7 @@ + {\ + app_PluginRef plugin(get_grt());\ + app_PluginObjectInputRef pdef(get_grt());\ +- plugin->name("wb.print."aName);\ ++ plugin->name("wb.print." aName);\ + plugin->caption(aCaption);\ + plugin->moduleName("WbPrinting");\ + plugin->moduleFunctionName(aName);\ |