Ver Fonte

* Avoid conflict with dirwatch in fcl-base

Michaël Van Canneyt há 2 meses atrás
pai
commit
697ee67e97

+ 1 - 1
utils/pas2js/compileserver.lpi

@@ -32,7 +32,7 @@
         <IsPartOfProject Value="True"/>
       </Unit0>
       <Unit1>
-        <Filename Value="dirwatch.pp"/>
+        <Filename Value="dirw.pp"/>
         <IsPartOfProject Value="True"/>
       </Unit1>
       <Unit2>

+ 1 - 1
utils/pas2js/dirwatch.pp → utils/pas2js/dirw.pp

@@ -1,4 +1,4 @@
-unit dirwatch;
+unit dirw;
 {$IFDEF LINUX}
 {$DEFINE USEINOTIFY}
 {$ELSE}

+ 2 - 2
utils/pas2js/fpmake.pp

@@ -45,9 +45,9 @@ begin
     P.Dependencies.Add('webidl');
     PT:=P.Targets.AddProgram('pas2js.pp');
     PT:=P.Targets.AddLibrary('pas2jslib.pp');
-    PT:=P.Targets.AddUnit('dirwatch.pp',DefaultOSes);
+    PT:=P.Targets.AddUnit('dirw.pp',DefaultOSes);
     PT:=P.Targets.AddUnit('httpcompiler.pp',DefaultOSes);
-    PT.Dependencies.AddUnit('dirwatch');
+    PT.Dependencies.AddUnit('dirw');
     PT:=P.Targets.AddProgram('compileserver.pp',DefaultOSes);
     PT.Dependencies.AddUnit('httpcompiler');
     PT:=P.Targets.AddProgram('webidl2pas.pp');

+ 1 - 1
utils/pas2js/httpcompiler.pp

@@ -11,7 +11,7 @@ uses
   strutils,
   {$ENDIF}
   sysutils, classes, fpjson, contnrs, syncobjs, fpmimetypes, custhttpapp, inifiles, types,
-  fpwebproxy, webutil, fpwebfile, httproute, httpdefs, dirwatch, Pas2JSFSCompiler,
+  fpwebproxy, webutil, fpwebfile, httproute, httpdefs, dirw, Pas2JSFSCompiler,
   Pas2JSCompilerCfg, ssockets, fpdebugcapturesvc, fpsimpleserver;
 
 Const