* makefile fixes (fpmake untested), 2.3.1 fields-before-methods fix for pdfvrlexico

git-svn-id: trunk@13405 -

.gitattributes

@@ -1726,10 +1726,13 @@ packages/fpmkunit/Makefile.fpc svneol=native#text/plain
 packages/fpmkunit/examples/ppu2fpmake.sh svneol=native#text/plain
 packages/fpmkunit/fpmake.pp svneol=native#text/plain
 packages/fpmkunit/src/fpmkunit.pp svneol=native#text/plain
+packages/fpvectorial/Makefile svneol=native#text/plain
 packages/fpvectorial/Makefile.fpc svneol=native#text/plain
+packages/fpvectorial/fpmake.pp svneol=native#text/plain
 packages/fpvectorial/src/avisocncgcodereader.pas svneol=native#text/plain
 packages/fpvectorial/src/avisocncgcodewriter.pas svneol=native#text/plain
 packages/fpvectorial/src/avisozlib.pas svneol=native#text/plain
+packages/fpvectorial/src/fpvectbuildunit.pas svneol=native#text/plain
 packages/fpvectorial/src/fpvectorial.pas svneol=native#text/plain
 packages/fpvectorial/src/fpvtocanvas.pas svneol=native#text/plain
 packages/fpvectorial/src/pdfvectorialreader.pas svneol=native#text/plain

packages/fpvectorial/Makefile.fpc

@@ -8,18 +8,21 @@ version=2.2.2
 
 [require]
 libc=n
+packages=fcl-image
 
 [target]
-units=fpvectorial
+units=fpvectbuildunit
 exampledirs=
-implicitunits=
+implicitunits= avisocncgcodereader avisocncgcodewriter avisozlib fpvectorial \
+	       fpvtocanvas  pdfvectorialreader pdfvrlexico pdfvrsemantico \
+	       pdfvrsintatico
 
 [compiler]
 includedir=src
 sourcedir=src
 
 [install]
-buildunit=
+buildunit=fpvectbuildunit
 fpcpackage=y
 
 [shared]
@@ -30,3 +33,5 @@ fpcdir=../..
 
 [rules]
 .NOTPARALLEL:
+
+

packages/fpvectorial/fpmake.pp

@@ -0,0 +1,57 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  T,TBuild : TTarget;
+  P : TPackage;
+  i : Integer;
+begin
+  With Installer do
+    begin
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('fpvectorial');
+{$ifdef ALLPACKAGES}
+    P.Directory:='fpvectorial';
+{$endif ALLPACKAGES}
+    P.Version:='2.2.2-0';
+    P.Author := 'Felipe Monteiro de Carvalho, Pedro Sol Pegorini L de Lima';
+    P.License := 'LGPL with static linking modification ';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := '???';
+    P.NeedLibC:= true;
+
+    P.Dependencies.Add('fcl-image');
+
+    P.SourcePath.Add('src');
+
+    T:=P.Targets.AddImplicitUnit('jwazmouse.pas');
+    T:=P.Targets.AddImplicitUnit('avisocncgcodereader'); 
+    T:=P.Targets.AddImplicitUnit('avisocncgcodewriter'); 
+    T:=P.Targets.AddImplicitUnit('avisozlib'); 
+    T:=P.Targets.AddImplicitUnit('fpvectorial'); 
+    T:=P.Targets.AddImplicitUnit('fpvtocanvas');  
+    T:=P.Targets.AddImplicitUnit('pdfvectorialreader'); 
+    T:=P.Targets.AddImplicitUnit('pdfvrlexico'); 
+    T:=P.Targets.AddImplicitUnit('pdfvrsemantico');
+    T:=P.Targets.AddImplicitUnit('pdfvrsintaticoa');
+
+    // Build unit depending on all implicit units
+    TBuild:=P.Targets.AddUnit('fpvectorialbuildunit.pp');
+    TBuild.Install:=False;
+    For I:=0 to P.Targets.Count-1 do
+      begin
+        T:=P.Targets.TargetItems[I];
+        if T.TargetType=ttImplicitUnit then
+          TBuild.Dependencies.AddUnit(T.Name);
+      end;
+
+{$ifndef ALLPACKAGES}
+    Run;
+    end;
+end.
+{$endif ALLPACKAGES}

packages/fpvectorial/src/fpvectbuildunit.pas

@@ -0,0 +1,9 @@
+unit fpvectbuildunit;
+
+interface
+Uses
+   avisocncgcodereader,avisocncgcodewriter,avisozlib,fpvectorial,
+   fpvtocanvas,pdfvectorialreader,pdfvrlexico,pdfvrsemantico,pdfvrsintatico;
+
+implementation
+end.

packages/fpvectorial/src/pdfvrlexico.pas

@@ -38,11 +38,11 @@ type
 
   AnLexico = class
   public
+    Doc: TStream;
+    bytesRemaining: Int64;
     constructor Create();
     function getToken(): Token;
     function getPageToken(): Token;
-    Doc: TStream;
-    bytesRemaining: Int64;
   end;
 
 implementation