Browse Source

* move FileInfo unit and the corresponding example from fcl-base to fcl-extra

git-svn-id: trunk@46392 -
svenbarth 5 years ago
parent
commit
aa95cfe0ae

+ 4 - 4
.gitattributes

@@ -3173,9 +3173,6 @@ packages/fcl-base/examples/parser.dat -text
 packages/fcl-base/examples/poolmm1.pp svneol=native#text/plain
 packages/fcl-base/examples/poolmm2.pp svneol=native#text/plain
 packages/fcl-base/examples/restest.pp svneol=native#text/plain
-packages/fcl-base/examples/showver.pp svneol=native#text/plain
-packages/fcl-base/examples/showver.rc -text
-packages/fcl-base/examples/showver.res -text
 packages/fcl-base/examples/simple.xml -text
 packages/fcl-base/examples/sitest.pp svneol=native#text/plain
 packages/fcl-base/examples/sockcli.pp svneol=native#text/plain
@@ -3237,7 +3234,6 @@ packages/fcl-base/src/csvreadwrite.pp svneol=native#text/plain
 packages/fcl-base/src/custapp.pp svneol=native#text/plain
 packages/fcl-base/src/dummy/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/eventlog.pp svneol=native#text/plain
-packages/fcl-base/src/fileinfo.pp svneol=native#text/plain
 packages/fcl-base/src/fpexprpars.pp svneol=native#text/plain
 packages/fcl-base/src/fpobserver.pp svneol=native#text/plain
 packages/fcl-base/src/fptemplate.pp svneol=native#text/plain
@@ -3590,8 +3586,12 @@ packages/fcl-extra/examples/double/daemonunit2.lfm svneol=native#text/plain
 packages/fcl-extra/examples/double/daemonunit2.pas svneol=native#text/plain
 packages/fcl-extra/examples/double/double.pp svneol=native#text/plain
 packages/fcl-extra/examples/double/resdaemonapp.pp svneol=native#text/plain
+packages/fcl-extra/examples/showver.pp svneol=native#text/pascal
+packages/fcl-extra/examples/showver.rc svneol=native#text/plain
+packages/fcl-extra/examples/showver.res -text
 packages/fcl-extra/fpmake.pp svneol=native#text/pascal
 packages/fcl-extra/src/daemonapp.pp svneol=native#text/plain
+packages/fcl-extra/src/fileinfo.pp svneol=native#text/pascal
 packages/fcl-extra/src/unix/daemonapp.inc svneol=native#text/plain
 packages/fcl-extra/src/win/ServiceManager.pas svneol=native#text/plain
 packages/fcl-extra/src/win/daemonapp.inc svneol=native#text/plain

+ 0 - 5
packages/fcl-base/fpmake.pp

@@ -120,8 +120,6 @@ begin
     T:=P.Targets.AddUnit('fpexprpars.pp');
       T.ResourceStrings:=true;
 
-    T:=P.Targets.AddUnit('fileinfo.pp');
-      T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('csvreadwrite.pp');
     T:=P.Targets.addUnit('csvdocument.pp');
     With T.Dependencies do
@@ -166,7 +164,6 @@ begin
       T:=P.Targets.AddExampleProgram('poolmm1.pp');
       T:=P.Targets.AddExampleProgram('poolmm2.pp');
       T:=P.Targets.AddExampleProgram('restest.pp');
-      T:=P.Targets.AddExampleProgram('showver.pp');
       T:=P.Targets.AddExampleProgram('sockcli.pp');
       T:=P.Targets.AddExampleProgram('socksvr.pp');
       T:=P.Targets.AddExampleProgram('sstream.pp');
@@ -208,8 +205,6 @@ begin
       // README
       // kword.xml
       // overview.rtf
-      // showver.rc
-      // showver.res
       // simple.xml
       // parser.dat
       // testcgi.html

+ 0 - 0
packages/fcl-base/examples/showver.pp → packages/fcl-extra/examples/showver.pp


+ 0 - 0
packages/fcl-base/examples/showver.rc → packages/fcl-extra/examples/showver.rc


+ 0 - 0
packages/fcl-base/examples/showver.res → packages/fcl-extra/examples/showver.res


+ 12 - 0
packages/fcl-extra/fpmake.pp

@@ -19,6 +19,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='3.3.1';
     P.Dependencies.Add('fcl-base');
+    P.Dependencies.Add('fcl-res');
     P.OSes:=[Win32,Win64]+AllUnixOSes;
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
@@ -47,10 +48,21 @@ begin
         end;
       T.ResourceStrings:=true;
 
+    T:=P.Targets.AddUnit('fileinfo.pp');
+      T.ResourceStrings:=true;
+
     // Windows units
     T:=P.Targets.AddUnit('ServiceManager.pas',[Win32,Win64]);
       T.ResourceStrings:=true;
 
+    // Examples
+    P.ExamplePath.Add('examples');
+      T:=P.Targets.AddExampleProgram('showver.pp');
+
+    // example data files.
+    // showver.rc
+    // showver.res
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

+ 0 - 0
packages/fcl-base/src/fileinfo.pp → packages/fcl-extra/src/fileinfo.pp