sqldb component:

- remove compatibility with fpc version < 2.0.4
* only enable ibconnection, mysql50connection and odbcconnection for win64

git-svn-id: trunk@11159 -

components/sqldb/registersqldb.pas

@@ -18,22 +18,26 @@
 unit registersqldb;
 
 {$mode objfpc}{$H+}
-{$DEFINE HASODBCCONNECTION}
-{$IFNDEF ver2_0_2}{$IFNDEF ver2_0_3}
-  {$DEFINE HASMYSQL50CONNECTION}
-  {$DEFINE HASORACLECONNECTION}
-{$ENDIF}{$ENDIF}
+{$IFNDEF win64}
+{$DEFINE HASMYSQL4CONNECTION}
+{$DEFINE HASORACLECONNECTION}
+{$DEFINE HASPQCONNECTION}
+{$ENDIF}
 
 interface
 
 uses
-  Classes, SysUtils, LResources, sqldb, ibconnection, pqconnection,
-  oracleconnection, odbcconn,
-{$IFDEF HASMYSQL50CONNECTION}
-  mysql40conn, mysql41conn, mysql50conn,
-{$ELSE}
-  mysql4conn,
+  Classes, SysUtils, LResources, sqldb, ibconnection, odbcconn,
+{$IFDEF HASPQCONNECTION}
+  pqconnection,
 {$ENDIF}
+{$IFDEF HASORACLECONNECTION}
+  oracleconnection,
+{$ENDIF}
+{$IFDEF HASMYSQL4CONNECTION}
+  mysql40conn, mysql41conn,
+{$ENDIF}
+  mysql50conn,
   LazarusPackageIntf;
 
 procedure Register;
@@ -44,19 +48,19 @@ procedure RegisterUnitSQLdb;
 begin
   RegisterComponents('SQLdb',[TSQLQuery,
                               TSQLTransaction,
-                              TIBConnection,
-                              TODBCConnection,
+{$IFDEF HASPQCONNECTION}
+                              TPQConnection,
+{$ENDIF}
 {$IFDEF HASORACLECONNECTION}
                               TOracleConnection,
 {$ENDIF}
-{$IFDEF HASMYSQL50CONNECTION}
+                              TODBCConnection,
+{$IFDEF HASMYSQL4CONNECTION}
                               TMySQL40Connection,
                               TMySQL41Connection,
-                              TMySQL50Connection,
-{$ELSE}
-                              TMySQLConnection,
 {$ENDIF}
-                              TPQConnection]);
+                              TMySQL50Connection,
+                              TIBConnection]);
 end;
 
 procedure Register;

components/sqldb/sqldblaz.lpk

@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
 <CONFIG>
   <Package Version="2">
+    <PathDelim Value="\"/>
     <Name Value="SQLDBLaz"/>
     <Author Value="Joost van der Sluis"/>
     <CompilerOptions>
       <Version Value="5"/>
+      <PathDelim Value="\"/>
       <SearchPaths>
-        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <CodeGeneration>
         <Generate Value="Faster"/>
@@ -19,7 +21,7 @@
     <Description Value="Lazarus package for the FCL SQLdb components."/>
     <License Value="Modified LGPL"/>
     <Version Major="1"/>
-    <Files Count="5">
+    <Files Count="4">
       <Item1>
         <Filename Value="registersqldb.pas"/>
         <HasRegisterProc Value="True"/>
@@ -40,11 +42,6 @@
         <Type Value="Virtual Unit"/>
         <UnitName Value="pqconnection"/>
       </Item4>
-      <Item5>
-        <Filename Value="mysql4conn.pp"/>
-        <Type Value="Virtual Unit"/>
-        <UnitName Value="mysql4conn"/>
-      </Item5>
     </Files>
     <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="1">
@@ -54,10 +51,11 @@
       </Item1>
     </RequiredPkgs>
     <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)/"/>
+      <UnitPath Value="$(PkgOutDir)\"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
+      <DestinationDirectory Value="$(TestDir)\publishedpackage\"/>
       <IgnoreBinaries Value="False"/>
     </PublishOptions>
   </Package>

components/sqldb/sqldblaz.pas

@@ -7,8 +7,7 @@ unit SQLDBLaz;
 interface
 
 uses
-  registersqldb, sqldb, ibconnection, pqconnection, mysql4conn, 
-    LazarusPackageIntf; 
+  registersqldb, sqldb, ibconnection, pqconnection, LazarusPackageIntf; 
 
 implementation