From 4472db6f3480a9d735409517a982538cfafdc28d Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 6 Jul 2016 08:59:26 +0000
Subject: [PATCH] tvplanit: Integrate sqlite3 datastore into main package
 (since sqlite3 belongs to standardLaz distribution). Update related demo
 project.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4923 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../examples/sqlite3datastore/project1.lpi    |   9 ++--
 .../sqlite3/laz_visualplanit_sqlite3.lpk      |  48 ------------------
 .../source/addons/sqlite3/vpregsqlite3.pas    |  28 ----------
 .../source/addons/sqlite3/vpregsqlite3.res    | Bin 357 -> 0 bytes
 .../tvplanit/source/laz_visualplanit.lpk      |   6 ++-
 components/tvplanit/source/vpreg.pas          |   2 +
 components/tvplanit/source/vpreg.res          | Bin 14417 -> 14745 bytes
 .../{addons/sqlite3 => }/vpsqlite3ds.pas      |   0
 8 files changed, 10 insertions(+), 83 deletions(-)
 delete mode 100644 components/tvplanit/source/addons/sqlite3/laz_visualplanit_sqlite3.lpk
 delete mode 100644 components/tvplanit/source/addons/sqlite3/vpregsqlite3.pas
 delete mode 100644 components/tvplanit/source/addons/sqlite3/vpregsqlite3.res
 rename components/tvplanit/source/{addons/sqlite3 => }/vpsqlite3ds.pas (100%)

diff --git a/components/tvplanit/examples/sqlite3datastore/project1.lpi b/components/tvplanit/examples/sqlite3datastore/project1.lpi
index b0d07bf55..2d81d24bd 100644
--- a/components/tvplanit/examples/sqlite3datastore/project1.lpi
+++ b/components/tvplanit/examples/sqlite3datastore/project1.lpi
@@ -24,19 +24,16 @@
         <FormatVersion Value="1"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="4">
+    <RequiredPackages Count="3">
       <Item1>
         <PackageName Value="SQLDBLaz"/>
       </Item1>
       <Item2>
-        <PackageName Value="laz_visualplanit_sqlite3"/>
+        <PackageName Value="laz_visualplanit"/>
       </Item2>
       <Item3>
-        <PackageName Value="laz_visualplanit"/>
-      </Item3>
-      <Item4>
         <PackageName Value="LCL"/>
-      </Item4>
+      </Item3>
     </RequiredPackages>
     <Units Count="2">
       <Unit0>
