From a59c79123296d5d74771b1888af6529ea825ecea Mon Sep 17 00:00:00 2001 From: Martin Stjernholm <mast@lysator.liu.se> Date: Tue, 2 Nov 2010 14:04:56 +0100 Subject: [PATCH] Don't dump sql driver files that depend on system libraries. --- .gitattributes | 10 ---------- lib/modules/Sql.pmod/dsn.pike | 6 +++++- lib/modules/Sql.pmod/dsn_result.pike | 6 +++++- lib/modules/Sql.pmod/msql.pike | 4 ++++ lib/modules/Sql.pmod/mysql.pike | 6 +++++- lib/modules/Sql.pmod/mysql_result.pike | 6 +++++- lib/modules/Sql.pmod/mysqls.pike | 6 +++++- lib/modules/Sql.pmod/mysqls_result.pike | 4 ++++ lib/modules/Sql.pmod/odbc.pike | 6 +++++- lib/modules/Sql.pmod/odbc_result.pike | 6 +++++- lib/modules/Sql.pmod/oracle.pike | 6 +++++- lib/modules/Sql.pmod/postgres.pike | 6 +++++- lib/modules/Sql.pmod/postgres_result.pike | 4 ++++ lib/modules/Sql.pmod/sqlite.pike | 4 ++++ lib/modules/Sql.pmod/sybase.pike | 6 +++++- 15 files changed, 66 insertions(+), 20 deletions(-) diff --git a/.gitattributes b/.gitattributes index 0326065c23..9f073ad74c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -208,18 +208,8 @@ testfont binary /lib/modules/SSL.pmod/state.pike foreign_ident /lib/modules/SSL.pmod/testsuite.in foreign_ident /lib/modules/Sql.pmod/Sql.pike foreign_ident -/lib/modules/Sql.pmod/dsn.pike foreign_ident -/lib/modules/Sql.pmod/dsn_result.pike foreign_ident -/lib/modules/Sql.pmod/mysql.pike foreign_ident -/lib/modules/Sql.pmod/mysql_result.pike foreign_ident -/lib/modules/Sql.pmod/mysqls.pike foreign_ident -/lib/modules/Sql.pmod/odbc.pike foreign_ident -/lib/modules/Sql.pmod/odbc_result.pike foreign_ident -/lib/modules/Sql.pmod/oracle.pike foreign_ident -/lib/modules/Sql.pmod/postgres.pike foreign_ident /lib/modules/Sql.pmod/sql_result.pike foreign_ident /lib/modules/Sql.pmod/sql_util.pmod foreign_ident -/lib/modules/Sql.pmod/sybase.pike foreign_ident /lib/modules/Sql.pmod/tds.pike foreign_ident /lib/modules/Standards.pmod/ASN1.pmod/Decode.pmod foreign_ident /lib/modules/Standards.pmod/ASN1.pmod/Types.pmod foreign_ident diff --git a/lib/modules/Sql.pmod/dsn.pike b/lib/modules/Sql.pmod/dsn.pike index f62945d061..2647a0f2cb 100644 --- a/lib/modules/Sql.pmod/dsn.pike +++ b/lib/modules/Sql.pmod/dsn.pike @@ -1,5 +1,5 @@ /* - * $Id: dsn.pike,v 1.2 2005/01/26 19:26:29 grubba Exp $ + * $Id$ * * Glue for the ODBC-module * @@ -8,6 +8,10 @@ #pike __REAL_VERSION__ +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(Odbc.odbc) inherit Odbc.odbc; diff --git a/lib/modules/Sql.pmod/dsn_result.pike b/lib/modules/Sql.pmod/dsn_result.pike index 982cbeabca..a722373954 100644 --- a/lib/modules/Sql.pmod/dsn_result.pike +++ b/lib/modules/Sql.pmod/dsn_result.pike @@ -1,11 +1,15 @@ /* - * $Id: dsn_result.pike,v 1.1 2005/01/26 18:57:45 grubba Exp $ + * $Id$ * * Glue for the ODBC-module */ #pike __REAL_VERSION__ +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(Odbc.odbc_result) inherit Odbc.odbc_result; #else /* !constant(Odbc.odbc_result) */ diff --git a/lib/modules/Sql.pmod/msql.pike b/lib/modules/Sql.pmod/msql.pike index 76af9ffc3e..9a06601ded 100644 --- a/lib/modules/Sql.pmod/msql.pike +++ b/lib/modules/Sql.pmod/msql.pike @@ -4,6 +4,10 @@ //! Implements the glue needed to access the Msql-module from the generic //! SQL module. +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(Msql.msql) inherit Msql.msql; diff --git a/lib/modules/Sql.pmod/mysql.pike b/lib/modules/Sql.pmod/mysql.pike index 99753c4e4b..c843da7480 100644 --- a/lib/modules/Sql.pmod/mysql.pike +++ b/lib/modules/Sql.pmod/mysql.pike @@ -1,5 +1,5 @@ /* - * $Id: mysql.pike,v 1.46 2010/01/04 17:18:18 mast Exp $ + * $Id$ * * Glue for the Mysql-module */ @@ -9,6 +9,10 @@ #pike __REAL_VERSION__ +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(Mysql.mysql) inherit Mysql.mysql; diff --git a/lib/modules/Sql.pmod/mysql_result.pike b/lib/modules/Sql.pmod/mysql_result.pike index cde5b29a24..3c1cf69392 100644 --- a/lib/modules/Sql.pmod/mysql_result.pike +++ b/lib/modules/Sql.pmod/mysql_result.pike @@ -1,11 +1,15 @@ /* - * $Id: mysql_result.pike,v 1.7 2008/06/28 16:49:55 nilsson Exp $ + * $Id$ * * Glue for the Mysql-module */ #pike __REAL_VERSION__ +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(Mysql.mysql_result) inherit Mysql.mysql_result; #else /* !constant(Mysql.mysql_result) */ diff --git a/lib/modules/Sql.pmod/mysqls.pike b/lib/modules/Sql.pmod/mysqls.pike index 1a6ee99bff..c19833a4d5 100644 --- a/lib/modules/Sql.pmod/mysqls.pike +++ b/lib/modules/Sql.pmod/mysqls.pike @@ -1,5 +1,5 @@ /* - * $Id: mysqls.pike,v 1.5 2004/04/16 12:12:46 grubba Exp $ + * $Id$ * * Glue for the Mysql-module using SSL */ @@ -19,6 +19,10 @@ #pike __REAL_VERSION__ +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(Mysql.mysql.CLIENT_SSL) inherit Sql.mysql; diff --git a/lib/modules/Sql.pmod/mysqls_result.pike b/lib/modules/Sql.pmod/mysqls_result.pike index 72b508da08..426dad875f 100644 --- a/lib/modules/Sql.pmod/mysqls_result.pike +++ b/lib/modules/Sql.pmod/mysqls_result.pike @@ -1,5 +1,9 @@ #pike __REAL_VERSION__ +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(Mysql.mysql.CLIENT_SSL) inherit Sql.mysql_result; diff --git a/lib/modules/Sql.pmod/odbc.pike b/lib/modules/Sql.pmod/odbc.pike index 3b761c5a3f..1928f7142b 100644 --- a/lib/modules/Sql.pmod/odbc.pike +++ b/lib/modules/Sql.pmod/odbc.pike @@ -1,11 +1,15 @@ /* - * $Id: odbc.pike,v 1.14 2004/04/16 12:12:46 grubba Exp $ + * $Id$ * * Glue for the ODBC-module */ #pike __REAL_VERSION__ +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(Odbc.odbc) inherit Odbc.odbc; diff --git a/lib/modules/Sql.pmod/odbc_result.pike b/lib/modules/Sql.pmod/odbc_result.pike index 37a8479b53..a722373954 100644 --- a/lib/modules/Sql.pmod/odbc_result.pike +++ b/lib/modules/Sql.pmod/odbc_result.pike @@ -1,11 +1,15 @@ /* - * $Id: odbc_result.pike,v 1.6 2004/04/16 12:12:46 grubba Exp $ + * $Id$ * * Glue for the ODBC-module */ #pike __REAL_VERSION__ +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(Odbc.odbc_result) inherit Odbc.odbc_result; #else /* !constant(Odbc.odbc_result) */ diff --git a/lib/modules/Sql.pmod/oracle.pike b/lib/modules/Sql.pmod/oracle.pike index 74e165ae5b..2aa76c6d20 100644 --- a/lib/modules/Sql.pmod/oracle.pike +++ b/lib/modules/Sql.pmod/oracle.pike @@ -1,11 +1,15 @@ /* - * $Id: oracle.pike,v 1.7 2002/11/27 15:40:34 mast Exp $ + * $Id$ * * Glue for the Oracle-module */ #pike __REAL_VERSION__ +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(Oracle.oracle) inherit Oracle.oracle; diff --git a/lib/modules/Sql.pmod/postgres.pike b/lib/modules/Sql.pmod/postgres.pike index a274c24718..abd483eecd 100644 --- a/lib/modules/Sql.pmod/postgres.pike +++ b/lib/modules/Sql.pmod/postgres.pike @@ -1,12 +1,16 @@ /* * This is part of the Postgres module for Pike. * - * $Id: postgres.pike,v 1.41 2010/02/21 22:42:16 srb Exp $ + * $Id$ * */ #pike __REAL_VERSION__ +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(Postgres.postgres) //! This is an interface to the Postgres (Postgres95, pgsql) database diff --git a/lib/modules/Sql.pmod/postgres_result.pike b/lib/modules/Sql.pmod/postgres_result.pike index e9b2bb24ca..868be6648e 100644 --- a/lib/modules/Sql.pmod/postgres_result.pike +++ b/lib/modules/Sql.pmod/postgres_result.pike @@ -3,6 +3,10 @@ //! Sql.postgres_result contains the result of a Postgres-query. //! See @[Sql.postgres] for a description of this program's functions. +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(Postgres.postgres_result) inherit Postgres.postgres_result; #else /* !constant(Postgres.postgres_result) */ diff --git a/lib/modules/Sql.pmod/sqlite.pike b/lib/modules/Sql.pmod/sqlite.pike index 9597d5e3e8..089008d0e9 100644 --- a/lib/modules/Sql.pmod/sqlite.pike +++ b/lib/modules/Sql.pmod/sqlite.pike @@ -1,6 +1,10 @@ #pike __REAL_VERSION__ +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(SQLite.SQLite) inherit SQLite.SQLite; diff --git a/lib/modules/Sql.pmod/sybase.pike b/lib/modules/Sql.pmod/sybase.pike index 18d59bbbfb..a8aeb9891f 100644 --- a/lib/modules/Sql.pmod/sybase.pike +++ b/lib/modules/Sql.pmod/sybase.pike @@ -2,12 +2,16 @@ * Sybase driver for the Pike programming language. * By Francesco Chemolli <kinkie@roxen.com> 10/12/1999 * - * $Id: sybase.pike,v 1.11 2008/01/09 14:26:07 mast Exp $ + * $Id$ * */ #pike __REAL_VERSION__ +// Cannot dump this since the #if constant(...) check below may depend +// on the presence of system libs at runtime. +constant dont_dump_program = 1; + #if constant(sybase.sybase) inherit sybase.sybase:mo; -- GitLab