From 236cd9bb1dd022e64d690c9b0080d1a15c5f61c7 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 13 Jun 2013 21:57:07 +0200 Subject: Handle --database option directly in automake and VC++ projects --- qt/common/basic/makefile | 8 ++++---- qt/common/containers/basics/makefile | 8 ++++---- qt/common/containers/change-tracking/makefile | 8 ++++---- qt/common/smart-ptr/makefile | 8 ++++---- qt/common/template/Makefile.am | 2 +- qt/common/template/makefile | 8 ++++---- qt/common/template/template-qt4-vc10.vcxproj | 2 +- qt/common/template/template-qt4-vc11.vcxproj | 2 +- qt/common/template/template-qt4-vc9.vcproj | 2 +- qt/common/template/template-qt5-vc10.vcxproj | 2 +- qt/common/template/template-qt5-vc11.vcxproj | 2 +- qt/common/template/template-qt5-vc9.vcproj | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) (limited to 'qt/common') diff --git a/qt/common/basic/makefile b/qt/common/basic/makefile index eea4f93..05d3375 100644 --- a/qt/common/basic/makefile +++ b/qt/common/basic/makefile @@ -43,13 +43,14 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) \ ---profile qt/basic --generate-schema --generate-query \ ---table-prefix qt_basic_ +$(gen) $(dist): export odb_options += --generate-schema --generate-query \ +--profile qt/basic --table-prefix qt_basic_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) +$(gen): odb_options += --database $(db_id) + $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # Alias for default target. @@ -60,7 +61,6 @@ $(out_base)/: $(driver) # name := $(subst /,-,$(subst $(src_root)/qt/common/,,$(src_base))) -$(dist): db_id := @database@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std diff --git a/qt/common/containers/basics/makefile b/qt/common/containers/basics/makefile index a992a2f..a14a29f 100644 --- a/qt/common/containers/basics/makefile +++ b/qt/common/containers/basics/makefile @@ -43,13 +43,14 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) \ ---profile qt/containers --profile qt/basic --generate-schema \ ---table-prefix qt_cont_bs_ +$(gen) $(dist): export odb_options += --generate-schema \ +--profile qt/containers --profile qt/basic --table-prefix qt_cont_bs_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) +$(gen): odb_options += --database $(db_id) + $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # Alias for default target. @@ -60,7 +61,6 @@ $(out_base)/: $(driver) # name := $(subst /,-,$(subst $(src_root)/qt/common/,,$(src_base))) -$(dist): db_id := @database@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std diff --git a/qt/common/containers/change-tracking/makefile b/qt/common/containers/change-tracking/makefile index c14aeaf..4cfee92 100644 --- a/qt/common/containers/change-tracking/makefile +++ b/qt/common/containers/change-tracking/makefile @@ -43,13 +43,14 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) \ ---profile qt/containers --profile qt/basic --generate-schema \ ---table-prefix qt_cont_ct_ +$(gen) $(dist): export odb_options += --generate-schema \ +--profile qt/containers --profile qt/basic --table-prefix qt_cont_ct_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) +$(gen): odb_options += --database $(db_id) + $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # Alias for default target. @@ -60,7 +61,6 @@ $(out_base)/: $(driver) # name := $(subst /,-,$(subst $(src_root)/qt/common/,,$(src_base))) -$(dist): db_id := @database@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std diff --git a/qt/common/smart-ptr/makefile b/qt/common/smart-ptr/makefile index 2619fd2..b539e08 100644 --- a/qt/common/smart-ptr/makefile +++ b/qt/common/smart-ptr/makefile @@ -43,13 +43,14 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) \ ---profile qt/smart-ptr --generate-schema --generate-session \ ---table-prefix qt_smart_ptr_ +$(gen) $(dist): export odb_options += --generate-schema --generate-session \ +--profile qt/smart-ptr --table-prefix qt_smart_ptr_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) +$(gen): odb_options += --database $(db_id) + $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # Alias for default target. @@ -60,7 +61,6 @@ $(out_base)/: $(driver) # name := $(subst /,-,$(subst $(src_root)/qt/common/,,$(src_base))) -$(dist): db_id := @database@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std diff --git a/qt/common/template/Makefile.am b/qt/common/template/Makefile.am index 80ef463..c65ad21 100644 --- a/qt/common/template/Makefile.am +++ b/qt/common/template/Makefile.am @@ -29,4 +29,4 @@ ODBFLAGS += --std c++11 endif test-odb.hxx: test.hxx - $(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $< + $(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) --database @database@ __value__(odb_options) $< diff --git a/qt/common/template/makefile b/qt/common/template/makefile index 3ec25d2..9836dca 100644 --- a/qt/common/template/makefile +++ b/qt/common/template/makefile @@ -43,13 +43,14 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) \ ---profile qt/version --generate-schema \ ---table-prefix qt_template_ #@@ CHANGE table prefix, qt/version +$(gen) $(dist): export odb_options += --generate-schema \ +--profile qt/version --table-prefix qt_template_ #@@ CHANGE prefix, profile $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) +$(gen): odb_options += --database $(db_id) + $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # Alias for default target. @@ -60,7 +61,6 @@ $(out_base)/: $(driver) # name := $(subst /,-,$(subst $(src_root)/qt/common/,,$(src_base))) -$(dist): db_id := @database@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std diff --git a/qt/common/template/template-qt4-vc10.vcxproj b/qt/common/template/template-qt4-vc10.vcxproj index 1c4b458..fddcac3 100644 --- a/qt/common/template/template-qt4-vc10.vcxproj +++ b/qt/common/template/template-qt4-vc10.vcxproj @@ -158,7 +158,7 @@ __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) diff --git a/qt/common/template/template-qt4-vc11.vcxproj b/qt/common/template/template-qt4-vc11.vcxproj index b9a0bc4..cecfe53 100644 --- a/qt/common/template/template-qt4-vc11.vcxproj +++ b/qt/common/template/template-qt4-vc11.vcxproj @@ -162,7 +162,7 @@ __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) diff --git a/qt/common/template/template-qt4-vc9.vcproj b/qt/common/template/template-qt4-vc9.vcproj index e8a6a3c..b37675e 100644 --- a/qt/common/template/template-qt4-vc9.vcproj +++ b/qt/common/template/template-qt4-vc9.vcproj @@ -348,7 +348,7 @@ __source_entries__(extra_sources) __file_entry_custom_build__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +odb.exe --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) __file_entry__(test-odb.hxx) __file_entry__(test-odb.ixx) diff --git a/qt/common/template/template-qt5-vc10.vcxproj b/qt/common/template/template-qt5-vc10.vcxproj index 2e721ee..add071a 100644 --- a/qt/common/template/template-qt5-vc10.vcxproj +++ b/qt/common/template/template-qt5-vc10.vcxproj @@ -158,7 +158,7 @@ __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) diff --git a/qt/common/template/template-qt5-vc11.vcxproj b/qt/common/template/template-qt5-vc11.vcxproj index afcc020..2af597c 100644 --- a/qt/common/template/template-qt5-vc11.vcxproj +++ b/qt/common/template/template-qt5-vc11.vcxproj @@ -162,7 +162,7 @@ __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) diff --git a/qt/common/template/template-qt5-vc9.vcproj b/qt/common/template/template-qt5-vc9.vcproj index dab4913..57b4edc 100644 --- a/qt/common/template/template-qt5-vc9.vcproj +++ b/qt/common/template/template-qt5-vc9.vcproj @@ -348,7 +348,7 @@ __source_entries__(extra_sources) __file_entry_custom_build__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +odb.exe --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) __file_entry__(test-odb.hxx) __file_entry__(test-odb.ixx) -- cgit v1.1