wikiconvert: clean up

git-svn-id: trunk@47529 -
This commit is contained in:
mattias 2015-01-26 18:23:55 +00:00
parent d2662f6bc3
commit 94bf7ff271
2 changed files with 9 additions and 22 deletions

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="9"/> <Version Value="9"/>
@ -30,7 +30,6 @@
<local> <local>
<FormatVersion Value="1"/> <FormatVersion Value="1"/>
<CommandLineParams Value="--format=chm --css=chm/wiki.css wikixml/Lazarus_Documentation.g400.xml wikixml/*.xml"/> <CommandLineParams Value="--format=chm --css=chm/wiki.css wikixml/Lazarus_Documentation.g400.xml wikixml/*.xml"/>
<LaunchingApplication PathPlusParams="/usr/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local> </local>
</RunParams> </RunParams>
<RequiredPackages Count="3"> <RequiredPackages Count="3">
@ -45,21 +44,15 @@
<PackageName Value="LazUtils"/> <PackageName Value="LazUtils"/>
</Item3> </Item3>
</RequiredPackages> </RequiredPackages>
<Units Count="3"> <Units Count="2">
<Unit0> <Unit0>
<Filename Value="wikiconvert.lpr"/> <Filename Value="wikiconvert.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="wikiconvert"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="wiki2fpdocconvert.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="Wiki2FPDocConvert"/>
</Unit1>
<Unit2>
<Filename Value="README.txt"/> <Filename Value="README.txt"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit2> </Unit1>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
@ -71,12 +64,6 @@
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Other>
<CompilerMessages>
<MsgFileName Value=""/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>
<Exceptions Count="3"> <Exceptions Count="3">

View File

@ -23,7 +23,7 @@ program wikiconvert;
uses uses
Classes, SysUtils, CustApp, WikiParser, WikiFormat, Classes, SysUtils, CustApp, WikiParser, WikiFormat,
Wiki2FPDocConvert, Wiki2XHTMLConvert, Wiki2HTMLConvert, Wiki2CHMConvert, Wiki2XHTMLConvert, Wiki2HTMLConvert, Wiki2CHMConvert, Wiki2FPDocConvert,
LazFileUtils, FileUtil, LazLogger, KeywordFuncLists; LazFileUtils, FileUtil, LazLogger, KeywordFuncLists;
type type
@ -293,10 +293,6 @@ begin
writeln(' Duplicates are ignored.'); writeln(' Duplicates are ignored.');
writeln(' You can use globbing, like "wikixml/*.xml". You must quote such parameters on console/shell.'); writeln(' You can use globbing, like "wikixml/*.xml". You must quote such parameters on console/shell.');
writeln; writeln;
writeln('Options for --format=fpdoc :');
writeln(' --root=<fpdoc xml root node> : default: ',FPDocConverter.RootName);
writeln(' --package=<fpdoc package name> : default: ',FPDocConverter.PackageName);
writeln;
writeln('Options for --format=xhtml,html,chm :'); writeln('Options for --format=xhtml,html,chm :');
writeln(' --css=<path of stylesheet> : default: ',XHTMLConverter.CSSFilename); writeln(' --css=<path of stylesheet> : default: ',XHTMLConverter.CSSFilename);
writeln; writeln;
@ -304,9 +300,13 @@ begin
writeln(' Note: the default page is the first page'); writeln(' Note: the default page is the first page');
writeln(' --chm=<output chm file> : default: ',CHMConverter.CHMFile); writeln(' --chm=<output chm file> : default: ',CHMConverter.CHMFile);
writeln; writeln;
writeln('Options for --format=fpdoc :');
writeln(' --root=<fpdoc xml root node> : default: ',FPDocConverter.RootName);
writeln(' --package=<fpdoc package name> : default: ',FPDocConverter.PackageName);
writeln;
writeln('Examples:'); writeln('Examples:');
writeln(' ',ParamStrUTF8(0),' --format=fpdoc --outputdir=fpdocxml wikipage1.xml wikipage2.xml');
writeln(' ',ParamStrUTF8(0),' --format=html --outputdir=html --css=html/wiki.css "wikixml/*.xml"'); writeln(' ',ParamStrUTF8(0),' --format=html --outputdir=html --css=html/wiki.css "wikixml/*.xml"');
writeln(' ',ParamStrUTF8(0),' --format=fpdoc --outputdir=fpdocxml wikipage1.xml wikipage2.xml');
end; end;
var var