* new fpmake.pp

git-svn-id: trunk@9913 -

.gitattributes

@@ -4434,7 +4434,6 @@ packages/paszlib/src/zstream.pp svneol=native#text/plain
 packages/paszlib/src/zuncompr.pas svneol=native#text/plain
 packages/winunits-base/Makefile svneol=native#text/plain
 packages/winunits-base/Makefile.fpc svneol=native#text/plain
-packages/winunits-base/fpmake.inc svneol=native#text/plain
 packages/winunits-base/fpmake.pp svneol=native#text/plain
 packages/winunits-base/src/activex.pp svneol=native#text/plain
 packages/winunits-base/src/buildwinutilsbase.pp svneol=native#text/plain

packages/winunits-base/fpmake.inc

@@ -1,24 +0,0 @@
-    StartPackage('winunits-base');
-    {$IF defined(ALLPACKAGES)}
-    Directory:='winunits-base';
-    {$ELSEIF defined(EXTRAPACKAGES)}
-    Directory:='winunits-base';
-    {$ENDIF}
-    OS:=[win32,win64];
-    T:=Targets.AddUnit('buildwinutils');
-    T.Install:=False;
-    T:=Targets.AddUnit('activex');
-    T:=Targets.AddUnit('comconst');
-    T:=Targets.AddUnit('commctrl');
-    T:=Targets.AddUnit('comobj');
-    T:=Targets.AddUnit('flatsb');
-    T:=Targets.AddUnit('mmsystem');
-    T:=Targets.AddUnit('ole2');
-    T:=Targets.AddUnit('oleserver');
-    T:=Targets.AddUnit('richedit');
-    T:=Targets.AddUnit('shellapi');
-    T:=Targets.AddUnit('shfolder');
-    T:=Targets.AddUnit('shlobj');
-    T:=Targets.AddUnit('winver');
-    T:=Targets.AddExampleunit('examples');
-    EndPackage;

packages/winunits-base/fpmake.pp

@@ -1,3 +1,4 @@
+{$ifndef ALLPACKAGES}
 {$mode objfpc}{$H+}
 program fpmake;
 
@@ -5,13 +6,39 @@ uses fpmkunit;
 
 Var
   T : TTarget;
-
+  P : TPackage;
 begin
-  With Installer do 
+  With Installer do
     begin
-    { Base packages }
-    {$i fpmake.inc}
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('winunits-base');
+{$ifdef ALLPACKAGES}
+    P.Directory:='winunits-base';
+{$endif ALLPACKAGES}
+    P.Version:='2.2.1';
+    P.OSes:=[win32,win64];
+
+    P.SourcePath.Add('src');
+
+    T:=P.Targets.AddUnit('buildwinutilsbase.pp');
+      T.Install:=False;
+    T:=P.Targets.AddImplicitUnit('activex.pp');
+    T:=P.Targets.AddImplicitUnit('comconst.pp');
+    T:=P.Targets.AddImplicitUnit('commctrl.pp');
+    T:=P.Targets.AddImplicitUnit('comobj.pp');
+    T:=P.Targets.AddImplicitUnit('flatsb.pp');
+    T:=P.Targets.AddImplicitUnit('mmsystem.pp');
+    T:=P.Targets.AddImplicitUnit('ole2.pp');
+    T:=P.Targets.AddImplicitUnit('oleserver.pp');
+    T:=P.Targets.AddImplicitUnit('richedit.pp');
+    T:=P.Targets.AddImplicitUnit('shellapi.pp');
+    T:=P.Targets.AddImplicitUnit('shfolder.pp');
+    T:=P.Targets.AddImplicitUnit('shlobj.pp');
+    T:=P.Targets.AddImplicitUnit('winver.pp');
+
+{$ifndef ALLPACKAGES}
     Run;
     end;
 end.
-
+{$endif ALLPACKAGES}