diff --git a/components/tvplanit/source/addons/sqlite3/laz_visualplanit_sqlite3.lpk b/components/tvplanit/source/addons/sqlite3/laz_visualplanit_sqlite3.lpk
deleted file mode 100644
index 1053c443c..000000000
--- a/components/tvplanit/source/addons/sqlite3/laz_visualplanit_sqlite3.lpk
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CONFIG>
-  <Package Version="4">
-    <PathDelim Value="\"/>
-    <Name Value="laz_visualplanit_sqlite3"/>
-    <Type Value="RunAndDesignTime"/>
-    <AddToProjectUsesSection Value="True"/>
-    <Author Value="W. Pamler"/>
-    <CompilerOptions>
-      <Version Value="11"/>
-      <PathDelim Value="\"/>
-      <SearchPaths>
-        <IncludeFiles Value="..\.."/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\$(LCLWidgetType)"/>
-      </SearchPaths>
-    </CompilerOptions>
-    <Description Value="Visual PlanIt datastore for SQLITE3 connection using SqlDB components"/>
-    <Version Major="1" Release="4"/>
-    <Files Count="2">
-      <Item1>
-        <Filename Value="vpregsqlite3.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="vpregsqlite3"/>
-      </Item1>
-      <Item2>
-        <Filename Value="vpsqlite3ds.pas"/>
-        <Type Value="Include"/>
-      </Item2>
-    </Files>
-    <RequiredPkgs Count="3">
-      <Item1>
-        <PackageName Value="SQLDBLaz"/>
-      </Item1>
-      <Item2>
-        <PackageName Value="laz_visualplanit"/>
-      </Item2>
-      <Item3>
-        <PackageName Value="FCL"/>
-      </Item3>
-    </RequiredPkgs>
-    <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)"/>
-    </UsageOptions>
-    <PublishOptions>
-      <Version Value="2"/>
-    </PublishOptions>
-  </Package>
-</CONFIG>
diff --git a/components/tvplanit/source/addons/sqlite3/vpregsqlite3.pas b/components/tvplanit/source/addons/sqlite3/vpregsqlite3.pas
deleted file mode 100644
index 31e6a33c3..000000000
--- a/components/tvplanit/source/addons/sqlite3/vpregsqlite3.pas
+++ /dev/null
@@ -1,28 +0,0 @@
-unit vpregsqlite3;
-  { Registration unit for the SQLite3 connection using SqlDb }
-
-{$I Vp.INC}            // Compiler version defines
-{$R vpregsqlite3.res}   // Palette glyphs
-
-interface
-
-uses
- {$IFDEF DELPHI}
- // Windows,
-  {$IFDEF VERSION6} DesignIntf, DesignEditors, {$ELSE} DsgnIntf, {$ENDIF}
- {$ENDIF}
-  Classes;
-
-procedure Register;
-
-implementation
-
-uses
-  VpSqlite3DS;
-
-procedure Register;
-begin
-  RegisterComponents('Visual PlanIt', [TVpSqlite3Datastore]);
-end;
-
-end.
diff --git a/components/tvplanit/source/addons/sqlite3/vpregsqlite3.res b/components/tvplanit/source/addons/sqlite3/vpregsqlite3.res
deleted file mode 100644
index 331a8023ac16c64ec5721d2c021fc2d096529eef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 357
zcmZQzU|>)H;{X347|28cjEoEnE<ln0|G5}K7{V9=7=jrB8GIN#fjn0RW1yTPkmU#z
z4Po$S2m*>hfPetPn9cw{cU~?jE}#gnr-w@rkd^>p4mKe9pxpKckm4-xh%9Dc;1&X5
z#!GkW{s09xd%8G=RNT56%E;HC!13hezd5IZE-*IDjL!8@KT+8(p`bKJKC0~KokC9c
zu%y@XxF(2jGksA|Y?%00{J^9vN#?bD(yB!<mnECcXK!bWI1_8tH!1ra&y$^;+ak9z
z-;a$umf)sj-mGgnquQ{UXVLq*83&)&ZrC%qvuqyo*~XJs&sp!BB4g@5dx31~eiomP
ztV`ad+OwNQ@kE&|;(9XOKhOBVYt_ie`bR$$Ird)PnQt?@H>R0crTe<cY^P<~K<6`f
My85}Sb4q9e0Jl_aO#lD@

diff --git a/components/tvplanit/source/laz_visualplanit.lpk b/components/tvplanit/source/laz_visualplanit.lpk
index 0be32b637..51e2c65e4 100644
--- a/components/tvplanit/source/laz_visualplanit.lpk
+++ b/components/tvplanit/source/laz_visualplanit.lpk
@@ -32,7 +32,7 @@ Portions created by TurboPower Software Inc. are Copyright (C) 2002 TurboPower S
 
 Contributor(s): "/>
     <Version Major="1" Release="4"/>
-    <Files Count="72">
+    <Files Count="73">
       <Item1>
         <Filename Value="vpalarmdlg.lfm"/>
         <Type Value="LFM"/>
@@ -322,6 +322,10 @@ Contributor(s): "/>
         <Filename Value="vpinids.pas"/>
         <UnitName Value="VpIniDs"/>
       </Item72>
+      <Item73>
+        <Filename Value="vpsqlite3ds.pas"/>
+        <UnitName Value="VpSQLite3DS"/>
+      </Item73>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>
diff --git a/components/tvplanit/source/vpreg.pas b/components/tvplanit/source/vpreg.pas
index db4c385a6..17cc7a659 100644
--- a/components/tvplanit/source/vpreg.pas
+++ b/components/tvplanit/source/vpreg.pas
@@ -162,6 +162,7 @@ uses
  {$IFDEF LCL}
   VpIniDS,                    { IniFile datastore                            }
   VpBufDS,                    { Datastore for TBufDataset                    }
+  VpSqlite3DS,                { Datastore for sqlite3                        }
   //  VpSdfDS                     { Datastore for TSdfDataset                    }
   //  VpDbfDS,                    { Datastore for dbase files                    }
  {$ENDIF}
@@ -621,6 +622,7 @@ begin
 {$IFDEF LCL}
     TVpIniDatastore,
     TVpBufDSDatastore,
+    TVpSqlite3Datastore,
     //TVpSdfDatastore,       // to do (maybe)...
     //TVpDbfDatastore,       // to do...
 {$ENDIF}
diff --git a/components/tvplanit/source/vpreg.res b/components/tvplanit/source/vpreg.res
index b16258df87e291e884b511b5758084e8305be3de..4690588bd25b45dac0b54cca9d4614ab5aa376f9 100644
GIT binary patch
delta 260
zcmV+f0sH>ZaG7(kSTP>~0RR9*00030{|W$909F7{08;=_089W$08{`)05g-}8X1!i
z12B`+0Tq9<Nkl<Zc-qxf0S<s52;}MhoXS$r0fL!ZZA>S~d50JvBAg#ucE#Lr2}f39
z>z)db6bl0MAR&N}{TINJY8eBq4jUzMT+<nYH=DNsSj=5Ij*@Hc4CJ{9wpq0U-(6nD
zU`8T0gDo|fdohCyqVIl~!RLLjypxG`o&(K+$<<5FJGqn`HBXzM9c8}+Oz{Pz?qxp*
zHd+i?HlhmTmrrgp;Oiw>S%2dAAqc(Kxo<q1ja-8RB#YNHn?j~500000NkvXXu0mjf
K006UBG5Q8xFJ^WC

delta 12
TcmbPPe6e6dgyH4|MnBmADc%MP

diff --git a/components/tvplanit/source/addons/sqlite3/vpsqlite3ds.pas b/components/tvplanit/source/vpsqlite3ds.pas
similarity index 100%
rename from components/tvplanit/source/addons/sqlite3/vpsqlite3ds.pas
rename to components/tvplanit/source/vpsqlite3ds.pas