Browse Source

makeskel: Adds more output info in case of error and fixes compilation through Lazarus (by adding +)

git-svn-id: trunk@18219 -
sekelsenmat 14 years ago
parent
commit
83b2948ec1
2 changed files with 25 additions and 22 deletions
  1. 17 22
      utils/fpdoc/makeskel.lpi
  2. 8 0
      utils/fpdoc/makeskel.pp

+ 17 - 22
utils/fpdoc/makeskel.lpi

@@ -1,23 +1,25 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="/"/>
-    <Version Value="6"/>
+    <Version Value="9"/>
     <General>
       <Flags>
         <MainUnitHasUsesSectionForAllUnits Value="False"/>
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
+        <LRSInOutputDirectory Value="False"/>
       </Flags>
+      <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
-      <ActiveEditorIndexAtStart Value="1"/>
     </General>
     <VersionInfo>
-      <ProjectVersion Value=""/>
       <Language Value=""/>
       <CharSet Value=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -27,6 +29,7 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
+        <CommandLineParams Value="--package=fpvectorial --input=/home/felipe/Programas/fpctrunk/packages/fpvectorial/src/fpvectorial.pas"/>
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
@@ -35,33 +38,25 @@
         <Filename Value="makeskel.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="MakeSkel"/>
-        <CursorPos X="8" Y="22"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="0"/>
-        <UsageCount Value="20"/>
-        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="dglobals.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="dGlobals"/>
-        <CursorPos X="40" Y="311"/>
-        <TopLine Value="300"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="20"/>
-        <Loaded Value="True"/>
       </Unit1>
     </Units>
-    <JumpHistory Count="1" HistoryIndex="0">
-      <Position1>
-        <Filename Value="makeskel.pp"/>
-        <Caret Line="22" Column="8" TopLine="1"/>
-      </Position1>
-    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="10"/>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Other>
+      <CompilerMessages>
+        <UseMsgFile Value="True"/>
+      </CompilerMessages>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>

+ 8 - 0
utils/fpdoc/makeskel.pp

@@ -15,8 +15,12 @@
 }
 
 
+{%RunCommand $MakeExe($(EdFile)) --package=fpvectorial --input=/home/felipe/Programas/fpctrunk/packages/fpvectorial/src/fpvectorial.pas}
 program MakeSkel;
 
+{$mode objfpc}
+{$h+}
+
 uses
   SysUtils, Classes, Gettext,
   dGlobals, PasTree, PParser,PScanner;
@@ -379,6 +383,7 @@ Var
   Engine: TSkelEngine;
 
 begin
+  Result:='';
   Assign(f, AOutputName);
   Rewrite(f);
   Try
@@ -399,7 +404,10 @@ begin
             Engine.DocumentFile(F,InputFiles[I],OSTarget,CPUTarget);
           except
             on E:Exception do
+            begin
+              WriteLn('Error while documenting: '+E.message);
               Result:='Error while documenting: '+E.message;
+            end;
           end;
         Finally
           Engine.Free;