paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-24 15:09:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Merging patch which was committed to wrong branch:

Browse Source 
--- Merging r21943 into '.':
U    packages/fcl-db/fpmake.pp
U    packages/dblib/fpmake.pp

# revisions: 21943
------------------------------------------------------------------------
r21943 | joost | 2012-07-21 22:34:26 +0200 (Sat, 21 Jul 2012) | 5 lines

 * Patch from Mark Morgan Lloyd (bug 22459):
   - Adds Solaris to SQLDBConnectionOSes 
   - added mssqlconn: Sybase/MS SQL client driver support to solaris 
   - for all platforms: sorted constants lines so its easier to see what OSes get what
   - for all platforms: cleaned up throwing in Oracle with PostgreSQL: separated constant
------------------------------------------------------------------------

git-svn-id: trunk@22552 -
This commit is contained in:
joost 2012-10-05 19:32:42 +00:00
parent a48aba60fb
commit 11ea2561b9
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/dblib/fpmake.pp
View File

@ -9,7 +9,7 @@ uses fpmkunit;
procedure add_dblib; procedure add_dblib;
Const Const
DBLibOSes = [linux,freebsd,netbsd,openbsd,win32,win64,haiku]; DBLibOSes = [linux,freebsd,netbsd,openbsd,solaris,win32,win64,haiku];
Var Var
P : TPackage; P : TPackage;

19
packages/fcl-db/fpmake.pp
View File

@ -9,11 +9,12 @@ procedure add_fcl_db;
const const
ParadoxOSes = [beos,haiku,linux,freebsd,netbsd,openbsd,win32]; ParadoxOSes = [beos,haiku,linux,freebsd,netbsd,openbsd,win32];
DatadictOSes = [beos,haiku,linux,freebsd,win32,win64,wince,darwin,aix]; DatadictOSes = [aix,beos,darwin,haiku,linux,freebsd,win32,win64,wince];
SqldbConnectionOSes = [beos,haiku,linux,freebsd,win32,win64,wince,darwin,iphonesim,netbsd,openbsd,aix]; SqldbConnectionOSes = [aix,beos,haiku,linux,freebsd,darwin,iphonesim,netbsd,openbsd,solaris,win32,win64,wince];
SqliteOSes = [beos,haiku,linux,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,win32,wince,aix]; SqliteOSes = [aix,beos,haiku,linux,freebsd,darwin,iphonesim,netbsd,openbsd,solaris,win32,wince];
DBaseOSes = [beos,haiku,linux,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,win32,win64,wince,aix]; DBaseOSes = [aix,beos,haiku,linux,freebsd,darwin,iphonesim,netbsd,openbsd,solaris,win32,win64,wince];
MSSQLOSes = [beos,haiku,linux,freebsd,netbsd,openbsd,win32,win64]; MSSQLOSes = [beos,haiku,linux,freebsd,netbsd,openbsd,solaris,win32,win64];
SqldbWithoutOracleOSes = [win64];
SqldbWithoutPostgresOSes = [win64]; SqldbWithoutPostgresOSes = [win64];
Var Var
@ -46,7 +47,7 @@ begin
P.SourcePath.Add('src/sqldb/mysql', SqldbConnectionOSes); P.SourcePath.Add('src/sqldb/mysql', SqldbConnectionOSes);
P.SourcePath.Add('src/sqldb/odbc', SqldbConnectionOSes); P.SourcePath.Add('src/sqldb/odbc', SqldbConnectionOSes);
P.SourcePath.Add('src/sqldb/examples', SqldbConnectionOSes); P.SourcePath.Add('src/sqldb/examples', SqldbConnectionOSes);
P.SourcePath.Add('src/sqldb/oracle', SqldbConnectionOSes-SqldbWithoutPostgresOSes); P.SourcePath.Add('src/sqldb/oracle', SqldbConnectionOSes-SqldbWithoutOracleOSes);
P.SourcePath.Add('src/sqldb/mssql', MSSQLOSes); P.SourcePath.Add('src/sqldb/mssql', MSSQLOSes);
P.SourcePath.Add('src/sdf'); P.SourcePath.Add('src/sdf');
P.SourcePath.Add('src/json'); P.SourcePath.Add('src/json');
@ -71,7 +72,7 @@ begin
P.Dependencies.Add('ibase', SqldbConnectionOSes); P.Dependencies.Add('ibase', SqldbConnectionOSes);
P.Dependencies.Add('mysql', SqldbConnectionOSes); P.Dependencies.Add('mysql', SqldbConnectionOSes);
P.Dependencies.Add('odbc', SqldbConnectionOSes); P.Dependencies.Add('odbc', SqldbConnectionOSes);
P.Dependencies.Add('oracle', SqldbConnectionOSes-SqldbWithoutPostgresOSes); P.Dependencies.Add('oracle', SqldbConnectionOSes-SqldbWithoutOracleOSes);
P.Dependencies.Add('postgres', SqldbConnectionOSes-SqldbWithoutPostgresOSes); P.Dependencies.Add('postgres', SqldbConnectionOSes-SqldbWithoutPostgresOSes);
P.Dependencies.Add('sqlite', SqldbConnectionOSes+SqliteOSes); P.Dependencies.Add('sqlite', SqldbConnectionOSes+SqliteOSes);
P.Dependencies.Add('dblib', MSSQLOSes); P.Dependencies.Add('dblib', MSSQLOSes);
@ -419,7 +420,7 @@ begin
AddUnit('fpddsqldb'); AddUnit('fpddsqldb');
AddUnit('odbcconn'); AddUnit('odbcconn');
end; end;
T:=P.Targets.AddUnit('fpddoracle.pp', DatadictOSes-SqldbWithoutPostgresOSes); T:=P.Targets.AddUnit('fpddoracle.pp', DatadictOSes-SqldbWithoutOracleOSes);
with T.Dependencies do with T.Dependencies do
begin begin
AddUnit('sqldb'); AddUnit('sqldb');
@ -637,7 +638,7 @@ begin
AddUnit('bufdataset'); AddUnit('bufdataset');
AddUnit('dbconst'); AddUnit('dbconst');
end; end;
T:=P.Targets.AddUnit('oracleconnection.pp', SqldbConnectionOSes-SqldbWithoutPostgresOSes); T:=P.Targets.AddUnit('oracleconnection.pp', SqldbConnectionOSes-SqldbWithoutOracleOSes);
T.ResourceStrings:=true; T.ResourceStrings:=true;
with T.Dependencies do with T.Dependencies do
begin begin