From fc3fb39c90ab7fe5fccbe3f3bc0eb2645157bb96 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 13 Dec 2023 21:57:53 +0300 Subject: Switch to build2 --- qt/common/Makefile.am | 5 - qt/common/basic/makefile | 134 -------------------------- qt/common/basic/test.std | 0 qt/common/containers/basics/makefile | 134 -------------------------- qt/common/containers/basics/test.std | 0 qt/common/containers/change-tracking/makefile | 134 -------------------------- qt/common/containers/change-tracking/test.std | 0 qt/common/makefile | 61 ------------ qt/common/smart-ptr/makefile | 134 -------------------------- qt/common/smart-ptr/test.std | 0 qt/common/template/Makefile.am | 31 ------ qt/common/template/makefile | 134 -------------------------- qt/common/template/test.std | 0 qt/common/test.bat | 79 --------------- 14 files changed, 846 deletions(-) delete mode 100644 qt/common/Makefile.am delete mode 100644 qt/common/basic/makefile delete mode 100644 qt/common/basic/test.std delete mode 100644 qt/common/containers/basics/makefile delete mode 100644 qt/common/containers/basics/test.std delete mode 100644 qt/common/containers/change-tracking/makefile delete mode 100644 qt/common/containers/change-tracking/test.std delete mode 100644 qt/common/makefile delete mode 100644 qt/common/smart-ptr/makefile delete mode 100644 qt/common/smart-ptr/test.std delete mode 100644 qt/common/template/Makefile.am delete mode 100644 qt/common/template/makefile delete mode 100644 qt/common/template/test.std delete mode 100644 qt/common/test.bat (limited to 'qt/common') diff --git a/qt/common/Makefile.am b/qt/common/Makefile.am deleted file mode 100644 index 0093f76..0000000 --- a/qt/common/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# file : qt/common/Makefile.am -# license : GNU GPL v2; see accompanying LICENSE file - -SUBDIRS = __path__(dirs) -EXTRA_DIST = __file__(extra_dist) diff --git a/qt/common/basic/makefile b/qt/common/basic/makefile deleted file mode 100644 index 7b604a4..0000000 --- a/qt/common/basic/makefile +++ /dev/null @@ -1,134 +0,0 @@ -# file : qt/common/basic/makefile -# license : GNU GPL v2; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -cxx_tun := driver.cxx -odb_hdr := test.hxx -genf := $(call odb-gen,$(odb_hdr)) -gen := $(addprefix $(out_base)/,$(genf)) -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -common.l := $(out_root)/libcommon/common/common.l -common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options - -# Import. -# -$(call import,\ - $(scf_root)/import/odb/stub.make,\ - odb: odb,odb-rules: odb_rules) - -$(call import,\ - $(scf_root)/import/libodb-qt/stub.make,\ - l: odb_qt.l,cpp-options: odb_qt.l.cpp-options) - -$(call import,\ - $(scf_root)/import/libqt/core/stub.make,\ - l: qt_core.l,cpp-options: qt_core.l.cpp-options) - -# Build. -# -$(driver): $(cxx_obj) $(odb_qt.l) $(common.l) $(qt_core.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) -$(cxx_obj) $(cxx_od): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ -$(qt_core.l.cpp-options) - -$(gen): $(odb) -$(gen): odb := $(odb) -$(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) - -ifneq ($(db_id),common) -$(gen): odb_options += --database $(db_id) -else -$(gen): odb_options += --multi-database dynamic -endif - -$(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -name := $(subst /,-,$(subst $(src_root)/qt/common/,,$(src_base))) - -$(dist): sources := $(cxx_tun) -$(dist): headers := $(odb_hdr) -$(dist): data_dist := test.std -$(dist): export name := $(name) -$(dist): export extra_dist := $(data_dist) \ -$(call vc8projs,$(name)-qt4) \ -$(call vc9projs,$(name)-qt4) $(call vc9projs,$(name)-qt5) \ -$(call vc10projs,$(name)-qt4) $(call vc10projs,$(name)-qt5) \ -$(call vc11projs,$(name)-qt4) $(call vc11projs,$(name)-qt5) \ -$(call vc12projs,$(name)-qt4) $(call vc12projs,$(name)-qt5) -$(dist): - $(call dist-data,$(sources) $(headers) $(data_dist)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc8projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc9projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc9projs,../template/template-qt5,$(name)-qt5) - $(call meta-vc10projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc10projs,../template/template-qt5,$(name)-qt5) - $(call meta-vc11projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc12projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc11projs,../template/template-qt5,$(name)-qt5) - $(call meta-vc12projs,../template/template-qt5,$(name)-qt5) - -# Test. -# -ifneq ($(db_id),common) -$(eval $(call test-rule)) -else -$(foreach d,$(databases),$(eval $(call test-rule,$d))) -endif - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) \ - $(addsuffix .hxx.clean,$(filter %.cxx,$(gen))) - $(call message,,rm -f $(out_base)/test.out) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc8proj.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): odb_options += --std $(cxx_standard) -$(call include,$(odb_rules)) -endif - -$(call include,$(bld_root)/cxx/cxx-d.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/o-e.make) - -# Dependencies. -# -$(call import,$(src_root)/libcommon/makefile) diff --git a/qt/common/basic/test.std b/qt/common/basic/test.std deleted file mode 100644 index e69de29..0000000 diff --git a/qt/common/containers/basics/makefile b/qt/common/containers/basics/makefile deleted file mode 100644 index efc9da1..0000000 --- a/qt/common/containers/basics/makefile +++ /dev/null @@ -1,134 +0,0 @@ -# file : qt/common/containers/basics/makefile -# license : GNU GPL v2; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -cxx_tun := driver.cxx -odb_hdr := test.hxx -genf := $(call odb-gen,$(odb_hdr)) -gen := $(addprefix $(out_base)/,$(genf)) -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -common.l := $(out_root)/libcommon/common/common.l -common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options - -# Import. -# -$(call import,\ - $(scf_root)/import/odb/stub.make,\ - odb: odb,odb-rules: odb_rules) - -$(call import,\ - $(scf_root)/import/libodb-qt/stub.make,\ - l: odb_qt.l,cpp-options: odb_qt.l.cpp-options) - -$(call import,\ - $(scf_root)/import/libqt/core/stub.make,\ - l: qt_core.l,cpp-options: qt.l.cpp-options) - -# Build. -# -$(driver): $(cxx_obj) $(odb_qt.l) $(common.l) $(qt_core.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) -$(cxx_obj) $(cxx_od): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ -$(qt_core.l.cpp-options) - -$(gen): $(odb) -$(gen): odb := $(odb) -$(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) - -ifneq ($(db_id),common) -$(gen): odb_options += --database $(db_id) -else -$(gen): odb_options += --multi-database dynamic -endif - -$(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -name := $(subst /,-,$(subst $(src_root)/qt/common/,,$(src_base))) - -$(dist): sources := $(cxx_tun) -$(dist): headers := $(odb_hdr) -$(dist): data_dist := test.std -$(dist): export name := $(name) -$(dist): export extra_dist := $(data_dist) \ -$(call vc8projs,$(name)-qt4) \ -$(call vc9projs,$(name)-qt4) $(call vc9projs,$(name)-qt5) \ -$(call vc10projs,$(name)-qt4) $(call vc10projs,$(name)-qt5) \ -$(call vc11projs,$(name)-qt4) $(call vc11projs,$(name)-qt5) \ -$(call vc12projs,$(name)-qt4) $(call vc12projs,$(name)-qt5) -$(dist): - $(call dist-data,$(sources) $(headers) $(data_dist)) - $(call meta-automake,../../template/Makefile.am) - $(call meta-vc8projs,../../template/template-qt4,$(name)-qt4) - $(call meta-vc9projs,../../template/template-qt4,$(name)-qt4) - $(call meta-vc9projs,../../template/template-qt5,$(name)-qt5) - $(call meta-vc10projs,../../template/template-qt4,$(name)-qt4) - $(call meta-vc10projs,../../template/template-qt5,$(name)-qt5) - $(call meta-vc11projs,../../template/template-qt4,$(name)-qt4) - $(call meta-vc12projs,../../template/template-qt4,$(name)-qt4) - $(call meta-vc11projs,../../template/template-qt5,$(name)-qt5) - $(call meta-vc12projs,../../template/template-qt5,$(name)-qt5) - -# Test. -# -ifneq ($(db_id),common) -$(eval $(call test-rule)) -else -$(foreach d,$(databases),$(eval $(call test-rule,$d))) -endif - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) \ - $(addsuffix .hxx.clean,$(filter %.cxx,$(gen))) - $(call message,,rm -f $(out_base)/test.out) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc8proj.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): odb_options += --std $(cxx_standard) -$(call include,$(odb_rules)) -endif - -$(call include,$(bld_root)/cxx/cxx-d.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/o-e.make) - -# Dependencies. -# -$(call import,$(src_root)/libcommon/makefile) diff --git a/qt/common/containers/basics/test.std b/qt/common/containers/basics/test.std deleted file mode 100644 index e69de29..0000000 diff --git a/qt/common/containers/change-tracking/makefile b/qt/common/containers/change-tracking/makefile deleted file mode 100644 index 13864c5..0000000 --- a/qt/common/containers/change-tracking/makefile +++ /dev/null @@ -1,134 +0,0 @@ -# file : qt/common/containers/change-tracking/makefile -# license : GNU GPL v2; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -cxx_tun := driver.cxx -odb_hdr := test.hxx -genf := $(call odb-gen,$(odb_hdr)) -gen := $(addprefix $(out_base)/,$(genf)) -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -common.l := $(out_root)/libcommon/common/common.l -common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options - -# Import. -# -$(call import,\ - $(scf_root)/import/odb/stub.make,\ - odb: odb,odb-rules: odb_rules) - -$(call import,\ - $(scf_root)/import/libodb-qt/stub.make,\ - l: odb_qt.l,cpp-options: odb_qt.l.cpp-options) - -$(call import,\ - $(scf_root)/import/libqt/core/stub.make,\ - l: qt_core.l,cpp-options: qt.l.cpp-options) - -# Build. -# -$(driver): $(cxx_obj) $(odb_qt.l) $(common.l) $(qt_core.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) -$(cxx_obj) $(cxx_od): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ -$(qt_core.l.cpp-options) - -$(gen): $(odb) -$(gen): odb := $(odb) -$(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) - -ifneq ($(db_id),common) -$(gen): odb_options += --database $(db_id) -else -$(gen): odb_options += --multi-database dynamic -endif - -$(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -name := $(subst /,-,$(subst $(src_root)/qt/common/,,$(src_base))) - -$(dist): sources := $(cxx_tun) -$(dist): headers := $(odb_hdr) -$(dist): data_dist := test.std -$(dist): export name := $(name) -$(dist): export extra_dist := $(data_dist) \ -$(call vc8projs,$(name)-qt4) \ -$(call vc9projs,$(name)-qt4) $(call vc9projs,$(name)-qt5) \ -$(call vc10projs,$(name)-qt4) $(call vc10projs,$(name)-qt5) \ -$(call vc11projs,$(name)-qt4) $(call vc11projs,$(name)-qt5) \ -$(call vc12projs,$(name)-qt4) $(call vc12projs,$(name)-qt5) -$(dist): - $(call dist-data,$(sources) $(headers) $(data_dist)) - $(call meta-automake,../../template/Makefile.am) - $(call meta-vc8projs,../../template/template-qt4,$(name)-qt4) - $(call meta-vc9projs,../../template/template-qt4,$(name)-qt4) - $(call meta-vc9projs,../../template/template-qt5,$(name)-qt5) - $(call meta-vc10projs,../../template/template-qt4,$(name)-qt4) - $(call meta-vc10projs,../../template/template-qt5,$(name)-qt5) - $(call meta-vc11projs,../../template/template-qt4,$(name)-qt4) - $(call meta-vc12projs,../../template/template-qt4,$(name)-qt4) - $(call meta-vc11projs,../../template/template-qt5,$(name)-qt5) - $(call meta-vc12projs,../../template/template-qt5,$(name)-qt5) - -# Test. -# -ifneq ($(db_id),common) -$(eval $(call test-rule)) -else -$(foreach d,$(databases),$(eval $(call test-rule,$d))) -endif - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) \ - $(addsuffix .hxx.clean,$(filter %.cxx,$(gen))) - $(call message,,rm -f $(out_base)/test.out) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc8proj.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): odb_options += --std $(cxx_standard) -$(call include,$(odb_rules)) -endif - -$(call include,$(bld_root)/cxx/cxx-d.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/o-e.make) - -# Dependencies. -# -$(call import,$(src_root)/libcommon/makefile) diff --git a/qt/common/containers/change-tracking/test.std b/qt/common/containers/change-tracking/test.std deleted file mode 100644 index e69de29..0000000 diff --git a/qt/common/makefile b/qt/common/makefile deleted file mode 100644 index 874b374..0000000 --- a/qt/common/makefile +++ /dev/null @@ -1,61 +0,0 @@ -# file : qt/common/makefile -# license : GNU GPL; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -tests := \ -basic \ -containers/basics \ -containers/change-tracking \ -smart-ptr \ -template - -all_tests := $(tests) -build_tests := $(tests) - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests))) - -name := qt-common -$(dist): name := $(name) -$(dist): export dirs := $(tests) -$(dist): export extra_dist := test.bat \ -$(call vc9slns,$(name)-qt4) \ -$(call vc9slns,$(name)-qt4) $(call vc9slns,$(name)-qt5) \ -$(call vc10slns,$(name)-qt4) $(call vc10slns,$(name)-qt5) \ -$(call vc11slns,$(name)-qt4) $(call vc11slns,$(name)-qt5) \ -$(call vc12slns,$(name)-qt4) $(call vc12slns,$(name)-qt5) -$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) - $(call meta-automake) - $(call meta-vc8slns,$(name)-qt4,-qt4) - $(call meta-vc9slns,$(name)-qt4,-qt4) - $(call meta-vc9slns,$(name)-qt5,-qt5) - $(call meta-vc10slns,$(name)-qt4,-qt4) - $(call meta-vc10slns,$(name)-qt5,-qt5) - $(call meta-vc11slns,$(name)-qt4,-qt4) - $(call meta-vc11slns,$(name)-qt5,-qt5) - $(call meta-vc12slns,$(name)-qt4,-qt4) - $(call meta-vc12slns,$(name)-qt5,-qt5) - # Can't have Qt-version specific tests. - $(call meta-vctest,$(name)-qt4-mysql-vc10.sln,test.bat) - -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(build_tests))) - -ifeq ($(db_id),common) -$(foreach d,$(databases),$(eval $(call db-test-dir,$d,$(tests)))) -endif - -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(all_tests))) - -$(call include,$(bld_root)/meta/vc8sln.make) -$(call include,$(bld_root)/meta/vc9sln.make) -$(call include,$(bld_root)/meta/vc10sln.make) -$(call include,$(bld_root)/meta/vc11sln.make) -$(call include,$(bld_root)/meta/vc12sln.make) -$(call include,$(bld_root)/meta/vctest.make) -$(call include,$(bld_root)/meta/automake.make) - -ifneq ($(filter $(MAKECMDGOALS),dist clean),) -$(foreach t,$(all_tests),$(call import,$(src_base)/$t/makefile)) -else -$(foreach t,$(build_tests),$(call import,$(src_base)/$t/makefile)) -endif diff --git a/qt/common/smart-ptr/makefile b/qt/common/smart-ptr/makefile deleted file mode 100644 index c678001..0000000 --- a/qt/common/smart-ptr/makefile +++ /dev/null @@ -1,134 +0,0 @@ -# file : qt/common/smart-ptr/makefile -# license : GNU GPL v2; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -cxx_tun := driver.cxx -odb_hdr := test.hxx -genf := $(call odb-gen,$(odb_hdr)) -gen := $(addprefix $(out_base)/,$(genf)) -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -common.l := $(out_root)/libcommon/common/common.l -common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options - -# Import. -# -$(call import,\ - $(scf_root)/import/odb/stub.make,\ - odb: odb,odb-rules: odb_rules) - -$(call import,\ - $(scf_root)/import/libodb-qt/stub.make,\ - l: odb_qt.l,cpp-options: odb_qt.l.cpp-options) - -$(call import,\ - $(scf_root)/import/libqt/core/stub.make,\ - l: qt_core.l,cpp-options: qt.l.cpp-options) - -# Build. -# -$(driver): $(cxx_obj) $(odb_qt.l) $(common.l) $(qt_core.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) -DQWEAKPOINTER_ENABLE_ARROW -$(cxx_obj) $(cxx_od): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ -$(qt_core.l.cpp-options) - -$(gen): $(odb) -$(gen): odb := $(odb) -$(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) - -ifneq ($(db_id),common) -$(gen): odb_options += --database $(db_id) -else -$(gen): odb_options += --multi-database dynamic -endif - -$(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -name := $(subst /,-,$(subst $(src_root)/qt/common/,,$(src_base))) - -$(dist): sources := $(cxx_tun) -$(dist): headers := $(odb_hdr) -$(dist): data_dist := test.std -$(dist): export name := $(name) -$(dist): export extra_dist := $(data_dist) \ -$(call vc8projs,$(name)-qt4) \ -$(call vc9projs,$(name)-qt4) $(call vc9projs,$(name)-qt5) \ -$(call vc10projs,$(name)-qt4) $(call vc10projs,$(name)-qt5) \ -$(call vc11projs,$(name)-qt4) $(call vc11projs,$(name)-qt5) \ -$(call vc12projs,$(name)-qt4) $(call vc12projs,$(name)-qt5) -$(dist): - $(call dist-data,$(sources) $(headers) $(data_dist)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc8projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc9projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc9projs,../template/template-qt5,$(name)-qt5) - $(call meta-vc10projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc10projs,../template/template-qt5,$(name)-qt5) - $(call meta-vc11projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc12projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc11projs,../template/template-qt5,$(name)-qt5) - $(call meta-vc12projs,../template/template-qt5,$(name)-qt5) - -# Test. -# -ifneq ($(db_id),common) -$(eval $(call test-rule)) -else -$(foreach d,$(databases),$(eval $(call test-rule,$d))) -endif - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) \ - $(addsuffix .hxx.clean,$(filter %.cxx,$(gen))) - $(call message,,rm -f $(out_base)/test.out) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc8proj.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): odb_options += --std $(cxx_standard) -$(call include,$(odb_rules)) -endif - -$(call include,$(bld_root)/cxx/cxx-d.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/o-e.make) - -# Dependencies. -# -$(call import,$(src_root)/libcommon/makefile) diff --git a/qt/common/smart-ptr/test.std b/qt/common/smart-ptr/test.std deleted file mode 100644 index e69de29..0000000 diff --git a/qt/common/template/Makefile.am b/qt/common/template/Makefile.am deleted file mode 100644 index 75652f3..0000000 --- a/qt/common/template/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# file : qt/common/template/Makefile.am -# license : GNU GPL v2; see accompanying LICENSE file - -EXTRA_DIST = __file__(extra_dist) - -noinst_PROGRAMS = driver -driver_SOURCES = driver.cxx __path__(extra_sources) __path__(extra_headers) -LDADD = $(top_builddir)/libcommon/common/libcommon.la -AM_CPPFLAGS = -I'$(top_builddir)/libcommon' -I'$(top_srcdir)/libcommon' -AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' - -TESTS=$(top_builddir)/tester -TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; - -# ODB compilation. -# -driver_SOURCES += test.hxx -nodist_driver_SOURCES = test-odb.cxx -BUILT_SOURCES = test-odb.hxx -CLEANFILES = test-odb.hxx test-odb.ixx test-odb.cxx - -ODB = @ODB@ -ODBFLAGS = @ODBFLAGS@ -ODBCPPFLAGS = @ODBCPPFLAGS@ - -if HAVE_CXX11 -ODBFLAGS += --std c++11 -endif - -test-odb.hxx: test.hxx - $(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) --database @database@ __value__(odb_options) $< diff --git a/qt/common/template/makefile b/qt/common/template/makefile deleted file mode 100644 index afe6b53..0000000 --- a/qt/common/template/makefile +++ /dev/null @@ -1,134 +0,0 @@ -# file : qt/common/template/makefile -# license : GNU GPL v2; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -cxx_tun := driver.cxx -odb_hdr := test.hxx -genf := $(call odb-gen,$(odb_hdr)) -gen := $(addprefix $(out_base)/,$(genf)) -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -common.l := $(out_root)/libcommon/common/common.l -common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options - -# Import. -# -$(call import,\ - $(scf_root)/import/odb/stub.make,\ - odb: odb,odb-rules: odb_rules) - -$(call import,\ - $(scf_root)/import/libodb-qt/stub.make,\ - l: odb_qt.l,cpp-options: odb_qt.l.cpp-options) - -$(call import,\ - $(scf_root)/import/libqt/core/stub.make,\ - l: qt_core.l,cpp-options: qt_core.l.cpp-options) - -# Build. -# -$(driver): $(cxx_obj) $(odb_qt.l) $(common.l) $(qt_core.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) -$(cxx_obj) $(cxx_od): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ -$(qt_core.l.cpp-options) - -$(gen): $(odb) -$(gen): odb := $(odb) -$(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) - -ifneq ($(db_id),common) -$(gen): odb_options += --database $(db_id) -else -$(gen): odb_options += --multi-database dynamic -endif - -$(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -name := $(subst /,-,$(subst $(src_root)/qt/common/,,$(src_base))) - -$(dist): sources := $(cxx_tun) -$(dist): headers := $(odb_hdr) -$(dist): data_dist := test.std -$(dist): export name := $(name) -$(dist): export extra_dist := $(data_dist) \ -$(call vc8projs,$(name)-qt4) \ -$(call vc9projs,$(name)-qt4) $(call vc9projs,$(name)-qt5) \ -$(call vc10projs,$(name)-qt4) $(call vc10projs,$(name)-qt5) \ -$(call vc11projs,$(name)-qt4) $(call vc11projs,$(name)-qt5) \ -$(call vc12projs,$(name)-qt4) $(call vc12projs,$(name)-qt5) -$(dist): - $(call dist-data,$(sources) $(headers) $(data_dist)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc8projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc9projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc9projs,../template/template-qt5,$(name)-qt5) - $(call meta-vc10projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc10projs,../template/template-qt5,$(name)-qt5) - $(call meta-vc11projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc12projs,../template/template-qt4,$(name)-qt4) - $(call meta-vc11projs,../template/template-qt5,$(name)-qt5) - $(call meta-vc12projs,../template/template-qt5,$(name)-qt5) - -# Test. -# -ifneq ($(db_id),common) -$(eval $(call test-rule)) -else -$(foreach d,$(databases),$(eval $(call test-rule,$d))) -endif - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) \ - $(addsuffix .hxx.clean,$(filter %.cxx,$(gen))) - $(call message,,rm -f $(out_base)/test.out) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc8proj.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): odb_options += --std $(cxx_standard) -$(call include,$(odb_rules)) -endif - -$(call include,$(bld_root)/cxx/cxx-d.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/o-e.make) - -# Dependencies. -# -$(call import,$(src_root)/libcommon/makefile) diff --git a/qt/common/template/test.std b/qt/common/template/test.std deleted file mode 100644 index e69de29..0000000 diff --git a/qt/common/test.bat b/qt/common/test.bat deleted file mode 100644 index 100628f..0000000 --- a/qt/common/test.bat +++ /dev/null @@ -1,79 +0,0 @@ -@echo off -rem file : qt/common/test.bat -rem license : GNU GPL v2; see accompanying LICENSE file - -setlocal - -set "tests=__path__(dirs)" -set "confs=__path__(configurations)" -set "plats=__path__(platforms)" -set "curdir=%CD%" -set "topdir=%curdir%\..\.." -set "failed=" - -if "_%1_" == "__" ( - echo no database specified - goto usage -) - -goto start - -rem -rem %1 - test directory -rem %2 - configuration -rem %3 - platform -rem %4 - database -rem -:run_test - cd %1 - - if "_%3_" == "_Win32_" ( - set "dir=%2" - ) else ( - set "dir=%3\%2" - ) - - if exist %dir%\driver.exe ( - echo %1\%3\%2 - call %topdir%\tester.bat %4 %2 %3 - if errorlevel 1 ( - set "failed=%failed% %1\%3\%2" - ) - ) - - cd %curdir% -goto :eof - -:start - -for %%t in (%tests%) do ( - for %%c in (%confs%) do ( - for %%p in (%plats%) do ( - call :run_test %%t %%c %%p %1 - ) - ) -) - -if not "_%failed%_" == "__" goto error - -echo. -echo ALL TESTS PASSED -echo. -goto end - -:usage -echo. -echo usage: test.bat database -echo. - -:error -if not "_%failed%_" == "__" ( - echo. - for %%t in (%failed%) do echo FAILED: %%t - echo. -) -endlocal -exit /b 1 - -:end -endlocal -- cgit v1.1