diff options
author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2012-07-21 20:34:26 +0000 |
---|---|---|
committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2012-07-21 20:34:26 +0000 |
commit | e7f9e6e8cffa6f0a416b62cd390efe9845ea9173 (patch) | |
tree | 976eb7d5dbf06d9fbe2c05ac1f3609da41a56525 | |
parent | ef74bb4ccf90ac2d93a677e007e390569c36931e (diff) | |
download | fpc-e7f9e6e8cffa6f0a416b62cd390efe9845ea9173.tar.gz |
* 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: http://svn.freepascal.org/svn/fpc/branches/joost@21943 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | classattributes/packages/dblib/fpmake.pp | 2 | ||||
-rw-r--r-- | classattributes/packages/fcl-db/fpmake.pp | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/classattributes/packages/dblib/fpmake.pp b/classattributes/packages/dblib/fpmake.pp index 7c9e5bb718..189a070de7 100644 --- a/classattributes/packages/dblib/fpmake.pp +++ b/classattributes/packages/dblib/fpmake.pp @@ -9,7 +9,7 @@ uses fpmkunit; procedure add_dblib; Const - DBLibOSes = [linux,freebsd,netbsd,openbsd,win32,win64,haiku]; + DBLibOSes = [linux,freebsd,netbsd,openbsd,solaris,win32,win64,haiku]; Var P : TPackage; diff --git a/classattributes/packages/fcl-db/fpmake.pp b/classattributes/packages/fcl-db/fpmake.pp index 64fe48485a..1acff3ce3d 100644 --- a/classattributes/packages/fcl-db/fpmake.pp +++ b/classattributes/packages/fcl-db/fpmake.pp @@ -9,11 +9,12 @@ procedure add_fcl_db; const ParadoxOSes = [beos,haiku,linux,freebsd,netbsd,openbsd,win32]; - DatadictOSes = [beos,haiku,linux,freebsd,win32,win64,wince,darwin,aix]; - SqldbConnectionOSes = [beos,haiku,linux,freebsd,win32,win64,wince,darwin,iphonesim,netbsd,openbsd,aix]; - SqliteOSes = [beos,haiku,linux,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,win32,wince,aix]; - DBaseOSes = [beos,haiku,linux,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,win32,win64,wince,aix]; - MSSQLOSes = [beos,haiku,linux,freebsd,netbsd,openbsd,win32,win64]; + DatadictOSes = [aix,beos,darwin,haiku,linux,freebsd,win32,win64,wince]; + SqldbConnectionOSes = [aix,beos,haiku,linux,freebsd,darwin,iphonesim,netbsd,openbsd,solaris,win32,win64,wince]; + SqliteOSes = [aix,beos,haiku,linux,freebsd,darwin,iphonesim,netbsd,openbsd,solaris,win32,wince]; + DBaseOSes = [aix,beos,haiku,linux,freebsd,darwin,iphonesim,netbsd,openbsd,solaris,win32,win64,wince]; + MSSQLOSes = [beos,haiku,linux,freebsd,netbsd,openbsd,solaris,win32,win64]; + SqldbWithoutOracleOSes = [win64]; SqldbWithoutPostgresOSes = [win64]; Var @@ -46,7 +47,7 @@ begin P.SourcePath.Add('src/sqldb/mysql', SqldbConnectionOSes); P.SourcePath.Add('src/sqldb/odbc', 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/sdf'); P.SourcePath.Add('src/json'); @@ -71,7 +72,7 @@ begin P.Dependencies.Add('ibase', SqldbConnectionOSes); P.Dependencies.Add('mysql', 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('sqlite', SqldbConnectionOSes+SqliteOSes); P.Dependencies.Add('dblib', MSSQLOSes); @@ -419,7 +420,7 @@ begin AddUnit('fpddsqldb'); AddUnit('odbcconn'); end; - T:=P.Targets.AddUnit('fpddoracle.pp', DatadictOSes-SqldbWithoutPostgresOSes); + T:=P.Targets.AddUnit('fpddoracle.pp', DatadictOSes-SqldbWithoutOracleOSes); with T.Dependencies do begin AddUnit('sqldb'); @@ -637,7 +638,7 @@ begin AddUnit('bufdataset'); AddUnit('dbconst'); end; - T:=P.Targets.AddUnit('oracleconnection.pp', SqldbConnectionOSes-SqldbWithoutPostgresOSes); + T:=P.Targets.AddUnit('oracleconnection.pp', SqldbConnectionOSes-SqldbWithoutOracleOSes); T.ResourceStrings:=true; with T.Dependencies do begin |