From 2fe70fbeb57cd457b913c376c1b987522c0c5d58 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 3 Jun 2013 13:22:37 +0200 Subject: Use database name in options and driver files (build part) This way we will be able to have several databases configured at the same time, which is needed for multi-database support testing. --- .gitignore | 4 ++-- access/makefile | 2 +- boost/makefile | 2 +- build/bootstrap.make | 2 +- build/configuration-rules.make | 4 ++-- build/mssql/configure | 4 ++-- build/mysql/configure | 4 ++-- build/oracle/configure | 4 ++-- build/pgsql/configure | 4 ++-- build/sqlite/configure | 2 +- c++11/makefile | 2 +- composite/makefile | 2 +- container/makefile | 2 +- hello/makefile | 2 +- inheritance/polymorphism/makefile | 2 +- inheritance/reuse/makefile | 2 +- inverse/makefile | 2 +- mapping/makefile | 2 +- optimistic/makefile | 2 +- pimpl/makefile | 2 +- prepared/makefile | 2 +- qt/makefile | 2 +- query/makefile | 2 +- relationship/makefile | 2 +- schema/custom/makefile | 2 +- schema/embedded/makefile | 2 +- template/makefile | 2 +- view/makefile | 2 +- 28 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 53c48be..8d08e72 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,8 @@ # Generated build system files. # *-dynamic.make -build/db.options -build/db-driver +build/*.options +build/*-driver # Generated .gitignore files. # diff --git a/access/makefile b/access/makefile index 8be26a0..fa04be6 100644 --- a/access/makefile +++ b/access/makefile @@ -79,7 +79,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/boost/makefile b/boost/makefile index 3556ba7..c254212 100644 --- a/boost/makefile +++ b/boost/makefile @@ -96,7 +96,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/build/bootstrap.make b/build/bootstrap.make index 6cdfc09..da59cf5 100644 --- a/build/bootstrap.make +++ b/build/bootstrap.make @@ -49,7 +49,7 @@ endif ifeq ($(filter $(db_id),sqlite),) $(out_base)/.test: schema = \ $(foreach h,$(header),$(call \ -message,sql $$1,$(dcf_root)/db-driver \ +message,sql $$1,$(dcf_root)/$(db_id)-driver \ $$1,$(out_base)/$(basename $h).sql)$(literal_newline)$(literal_tab)) endif diff --git a/build/configuration-rules.make b/build/configuration-rules.make index 5576495..fb9f51f 100644 --- a/build/configuration-rules.make +++ b/build/configuration-rules.make @@ -9,8 +9,8 @@ ifndef %foreign% disfigure:: $(call message,rm $$1,rm -f $$1,$(dcf_root)/configuration-dynamic.make) - $(call message,rm $$1,rm -f $$1,$(dcf_root)/db.options) - $(call message,rm $$1,rm -f $$1,$(dcf_root)/db-driver) + $(call message,rm $$1,rm -f $$1,$(dcf_root)/*.options) + $(call message,rm $$1,rm -f $$1,$(dcf_root)/*-driver) endif diff --git a/build/mssql/configure b/build/mssql/configure index 33fbf7b..9603c10 100755 --- a/build/mssql/configure +++ b/build/mssql/configure @@ -39,8 +39,8 @@ $echo server=`read_value ""` -opt=$dcf_root/db.options -drv=$dcf_root/db-driver +opt=$dcf_root/mssql.options +drv=$dcf_root/mssql-driver echo "--user '$user'" >$opt echo "--password '$passwd'" >>$opt diff --git a/build/mysql/configure b/build/mysql/configure index afbf849..704a96f 100755 --- a/build/mysql/configure +++ b/build/mysql/configure @@ -53,8 +53,8 @@ $echo socket=`read_value "NULL"` -opt=$dcf_root/db.options -drv=$dcf_root/db-driver +opt=$dcf_root/mysql.options +drv=$dcf_root/mysql-driver echo "--user '$user'" >$opt diff --git a/build/oracle/configure b/build/oracle/configure index bcd3c6c..0366b76 100755 --- a/build/oracle/configure +++ b/build/oracle/configure @@ -55,8 +55,8 @@ $echo service=`read_value ""` -opt=$dcf_root/db.options -drv=$dcf_root/db-driver +opt=$dcf_root/oracle.options +drv=$dcf_root/oracle-driver if [ -n "$user" ]; then echo "--user '$user'" >$opt diff --git a/build/pgsql/configure b/build/pgsql/configure index 2e78a13..d129b54 100755 --- a/build/pgsql/configure +++ b/build/pgsql/configure @@ -44,8 +44,8 @@ $echo port=`read_value ""` -opt=$dcf_root/db.options -drv=$dcf_root/db-driver +opt=$dcf_root/pgsql.options +drv=$dcf_root/pgsql-driver echo "--user '$user'" >$opt echo "--database '$db'" >>$opt diff --git a/build/sqlite/configure b/build/sqlite/configure index 75a4773..a454df9 100755 --- a/build/sqlite/configure +++ b/build/sqlite/configure @@ -16,6 +16,6 @@ $echo db=`read_value "/tmp/odb-test.db"` -opt=$dcf_root/db.options +opt=$dcf_root/sqlite.options echo "--database '$db'" >$opt diff --git a/c++11/makefile b/c++11/makefile index 8bde7f8..a68032d 100644 --- a/c++11/makefile +++ b/c++11/makefile @@ -97,7 +97,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/composite/makefile b/composite/makefile index 10256ee..9187ee0 100644 --- a/composite/makefile +++ b/composite/makefile @@ -79,7 +79,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/container/makefile b/container/makefile index aad0412..e6701c0 100644 --- a/container/makefile +++ b/container/makefile @@ -79,7 +79,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/hello/makefile b/hello/makefile index 83fc916..8bdfb97 100644 --- a/hello/makefile +++ b/hello/makefile @@ -79,7 +79,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/inheritance/polymorphism/makefile b/inheritance/polymorphism/makefile index e454db6..88456ae 100644 --- a/inheritance/polymorphism/makefile +++ b/inheritance/polymorphism/makefile @@ -80,7 +80,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/inheritance/reuse/makefile b/inheritance/reuse/makefile index eb0fd1e..b47b703 100644 --- a/inheritance/reuse/makefile +++ b/inheritance/reuse/makefile @@ -79,7 +79,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/inverse/makefile b/inverse/makefile index b4ec4c3..848aeb3 100644 --- a/inverse/makefile +++ b/inverse/makefile @@ -80,7 +80,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/mapping/makefile b/mapping/makefile index c810a17..ff5b1f2 100644 --- a/mapping/makefile +++ b/mapping/makefile @@ -82,7 +82,7 @@ README database.hxx) $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/optimistic/makefile b/optimistic/makefile index 297427a..e7bd43f 100644 --- a/optimistic/makefile +++ b/optimistic/makefile @@ -79,7 +79,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/pimpl/makefile b/pimpl/makefile index 86a3d7e..cfdde26 100644 --- a/pimpl/makefile +++ b/pimpl/makefile @@ -80,7 +80,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/prepared/makefile b/prepared/makefile index 5cff660..de5ebd0 100644 --- a/prepared/makefile +++ b/prepared/makefile @@ -79,7 +79,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/qt/makefile b/qt/makefile index 4488f3e..cb2a0d2 100644 --- a/qt/makefile +++ b/qt/makefile @@ -100,7 +100,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/query/makefile b/query/makefile index 3b4293b..7de6808 100644 --- a/query/makefile +++ b/query/makefile @@ -79,7 +79,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/relationship/makefile b/relationship/makefile index 004adef..24318db 100644 --- a/relationship/makefile +++ b/relationship/makefile @@ -80,7 +80,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/schema/custom/makefile b/schema/custom/makefile index f38973b..b726a66 100644 --- a/schema/custom/makefile +++ b/schema/custom/makefile @@ -77,7 +77,7 @@ $(dist): # Test. # $(test): $(driver) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/schema/embedded/makefile b/schema/embedded/makefile index c336b3f..1748ff4 100644 --- a/schema/embedded/makefile +++ b/schema/embedded/makefile @@ -78,7 +78,7 @@ $(dist): # Test. # $(test): $(driver) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/template/makefile b/template/makefile index 514d3c3..cc1bebf 100644 --- a/template/makefile +++ b/template/makefile @@ -79,7 +79,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # diff --git a/view/makefile b/view/makefile index f126cff..4454ff8 100644 --- a/view/makefile +++ b/view/makefile @@ -80,7 +80,7 @@ $(dist): $(test): header := $(odb_hdr) $(test): $(driver) $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options) + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options) # Clean. # -- cgit v1.1