ソースを参照

* Namespaced version of webwidgets

Michaël Van Canneyt 1 年間 前
コミット
305ec178cd

+ 3 - 0
packages/webwidget/namespaced/Widget.DB.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Widget.DB;
+{$include ../src/dbwebwidget.pp}

+ 3 - 0
packages/webwidget/namespaced/Widget.HTML.DB.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Widget.HTML.DB;
+{$include ../src/dbhtmlwidgets.pp}

+ 3 - 0
packages/webwidget/namespaced/Widget.HTML.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Widget.HTML;
+{$include ../src/htmlwidgets.pp}

+ 3 - 0
packages/webwidget/namespaced/Widget.PropertyGrid.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Widget.PropertyGrid;
+{$include ../src/propertygridwidget.pp}

+ 3 - 0
packages/webwidget/namespaced/Widget.Web.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Widget.Web;
+{$include ../src/webwidget.pas}

+ 68 - 0
packages/webwidget/namespaced/lazwebwidgets_namespaced.lpk

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <Package Version="5">
+    <PathDelim Value="\"/>
+    <Name Value="lazwebwidgets_namespaced"/>
+    <Type Value="RunTimeOnly"/>
+    <AutoUpdate Value="Manually"/>
+    <CompilerOptions>
+      <Version Value="11"/>
+      <PathDelim Value="\"/>
+      <SearchPaths>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      </SearchPaths>
+      <Other>
+        <ConfigFile>
+          <WriteConfigFilePath Value="$(PkgOutDir)\fpclaz.cfg"/>
+        </ConfigFile>
+        <ExecuteBefore>
+          <Command Value="$MakeExe(IDE,pas2js) -O- -Jc -vbq lazwebwidgets_namespaced.pas"/>
+          <Parsers Count="1">
+            <Item1 Value="Pas2JS"/>
+          </Parsers>
+        </ExecuteBefore>
+      </Other>
+      <SkipCompiler Value="True"/>
+    </CompilerOptions>
+    <Files Count="5">
+      <Item1>
+        <Filename Value="Widget.Web.pas"/>
+        <UnitName Value="Widget.Web"/>
+      </Item1>
+      <Item2>
+        <Filename Value="Widget.DB.pas"/>
+        <UnitName Value="Widget.DB"/>
+      </Item2>
+      <Item3>
+        <Filename Value="Widget.HTML.DB.pas"/>
+        <UnitName Value="Widget.HTML.DB"/>
+      </Item3>
+      <Item4>
+        <Filename Value="Widget.HTML.pas"/>
+        <UnitName Value="Widget.HTML"/>
+      </Item4>
+      <Item5>
+        <Filename Value="Widget.PropertyGrid.pas"/>
+        <UnitName Value="Widget.PropertyGrid"/>
+      </Item5>
+    </Files>
+    <CompatibilityMode Value="True"/>
+    <RequiredPkgs Count="3">
+      <Item1>
+        <PackageName Value="pas2js_rtl_namespaced"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="fcl_base_pas2js_namespaced"/>
+      </Item2>
+      <Item3>
+        <PackageName Value="pas2js_fcldb_namespaced"/>
+      </Item3>
+    </RequiredPkgs>
+    <UsageOptions>
+      <UnitPath Value="$(PkgOutDir)"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>

+ 15 - 0
packages/webwidget/namespaced/lazwebwidgets_namespaced.pas

@@ -0,0 +1,15 @@
+{ This file was automatically created by Lazarus. Do not edit!
+  This source is only used to compile and install the package.
+ }
+
+unit lazwebwidgets_namespaced;
+
+{$warn 5023 off : no warning about unused units}
+interface
+
+uses
+  Widget.Web, Widget.DB, Widget.HTML.DB, Widget.HTML, Widget.PropertyGrid;
+
+implementation
+
+end.

+ 6 - 0
packages/webwidget/dbhtmlwidgets.pp → packages/webwidget/src/dbhtmlwidgets.pp

@@ -13,7 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit dbhtmlwidgets;
+{$ENDIF}
 
 {$mode objfpc}
 {$h+}
@@ -21,7 +23,11 @@ unit dbhtmlwidgets;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, System.Classes, System.SysUtils, Data.DB, BrowserApi.Web, Widget.HTML;
+{$ELSE}
   JS, Classes, SysUtils, db, web, htmlwidgets;
+{$ENDIF}
 
 Type
 

+ 6 - 1
packages/webwidget/dbwebwidget.pp → packages/webwidget/src/dbwebwidget.pp

@@ -13,8 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit dbwebwidget;
-
+{$ENDIF}
 
 {$mode objfpc}
 {$h+}
@@ -24,7 +25,11 @@ unit dbwebwidget;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.SysUtils, System.Classes, Widget.Web, Data.DB;
+{$ELSE}
   SysUtils, Classes, webwidget, db;
+{$ENDIF}
 
 Type
   TCustomDBLoopTemplateWidget = class;

+ 12 - 1
packages/webwidget/htmlwidgets.pp → packages/webwidget/src/htmlwidgets.pp

@@ -13,7 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit htmlwidgets;
+{$ENDIF}
 
 {$mode objfpc}
 {$h+}
@@ -21,7 +23,11 @@ unit htmlwidgets;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Classes, System.SysUtils, Widget.Web, JSApi.JS, BrowserApi.Web;
+{$ELSE}
   Classes, SysUtils, webwidget, js, web;
+{$ENDIF}
 
 Type
   TTextMode = (tmText,tmHTML);
@@ -1037,7 +1043,12 @@ Const
 
 implementation
 
-uses DateUtils;
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  System.DateUtils;
+{$ELSE}
+  DateUtils;
+{$ENDIF}
 
 resourcestring
   SErrInvalidIndex = 'Index %d not in valid range of [0..%d]';

+ 0 - 0
packages/webwidget/lazwebwidgets.lpk → packages/webwidget/src/lazwebwidgets.lpk


+ 0 - 0
packages/webwidget/lazwebwidgets.pas → packages/webwidget/src/lazwebwidgets.pas


+ 6 - 0
packages/webwidget/propertygridwidget.pp → packages/webwidget/src/propertygridwidget.pp

@@ -1,11 +1,17 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit propertygridwidget;
+{$ENDIF}
 
 {$mode objfpc}
 
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Classes, System.SysUtils, System.Types, BrowserApi.Web, Widget.Web, Widget.HTML, System.TypInfo, System.Contnrs;
+{$ELSE}
   Classes, SysUtils, types, web, webwidget, htmlwidgets, typinfo, contnrs;
+{$ENDIF}
 
 Type
 

+ 13 - 1
packages/webwidget/webwidget.pas → packages/webwidget/src/webwidget.pas

@@ -13,14 +13,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit webwidget;
+{$ENDIF}
 
 {$mode objfpc}{$H+}
 {$WARN 4501 off : }
+
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Types, System.Classes, System.SysUtils, JSApi.JS, BrowserApi.Web, BrowserApi.WebOrWorker;
+{$ELSE}
   Types, Classes, SysUtils, JS, Web, weborworker;
+{$ENDIF}
 
 Const
 
@@ -988,7 +995,12 @@ Type
 
 implementation
 
-uses Strutils, TypInfo;
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Strutils, System.TypInfo;
+{$ELSE}
+  Strutils, TypInfo;
+{$ENDIF}
 
 ResourceString
    SErrCannotSetParentAndElementID = 'ElementID and ParentID cannot be set at the same time.';