Author: locilka Date: Tue Sep 30 10:55:07 2008 New Revision: 51684 URL: http://svn.opensuse.org/viewcvs/yast?rev=51684&view=rev Log: - Support for commandline: "help", "longhelp", and "xmlhelp" (bnc #430852). - 2.17.4 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=51684&r1=51683&r2=51684&view=diff ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Tue Sep 30 10:55:07 2008 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.changes?rev=51684&r1=51683&r2=51684&view=diff ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Tue Sep 30 10:55:07 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Sep 30 10:53:19 CEST 2008 - locilka@suse.cz + +- Support for commandline: "help", "longhelp", and "xmlhelp" + (bnc #430852). +- 2.17.4 + +------------------------------------------------------------------- Mon Sep 8 17:34:39 CEST 2008 - locilka@suse.cz - merged texts from proofread Modified: trunk/add-on/src/add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on.ycp?rev=51684&r1=51683&r2=51684&view=diff ============================================================================== --- trunk/add-on/src/add-on.ycp (original) +++ trunk/add-on/src/add-on.ycp Tue Sep 30 10:55:07 2008 @@ -18,16 +18,20 @@ import "GetInstArgs"; import "Mode"; import "CommandLine"; +import "Directory"; +import "XML"; include "add-on/add-on-workflow.ycp"; list wfm_args = WFM::Args(); y2milestone ("ARGS: %1", wfm_args); -if ( - (size (wfm_args) > 0) - && - (contains (wfm_args, "help") || contains (wfm_args, "longhelp")) -) { + +map commands = CommandLine::Parse (wfm_args); + +y2internal ("Commands: %1", commands); + +// bnc #430852 +if (commands["command"]:"" == "help" || commands["command"]:"" == "longhelp") { Mode::SetUI ("commandline"); // TRANSLATORS: commandline help CommandLine::Print(_(" @@ -47,6 +51,31 @@ dvd:// ")); return `auto; +} else if (commands["command"]:"" == "xmlhelp") { + Mode::SetUI ("commandline"); + if (! haskey (commands["options"]:$[], "xmlfile")) { + CommandLine::Print(_("Target file name ('xmlfile' option) is missing. Use xmlfile= command line option.")); + return `auto; + } else { + map doc = $[]; + + doc["listEntries"] = $[ + "commands": "command", + "options": "option", + "examples": "example", + ]; + doc["systemID"] = Directory::schemadir + "/commandline.dtd"; + doc["typeNamespace"] = "http://www.suse.com/1.0/configns"; + doc["rootElement"] = "commandline"; + XML::xmlCreateDoc(`xmlhelp, doc); + + map exportmap = $[ + "module" : "add-on", + ]; + XML::YCPToXMLFile(`xmlhelp, exportmap, commands["options", "xmlfile"]:""); + y2milestone("exported XML map: %1", exportmap); + return `auto; + } } Wizard::CreateDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org