summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpp/config/Make.rules4
-rw-r--r--cpp/config/Make.rules.Darwin21
-rw-r--r--cpp/config/Make.rules.Linux15
-rw-r--r--cpp/config/Make.rules.SunOS9
-rwxr-xr-xcpp/config/Make.rules.mak3
-rw-r--r--cpp/src/IceGrid/Makefile6
-rw-r--r--cpp/src/IceGrid/Makefile.mak2
-rw-r--r--cpp/src/IceStorm/Makefile3
-rw-r--r--cpp/src/IceStorm/Makefile.mak2
-rwxr-xr-xscripts/TestUtil.py24
10 files changed, 46 insertions, 43 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 892b78b413b..adae419a5c5 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -117,8 +117,8 @@ USE_READLINE ?= no
#READLINE_HOME ?= /opt/readline
#
-# If you want to build the SQL database plugins for IceStorm and
-# IceGrid, set QT_HOME to the Qt installation directory.
+# If you want to build the deprecated SQL database plugins for IceStorm
+# and IceGrid, set QT_HOME to the Qt installation directory.
#
#
#QT_HOME = /usr/local/Trolltech/Qt-4.5.3
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index 0b6e105bee9..509954efa86 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -103,15 +103,6 @@ ifeq ($(DB_HOME),)
endif
endif
-ifneq ($(QT_HOME),)
- ifneq ($(QT_HOME), /Library/Frameworks)
- # Frameworks are installed in the lib directory
- QT_FLAGS = -F$(QT_HOME)/lib
- QT_LIBS = -F$(QT_HOME)/lib
- endif
- QT_LIBS := $(QT_LIBS) -framework QtCore -framework QtSql
-endif
-
BASELIBS = -lIceUtil -lpthread
LIBS = -lIce $(BASELIBS)
@@ -121,3 +112,15 @@ ICEUTIL_OS_LIBS = -lpthread
ICE_OS_LIBS = -ldl
PLATFORM_HAS_READLINE := no
+
+#
+# QT is used only for the deprecated IceGrid and IceStorm SQL plugins
+#
+ifneq ($(QT_HOME),)
+ ifneq ($(QT_HOME), /Library/Frameworks)
+ # Frameworks are installed in the lib directory
+ QT_FLAGS = -F$(QT_HOME)/lib
+ QT_LIBS = -F$(QT_HOME)/lib
+ endif
+ QT_LIBS := $(QT_LIBS) -framework QtCore -framework QtSql
+endif
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
index 9e0128f6712..269fea15a03 100644
--- a/cpp/config/Make.rules.Linux
+++ b/cpp/config/Make.rules.Linux
@@ -152,14 +152,17 @@ endif
LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS)
-ifneq ($(QT_HOME),)
- QT_FLAGS = -I$(QT_HOME)/include
- QT_LIBS = -L$(QT_HOME)/$(libsubdir) -lQtCore -lQtSql
- QT_RPATH_LINK = $(call rpathlink,$(QT_HOME)/$(libsubdir))
-endif
-
ICEUTIL_OS_LIBS =
ICE_OS_LIBS = -ldl
PLATFORM_HAS_READLINE = yes
+
+#
+# QT is used only for the deprecated IceGrid and IceStorm SQL plugins
+#
+ifneq ($(QT_HOME),)
+ QT_FLAGS = -I$(QT_HOME)/include
+ QT_LIBS = -L$(QT_HOME)/$(libsubdir) -lQtCore -lQtSql
+ QT_RPATH_LINK = $(call rpathlink,$(QT_HOME)/$(libsubdir))
+endif \ No newline at end of file
diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS
index 82bc335d3e7..18df843d00d 100644
--- a/cpp/config/Make.rules.SunOS
+++ b/cpp/config/Make.rules.SunOS
@@ -114,10 +114,13 @@ rpathlink = -L$(1)
BASELIBS = -lIceUtil -lpthread
LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS)
+ICEUTIL_OS_LIBS = -lpthread -lrt
+ICE_OS_LIBS = -ldl -lsocket
+
+#
+# QT is used only for the deprecated IceGrid and IceStorm SQL plugins
+#
ifneq ($(QT_HOME),)
QT_FLAGS = -I$(QT_HOME)/include
QT_LIBS = -L$(QT_HOME)/$(libsubdir) -lQtCore -lQtSql
endif
-
-ICEUTIL_OS_LIBS = -lpthread -lrt
-ICE_OS_LIBS = -ldl -lsocket
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index 83439a59818..c026e3aafce 100755
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -146,6 +146,9 @@ RCFLAGS = -D_DEBUG
OPENSSL_LIBS = ssleay32.lib libeay32.lib
EXPAT_LIBS = libexpat.lib
+#
+# QT is used only for the deprecated IceGrid and IceStorm SQL plugins
+#
QT_LIBS = QtSql$(LIBSUFFIX)4.lib QtCore$(LIBSUFFIX)4.lib
CPPFLAGS = $(CPPFLAGS) -I"$(includedir)"
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
index 6fbab02e7f7..b4593c58dfd 100644
--- a/cpp/src/IceGrid/Makefile
+++ b/cpp/src/IceGrid/Makefile
@@ -118,9 +118,6 @@ install:: all
$(call installprogram,$(REGISTRY_SERVER),$(install_bindir))
SUBDIRS = FreezeDB
-ifneq ($(QT_HOME),)
- SUBDIRS += SqlDB
-endif
$(EVERYTHING)::
@for subdir in $(SUBDIRS); \
@@ -132,7 +129,4 @@ $(EVERYTHING)::
fi; \
done
-# Needed for make -jn to work.
-#../IceGrid/Grammar.y: Grammar.h
-
include .depend
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
index f9e582fa235..2dfa2e32adb 100644
--- a/cpp/src/IceGrid/Makefile.mak
+++ b/cpp/src/IceGrid/Makefile.mak
@@ -162,7 +162,7 @@ install:: all
!endif
-SUBDIRS = FreezeDB SqlDB
+SUBDIRS = FreezeDB
$(EVERYTHING)::
@for %i in ( $(SUBDIRS) ) do \
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 87b811f61de..af2b258aae2 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -88,9 +88,6 @@ install:: all
$(call installprogram,$(ADMIN),$(install_bindir))
SUBDIRS = FreezeDB
-ifneq ($(QT_HOME),)
- SUBDIRS += SqlDB
-endif
$(EVERYTHING)::
@for subdir in $(SUBDIRS); \
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index 0390adbde8f..b571d90af62 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -119,7 +119,7 @@ install:: all
!endif
-SUBDIRS = FreezeDB SqlDB
+SUBDIRS = FreezeDB
$(EVERYTHING)::
@for %i in ( $(SUBDIRS) ) do \
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 07d379be2a5..3d59e01be4a 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -324,12 +324,12 @@ def run(tests, root = False):
--cross=lang Run cross language test.
--script Generate a script to run the tests.
--env Print important environment variables.
- --sql-type=<driver> Run IceStorm/IceGrid tests using QtSql with specified driver.
- --sql-db=<db> Set SQL database name.
- --sql-host=<host> Set SQL host name.
- --sql-port=<port> Set SQL server port.
- --sql-user=<user> Set SQL user name.
- --sql-passwd=<passwd> Set SQL password.
+ --sql-type=<driver> Run IceStorm/IceGrid tests using QtSql with specified driver. (deprecated)
+ --sql-db=<db> Set SQL database name. (deprecated)
+ --sql-host=<host> Set SQL host name. (deprecated)
+ --sql-port=<port> Set SQL server port. (deprecated)
+ --sql-user=<user> Set SQL user name. (deprecated)
+ --sql-passwd=<passwd> Set SQL password. (deprecated)
--service-dir=<dir> Where to locate services for builds without service support.
--compact Ice for .NET uses the Compact Framework.
--silverlight Ice for .NET uses Silverlight.
@@ -1499,12 +1499,12 @@ def processCmdLine():
--x64 Binary distribution is 64-bit.
--env Print important environment variables.
--cross=lang Run cross language test.
- --sql-type=<driver> Run IceStorm/IceGrid tests using QtSql with specified driver.
- --sql-db=<db> Set SQL database name.
- --sql-host=<host> Set SQL host name.
- --sql-port=<port> Set SQL server port.
- --sql-user=<user> Set SQL user name.
- --sql-passwd=<passwd> Set SQL password.
+ --sql-type=<driver> Run IceStorm/IceGrid tests using QtSql with specified driver. (deprecated)
+ --sql-db=<db> Set SQL database name. (deprecated)
+ --sql-host=<host> Set SQL host name. (deprecated)
+ --sql-port=<port> Set SQL server port. (deprecated)
+ --sql-user=<user> Set SQL user name. (deprecated)
+ --sql-passwd=<passwd> Set SQL password. (deprecated)
--service-dir=<dir> Where to locate services for builds without service support.
--compact Ice for .NET uses the Compact Framework.
--silverlight Ice for .NET uses Silverlight.
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 23:05:20 +0000