From 14ab1176887a175cf52bceaeabc50ae6804ad27d Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 23 Jan 2025 18:18:35 +0100 Subject: [PATCH] Makefiles cleanup (#3410) --- config/Make.project.rules | 35 ++++++--- config/Make.rules | 5 +- config/Make.rules.Darwin | 13 +--- config/Make.rules.Linux | 74 +++++-------------- config/Make.tests.rules | 9 +-- cpp/Makefile | 12 +-- cpp/config/Make.rules | 7 +- cpp/test/DataStorm/api/Makefile.mk | 8 +- cpp/test/DataStorm/callbacks/Makefile.mk | 10 +-- cpp/test/DataStorm/config/Makefile.mk | 10 +-- cpp/test/DataStorm/events/Makefile.mk | 10 +-- cpp/test/DataStorm/partial/Makefile.mk | 10 +-- cpp/test/DataStorm/reliability/Makefile.mk | 10 +-- cpp/test/DataStorm/types/Makefile.mk | 10 +-- cpp/test/Glacier2/attack/Makefile.mk | 8 +- .../Glacier2/dynamicFiltering/Makefile.mk | 8 +- cpp/test/Glacier2/router/Makefile.mk | 8 +- cpp/test/Glacier2/sessionControl/Makefile.mk | 8 +- cpp/test/Glacier2/ssl/Makefile.mk | 6 +- cpp/test/Glacier2/staticFiltering/Makefile.mk | 8 +- cpp/test/Ice/adapterDeactivation/Makefile.mk | 4 +- cpp/test/Ice/background/Makefile.mk | 16 ++-- cpp/test/Ice/custom/Makefile.mk | 12 +-- cpp/test/Ice/defaultServant/Makefile.mk | 4 +- cpp/test/Ice/echo/Makefile.mk | 4 +- cpp/test/Ice/executor/Makefile.mk | 6 +- cpp/test/Ice/info/Makefile.mk | 6 +- cpp/test/Ice/invoke/Makefile.mk | 4 +- cpp/test/Ice/library/Makefile.mk | 18 ++--- cpp/test/Ice/location/Makefile.mk | 4 +- cpp/test/Ice/logger/Makefile.mk | 16 ++-- cpp/test/Ice/middleware/Makefile.mk | 4 +- cpp/test/Ice/objects/Makefile.mk | 8 +- cpp/test/Ice/operations/Makefile.mk | 8 +- cpp/test/Ice/optional/Makefile.mk | 6 +- cpp/test/Ice/plugin/Makefile.mk | 6 +- cpp/test/Ice/proxy/Makefile.mk | 4 +- cpp/test/Ice/retry/Makefile.mk | 4 +- cpp/test/Ice/servantLocator/Makefile.mk | 8 +- cpp/test/Ice/services/Makefile.mk | 4 +- cpp/test/Ice/slicing/exceptions/Makefile.mk | 10 +-- cpp/test/Ice/slicing/objects/Makefile.mk | 8 +- cpp/test/Ice/span/Makefile.mk | 4 +- cpp/test/Ice/stringConverter/Makefile.mk | 4 +- cpp/test/Ice/timeout/Makefile.mk | 4 +- cpp/test/IceBox/admin/Makefile.mk | 12 +-- cpp/test/IceBox/configuration/Makefile.mk | 12 +-- cpp/test/IceDiscovery/simple/Makefile.mk | 4 +- cpp/test/IceGrid/activation/Makefile.mk | 4 +- cpp/test/IceGrid/admin/Makefile.mk | 2 +- cpp/test/IceGrid/allocation/Makefile.mk | 10 +-- cpp/test/IceGrid/deployer/Makefile.mk | 14 ++-- cpp/test/IceGrid/noRestartUpdate/Makefile.mk | 14 ++-- cpp/test/IceGrid/replicaGroup/Makefile.mk | 18 ++--- cpp/test/IceGrid/replication/Makefile.mk | 4 +- cpp/test/IceGrid/session/Makefile.mk | 12 +-- cpp/test/IceGrid/simple/Makefile.mk | 4 +- cpp/test/IceGrid/update/Makefile.mk | 4 +- cpp/test/IceSSL/configuration/Makefile.mk | 16 ++-- cpp/test/IceStorm/federation/Makefile.mk | 12 +-- cpp/test/IceStorm/federation2/Makefile.mk | 12 +-- cpp/test/IceStorm/persistent/Makefile.mk | 8 +- cpp/test/IceStorm/rep1/Makefile.mk | 14 ++-- cpp/test/IceStorm/repgrid/Makefile.mk | 6 +- cpp/test/IceStorm/repstress/Makefile.mk | 14 ++-- cpp/test/IceStorm/single/Makefile.mk | 10 +-- cpp/test/IceStorm/stress/Makefile.mk | 10 +-- cpp/test/IceUtil/ctrlCHandler/Makefile.mk | 2 +- cpp/test/Slice/escape/Makefile.mk | 4 +- cpp/test/Slice/parser/Makefile.mk | 4 +- php/test/Slice/escape/Makefile.mk | 2 +- 71 files changed, 314 insertions(+), 359 deletions(-) diff --git a/config/Make.project.rules b/config/Make.project.rules index e0a1d898da1..06ecea144fe 100644 --- a/config/Make.project.rules +++ b/config/Make.project.rules @@ -1,20 +1,35 @@ # Copyright (c) ZeroC, Inc. +# $(call project,[$1=]) # -# $(call project,[$1]) -# -# Returns the project name, $(top_srcdir) is removed from the begining -# of the path so for example ./src/Ice is transformed to src/Ice. +# Returns the project name by removing the lang-specific directory prefix. +# For example, ./src/Ice becomes src/Ice, and ./test/Ice/ami becomes test/Ice/ami. # +# $1 is the project path. If $1 is not provided, the current directory is used. project = $(patsubst $(lang_srcdir)/%,%,$(if $1,$1,$(currentdir))) -# # The platforms, configs and languages to build. -# -platforms = $(filter-out $(SKIP),$(if $(filter all,$(PLATFORMS)),$(supported-platforms),$(filter $(supported-platforms),$(PLATFORMS)))) -configs = $(filter-out $(SKIP),$(if $(filter all,$(CONFIGS)),$(supported-configs),$(filter $(supported-configs),$(CONFIGS)))) -languages = $(filter-out $(SKIP),$(if $(filter all,$(or $(LANGUAGES),all)),$(supported-languages),$(filter $(supported-languages),$(LANGUAGES)))) -build-platform := $(or $(build-platform),$(firstword $(supported-platforms))) + +# Define the platforms to build, excluding those listed in SKIP. +# If PLATFORMS is set to 'all', include all supported platforms from supported-platforms. +# Otherwise, include only the platforms in PLATFORMS that are also in supported-platforms. +platforms = $(filter-out $(SKIP),\ + $(if $(filter all,$(PLATFORMS)),$(supported-platforms),$(filter $(supported-platforms),$(PLATFORMS)))) + +# Define the configurations to build, excluding those listed in SKIP. +# If CONFIGS is set to 'all', include all supported configurations from supported-configs. +# Otherwise, include only the configurations in CONFIGS that are also in supported-configs. +configs = $(filter-out $(SKIP), \ + $(if $(filter all,$(CONFIGS)),$(supported-configs),$(filter $(supported-configs),$(CONFIGS)))) + +# Define the languages to build, excluding those listed in SKIP. +# If LANGUAGES is set to 'all', include all supported languages from supported-languages. +# Otherwise, include only the languages in LANGUAGES that are also in supported-languages. +languages = $(filter-out $(SKIP),\ + $(if $(filter all,$(or $(LANGUAGES),all)),$(supported-languages),$(filter $(supported-languages),$(LANGUAGES)))) + +# The platform the build is running on, if not set default to the first supported platform. +build-platform := $(or $(build-platform),$(firstword $(supported-platforms))) # # The list of platforms to build for the given component. We iterate over the platform diff --git a/config/Make.rules b/config/Make.rules index 20ea5f93033..361f9c60539 100644 --- a/config/Make.rules +++ b/config/Make.rules @@ -1,9 +1,6 @@ # Copyright (c) ZeroC, Inc. -# -# Select an installation base directory. The directory will be created -# if it does not exist. -# +# Select an installation base directory. The directory will be created if it does not exist. prefix ?= /opt/Ice-$(version) # diff --git a/config/Make.rules.Darwin b/config/Make.rules.Darwin index d9c32cc68eb..dc81aa794a0 100644 --- a/config/Make.rules.Darwin +++ b/config/Make.rules.Darwin @@ -45,8 +45,10 @@ mcpp_ldflags := $(MCPP_HOME)/lib/libmcpp.a cppflags = -fvisibility=hidden -Wall -Wextra -Wshadow -Wshadow-all -Wredundant-decls -Wno-shadow-field \ -Wdeprecated -Wstrict-prototypes -Werror -Wconversion -Wdocumentation -Wno-shadow-uncaptured-local \ -Wreorder-init-list -pthread \ - $(if $(filter yes,$(OPTIMIZE)),-O2 -DNDEBUG,-g) + $(if $(filter yes,$(OPTIMIZE)),-O2 -DNDEBUG,-g) \ + -std=c++20 +# TODO review this setting ifeq ($(MAXWARN),yes) cppflags += -Wweak-vtables endif @@ -55,15 +57,6 @@ endif static_objdir = obj shared_objdir = obj -clang_version = $(shell clang -dumpversion 2>&1 | cut -f1 -d\.) - -# We use -std=c++20 with clang 15.0 and later. -ifeq ($(shell test $(clang_version) -ge 15 && echo yes),yes) - cppflags += -std=c++20 -else - cppflags += -std=c++17 -endif - nodeprecatedwarnings-cppflags := -Wno-deprecated-declarations nounusedparameter-cppflags := -Wno-unused-parameter diff --git a/config/Make.rules.Linux b/config/Make.rules.Linux index 1558daf5ad5..ed0d78c2dbb 100644 --- a/config/Make.rules.Linux +++ b/config/Make.rules.Linux @@ -1,31 +1,17 @@ # Copyright (c) ZeroC, Inc. -known_distributions := centos rhel fedora debian ubuntu amzn sles -linux_ids := $(if $(wildcard /etc/os-release),$(shell . /etc/os-release && echo $${ID} $${ID_LIKE}),) -linux_id ?= $(word 1,$(or $(filter $(known_distributions),$(linux_ids)),$(linux_ids))) -is-bin-program = $(and $(filter $(bindir)%,$($4_targetdir)),$(filter $($1_target),program)) - -ifneq ($(OECORE_SDK_VERSION),) -linux_id = yocto -endif - -ifneq ($(filter yocto poky,$(linux_id)),) +known_distributions := centos rhel fedora debian ubuntu -build-platform = default -supported-platforms = $(build-platform) +# Assign the linux_ids from the ID and ID_LIKE variables in /etc/os-release if available. +linux_ids := $(if $(wildcard /etc/os-release),$(shell . /etc/os-release && echo $${ID} $${ID_LIKE}),) -$(build-platform)_cc = $(CC) -$(build-platform)_cxx = $(CXX) -$(build-platform)_cppflags = -Wno-psabi -$(build-platform)_libtool = $(AR) -$(build-platform)_targetdir = $(if $(filter %/build,$5),/$(build-platform)) -$(build-platform)_installdir = -$(build-platform)_objdir = +# Assign the linux_id to the first known distribution in the linux_ids list, or for unknown distributions to the first +# element in the linux_ids list. +linux_id ?= $(firstword $(or $(filter $(known_distributions),$(linux_ids)),$(linux_ids))) -# system install directory -system-install-dir := $(OECORE_TARGET_SYSROOT)/usr +is-bin-program = $(and $(filter $(bindir)%,$($4_targetdir)),$(filter $($1_target),program)) -else ifneq ($(and $(filter centos rhel fedora,$(linux_id)),$(filter x86_64 i%86,$(shell uname -m))),) +ifneq ($(and $(filter centos rhel fedora,$(linux_id)),$(filter x86_64 i%86,$(shell uname -m))),) # # MultiLib Linux (x64 libraries go in the lib64 directory, x86 executable names are suffixed with 32) @@ -64,10 +50,8 @@ x86_excludes = slice2% else ifneq ($(filter debian ubuntu,$(linux_id)),) -# -# MultiArch Linux (libraries are installed in lib/, executables are installed in bin/ -# except for the build architecture where executables are installed in bin/). -# +# MultiArch Linux (libraries are installed in lib/, executables are installed in bin/ except for the build +# architecture where executables are installed in bin/). build-platform ?= $(shell dpkg --print-architecture) foreign-platforms ?= $(shell dpkg --print-foreign-architectures) @@ -113,12 +97,8 @@ else # ifeq ($(OPTIMIZE),yes) # Use default system packaging flags if building with OPTIMIZE and CXXFLAGS/LDFLAGS aren't defined. - ifneq ($(filter amzn sles,$(linux_id)),) - opt-cppflags = $(if $(CXXFLAGS),,$(shell setarch $1 rpm --eval %optflags)) - opt-ldflags = $(if $(LDFLAGS),,$(shell setarch $1 rpm --eval %?__global_ldflags)) - else - opt-cppflags = $(if $(CXXFLAGS),,-O2) - endif + opt-cppflags = $(if $(CXXFLAGS),,$(shell setarch $1 rpm --eval %optflags)) + opt-ldflags = $(if $(LDFLAGS),,$(shell setarch $1 rpm --eval %?__global_ldflags)) endif build-platform = $(if $(filter arm%,$(shell uname -m)),arm,$(shell uname -m)) @@ -136,7 +116,7 @@ rpath-link-ldflag = -Wl,-rpath-link,$1 make-rpath-link-ldflags = $(foreach d,$(filter-out $2,$(call get-all-deps,$1)),$(call rpath-link-ldflag,$($d_targetdir))) # If building objects for a shared library build, add -fPIC or -fPIE. -# gcc in most Linux distribution is configued with --enable-default-pie, which is equivalent to auto-adding -fPIE -pie: +# gcc in most Linux distribution is configured with --enable-default-pie, which is equivalent to auto-adding -fPIE -pie: # https://gcc.gnu.org/install/configure.html # We pass these options explicitly in case the gcc we use is not configured with --enable-default-pie. shared_cppflags = $(if $(filter-out program,$($1_target)),-fPIC,-fPIE) @@ -160,8 +140,6 @@ cppflags = -fvisibility=hidden -Wall -Wextra -Wredundant-decls -Wshadow - $(if $(filter yes,$(OPTIMIZE)),-DNDEBUG,-g) ldflags = -pthread -gcc_version = $(shell $(CXX) -dumpversion 2>&1 | cut -f1 -d\.) - # As of GCC 13.4, https://gcc.gnu.org/projects/cxx-status.html#cxx20 still describes C++20 support as "experimental". cppflags += -std=c++17 @@ -186,35 +164,19 @@ mkshlibname = lib$(1).so # Clear the iconv ldflags, iconv is part of libc on Linux iconv_ldflags := -# -# With GCC < 6.1, libbacktrace crash with a SEGV for -pie exes linked with debug-stripped libs -# See https://gcc.gnu.org/ml/gcc-patches/2016-03/msg00132.html -# Here we assume only release builds occasionally get -g and later get stripped -# TODO: enable libbacktrace for release builds with GCC >= 6.1 -ifneq ($(OPTIMIZE),yes) -libbacktrace_fullpath := $(shell $(CXX) --print-file-name=libbacktrace.a) -ifneq ($(libbacktrace_fullpath),libbacktrace.a) - libbacktrace = yes -endif -endif - -IceUtil_system_libs = -lrt $(if $(filter yes,$(libbacktrace)),-lbacktrace) +IceUtil_system_libs = -lrt -lbacktrace Ice_system_libs = -ldl -lssl -lcrypto $(IceUtil_system_libs) ifeq ($(shell pkg-config --exists libsystemd 2> /dev/null && echo yes),yes) Ice_system_libs += $(shell pkg-config --libs libsystemd) endif + Glacier2CryptPermissionsVerifier_system_libs = -lcrypt icegridadmin_system_libs = -ledit icestormadmin_system_libs = -ledit -# -# On supported platforms and if Bluez and DBus are installed, we set the IceBT -# system libraries. The build system checks for this variable to build or not -# the IceBT plugin, demos, ... -# -ifneq ($(filter debian ubuntu yocto poky,$(linux_id)),) +# If BlueZ and DBus are installed, set the IceBT system libraries. +# The build system uses this variable to determine whether or not to build the IceBT targets. ifeq ($(shell pkg-config --exists bluez dbus-1 2> /dev/null && echo yes),yes) -IceBT_system_libs = $(shell pkg-config --libs dbus-1) -endif +IceBT_system_libs = $(shell pkg-config --libs dbus-1) endif diff --git a/config/Make.tests.rules b/config/Make.tests.rules index 3f71cbb47b6..5fc49232a02 100644 --- a/config/Make.tests.rules +++ b/config/Make.tests.rules @@ -1,12 +1,5 @@ # Copyright (c) ZeroC, Inc. -# -# $(call test,[$1]) -# -# Returns the test project name (./test/Ice/operations -> test/Ice/operations) -# -test = $(patsubst $(lang_srcdir)/%,%,$(if $1,$1,$(currentdir))) - # # $(call test-sources,$1=sources,$2=dir,$3=main-src extra-srcs) # @@ -83,7 +76,7 @@ endef # Returns the tests which don't have a Makefile.mk fragment specified # tests-without-project-makefile = $(foreach d,$(patsubst %/Client.$1,%,$(shell find $(lang_srcdir)/test -name Client.$1)),\ - $(if $(wildcard $d/Makefile.mk),,$(call test,$d))) + $(if $(wildcard $d/Makefile.mk),,$(call project,$d))) # # The tests variable is used to load tests in Makefile.mk fragments diff --git a/cpp/Makefile b/cpp/Makefile index 56b91876a96..36a2959a2a4 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -11,14 +11,14 @@ include $(lang_srcdir)/config/Make.rules # that other projects might depend on so it's important to parse them first for the # generated headers variable to be defined when we load other projects. # -load_first = Ice IceBox Glacier2Lib IceGridLib IceStormLib +load_first = Ice IceBox Glacier2Lib IceGridLib IceStormLib DataStorm -# -# Create projects for all the Slice translators from src/slice2* and load source projects. -# projects := -$(foreach t,$(wildcard $(lang_srcdir)/src/slice2*),$(eval $(call create-translator-project,$(call project,$t)))) -$(eval $(call create-translator-project,$(call project,$(lang_srcdir)/src/ice2slice))) + +# Create projects for all the Slice translators from src/slice2* and src/ice2slice. +slice_translators := $(wildcard $(lang_srcdir)/src/slice2*) $(lang_srcdir)/src/ice2slice +$(foreach t, $(slice_translators), $(eval $(call create-translator-project,$(call project,$t)))) + include $(foreach p,$(load_first),src/$p/Makefile.mk) include $(filter-out $(foreach p,$(load_first),%/src/$p/Makefile.mk),$(shell find $(lang_srcdir)/src -name Makefile.mk)) $(call make-projects,$(projects),make-cpp-src-project,,$(filter all cpp,$(ICE_BIN_DIST))) diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index eb489c5ae8a..58ecae9c723 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -1,9 +1,5 @@ # Copyright (c) ZeroC, Inc. -# ---------------------------------------------------------------------- -# Don't change anything below this line! -# ---------------------------------------------------------------------- - # # Supported configurations # @@ -58,8 +54,7 @@ static_projects = test/Common \ static_excludes = test/Ice/library test/Ice/plugin # -# If building on a Linux multilib platform, we restrict what we build for -# the 32-bits architecture. +# If building on a Linux multilib platform, we restrict what we build for the 32-bits architecture. # ifeq ($(multilib-platform),yes) x86_components = $(coreandstub_components) IceDB IceStormService icebox diff --git a/cpp/test/DataStorm/api/Makefile.mk b/cpp/test/DataStorm/api/Makefile.mk index 66314c2567e..6e3ddedad54 100644 --- a/cpp/test/DataStorm/api/Makefile.mk +++ b/cpp/test/DataStorm/api/Makefile.mk @@ -1,8 +1,8 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = writer -$(test)_dependencies = DataStorm Ice TestCommon +$(project)_programs = writer +$(project)_dependencies = DataStorm Ice TestCommon -$(test)_writer_sources = Writer.cpp DuplicateSymbols.cpp Test.ice +$(project)_writer_sources = Writer.cpp DuplicateSymbols.cpp Test.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/DataStorm/callbacks/Makefile.mk b/cpp/test/DataStorm/callbacks/Makefile.mk index 088f9f9d41b..c1b13e5b795 100644 --- a/cpp/test/DataStorm/callbacks/Makefile.mk +++ b/cpp/test/DataStorm/callbacks/Makefile.mk @@ -1,9 +1,9 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = reader writer -$(test)_dependencies = DataStorm Ice TestCommon +$(project)_programs = reader writer +$(project)_dependencies = DataStorm Ice TestCommon -$(test)_reader_sources = Reader.cpp -$(test)_writer_sources = Writer.cpp +$(project)_reader_sources = Reader.cpp +$(project)_writer_sources = Writer.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/DataStorm/config/Makefile.mk b/cpp/test/DataStorm/config/Makefile.mk index 088f9f9d41b..6c476d9f98b 100644 --- a/cpp/test/DataStorm/config/Makefile.mk +++ b/cpp/test/DataStorm/config/Makefile.mk @@ -1,9 +1,9 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = reader writer -$(test)_dependencies = DataStorm Ice TestCommon +$(project)_programs = reader writer +$(project)_dependencies = DataStorm Ice TestCommon -$(test)_reader_sources = Reader.cpp -$(test)_writer_sources = Writer.cpp +$(project)_reader_sources = Reader.cpp +$(project)_writer_sources = Writer.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/DataStorm/events/Makefile.mk b/cpp/test/DataStorm/events/Makefile.mk index 6fb13a68791..c61d2734e78 100644 --- a/cpp/test/DataStorm/events/Makefile.mk +++ b/cpp/test/DataStorm/events/Makefile.mk @@ -1,9 +1,9 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = reader writer -$(test)_dependencies = DataStorm Ice TestCommon +$(project)_programs = reader writer +$(project)_dependencies = DataStorm Ice TestCommon -$(test)_reader_sources = Reader.cpp Test.ice -$(test)_writer_sources = Writer.cpp Test.ice +$(project)_reader_sources = Reader.cpp Test.ice +$(project)_writer_sources = Writer.cpp Test.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/DataStorm/partial/Makefile.mk b/cpp/test/DataStorm/partial/Makefile.mk index 6fb13a68791..c61d2734e78 100644 --- a/cpp/test/DataStorm/partial/Makefile.mk +++ b/cpp/test/DataStorm/partial/Makefile.mk @@ -1,9 +1,9 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = reader writer -$(test)_dependencies = DataStorm Ice TestCommon +$(project)_programs = reader writer +$(project)_dependencies = DataStorm Ice TestCommon -$(test)_reader_sources = Reader.cpp Test.ice -$(test)_writer_sources = Writer.cpp Test.ice +$(project)_reader_sources = Reader.cpp Test.ice +$(project)_writer_sources = Writer.cpp Test.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/DataStorm/reliability/Makefile.mk b/cpp/test/DataStorm/reliability/Makefile.mk index 088f9f9d41b..6c476d9f98b 100644 --- a/cpp/test/DataStorm/reliability/Makefile.mk +++ b/cpp/test/DataStorm/reliability/Makefile.mk @@ -1,9 +1,9 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = reader writer -$(test)_dependencies = DataStorm Ice TestCommon +$(project)_programs = reader writer +$(project)_dependencies = DataStorm Ice TestCommon -$(test)_reader_sources = Reader.cpp -$(test)_writer_sources = Writer.cpp +$(project)_reader_sources = Reader.cpp +$(project)_writer_sources = Writer.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/DataStorm/types/Makefile.mk b/cpp/test/DataStorm/types/Makefile.mk index 6fb13a68791..c61d2734e78 100644 --- a/cpp/test/DataStorm/types/Makefile.mk +++ b/cpp/test/DataStorm/types/Makefile.mk @@ -1,9 +1,9 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = reader writer -$(test)_dependencies = DataStorm Ice TestCommon +$(project)_programs = reader writer +$(project)_dependencies = DataStorm Ice TestCommon -$(test)_reader_sources = Reader.cpp Test.ice -$(test)_writer_sources = Writer.cpp Test.ice +$(project)_reader_sources = Reader.cpp Test.ice +$(project)_writer_sources = Writer.cpp Test.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/Glacier2/attack/Makefile.mk b/cpp/test/Glacier2/attack/Makefile.mk index adbad803c0c..31de99a1265 100644 --- a/cpp/test/Glacier2/attack/Makefile.mk +++ b/cpp/test/Glacier2/attack/Makefile.mk @@ -1,8 +1,8 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = Client.cpp BackendI.cpp Backend.ice -$(test)_client_dependencies = Glacier2 +$(project)_client_sources = Client.cpp BackendI.cpp Backend.ice +$(project)_client_dependencies = Glacier2 -$(test)_server_sources = Server.cpp BackendI.cpp Backend.ice +$(project)_server_sources = Server.cpp BackendI.cpp Backend.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/Glacier2/dynamicFiltering/Makefile.mk b/cpp/test/Glacier2/dynamicFiltering/Makefile.mk index 8e9642f4820..194091ecb32 100644 --- a/cpp/test/Glacier2/dynamicFiltering/Makefile.mk +++ b/cpp/test/Glacier2/dynamicFiltering/Makefile.mk @@ -1,9 +1,9 @@ # Copyright (c) ZeroC, Inc. -$(test)_dependencies = Glacier2 Ice TestCommon +$(project)_dependencies = Glacier2 Ice TestCommon -$(test)_client_sources = Client.cpp Test.ice +$(project)_client_sources = Client.cpp Test.ice -$(test)_server_sources = Server.cpp TestControllerI.cpp BackendI.cpp SessionI.cpp Test.ice +$(project)_server_sources = Server.cpp TestControllerI.cpp BackendI.cpp SessionI.cpp Test.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/Glacier2/router/Makefile.mk b/cpp/test/Glacier2/router/Makefile.mk index 6245606f6c3..332a19ce8ef 100644 --- a/cpp/test/Glacier2/router/Makefile.mk +++ b/cpp/test/Glacier2/router/Makefile.mk @@ -1,8 +1,8 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = Client.cpp CallbackI.cpp Callback.ice -$(test)_client_dependencies = Glacier2 +$(project)_client_sources = Client.cpp CallbackI.cpp Callback.ice +$(project)_client_dependencies = Glacier2 -$(test)_server_sources = Server.cpp CallbackI.cpp Callback.ice +$(project)_server_sources = Server.cpp CallbackI.cpp Callback.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/Glacier2/sessionControl/Makefile.mk b/cpp/test/Glacier2/sessionControl/Makefile.mk index 13bea731d0d..73e6ef0caa5 100644 --- a/cpp/test/Glacier2/sessionControl/Makefile.mk +++ b/cpp/test/Glacier2/sessionControl/Makefile.mk @@ -1,9 +1,9 @@ # Copyright (c) ZeroC, Inc. -$(test)_dependencies = Glacier2 Ice TestCommon +$(project)_dependencies = Glacier2 Ice TestCommon -$(test)_client_sources = Client.cpp Session.ice +$(project)_client_sources = Client.cpp Session.ice -$(test)_server_sources = Server.cpp SessionI.cpp Session.ice +$(project)_server_sources = Server.cpp SessionI.cpp Session.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/Glacier2/ssl/Makefile.mk b/cpp/test/Glacier2/ssl/Makefile.mk index b1ec34cf04f..11e6e08d93a 100644 --- a/cpp/test/Glacier2/ssl/Makefile.mk +++ b/cpp/test/Glacier2/ssl/Makefile.mk @@ -1,6 +1,6 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_dependencies = Glacier2 -$(test)_server_dependencies = Glacier2 +$(project)_client_dependencies = Glacier2 +$(project)_server_dependencies = Glacier2 -tests += $(test) +tests += $(project) diff --git a/cpp/test/Glacier2/staticFiltering/Makefile.mk b/cpp/test/Glacier2/staticFiltering/Makefile.mk index adbad803c0c..31de99a1265 100644 --- a/cpp/test/Glacier2/staticFiltering/Makefile.mk +++ b/cpp/test/Glacier2/staticFiltering/Makefile.mk @@ -1,8 +1,8 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = Client.cpp BackendI.cpp Backend.ice -$(test)_client_dependencies = Glacier2 +$(project)_client_sources = Client.cpp BackendI.cpp Backend.ice +$(project)_client_dependencies = Glacier2 -$(test)_server_sources = Server.cpp BackendI.cpp Backend.ice +$(project)_server_sources = Server.cpp BackendI.cpp Backend.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/adapterDeactivation/Makefile.mk b/cpp/test/Ice/adapterDeactivation/Makefile.mk index 88150944c9b..5ff98bb7ffe 100644 --- a/cpp/test/Ice/adapterDeactivation/Makefile.mk +++ b/cpp/test/Ice/adapterDeactivation/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_server_sources = Server.cpp TestI.cpp Test.ice ServantLocatorI.cpp +$(project)_server_sources = Server.cpp TestI.cpp Test.ice ServantLocatorI.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/background/Makefile.mk b/cpp/test/Ice/background/Makefile.mk index c21196e3026..1184cded78a 100644 --- a/cpp/test/Ice/background/Makefile.mk +++ b/cpp/test/Ice/background/Makefile.mk @@ -1,15 +1,15 @@ # Copyright (c) ZeroC, Inc. -$(test)_libraries := $(test)_TestTransport -$(test)_cppflags := -I$(srcdir) +$(project)_libraries := $(project)_TestTransport +$(project)_cppflags := -I$(srcdir) -$(test)_client_sources = Client.cpp AllTests.cpp -$(test)_client_dependencies := $(test)_TestTransport +$(project)_client_sources = Client.cpp AllTests.cpp +$(project)_client_dependencies := $(project)_TestTransport -$(test)_server_sources = Server.cpp TestI.cpp -$(test)_server_dependencies := $(test)_TestTransport +$(project)_server_sources = Server.cpp TestI.cpp +$(project)_server_dependencies := $(project)_TestTransport -$(test)_TestTransport_sources = Test.ice \ +$(project)_TestTransport_sources = Test.ice \ Configuration.cpp \ Connector.cpp \ Acceptor.cpp \ @@ -18,4 +18,4 @@ $(test)_TestTransport_sources = Test.ice \ EndpointFactory.cpp \ PluginI.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/custom/Makefile.mk b/cpp/test/Ice/custom/Makefile.mk index 88bef57ab20..9a8002192db 100644 --- a/cpp/test/Ice/custom/Makefile.mk +++ b/cpp/test/Ice/custom/Makefile.mk @@ -1,13 +1,13 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = Client.cpp \ +$(project)_client_sources = Client.cpp \ AllTests.cpp \ Test.ice \ Wstring.ice \ MyByteSeq.cpp \ StringConverterI.cpp -$(test)_server_sources = Server.cpp \ +$(project)_server_sources = Server.cpp \ TestI.cpp \ WstringI.cpp \ Test.ice \ @@ -15,7 +15,7 @@ $(test)_server_sources = Server.cpp \ MyByteSeq.cpp \ StringConverterI.cpp -$(test)_serveramd_sources = ServerAMD.cpp \ +$(project)_serveramd_sources = ServerAMD.cpp \ TestAMDI.cpp \ WstringAMDI.cpp \ TestAMD.ice \ @@ -26,13 +26,13 @@ $(test)_serveramd_sources = ServerAMD.cpp \ # Extra -I because we include in the generated code. # ICE_UNALIGNED means enable unaligned decoding for integral types such as int32_t. It requires a little endian CPU. # TODO: should be turn on ICE_UNALIGNED only on some platforms? -$(test)_cppflags := -I$(project) -DICE_UNALIGNED +$(project)_cppflags := -I$(project) -DICE_UNALIGNED # # Disable var tracking assignments for Linux with this test # ifneq ($(linux_id),) - $(test)_cppflags += $(if $(filter yes,$(OPTIMIZE)),-fno-var-tracking-assignments) + $(project)_cppflags += $(if $(filter yes,$(OPTIMIZE)),-fno-var-tracking-assignments) endif -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/defaultServant/Makefile.mk b/cpp/test/Ice/defaultServant/Makefile.mk index b62e661f092..194822ba07a 100644 --- a/cpp/test/Ice/defaultServant/Makefile.mk +++ b/cpp/test/Ice/defaultServant/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = Client.cpp AllTests.cpp Test.ice TestI.cpp +$(project)_client_sources = Client.cpp AllTests.cpp Test.ice TestI.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/echo/Makefile.mk b/cpp/test/Ice/echo/Makefile.mk index c6d16e1ff11..086ff4dbeaf 100644 --- a/cpp/test/Ice/echo/Makefile.mk +++ b/cpp/test/Ice/echo/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_server_sources = Test.ice BlobjectI.cpp Server.cpp +$(project)_server_sources = Test.ice BlobjectI.cpp Server.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/executor/Makefile.mk b/cpp/test/Ice/executor/Makefile.mk index a10899d5e88..28e13c7024f 100644 --- a/cpp/test/Ice/executor/Makefile.mk +++ b/cpp/test/Ice/executor/Makefile.mk @@ -1,6 +1,6 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = $(test-client-sources) Executor.cpp -$(test)_server_sources = $(test-server-sources) Executor.cpp +$(project)_client_sources = $(test-client-sources) Executor.cpp +$(project)_server_sources = $(test-server-sources) Executor.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/info/Makefile.mk b/cpp/test/Ice/info/Makefile.mk index 83ceec4c562..d086e3febe6 100644 --- a/cpp/test/Ice/info/Makefile.mk +++ b/cpp/test/Ice/info/Makefile.mk @@ -1,6 +1,6 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = Test.ice TestI.cpp Client.cpp AllTests.cpp -$(test)_dependencies = TestCommon Ice +$(project)_client_sources = Test.ice TestI.cpp Client.cpp AllTests.cpp +$(project)_dependencies = TestCommon Ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/invoke/Makefile.mk b/cpp/test/Ice/invoke/Makefile.mk index 3e7c19bbcb8..8b8c13538ad 100644 --- a/cpp/test/Ice/invoke/Makefile.mk +++ b/cpp/test/Ice/invoke/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_server_sources = Server.cpp Test.ice BlobjectI.cpp +$(project)_server_sources = Server.cpp Test.ice BlobjectI.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/library/Makefile.mk b/cpp/test/Ice/library/Makefile.mk index d5b0b65164b..00c9ab29abc 100644 --- a/cpp/test/Ice/library/Makefile.mk +++ b/cpp/test/Ice/library/Makefile.mk @@ -1,16 +1,16 @@ # Copyright (c) ZeroC, Inc. -$(test)_libraries := $(test)_GenCode $(test)_Consumer $(test)_AllTests +$(project)_libraries := $(project)_GenCode $(project)_Consumer $(project)_AllTests -$(test)_GenCode_sources := Test.ice +$(project)_GenCode_sources := Test.ice -$(test)_Consumer_sources := Consumer.cpp -$(test)_Consumer_dependencies := $(test)_GenCode +$(project)_Consumer_sources := Consumer.cpp +$(project)_Consumer_dependencies := $(project)_GenCode -$(test)_AllTests_sources := AllTests.cpp -$(test)_AllTests_dependencies := $(test)_GenCode $(test)_Consumer +$(project)_AllTests_sources := AllTests.cpp +$(project)_AllTests_dependencies := $(project)_GenCode $(project)_Consumer -$(test)_client_sources := Client.cpp -$(test)_client_dependencies := $(test)_AllTests +$(project)_client_sources := Client.cpp +$(project)_client_dependencies := $(project)_AllTests -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/location/Makefile.mk b/cpp/test/Ice/location/Makefile.mk index f4a761d9200..dcd1fa9dbdd 100644 --- a/cpp/test/Ice/location/Makefile.mk +++ b/cpp/test/Ice/location/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_server_sources = $(test-server-sources) ServerLocator.cpp +$(project)_server_sources = $(test-server-sources) ServerLocator.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/logger/Makefile.mk b/cpp/test/Ice/logger/Makefile.mk index 9bc934cfa40..9a7ca503f07 100644 --- a/cpp/test/Ice/logger/Makefile.mk +++ b/cpp/test/Ice/logger/Makefile.mk @@ -1,12 +1,12 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = client1 client2 client3 client4 client5 -$(test)_libs = iconv +$(project)_programs = client1 client2 client3 client4 client5 +$(project)_libs = iconv -$(test)_client1_sources = Client1.cpp -$(test)_client2_sources = Client2.cpp -$(test)_client3_sources = Client3.cpp -$(test)_client4_sources = Client4.cpp -$(test)_client5_sources = Client5.cpp +$(project)_client1_sources = Client1.cpp +$(project)_client2_sources = Client2.cpp +$(project)_client3_sources = Client3.cpp +$(project)_client4_sources = Client4.cpp +$(project)_client5_sources = Client5.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/middleware/Makefile.mk b/cpp/test/Ice/middleware/Makefile.mk index b62e661f092..194822ba07a 100644 --- a/cpp/test/Ice/middleware/Makefile.mk +++ b/cpp/test/Ice/middleware/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = Client.cpp AllTests.cpp Test.ice TestI.cpp +$(project)_client_sources = Client.cpp AllTests.cpp Test.ice TestI.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/objects/Makefile.mk b/cpp/test/Ice/objects/Makefile.mk index c3c0aa42fe3..03d808ed18c 100644 --- a/cpp/test/Ice/objects/Makefile.mk +++ b/cpp/test/Ice/objects/Makefile.mk @@ -1,7 +1,7 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = Client.cpp Forward.ice Test.ice Derived.ice DerivedEx.ice TestI.cpp AllTests.cpp -$(test)_server_sources = Server.cpp Forward.ice Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp -$(test)_collocated_sources = Collocated.cpp Forward.ice Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp AllTests.cpp +$(project)_client_sources = Client.cpp Forward.ice Test.ice Derived.ice DerivedEx.ice TestI.cpp AllTests.cpp +$(project)_server_sources = Server.cpp Forward.ice Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp +$(project)_collocated_sources = Collocated.cpp Forward.ice Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp AllTests.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/operations/Makefile.mk b/cpp/test/Ice/operations/Makefile.mk index 7fef4290bf9..d77a9257b5e 100644 --- a/cpp/test/Ice/operations/Makefile.mk +++ b/cpp/test/Ice/operations/Makefile.mk @@ -1,6 +1,6 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = Test.ice \ +$(project)_client_sources = Test.ice \ Client.cpp \ AllTests.cpp \ Twoways.cpp \ @@ -11,14 +11,14 @@ $(test)_client_sources = Test.ice \ BatchOnewaysAMI.cpp ifeq ($(xlc_compiler),yes) - $(test)_cppflags += -qsuppress="1540-0895" + $(project)_cppflags += -qsuppress="1540-0895" endif # # Disable var tracking assignments for Linux with this test # ifneq ($(linux_id),) - $(test)_cppflags += $(if $(filter yes,$(OPTIMIZE)),-fno-var-tracking-assignments) + $(project)_cppflags += $(if $(filter yes,$(OPTIMIZE)),-fno-var-tracking-assignments) endif -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/optional/Makefile.mk b/cpp/test/Ice/optional/Makefile.mk index 5bc95a1bb35..4ece8049c83 100644 --- a/cpp/test/Ice/optional/Makefile.mk +++ b/cpp/test/Ice/optional/Makefile.mk @@ -1,11 +1,11 @@ # For the include in the generated code. -$(test)_cppflags := -I$(project) +$(project)_cppflags := -I$(project) # # Disable var tracking assignments for Linux with this test # ifneq ($(linux_id),) - $(test)_cppflags += $(if $(filter yes,$(OPTIMIZE)),-fno-var-tracking-assignments) + $(project)_cppflags += $(if $(filter yes,$(OPTIMIZE)),-fno-var-tracking-assignments) endif -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/plugin/Makefile.mk b/cpp/test/Ice/plugin/Makefile.mk index 7590399245c..66afbd0129a 100644 --- a/cpp/test/Ice/plugin/Makefile.mk +++ b/cpp/test/Ice/plugin/Makefile.mk @@ -1,7 +1,7 @@ # Copyright (c) ZeroC, Inc. -$(test)_libraries := $(test)_TestPlugin +$(project)_libraries := $(project)_TestPlugin -$(test)_TestPlugin_sources := Plugin.cpp +$(project)_TestPlugin_sources := Plugin.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/proxy/Makefile.mk b/cpp/test/Ice/proxy/Makefile.mk index bf2fa277449..fee78558b0c 100644 --- a/cpp/test/Ice/proxy/Makefile.mk +++ b/cpp/test/Ice/proxy/Makefile.mk @@ -2,6 +2,6 @@ # Disable var tracking assignments for Linux with this test # ifneq ($(linux_id),) - $(test)_cppflags += $(if $(filter yes,$(OPTIMIZE)),-fno-var-tracking-assignments) + $(project)_cppflags += $(if $(filter yes,$(OPTIMIZE)),-fno-var-tracking-assignments) endif -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/retry/Makefile.mk b/cpp/test/Ice/retry/Makefile.mk index d128397e301..bb5ed42aeef 100644 --- a/cpp/test/Ice/retry/Makefile.mk +++ b/cpp/test/Ice/retry/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = Client.cpp AllTests.cpp Test.ice InstrumentationI.cpp +$(project)_client_sources = Client.cpp AllTests.cpp Test.ice InstrumentationI.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/servantLocator/Makefile.mk b/cpp/test/Ice/servantLocator/Makefile.mk index ed2dda3cd75..714314ba99c 100644 --- a/cpp/test/Ice/servantLocator/Makefile.mk +++ b/cpp/test/Ice/servantLocator/Makefile.mk @@ -1,7 +1,7 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = $(test-client-sources) ServantLocatorI.cpp -$(test)_server_sources = $(test-server-sources) ServantLocatorI.cpp -$(test)_serveramd_sources = $(test-serveramd-sources) ServantLocatorI.cpp +$(project)_client_sources = $(test-client-sources) ServantLocatorI.cpp +$(project)_server_sources = $(test-server-sources) ServantLocatorI.cpp +$(project)_serveramd_sources = $(test-serveramd-sources) ServantLocatorI.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/services/Makefile.mk b/cpp/test/Ice/services/Makefile.mk index a19769696c1..8ad94bdf7a1 100644 --- a/cpp/test/Ice/services/Makefile.mk +++ b/cpp/test/Ice/services/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_dependencies = Glacier2 IceStorm IceGrid TestCommon Ice +$(project)_dependencies = Glacier2 IceStorm IceGrid TestCommon Ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/slicing/exceptions/Makefile.mk b/cpp/test/Ice/slicing/exceptions/Makefile.mk index af90f5c38ec..443f394fc19 100644 --- a/cpp/test/Ice/slicing/exceptions/Makefile.mk +++ b/cpp/test/Ice/slicing/exceptions/Makefile.mk @@ -1,11 +1,11 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = $(test-client-sources) -$(test)_server_sources = $(test-server-sources) ServerPrivate.ice -$(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice +$(project)_client_sources = $(test-client-sources) +$(project)_server_sources = $(test-server-sources) ServerPrivate.ice +$(project)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice ifneq ($(linux_id),) - $(test)_cppflags += $(if $(filter yes,$(OPTIMIZE)),-fno-var-tracking-assignments) + $(project)_cppflags += $(if $(filter yes,$(OPTIMIZE)),-fno-var-tracking-assignments) endif -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/slicing/objects/Makefile.mk b/cpp/test/Ice/slicing/objects/Makefile.mk index ac2097d8b08..948932652c4 100644 --- a/cpp/test/Ice/slicing/objects/Makefile.mk +++ b/cpp/test/Ice/slicing/objects/Makefile.mk @@ -1,7 +1,7 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = $(test-client-sources) ClientPrivate.ice -$(test)_server_sources = $(test-server-sources) ServerPrivate.ice -$(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice +$(project)_client_sources = $(test-client-sources) ClientPrivate.ice +$(project)_server_sources = $(test-server-sources) ServerPrivate.ice +$(project)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/span/Makefile.mk b/cpp/test/Ice/span/Makefile.mk index 0ff96ca9648..5b5c3264aba 100644 --- a/cpp/test/Ice/span/Makefile.mk +++ b/cpp/test/Ice/span/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_cppflags += -std=c++20 +$(project)_cppflags += -std=c++20 -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/stringConverter/Makefile.mk b/cpp/test/Ice/stringConverter/Makefile.mk index 2b77a76a837..dad59673afa 100644 --- a/cpp/test/Ice/stringConverter/Makefile.mk +++ b/cpp/test/Ice/stringConverter/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_libs = iconv +$(project)_libs = iconv -tests += $(test) +tests += $(project) diff --git a/cpp/test/Ice/timeout/Makefile.mk b/cpp/test/Ice/timeout/Makefile.mk index 3abeb1b43c6..1d483e334c6 100644 --- a/cpp/test/Ice/timeout/Makefile.mk +++ b/cpp/test/Ice/timeout/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = $(test-client-sources) TestI.cpp +$(project)_client_sources = $(test-client-sources) TestI.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceBox/admin/Makefile.mk b/cpp/test/IceBox/admin/Makefile.mk index d2af69f0103..a99ff98fc74 100644 --- a/cpp/test/IceBox/admin/Makefile.mk +++ b/cpp/test/IceBox/admin/Makefile.mk @@ -1,10 +1,10 @@ # Copyright (c) ZeroC, Inc. -$(test)_libraries := $(test)_TestService +$(project)_libraries := $(project)_TestService -$(test)_TestService_sources = TestI.cpp Service.cpp Test.ice -$(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(project)_TestService_sources = TestI.cpp Service.cpp Test.ice +$(project)_TestService_dependencies = IceBox +$(project)_TestService_version = +$(project)_TestService_soversion = -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceBox/configuration/Makefile.mk b/cpp/test/IceBox/configuration/Makefile.mk index d2af69f0103..a99ff98fc74 100644 --- a/cpp/test/IceBox/configuration/Makefile.mk +++ b/cpp/test/IceBox/configuration/Makefile.mk @@ -1,10 +1,10 @@ # Copyright (c) ZeroC, Inc. -$(test)_libraries := $(test)_TestService +$(project)_libraries := $(project)_TestService -$(test)_TestService_sources = TestI.cpp Service.cpp Test.ice -$(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(project)_TestService_sources = TestI.cpp Service.cpp Test.ice +$(project)_TestService_dependencies = IceBox +$(project)_TestService_version = +$(project)_TestService_soversion = -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceDiscovery/simple/Makefile.mk b/cpp/test/IceDiscovery/simple/Makefile.mk index 1a6a8a6202e..f0a6d04f38a 100644 --- a/cpp/test/IceDiscovery/simple/Makefile.mk +++ b/cpp/test/IceDiscovery/simple/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_dependencies = IceDiscovery TestCommon Ice +$(project)_dependencies = IceDiscovery TestCommon Ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceGrid/activation/Makefile.mk b/cpp/test/IceGrid/activation/Makefile.mk index bcefc2ba8ca..7f67c9b75fb 100644 --- a/cpp/test/IceGrid/activation/Makefile.mk +++ b/cpp/test/IceGrid/activation/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_dependencies = IceGrid Glacier2 +$(project)_client_dependencies = IceGrid Glacier2 -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceGrid/admin/Makefile.mk b/cpp/test/IceGrid/admin/Makefile.mk index 8cd6a48c883..e5308a69c19 100644 --- a/cpp/test/IceGrid/admin/Makefile.mk +++ b/cpp/test/IceGrid/admin/Makefile.mk @@ -3,4 +3,4 @@ # This Makefile.mk is necessary to get this test to build because the # test doesn't have a Client.cpp file. -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceGrid/allocation/Makefile.mk b/cpp/test/IceGrid/allocation/Makefile.mk index eba37941aac..9606db5aacb 100644 --- a/cpp/test/IceGrid/allocation/Makefile.mk +++ b/cpp/test/IceGrid/allocation/Makefile.mk @@ -1,10 +1,10 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = client server verifier +$(project)_programs = client server verifier -$(test)_client_dependencies = IceGrid Glacier2 +$(project)_client_dependencies = IceGrid Glacier2 -$(test)_verifier_sources = PermissionsVerifier.cpp -$(test)_verifier_dependencies = Glacier2 +$(project)_verifier_sources = PermissionsVerifier.cpp +$(project)_verifier_dependencies = Glacier2 -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceGrid/deployer/Makefile.mk b/cpp/test/IceGrid/deployer/Makefile.mk index 6880bf466c4..fd3707900ed 100644 --- a/cpp/test/IceGrid/deployer/Makefile.mk +++ b/cpp/test/IceGrid/deployer/Makefile.mk @@ -1,12 +1,12 @@ # Copyright (c) ZeroC, Inc. -$(test)_libraries := $(test)_TestService +$(project)_libraries := $(project)_TestService -$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice -$(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(project)_TestService_sources = Service.cpp TestI.cpp Test.ice +$(project)_TestService_dependencies = IceBox +$(project)_TestService_version = +$(project)_TestService_soversion = -$(test)_client_dependencies = IceGrid Glacier2 +$(project)_client_dependencies = IceGrid Glacier2 -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk index 6880bf466c4..fd3707900ed 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk +++ b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk @@ -1,12 +1,12 @@ # Copyright (c) ZeroC, Inc. -$(test)_libraries := $(test)_TestService +$(project)_libraries := $(project)_TestService -$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice -$(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(project)_TestService_sources = Service.cpp TestI.cpp Test.ice +$(project)_TestService_dependencies = IceBox +$(project)_TestService_version = +$(project)_TestService_soversion = -$(test)_client_dependencies = IceGrid Glacier2 +$(project)_client_dependencies = IceGrid Glacier2 -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceGrid/replicaGroup/Makefile.mk b/cpp/test/IceGrid/replicaGroup/Makefile.mk index 2e1026cf719..3ea8daa915d 100644 --- a/cpp/test/IceGrid/replicaGroup/Makefile.mk +++ b/cpp/test/IceGrid/replicaGroup/Makefile.mk @@ -1,15 +1,15 @@ # Copyright (c) ZeroC, Inc. -$(test)_libraries := $(test)_TestService $(test)_RegistryPlugin +$(project)_libraries := $(project)_TestService $(project)_RegistryPlugin -$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice -$(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(project)_TestService_sources = Service.cpp TestI.cpp Test.ice +$(project)_TestService_dependencies = IceBox +$(project)_TestService_version = +$(project)_TestService_soversion = -$(test)_RegistryPlugin_sources = RegistryPlugin.cpp -$(test)_RegistryPlugin_dependencies = IceGrid Glacier2 +$(project)_RegistryPlugin_sources = RegistryPlugin.cpp +$(project)_RegistryPlugin_dependencies = IceGrid Glacier2 -$(test)_client_dependencies = IceGrid Glacier2 +$(project)_client_dependencies = IceGrid Glacier2 -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceGrid/replication/Makefile.mk b/cpp/test/IceGrid/replication/Makefile.mk index bcefc2ba8ca..7f67c9b75fb 100644 --- a/cpp/test/IceGrid/replication/Makefile.mk +++ b/cpp/test/IceGrid/replication/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_dependencies = IceGrid Glacier2 +$(project)_client_dependencies = IceGrid Glacier2 -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceGrid/session/Makefile.mk b/cpp/test/IceGrid/session/Makefile.mk index 2009ea0d3e1..e2f2656ec3c 100644 --- a/cpp/test/IceGrid/session/Makefile.mk +++ b/cpp/test/IceGrid/session/Makefile.mk @@ -1,12 +1,12 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = client server verifier +$(project)_programs = client server verifier -$(test)_client_dependencies = IceGrid Glacier2 +$(project)_client_dependencies = IceGrid Glacier2 -$(test)_server_dependencies = Glacier2 +$(project)_server_dependencies = Glacier2 -$(test)_verifier_sources = PermissionsVerifier.cpp -$(test)_verifier_dependencies = Glacier2 +$(project)_verifier_sources = PermissionsVerifier.cpp +$(project)_verifier_dependencies = Glacier2 -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceGrid/simple/Makefile.mk b/cpp/test/IceGrid/simple/Makefile.mk index aa89648189b..26689504712 100644 --- a/cpp/test/IceGrid/simple/Makefile.mk +++ b/cpp/test/IceGrid/simple/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_dependencies = IceLocatorDiscovery IceGrid Glacier2 TestCommon Ice +$(project)_dependencies = IceLocatorDiscovery IceGrid Glacier2 TestCommon Ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceGrid/update/Makefile.mk b/cpp/test/IceGrid/update/Makefile.mk index bcefc2ba8ca..7f67c9b75fb 100644 --- a/cpp/test/IceGrid/update/Makefile.mk +++ b/cpp/test/IceGrid/update/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_dependencies = IceGrid Glacier2 +$(project)_client_dependencies = IceGrid Glacier2 -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceSSL/configuration/Makefile.mk b/cpp/test/IceSSL/configuration/Makefile.mk index e90e5342299..8483670299c 100644 --- a/cpp/test/IceSSL/configuration/Makefile.mk +++ b/cpp/test/IceSSL/configuration/Makefile.mk @@ -1,23 +1,23 @@ # Copyright (c) ZeroC, Inc. -$(test)_dependencies = TestCommon Ice +$(project)_dependencies = TestCommon Ice -$(test)_client_sources := Client.cpp AllTests.cpp Test.ice TestI.cpp +$(project)_client_sources := Client.cpp AllTests.cpp Test.ice TestI.cpp ifeq ($(os),Darwin) - $(test)_client_sources += SecureTransportTests.cpp - $(test)_client_ldflags = -framework Security -framework CoreFoundation + $(project)_client_sources += SecureTransportTests.cpp + $(project)_client_ldflags = -framework Security -framework CoreFoundation endif ifeq ($(os),Linux) - $(test)_client_sources += OpenSSLTests.cpp - $(test)_client_ldflags = -lssl -lcrypto + $(project)_client_sources += OpenSSLTests.cpp + $(project)_client_ldflags = -lssl -lcrypto # Disable var tracking assignments for Linux with this test - $(test)_cppflags += $(if $(filter yes,$(OPTIMIZE)),-fno-var-tracking-assignments) + $(project)_cppflags += $(if $(filter yes,$(OPTIMIZE)),-fno-var-tracking-assignments) endif # Need to load certificates with functions from src/IceSSL/SSLUtil.h $(test)[iphoneos]_cppflags := -Isrc $(test)[iphonesimulator]_cppflags := -Isrc -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceStorm/federation/Makefile.mk b/cpp/test/IceStorm/federation/Makefile.mk index d56226b74c9..6b91670f83a 100644 --- a/cpp/test/IceStorm/federation/Makefile.mk +++ b/cpp/test/IceStorm/federation/Makefile.mk @@ -1,11 +1,11 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = publisher subscriber -$(test)_dependencies = IceStorm Ice TestCommon +$(project)_programs = publisher subscriber +$(project)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Event.ice -$(test)_subscriber_sources = Subscriber.cpp Event.ice +$(project)_publisher_sources = Publisher.cpp Event.ice +$(project)_subscriber_sources = Subscriber.cpp Event.ice -$(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* +$(project)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk index aac953d64a5..1bfcdeab496 100644 --- a/cpp/test/IceStorm/federation2/Makefile.mk +++ b/cpp/test/IceStorm/federation2/Makefile.mk @@ -1,11 +1,11 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = publisher subscriber -$(test)_dependencies = IceStorm Ice TestCommon +$(project)_programs = publisher subscriber +$(project)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Event.ice -$(test)_subscriber_sources = Subscriber.cpp Event.ice +$(project)_publisher_sources = Publisher.cpp Event.ice +$(project)_subscriber_sources = Subscriber.cpp Event.ice -$(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* db2/* 0.db2/* 1.db2/* 2.db2/* +$(project)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* db2/* 0.db2/* 1.db2/* 2.db2/* -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceStorm/persistent/Makefile.mk b/cpp/test/IceStorm/persistent/Makefile.mk index b56d505fac3..7f4f084573b 100644 --- a/cpp/test/IceStorm/persistent/Makefile.mk +++ b/cpp/test/IceStorm/persistent/Makefile.mk @@ -1,8 +1,8 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = client -$(test)_dependencies = IceStorm Ice TestCommon +$(project)_programs = client +$(project)_dependencies = IceStorm Ice TestCommon -$(test)_client_sources = Client.cpp +$(project)_client_sources = Client.cpp -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceStorm/rep1/Makefile.mk b/cpp/test/IceStorm/rep1/Makefile.mk index ae355607c47..f1c337c6ca9 100644 --- a/cpp/test/IceStorm/rep1/Makefile.mk +++ b/cpp/test/IceStorm/rep1/Makefile.mk @@ -1,12 +1,12 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = publisher subscriber sub -$(test)_dependencies = IceStorm Ice TestCommon +$(project)_programs = publisher subscriber sub +$(project)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Single.ice -$(test)_subscriber_sources = Subscriber.cpp Single.ice -$(test)_sub_sources = Sub.cpp Single.ice +$(project)_publisher_sources = Publisher.cpp Single.ice +$(project)_subscriber_sources = Subscriber.cpp Single.ice +$(project)_sub_sources = Sub.cpp Single.ice -$(test)_cleanfiles = 0.db/* 1.db/* 2.db/* +$(project)_cleanfiles = 0.db/* 1.db/* 2.db/* -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceStorm/repgrid/Makefile.mk b/cpp/test/IceStorm/repgrid/Makefile.mk index 40a5dfd0683..78441f36642 100644 --- a/cpp/test/IceStorm/repgrid/Makefile.mk +++ b/cpp/test/IceStorm/repgrid/Makefile.mk @@ -1,7 +1,7 @@ # Copyright (c) ZeroC, Inc. -$(test)_dependencies = IceStorm Ice TestCommon +$(project)_dependencies = IceStorm Ice TestCommon -$(test)_client_sources = Client.cpp Single.ice +$(project)_client_sources = Client.cpp Single.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceStorm/repstress/Makefile.mk b/cpp/test/IceStorm/repstress/Makefile.mk index 20e3531f3c8..70d6205530b 100644 --- a/cpp/test/IceStorm/repstress/Makefile.mk +++ b/cpp/test/IceStorm/repstress/Makefile.mk @@ -1,12 +1,12 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = publisher subscriber control -$(test)_dependencies = IceStorm Ice TestCommon +$(project)_programs = publisher subscriber control +$(project)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Single.ice Controller.ice -$(test)_subscriber_sources = Subscriber.cpp Single.ice Controller.ice -$(test)_control_sources = Control.cpp Controller.ice +$(project)_publisher_sources = Publisher.cpp Single.ice Controller.ice +$(project)_subscriber_sources = Subscriber.cpp Single.ice Controller.ice +$(project)_control_sources = Control.cpp Controller.ice -$(test)_cleanfiles = 0.db/* 1.db/* 2.db/* +$(project)_cleanfiles = 0.db/* 1.db/* 2.db/* -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceStorm/single/Makefile.mk b/cpp/test/IceStorm/single/Makefile.mk index 8d69e49b2c5..ffceb3139cb 100644 --- a/cpp/test/IceStorm/single/Makefile.mk +++ b/cpp/test/IceStorm/single/Makefile.mk @@ -1,9 +1,9 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = publisher subscriber -$(test)_dependencies = IceStorm Ice TestCommon +$(project)_programs = publisher subscriber +$(project)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Single.ice -$(test)_subscriber_sources = Subscriber.cpp Single.ice +$(project)_publisher_sources = Publisher.cpp Single.ice +$(project)_subscriber_sources = Subscriber.cpp Single.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceStorm/stress/Makefile.mk b/cpp/test/IceStorm/stress/Makefile.mk index 004aba1f973..310f2ac503e 100644 --- a/cpp/test/IceStorm/stress/Makefile.mk +++ b/cpp/test/IceStorm/stress/Makefile.mk @@ -1,9 +1,9 @@ # Copyright (c) ZeroC, Inc. -$(test)_programs = publisher subscriber -$(test)_dependencies = IceStorm Ice TestCommon +$(project)_programs = publisher subscriber +$(project)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Event.ice -$(test)_subscriber_sources = Subscriber.cpp Event.ice +$(project)_publisher_sources = Publisher.cpp Event.ice +$(project)_subscriber_sources = Subscriber.cpp Event.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/IceUtil/ctrlCHandler/Makefile.mk b/cpp/test/IceUtil/ctrlCHandler/Makefile.mk index b683544f4ae..2c9ce53d78e 100644 --- a/cpp/test/IceUtil/ctrlCHandler/Makefile.mk +++ b/cpp/test/IceUtil/ctrlCHandler/Makefile.mk @@ -1,3 +1,3 @@ # Copyright (c) ZeroC, Inc. -tests += $(test) +tests += $(project) diff --git a/cpp/test/Slice/escape/Makefile.mk b/cpp/test/Slice/escape/Makefile.mk index 0f194a97ae0..b1529d4b40c 100644 --- a/cpp/test/Slice/escape/Makefile.mk +++ b/cpp/test/Slice/escape/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_client_sources = Client.cpp Clash.ice Key.ice +$(project)_client_sources = Client.cpp Clash.ice Key.ice -tests += $(test) +tests += $(project) diff --git a/cpp/test/Slice/parser/Makefile.mk b/cpp/test/Slice/parser/Makefile.mk index 0c8575e1a33..db93365fa25 100644 --- a/cpp/test/Slice/parser/Makefile.mk +++ b/cpp/test/Slice/parser/Makefile.mk @@ -1,5 +1,5 @@ # Copyright (c) ZeroC, Inc. -$(test)_libraries := SliceParser +$(project)_libraries := SliceParser -tests += $(test) +tests += $(project) diff --git a/php/test/Slice/escape/Makefile.mk b/php/test/Slice/escape/Makefile.mk index b683544f4ae..2c9ce53d78e 100644 --- a/php/test/Slice/escape/Makefile.mk +++ b/php/test/Slice/escape/Makefile.mk @@ -1,3 +1,3 @@ # Copyright (c) ZeroC, Inc. -tests += $(test) +tests += $(project)