* note that these are only leftover of these revisions, like testsuite and

   yes  sleeping fpmake code. The big parts were already done when
   the mysql55 and tds ports were merged back.

--- Merging r20682 into '.':
C    packages/fcl-db/fpmake.pp
--- Merging r20682 into 'packages/fcl-db/src':
U    packages/fcl-db/src/sqldb/mssql/fpmake.inc
U    packages/fcl-db/src/sqldb/mysql/fpmake.inc
U    packages/fcl-db/src/sqldb/postgres/fpmake.inc
U    packages/fcl-db/src/sqldb/interbase/fpmake.inc
--- Merging r20682 into '.':
U    packages/fpindexer/fpmake.pp
U    packages/dblib/fpmake.pp
--- Merging r20692 into '.':
C    packages/fcl-db/fpmake.pp
C    packages/fcl-db/tests/sqldbtoolsunit.pas
--- Merging r20692 into 'packages/fcl-db/src':
G    packages/fcl-db/src/sqldb/mssql/fpmake.inc
U    packages/fcl-db/src/sqldb/mssql/readme.txt
--- Merging r20692 into '.':
G    packages/dblib/fpmake.pp
Summary of conflicts:
  Text conflicts: 3

# revisions: 20682,20692
------------------------------------------------------------------------
r20682 | marco | 2012-03-31 22:11:51 +0200 (Sat, 31 Mar 2012) | 2 lines
Changed paths:
   M /trunk/packages/dblib/fpmake.pp
   M /trunk/packages/fcl-db/fpmake.pp
   M /trunk/packages/fcl-db/src/sqldb/interbase/fpmake.inc
   M /trunk/packages/fcl-db/src/sqldb/mssql/fpmake.inc
   M /trunk/packages/fcl-db/src/sqldb/mysql/fpmake.inc
   M /trunk/packages/fcl-db/src/sqldb/postgres/fpmake.inc
   M /trunk/packages/fpindexer/fpmake.pp

 * enable parts of sqldb,dblib and fpindexer for Haiku. Patch by Oliver, Mantis #21618

------------------------------------------------------------------------
------------------------------------------------------------------------
r20692 | marco | 2012-04-02 13:46:51 +0200 (Mon, 02 Apr 2012) | 2 lines
Changed paths:
   M /trunk/packages/dblib/fpmake.pp
   M /trunk/packages/fcl-db/fpmake.pp
   M /trunk/packages/fcl-db/src/sqldb/mssql/fpmake.inc
   M /trunk/packages/fcl-db/src/sqldb/mssql/readme.txt
   M /trunk/packages/fcl-db/tests/sqldbtoolsunit.pas

 * reenable dblib/freetds for win64, after successfull test.

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@21316 -

packages/dblib/fpmake.pp

@@ -5,7 +5,7 @@ program fpmake;
 uses fpmkunit;
 
 Const
-  DBLibOSes         = [linux,freebsd,netbsd,openbsd,win32];
+  DBLibOSes         = [linux,freebsd,netbsd,openbsd,win32,win64,haiku];
   
 Var
   P : TPackage;

packages/fcl-db/src/sqldb/interbase/fpmake.inc

@@ -6,6 +6,6 @@
 Targets.ResetDefaults;
 Targets.DefaultDir:='db/sqldb/interbase';
 { Drivers only for the following OSes }
-Targets.DefaultOS:=[win32,openbsd,netbsd,freebsd,darwin,linux];
+Targets.DefaultOS:=[win32,openbsd,netbsd,freebsd,darwin,linux,haiku];
 T:=Targets.AddUnit('ibconnection');
-T.ResourceStrings:=True;
+T.ResourceStrings:=True;

packages/fcl-db/src/sqldb/mssql/fpmake.inc

@@ -6,6 +6,6 @@
 Targets.ResetDefaults;
 Targets.DefaultDir:='db/sqldb/mssql';
 { Drivers only for the following OSes }
-Targets.DefaultOS:=[win32,openbsd,netbsd,freebsd,linux];
+Targets.DefaultOS:=[win32,win64,openbsd,netbsd,freebsd,linux,haiku];
 T:=Targets.AddUnit('mssqlconn');
-T.ResourceStrings:=False;
+T.ResourceStrings:=False;

packages/fcl-db/src/sqldb/mssql/readme.txt

@@ -14,6 +14,12 @@ Compiling FreeTDS DB-Lib with MS Visual C++ 2005/2008/2010:
 4.   The dblib.dll will appear in the .\dbdll_Release\ subdirectory
      Note: To avoid dependency on msvc*.dll you can set in C/C++ / Code Generation / Runtime Library : "Multi-threaded (/MT)" in all projects
 
+     To build dblib.dll under MS Visual C++ 2010 Express for Win64 you must:
+     - download and install Microsoft Windows Software Development Kit 7.1
+     - setup FreeTDS project to target 64-bit platform (http://msdn.microsoft.com/en-us/library/9yb4317s.aspx)
+     - Right-click on project "dblib_dll" and select "Properties".
+       Linker / General / Additional Library Directories add path to "Microsoft SDKs\Windows\v7.1\Lib\x64"
+
 
 Compiling FreeTDS with iconv support:
 =====================================

packages/fcl-db/src/sqldb/mysql/fpmake.inc

@@ -6,6 +6,6 @@
 Targets.ResetDefaults;
 Targets.DefaultDir:='db/sqldb/mysql';
 { Drivers only for the following OSes }
-Targets.DefaultOS:=[win32,openbsd,netbsd,freebsd,darwin,linux];
+Targets.DefaultOS:=[win32,openbsd,netbsd,freebsd,darwin,linux,haiku];
 T:=Targets.AddUnit('mysql4conn');
 T.ResourceStrings:=True;

packages/fcl-db/src/sqldb/postgres/fpmake.inc

@@ -6,6 +6,6 @@
 Targets.ResetDefaults;
 Targets.DefaultDir:='db/sqldb/postgres';
 { Drivers only for the following OSes }
-Targets.DefaultOS:=[win32,openbsd,netbsd,freebsd,darwin,linux];
+Targets.DefaultOS:=[win32,openbsd,netbsd,freebsd,darwin,linux,haiku];
 T:=Targets.AddUnit('pqconnection');
 T.ResourceStrings:=True;

packages/fcl-db/tests/sqldbtoolsunit.pas

@@ -5,10 +5,22 @@ unit SQLDBToolsUnit;
 interface
 
 uses
-  Classes, SysUtils, toolsunit,
-  db, sqldb,
-  mysql40conn, mysql41conn, mysql50conn, mysql51conn, mysql55conn,
-  ibconnection, pqconnection, odbcconn, oracleconnection, sqlite3conn, mssqlconn;
+  Classes, SysUtils, toolsunit
+  ,db, sqldb
+  ,mysql40conn, mysql41conn, mysql50conn, mysql51conn, mysql55conn
+  ,ibconnection
+  {$IFNDEF WIN64}
+  {See packages\fcl-db\src\sqldb\postgres\fpmake.pp: postgres connector won't be present on Win64}
+  ,pqconnection
+  {$ENDIF WIN64}
+  ,odbcconn
+  {$IFNDEF WIN64}
+  {See packages\fcl-db\fpmake.pp: Oracle connector is not built if PostgreSQL connectoris not built}
+  ,oracleconnection
+  {$ENDIF WIN64}
+  ,sqlite3conn
+  ,mssqlconn
+  ;
 
 type TSQLDBTypes = (mysql40,mysql41,mysql50,mysql51,mysql55,postgresql,interbase,odbc,oracle,sqlite3,mssql);
 
@@ -141,6 +153,7 @@ begin
     FieldtypeDefinitions[ftVarBytes] := 'VARBINARY(10)';
     FieldtypeDefinitions[ftMemo] := 'CLOB'; //or TEXT SQLite supports both, but CLOB is sql standard (TEXT not)
     end;
+  {$IFNDEF win64}
   if SQLDbType = POSTGRESQL then
     begin
     Fconnection := tPQConnection.Create(nil);
@@ -149,6 +162,7 @@ begin
     FieldtypeDefinitions[ftMemo] := 'TEXT';
     FieldtypeDefinitions[ftGraphic] := '';
     end;
+  {$ENDIF Win64}
   if SQLDbType = INTERBASE then
     begin
     Fconnection := tIBConnection.Create(nil);
@@ -156,7 +170,9 @@ begin
     FieldtypeDefinitions[ftMemo] := 'BLOB SUB_TYPE TEXT';
     end;
   if SQLDbType = ODBC then Fconnection := tODBCConnection.Create(nil);
+  {$IFDEF Win64}
   if SQLDbType = ORACLE then Fconnection := TOracleConnection.Create(nil);
+  {$ENDIF Win64}
   if SQLDbType = MSSQL then
     begin
     Fconnection := TMSSQLConnection.Create(nil);

packages/fpindexer/fpmake.pp

@@ -5,7 +5,7 @@ program fpmake;
 uses fpmkunit;
 
 Const
-  SqldbConnectionOSes = [beos,linux,freebsd,win32,win64,wince,darwin,iphonesim,netbsd,openbsd];
+  SqldbConnectionOSes = [beos,haiku,linux,freebsd,win32,win64,wince,darwin,iphonesim,netbsd,openbsd];
   SqliteOSes          = [beos,haiku,linux,freebsd,darwin,iphonesim,netbsd,openbsd,win32,wince];
     
 Var