diff options
Diffstat (limited to 'cpp')
176 files changed, 9845 insertions, 9845 deletions
diff --git a/cpp/Makefile.mak b/cpp/Makefile.mak index 343fe201c37..9c0b3ceca5c 100644 --- a/cpp/Makefile.mak +++ b/cpp/Makefile.mak @@ -1,30 +1,30 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = . - -!include $(top_srcdir)/config/Make.rules.mak - -SUBDIRS = config src include test demo doc - -INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_docdir) - -install:: install-common - @for %i in ( $(INSTALL_SUBDIRS) ) do \ - @if not exist %i \ - @echo "Creating %i..." && \ - mkdir %i - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 - -test:: - @python $(top_srcdir)/allTests.py +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = .
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SUBDIRS = config src include test demo doc
+
+INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_docdir)
+
+install:: install-common
+ @for %i in ( $(INSTALL_SUBDIRS) ) do \
+ @if not exist %i \
+ @echo "Creating %i..." && \
+ mkdir %i
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
+
+test::
+ @python $(top_srcdir)/allTests.py
diff --git a/cpp/config/Make.rules.bcc b/cpp/config/Make.rules.bcc index fae5fba9202..3ebbd71d400 100644 --- a/cpp/config/Make.rules.bcc +++ b/cpp/config/Make.rules.bcc @@ -1,58 +1,58 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -# -# This file is included by Make.rules.mak when using Borland C++Builder. -# -# The following warnings are suppressed when building Ice: -# -# -w-par: W8057 - Parameter is never used -# -w-lvc: W8031 - Temporary used for parameter -# -w-rch: W8066 - Unreachable code -# -# Ice and Ice applications must be built with multi-threaded support (-tWM) -# and linked with the multi-threaded runtime library (cw32mti.lib). -# - -CXX = bcc32.exe -CC = bcc32.exe -LINK = ilink32.exe -RC = brc32.exe - -PREOUT = , -PRELIBS = ,, - -SETARGV = wildargs.obj - -!if "$(THIRDPARTY_HOME)" != "" -CPPFLAGS = -I"$(THIRDPARTY_HOME)\include" -LDFLAGS = -L"$(THIRDPARTY_HOME)\lib" -!endif - -CPPFLAGS = $(CPPFLAGS) -q -w-par -w-lvc -w-rch -vi- -tWM -c -DNO_STRICT;_NO_VCL;_RTLDLL - -!if "$(OPTIMIZE)" == "yes" -CPPFLAGS = $(CPPFLAGS) -O2 -k- -DNDEBUG -!else -CPPFLAGS = $(CPPFLAGS) -Od -v -k -D_DEBUG -!endif - -LDFLAGS = $(LDFLAGS) -L"$(libdir)" -L"$(BCB)\lib" -q -Gn -v -x - -LD_DLLFLAGS = $(LDFLAGS) -Gi -Tpd c0d32.obj -LD_EXEFLAGS = $(LDFLAGS) -Tpe c0x32.obj - -ICE_OS_LIBS = cw32mti.lib import32.lib - -BASELIBS = iceutil$(LIBSUFFIX).lib $(ICE_OS_LIBS) -LIBS = ice$(LIBSUFFIX).lib $(BASELIBS) - -BZIP2_LIBS = libbz2.lib -DB_LIBS = libdb46.lib -ICONV_LIB = libiconv-bcc.lib +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+#
+# This file is included by Make.rules.mak when using Borland C++Builder.
+#
+# The following warnings are suppressed when building Ice:
+#
+# -w-par: W8057 - Parameter is never used
+# -w-lvc: W8031 - Temporary used for parameter
+# -w-rch: W8066 - Unreachable code
+#
+# Ice and Ice applications must be built with multi-threaded support (-tWM)
+# and linked with the multi-threaded runtime library (cw32mti.lib).
+#
+
+CXX = bcc32.exe
+CC = bcc32.exe
+LINK = ilink32.exe
+RC = brc32.exe
+
+PREOUT = ,
+PRELIBS = ,,
+
+SETARGV = wildargs.obj
+
+!if "$(THIRDPARTY_HOME)" != ""
+CPPFLAGS = -I"$(THIRDPARTY_HOME)\include"
+LDFLAGS = -L"$(THIRDPARTY_HOME)\lib"
+!endif
+
+CPPFLAGS = $(CPPFLAGS) -q -w-par -w-lvc -w-rch -vi- -tWM -c -DNO_STRICT;_NO_VCL;_RTLDLL
+
+!if "$(OPTIMIZE)" == "yes"
+CPPFLAGS = $(CPPFLAGS) -O2 -k- -DNDEBUG
+!else
+CPPFLAGS = $(CPPFLAGS) -Od -v -k -D_DEBUG
+!endif
+
+LDFLAGS = $(LDFLAGS) -L"$(libdir)" -L"$(BCB)\lib" -q -Gn -v -x
+
+LD_DLLFLAGS = $(LDFLAGS) -Gi -Tpd c0d32.obj
+LD_EXEFLAGS = $(LDFLAGS) -Tpe c0x32.obj
+
+ICE_OS_LIBS = cw32mti.lib import32.lib
+
+BASELIBS = iceutil$(LIBSUFFIX).lib $(ICE_OS_LIBS)
+LIBS = ice$(LIBSUFFIX).lib $(BASELIBS)
+
+BZIP2_LIBS = libbz2.lib
+DB_LIBS = libdb46.lib
+ICONV_LIB = libiconv-bcc.lib
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index ba0bd4230f6..5e594a541df 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -1,187 +1,187 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -# -# Select an installation base directory. The directory will be created -# if it does not exist. -# -prefix = C:\Ice-$(VERSION) - -# -# Define OPTIMIZE as yes if you want to build with -# optimization. Otherwise Ice is build with debug information. -# -#OPTIMIZE = yes - -# -# Define if you want to build the Ice-E slice compilers with -# static libraries. -# -#STATICLIBS = yes - -# -# Specify your C++ compiler. Supported values are: -# VC60, VC80, VC80_EXPRESS, VC90, VC90_EXPRESS -# -!if "$(CPP_COMPILER)" == "" -CPP_COMPILER = VC80 -!endif - -# -# Borland C++Builder 2006 home directory. Used if CPP_COMPILER -# is set to BCC2006. Change if different from default. -# -!if "$(BCB)" == "" -BCB = C:\Program Files\Borland\BDS\4.0 -!endif - -# -# If third party libraries are not installed in the default location -# or THIRDPARTY_HOME is not set in your environment variables then -# change the following setting to reflect the installation location. -# -!if "$(CPP_COMPILER)" == "BCC2006" -THIRDPARTY_HOME_EXT = BCC -!elseif "$(CPP_COMPILER)" == "VC80_EXPRESS" -THIRDPARTY_HOME_EXT = VC80 -!elseif "$(CPP_COMPILER)" == "VC90_EXPRESS" -THIRDPARTY_HOME_EXT = VC90 -!else -THIRDPARTY_HOME_EXT = $(CPP_COMPILER) -!endif - -!if "$(THIRDPARTY_HOME)" == "" -THIRDPARTY_HOME = C:\Ice-$(VERSION)-ThirdParty-$(THIRDPARTY_HOME_EXT) -!endif - -# -# For VC80 and VC80 Express it is necessary to set the location of the -# manifest tool. This must be the 6.x version of mt.exe, not the 5.x -# version! -# -# For VC80 Express mt.exe 6.x is provided by the Windows Platform SDK. -# It is necessary to set the location of the Platform SDK through the -# PDK_HOME environment variable (see INSTALL.WINDOWS for details). -# -!if "$(CPP_COMPILER)" == "VC80" -MT = "$(VS80COMNTOOLS)bin\mt.exe" -!elseif "$(CPP_COMPILER)" == "VC80_EXPRESS" -MT = "$(PDK_HOME)\bin\mt.exe" -!else -MT = mt.exe -!endif - - -# ---------------------------------------------------------------------- -# Don't change anything below this line! -# ---------------------------------------------------------------------- - -# -# Common definitions -# -ice_language = cpp -!if "$(USE_BIN_DIST)" == "yes" || !exist ($(top_srcdir)\..\cpp) -slice_translator = slice2cpp.exe -ice_require_cpp = 1 -!endif - -!if exist ($(top_srcdir)\..\config\Make.common.rules) -!include $(top_srcdir)\..\config\Make.common.rules.mak -!else -!include $(top_srcdir)\config\Make.common.rules.mak -!endif - -bindir = $(top_srcdir)\bin -libdir = $(top_srcdir)\lib -!if "$(ice_src_dist)" != "" -includedir = $(top_srcdir)\include -!else -includedir = $(ice_dir)\include -!endif - -install_bindir = $(prefix)\bin$(x64suffix) -install_libdir = $(prefix)\lib$(x64suffix) -install_includedir = $(prefix)\include -install_docdir = $(prefix)\doc -libsubdir = lib - -SETARGV = setargv.obj - -!if "$(CPP_COMPILER)" == "BCC2006" -!include $(top_srcdir)/config/Make.rules.bcc -!elseif "$(CPP_COMPILER)" == "VC60" || "$(CPP_COMPILER)" == "VC71" || \ - "$(CPP_COMPILER)" == "VC80" || "$(CPP_COMPILER)" == "VC80_EXPRESS" || \ - "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" -!include $(top_srcdir)/config/Make.rules.msvc -! else -!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER) -!endif - -!if "$(OPTIMIZE)" != "yes" -LIBSUFFIX = $(LIBSUFFIX)d -RCFLAGS = -D_DEBUG -!endif - -OPENSSL_LIBS = ssleay32.lib libeay32.lib -EXPAT_LIBS = libexpat.lib - -CPPFLAGS = $(CPPFLAGS) -I$(includedir) -ICECPPFLAGS = -I$(slicedir) -SLICE2CPPFLAGS = $(ICECPPFLAGS) - -LDFLAGS = $(LDFLAGS) $(LDPLATFORMFLAGS) $(CXXFLAGS) - -!if "$(ice_src_dist)" != "" -SLICEPARSERLIB = $(libdir)\slice$(LIBSUFFIX).lib -SLICE2CPP = $(bindir)\slice2cpp.exe -SLICE2XSD = $(bindir)\slice2xsd.exe -SLICE2FREEZE = $(bindir)\slice2freeze.exe -SLICE2DOCBOOK = $(bindir)\slice2docbook.exe -!else -SLICEPARSERLIB = $(ice_dir)\lib$(x64suffix)\slice$(LIBSUFFIX).lib -SLICE2CPP = $(ice_dir)\bin$(x64suffix)\slice2cpp.exe -SLICE2XSD = $(ice_dir)\bin$(x64suffix)\slice2xsd.exe -SLICE2FREEZE = $(ice_dir)\bin$(x64suffix)\slice2freeze.exe -SLICE2DOCBOOK = $(ice_dir)\bin$(x64suffix)\slice2docbook.exe -!endif - -EVERYTHING = all clean install - -.SUFFIXES: -.SUFFIXES: .ice .cpp .c .obj - -.cpp.obj:: - $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $< - -.c.obj: - $(CC) /c $(CPPFLAGS) $(CFLAGS) $< - - -{$(SDIR)\}.ice{$(HDIR)}.h: - del /q $(HDIR)\$(*F).h $(*F).cpp - $(SLICE2CPP) $(SLICE2CPPFLAGS) $< - move $(*F).h $(HDIR) - -.ice.cpp: - del /q $(*F).h $(*F).cpp - $(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice - -all:: $(SRCS) $(TARGETS) - -!if "$(TARGETS)" != "" - -clean:: - -del /q $(TARGETS) - -!endif - -clean:: - -del /q *.obj *.bak *.ilk *.exp *.pdb *.tds *.idb - -install:: +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+#
+# Select an installation base directory. The directory will be created
+# if it does not exist.
+#
+prefix = C:\Ice-$(VERSION)
+
+#
+# Define OPTIMIZE as yes if you want to build with
+# optimization. Otherwise Ice is build with debug information.
+#
+#OPTIMIZE = yes
+
+#
+# Define if you want to build the Ice-E slice compilers with
+# static libraries.
+#
+#STATICLIBS = yes
+
+#
+# Specify your C++ compiler. Supported values are:
+# VC60, VC80, VC80_EXPRESS, VC90, VC90_EXPRESS
+#
+!if "$(CPP_COMPILER)" == ""
+CPP_COMPILER = VC80
+!endif
+
+#
+# Borland C++Builder 2006 home directory. Used if CPP_COMPILER
+# is set to BCC2006. Change if different from default.
+#
+!if "$(BCB)" == ""
+BCB = C:\Program Files\Borland\BDS\4.0
+!endif
+
+#
+# If third party libraries are not installed in the default location
+# or THIRDPARTY_HOME is not set in your environment variables then
+# change the following setting to reflect the installation location.
+#
+!if "$(CPP_COMPILER)" == "BCC2006"
+THIRDPARTY_HOME_EXT = BCC
+!elseif "$(CPP_COMPILER)" == "VC80_EXPRESS"
+THIRDPARTY_HOME_EXT = VC80
+!elseif "$(CPP_COMPILER)" == "VC90_EXPRESS"
+THIRDPARTY_HOME_EXT = VC90
+!else
+THIRDPARTY_HOME_EXT = $(CPP_COMPILER)
+!endif
+
+!if "$(THIRDPARTY_HOME)" == ""
+THIRDPARTY_HOME = C:\Ice-$(VERSION)-ThirdParty-$(THIRDPARTY_HOME_EXT)
+!endif
+
+#
+# For VC80 and VC80 Express it is necessary to set the location of the
+# manifest tool. This must be the 6.x version of mt.exe, not the 5.x
+# version!
+#
+# For VC80 Express mt.exe 6.x is provided by the Windows Platform SDK.
+# It is necessary to set the location of the Platform SDK through the
+# PDK_HOME environment variable (see INSTALL.WINDOWS for details).
+#
+!if "$(CPP_COMPILER)" == "VC80"
+MT = "$(VS80COMNTOOLS)bin\mt.exe"
+!elseif "$(CPP_COMPILER)" == "VC80_EXPRESS"
+MT = "$(PDK_HOME)\bin\mt.exe"
+!else
+MT = mt.exe
+!endif
+
+
+# ----------------------------------------------------------------------
+# Don't change anything below this line!
+# ----------------------------------------------------------------------
+
+#
+# Common definitions
+#
+ice_language = cpp
+!if "$(USE_BIN_DIST)" == "yes" || !exist ($(top_srcdir)\..\cpp)
+slice_translator = slice2cpp.exe
+ice_require_cpp = 1
+!endif
+
+!if exist ($(top_srcdir)\..\config\Make.common.rules)
+!include $(top_srcdir)\..\config\Make.common.rules.mak
+!else
+!include $(top_srcdir)\config\Make.common.rules.mak
+!endif
+
+bindir = $(top_srcdir)\bin
+libdir = $(top_srcdir)\lib
+!if "$(ice_src_dist)" != ""
+includedir = $(top_srcdir)\include
+!else
+includedir = $(ice_dir)\include
+!endif
+
+install_bindir = $(prefix)\bin$(x64suffix)
+install_libdir = $(prefix)\lib$(x64suffix)
+install_includedir = $(prefix)\include
+install_docdir = $(prefix)\doc
+libsubdir = lib
+
+SETARGV = setargv.obj
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+!include $(top_srcdir)/config/Make.rules.bcc
+!elseif "$(CPP_COMPILER)" == "VC60" || "$(CPP_COMPILER)" == "VC71" || \
+ "$(CPP_COMPILER)" == "VC80" || "$(CPP_COMPILER)" == "VC80_EXPRESS" || \
+ "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"
+!include $(top_srcdir)/config/Make.rules.msvc
+! else
+!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER)
+!endif
+
+!if "$(OPTIMIZE)" != "yes"
+LIBSUFFIX = $(LIBSUFFIX)d
+RCFLAGS = -D_DEBUG
+!endif
+
+OPENSSL_LIBS = ssleay32.lib libeay32.lib
+EXPAT_LIBS = libexpat.lib
+
+CPPFLAGS = $(CPPFLAGS) -I$(includedir)
+ICECPPFLAGS = -I$(slicedir)
+SLICE2CPPFLAGS = $(ICECPPFLAGS)
+
+LDFLAGS = $(LDFLAGS) $(LDPLATFORMFLAGS) $(CXXFLAGS)
+
+!if "$(ice_src_dist)" != ""
+SLICEPARSERLIB = $(libdir)\slice$(LIBSUFFIX).lib
+SLICE2CPP = $(bindir)\slice2cpp.exe
+SLICE2XSD = $(bindir)\slice2xsd.exe
+SLICE2FREEZE = $(bindir)\slice2freeze.exe
+SLICE2DOCBOOK = $(bindir)\slice2docbook.exe
+!else
+SLICEPARSERLIB = $(ice_dir)\lib$(x64suffix)\slice$(LIBSUFFIX).lib
+SLICE2CPP = $(ice_dir)\bin$(x64suffix)\slice2cpp.exe
+SLICE2XSD = $(ice_dir)\bin$(x64suffix)\slice2xsd.exe
+SLICE2FREEZE = $(ice_dir)\bin$(x64suffix)\slice2freeze.exe
+SLICE2DOCBOOK = $(ice_dir)\bin$(x64suffix)\slice2docbook.exe
+!endif
+
+EVERYTHING = all clean install
+
+.SUFFIXES:
+.SUFFIXES: .ice .cpp .c .obj
+
+.cpp.obj::
+ $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
+
+.c.obj:
+ $(CC) /c $(CPPFLAGS) $(CFLAGS) $<
+
+
+{$(SDIR)\}.ice{$(HDIR)}.h:
+ del /q $(HDIR)\$(*F).h $(*F).cpp
+ $(SLICE2CPP) $(SLICE2CPPFLAGS) $<
+ move $(*F).h $(HDIR)
+
+.ice.cpp:
+ del /q $(*F).h $(*F).cpp
+ $(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice
+
+all:: $(SRCS) $(TARGETS)
+
+!if "$(TARGETS)" != ""
+
+clean::
+ -del /q $(TARGETS)
+
+!endif
+
+clean::
+ -del /q *.obj *.bak *.ilk *.exp *.pdb *.tds *.idb
+
+install::
diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index 7af1ce67980..0fbd0a1636e 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -1,102 +1,102 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -# -# This file is included by Make.rules.mak when using a Microsoft C++ -# compiler -# - -CXX = cl.exe -CC = cl.exe -LINK = link.exe -AR = lib.exe -RC = rc.exe - -PREOUT = /out: -PRELIBS = - -!if "$(ice_src_dist)" != "" - -# If building a source distribution, use THIRDPARTY_HOME for the 3rd party libraries -!if "$(THIRDPARTY_HOME)" != "" -CPPFLAGS = -I"$(THIRDPARTY_HOME)\include" -LDFLAGS = /LIBPATH:"$(THIRDPARTY_HOME)\lib$(x64suffix)" - -!if "$(CPP_COMPILER)" == "VC60" -CPPFLAGS = -I"$(THIRDPARTY_HOME)\include\stlport" $(CPPFLAGS) -!endif - -!endif - -!else - -# If building against a binary distribution, the 3rd party headers are located in -# the same include directory as Ice headers so there's nothing special to do, -# except for STLport if building w/ VC6. -!if "$(CPP_COMPILER)" == "VC60" -CPPFLAGS = -I"$(ice_dir)\include\stlport" $(CPPFLAGS) -!endif - -!endif - -CPPFLAGS = $(CPPFLAGS) -nologo -W3 -WX -GR -EHsc -FD -D_CONSOLE - -!if "$(OPTIMIZE)" == "yes" - -CPPFLAGS = $(CPPFLAGS) -O2 -DNDEBUG -!if "$(STATICLIBS)" == "yes" -CPPFLAGS = $(CPPFLAGS) -MT -!else -CPPFLAGS = $(CPPFLAGS) -MD -!endif - -!else - -CPPFLAGS = $(CPPFLAGS) -Zi -Gm -Od -D_DEBUG -!if "$(STATICLIBS)" == "yes" -CPPFLAGS = $(CPPFLAGS) -MTd -!else -CPPFLAGS = $(CPPFLAGS) -MDd -!endif -!if "$(CPP_COMPILER)" == "VC60" || "$(CPP_COMPILER)" == "VC71" -CPPFLAGS = $(CPPFLAGS) -GZ -!else -CPPFLAGS = $(CPPFLAGS) -RTC1 -!endif - -!endif - -!if "$(STATICLIBS)" == "yes" -CPPFLAGS = $(CPPFLAGS) -DICE_STATIC_LIBS -!endif - -!if "$(ice_src_dist)" != "" -LDFLAGS = $(LDFLAGS) /LIBPATH:"$(libdir)" /nologo /FIXED:no -!else -LDFLAGS = $(LDFLAGS) /LIBPATH:"$(ice_dir)\lib$(x64suffix)" /nologo /FIXED:no -!endif -LDFLAGS = $(LDFLAGS) /nologo /FIXED:no - -!if "$(OPTIMIZE)" != "yes" -LDFLAGS = $(LDFLAGS) /debug /incremental:yes -!else -LDFLAGS = $(LDFLAGS) /pdb:none /OPT:REF -!endif - -LD_DLLFLAGS = $(LDFLAGS) /dll -LD_EXEFLAGS = $(LDFLAGS) - -ICE_OS_LIBS = rpcrt4.lib advapi32.lib - -BASELIBS = iceutil$(LIBSUFFIX).lib $(ICE_OS_LIBS) -LIBS = ice$(LIBSUFFIX).lib $(BASELIBS) - -BZIP2_LIBS = libbz2$(LIBSUFFIX).lib -DB_LIBS = libdb46$(LIBSUFFIX).lib -ICONV_LIB = libiconv.lib +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+#
+# This file is included by Make.rules.mak when using a Microsoft C++
+# compiler
+#
+
+CXX = cl.exe
+CC = cl.exe
+LINK = link.exe
+AR = lib.exe
+RC = rc.exe
+
+PREOUT = /out:
+PRELIBS =
+
+!if "$(ice_src_dist)" != ""
+
+# If building a source distribution, use THIRDPARTY_HOME for the 3rd party libraries
+!if "$(THIRDPARTY_HOME)" != ""
+CPPFLAGS = -I"$(THIRDPARTY_HOME)\include"
+LDFLAGS = /LIBPATH:"$(THIRDPARTY_HOME)\lib$(x64suffix)"
+
+!if "$(CPP_COMPILER)" == "VC60"
+CPPFLAGS = -I"$(THIRDPARTY_HOME)\include\stlport" $(CPPFLAGS)
+!endif
+
+!endif
+
+!else
+
+# If building against a binary distribution, the 3rd party headers are located in
+# the same include directory as Ice headers so there's nothing special to do,
+# except for STLport if building w/ VC6.
+!if "$(CPP_COMPILER)" == "VC60"
+CPPFLAGS = -I"$(ice_dir)\include\stlport" $(CPPFLAGS)
+!endif
+
+!endif
+
+CPPFLAGS = $(CPPFLAGS) -nologo -W3 -WX -GR -EHsc -FD -D_CONSOLE
+
+!if "$(OPTIMIZE)" == "yes"
+
+CPPFLAGS = $(CPPFLAGS) -O2 -DNDEBUG
+!if "$(STATICLIBS)" == "yes"
+CPPFLAGS = $(CPPFLAGS) -MT
+!else
+CPPFLAGS = $(CPPFLAGS) -MD
+!endif
+
+!else
+
+CPPFLAGS = $(CPPFLAGS) -Zi -Gm -Od -D_DEBUG
+!if "$(STATICLIBS)" == "yes"
+CPPFLAGS = $(CPPFLAGS) -MTd
+!else
+CPPFLAGS = $(CPPFLAGS) -MDd
+!endif
+!if "$(CPP_COMPILER)" == "VC60" || "$(CPP_COMPILER)" == "VC71"
+CPPFLAGS = $(CPPFLAGS) -GZ
+!else
+CPPFLAGS = $(CPPFLAGS) -RTC1
+!endif
+
+!endif
+
+!if "$(STATICLIBS)" == "yes"
+CPPFLAGS = $(CPPFLAGS) -DICE_STATIC_LIBS
+!endif
+
+!if "$(ice_src_dist)" != ""
+LDFLAGS = $(LDFLAGS) /LIBPATH:"$(libdir)" /nologo /FIXED:no
+!else
+LDFLAGS = $(LDFLAGS) /LIBPATH:"$(ice_dir)\lib$(x64suffix)" /nologo /FIXED:no
+!endif
+LDFLAGS = $(LDFLAGS) /nologo /FIXED:no
+
+!if "$(OPTIMIZE)" != "yes"
+LDFLAGS = $(LDFLAGS) /debug /incremental:yes
+!else
+LDFLAGS = $(LDFLAGS) /pdb:none /OPT:REF
+!endif
+
+LD_DLLFLAGS = $(LDFLAGS) /dll
+LD_EXEFLAGS = $(LDFLAGS)
+
+ICE_OS_LIBS = rpcrt4.lib advapi32.lib
+
+BASELIBS = iceutil$(LIBSUFFIX).lib $(ICE_OS_LIBS)
+LIBS = ice$(LIBSUFFIX).lib $(BASELIBS)
+
+BZIP2_LIBS = libbz2$(LIBSUFFIX).lib
+DB_LIBS = libdb46$(LIBSUFFIX).lib
+ICONV_LIB = libiconv.lib
diff --git a/cpp/config/Makefile.mak b/cpp/config/Makefile.mak index 09ba5aac35a..f6d669577b5 100644 --- a/cpp/config/Makefile.mak +++ b/cpp/config/Makefile.mak @@ -1,28 +1,28 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = .. - -!include $(top_srcdir)/config/Make.rules.mak - -install:: - @if not exist $(prefix)\config \ - @echo "Creating $(prefix)\config..." && \ - mkdir $(prefix)\config - copy Make.rules.mak $(prefix)\config - copy Make.rules.bcc $(prefix)\config - copy templates.xml $(prefix)\config - copy convertssl.py $(prefix)\config - copy upgradeicegrid.py $(prefix)\config - copy icegridregistry.cfg $(prefix)\config - copy icegridnode.cfg $(prefix)\config - copy glacier2router.cfg $(prefix)\config - copy icegrid-slice.3.1.ice.gz $(prefix)\config - copy icegrid-slice.3.2.ice.gz $(prefix)\config - copy icegrid-slice.3.3.ice.gz $(prefix)\config +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+install::
+ @if not exist $(prefix)\config \
+ @echo "Creating $(prefix)\config..." && \
+ mkdir $(prefix)\config
+ copy Make.rules.mak $(prefix)\config
+ copy Make.rules.bcc $(prefix)\config
+ copy templates.xml $(prefix)\config
+ copy convertssl.py $(prefix)\config
+ copy upgradeicegrid.py $(prefix)\config
+ copy icegridregistry.cfg $(prefix)\config
+ copy icegridnode.cfg $(prefix)\config
+ copy glacier2router.cfg $(prefix)\config
+ copy icegrid-slice.3.1.ice.gz $(prefix)\config
+ copy icegrid-slice.3.2.ice.gz $(prefix)\config
+ copy icegrid-slice.3.3.ice.gz $(prefix)\config
diff --git a/cpp/demo/Database/Makefile.mak b/cpp/demo/Database/Makefile.mak index 2d32365fa55..4dbbaff3e7e 100644 --- a/cpp/demo/Database/Makefile.mak +++ b/cpp/demo/Database/Makefile.mak @@ -1,19 +1,19 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = Oracle - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = Oracle
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/Database/Oracle/Makefile.mak b/cpp/demo/Database/Oracle/Makefile.mak index 3a6b8151672..9f682ebcff6 100644 --- a/cpp/demo/Database/Oracle/Makefile.mak +++ b/cpp/demo/Database/Oracle/Makefile.mak @@ -1,19 +1,19 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = proc occi - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = proc occi
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/Database/Oracle/occi/Makefile.mak b/cpp/demo/Database/Oracle/occi/Makefile.mak index efa285cfaae..47bb2a92ea5 100755 --- a/cpp/demo/Database/Oracle/occi/Makefile.mak +++ b/cpp/demo/Database/Oracle/occi/Makefile.mak @@ -1,82 +1,82 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_SRCS = HR.ice - -OBJS = HR.obj - -COBJS = Client.obj - -SOBJS = DbTypes.obj \ - DbTypesMap.obj \ - DeptFactoryI.obj \ - DeptI.obj \ - EmpI.obj \ - OCCIServantLocator.obj \ - Server.obj \ - Util.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)\config\Make.rules.mak - -# -# Disable warnings 4101 and 4291 issued when compiling DbTypes.cpp -# -CPPFLAGS = -I. -I$(ORACLE_HOME)\oci\include -wd4101 -wd4291 $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -# -# OCCI first -# -!if "$(CPP_COMPILER)" == "VC80" || "$(CPP_COMPILER)" == "VC80_EXPRESS" -ORACLE_LIBS = -LIBPATH:"$(ORACLE_HOME)\oci\lib\msvc\vc8" oraocci10$(LIBSUFFIX).lib -!else -!error "$(CPP_COMPILER) is not supported by this demo" -!endif - -# -# OCI -# -ORACLE_LIBS = $(ORACLE_LIBS) -LIBPATH:"$(ORACLE_HOME)\oci\lib\msvc" oci.lib - - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - rm -f $@ - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ: DbTypes.typ - ott userid=scott/tiger@orcl code=cpp hfile=DbTypes.h cppfile=DbTypes.cpp mapfile=DbTypesMap.cpp \ - intype=DbTypes.typ outtype=DbTypesOut.typ attraccess=private - -clean:: - del /q HR.cpp HR.h - del /q DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+SLICE_SRCS = HR.ice
+
+OBJS = HR.obj
+
+COBJS = Client.obj
+
+SOBJS = DbTypes.obj \
+ DbTypesMap.obj \
+ DeptFactoryI.obj \
+ DeptI.obj \
+ EmpI.obj \
+ OCCIServantLocator.obj \
+ Server.obj \
+ Util.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+#
+# Disable warnings 4101 and 4291 issued when compiling DbTypes.cpp
+#
+CPPFLAGS = -I. -I$(ORACLE_HOME)\oci\include -wd4101 -wd4291 $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+#
+# OCCI first
+#
+!if "$(CPP_COMPILER)" == "VC80" || "$(CPP_COMPILER)" == "VC80_EXPRESS"
+ORACLE_LIBS = -LIBPATH:"$(ORACLE_HOME)\oci\lib\msvc\vc8" oraocci10$(LIBSUFFIX).lib
+!else
+!error "$(CPP_COMPILER) is not supported by this demo"
+!endif
+
+#
+# OCI
+#
+ORACLE_LIBS = $(ORACLE_LIBS) -LIBPATH:"$(ORACLE_HOME)\oci\lib\msvc" oci.lib
+
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ rm -f $@
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ: DbTypes.typ
+ ott userid=scott/tiger@orcl code=cpp hfile=DbTypes.h cppfile=DbTypes.cpp mapfile=DbTypesMap.cpp \
+ intype=DbTypes.typ outtype=DbTypesOut.typ attraccess=private
+
+clean::
+ del /q HR.cpp HR.h
+ del /q DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ
+
+!include .depend
diff --git a/cpp/demo/Database/Oracle/proc/Makefile.mak b/cpp/demo/Database/Oracle/proc/Makefile.mak index bc6fbe8b468..6ab7d8fecb5 100755 --- a/cpp/demo/Database/Oracle/proc/Makefile.mak +++ b/cpp/demo/Database/Oracle/proc/Makefile.mak @@ -1,67 +1,67 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -PROC_SRCS = CurrentSqlContext.pc \ - Util.pc \ - EmpI.pc \ - DeptI.pc \ - DeptFactoryI.pc \ - Server.pc - -OBJS = HR.obj - -COBJS = Client.obj - -SOBJS = $(PROC_SRCS:.pc=.obj) - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I"$(ORACLE_HOME)\precomp\public" -DSQLCA_NONE $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -GENERATED_PROC_FILES = $(PROC_SRCS:.pc=.cpp) - -ORACLE_LIBS = -LIBPATH:"$(ORACLE_HOME)\precomp\lib" orasql10.lib - -.SUFFIXES: -.SUFFIXES: .ice .pc .cpp .c .obj - -.pc.cpp: - proc threads=yes parse=none lines=yes code=cpp cpp_suffix=cpp close_on_commit=yes $< - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q HR.cpp HR.h - del /q $(GENERATED_PROC_FILES) - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+PROC_SRCS = CurrentSqlContext.pc \
+ Util.pc \
+ EmpI.pc \
+ DeptI.pc \
+ DeptFactoryI.pc \
+ Server.pc
+
+OBJS = HR.obj
+
+COBJS = Client.obj
+
+SOBJS = $(PROC_SRCS:.pc=.obj)
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I"$(ORACLE_HOME)\precomp\public" -DSQLCA_NONE $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+GENERATED_PROC_FILES = $(PROC_SRCS:.pc=.cpp)
+
+ORACLE_LIBS = -LIBPATH:"$(ORACLE_HOME)\precomp\lib" orasql10.lib
+
+.SUFFIXES:
+.SUFFIXES: .ice .pc .cpp .c .obj
+
+.pc.cpp:
+ proc threads=yes parse=none lines=yes code=cpp cpp_suffix=cpp close_on_commit=yes $<
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q HR.cpp HR.h
+ del /q $(GENERATED_PROC_FILES)
+
+!include .depend
diff --git a/cpp/demo/Freeze/Makefile.mak b/cpp/demo/Freeze/Makefile.mak index a3a3a398d82..c4dc133040e 100644 --- a/cpp/demo/Freeze/Makefile.mak +++ b/cpp/demo/Freeze/Makefile.mak @@ -1,25 +1,25 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = bench \ - backup \ - casino \ - customEvictor \ - library \ - phonebook \ - transform - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = bench \
+ backup \
+ casino \
+ customEvictor \
+ library \
+ phonebook \
+ transform
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/Freeze/backup/Makefile.mak b/cpp/demo/Freeze/backup/Makefile.mak index b6d353c3387..9fc6d42d35b 100755 --- a/cpp/demo/Freeze/backup/Makefile.mak +++ b/cpp/demo/Freeze/backup/Makefile.mak @@ -1,46 +1,46 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = Client.obj IntLongMap.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -IntLongMap.h IntLongMap.cpp: $(SLICE2FREEZE) - del /q IntLongMap.h IntLongMap.cpp - $(SLICE2FREEZE) -I$(slicedir) --dict IntLongMap,int,long IntLongMap - -clean:: - -del /q IntLongMap.h IntLongMap.cpp - -del /q oldlogs.txt - if exist hotbackup rmdir /q /s hotbackup - if exist hotbackup.1 rmdir /q /s hotbackup.1 - -del /q db\__*.* - -for %f in (db\data\*) do if not %f == db\data\.gitignore del /q %f - -for %f in (db\logs\*) do if not %f == db\logs\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = Client.obj IntLongMap.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+IntLongMap.h IntLongMap.cpp: $(SLICE2FREEZE)
+ del /q IntLongMap.h IntLongMap.cpp
+ $(SLICE2FREEZE) -I$(slicedir) --dict IntLongMap,int,long IntLongMap
+
+clean::
+ -del /q IntLongMap.h IntLongMap.cpp
+ -del /q oldlogs.txt
+ if exist hotbackup rmdir /q /s hotbackup
+ if exist hotbackup.1 rmdir /q /s hotbackup.1
+ -del /q db\__*.*
+ -for %f in (db\data\*) do if not %f == db\data\.gitignore del /q %f
+ -for %f in (db\logs\*) do if not %f == db\logs\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/demo/Freeze/bench/Makefile.mak b/cpp/demo/Freeze/bench/Makefile.mak index ccc0a8f1978..50a27a2394b 100644 --- a/cpp/demo/Freeze/bench/Makefile.mak +++ b/cpp/demo/Freeze/bench/Makefile.mak @@ -1,51 +1,51 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = Client.obj BenchTypes.obj Test.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -BenchTypes.h BenchTypes.cpp: Test.ice $(SLICE2FREEZE) - del /q BenchTypes.h BenchTypes.cpp - $(SLICE2FREEZE) -I$(slicedir) --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2 \ - --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1 \ - --dict Demo::Struct1ObjectMap,Demo::Struct1,Object \ - --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap \ - --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2 \ - --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive \ - --dict-index Demo::IndexedStruct1Struct2Map,s1 \ - --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1 \ - --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive \ - BenchTypes Test.ice - -clean:: - -del /q BenchTypes.h BenchTypes.cpp - -del /q Test.cpp Test.h - -for %f in (db\*) do if not %f == db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = Client.obj BenchTypes.obj Test.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+BenchTypes.h BenchTypes.cpp: Test.ice $(SLICE2FREEZE)
+ del /q BenchTypes.h BenchTypes.cpp
+ $(SLICE2FREEZE) -I$(slicedir) --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2 \
+ --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1 \
+ --dict Demo::Struct1ObjectMap,Demo::Struct1,Object \
+ --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap \
+ --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2 \
+ --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive \
+ --dict-index Demo::IndexedStruct1Struct2Map,s1 \
+ --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1 \
+ --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive \
+ BenchTypes Test.ice
+
+clean::
+ -del /q BenchTypes.h BenchTypes.cpp
+ -del /q Test.cpp Test.h
+ -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/demo/Freeze/casino/Makefile.mak b/cpp/demo/Freeze/casino/Makefile.mak index 8ca02b9d427..005edd2e11e 100644 --- a/cpp/demo/Freeze/casino/Makefile.mak +++ b/cpp/demo/Freeze/casino/Makefile.mak @@ -1,57 +1,57 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Casino.obj - -COBJS = Client.obj \ - -SOBJS = CasinoStore.obj \ - BankI.obj \ - BetI.obj \ - PlayerI.obj \ - BetResolver.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -SLICE2CPPFLAGS = -I. $(SLICE2CPPFLAGS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Casino.cpp Casino.h - del /q CasinoStore.cpp CasinoStore.h - -for %f in (db\*) do if not %f == db\DB_CONFIG del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Casino.obj
+
+COBJS = Client.obj \
+
+SOBJS = CasinoStore.obj \
+ BankI.obj \
+ BetI.obj \
+ PlayerI.obj \
+ BetResolver.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+SLICE2CPPFLAGS = -I. $(SLICE2CPPFLAGS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Casino.cpp Casino.h
+ del /q CasinoStore.cpp CasinoStore.h
+ -for %f in (db\*) do if not %f == db\DB_CONFIG del /q %f
+
+!include .depend
diff --git a/cpp/demo/Freeze/customEvictor/Makefile.mak b/cpp/demo/Freeze/customEvictor/Makefile.mak index abbb79e1ecd..fcc27b087a1 100755 --- a/cpp/demo/Freeze/customEvictor/Makefile.mak +++ b/cpp/demo/Freeze/customEvictor/Makefile.mak @@ -1,66 +1,66 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Item.obj - -COBJS = Client.obj - -SOBJS = ItemInfo.obj \ - Database.obj \ - CurrentDatabase.obj \ - ItemI.obj \ - Evictor.obj \ - EvictorBase.obj \ - SimpleEvictor.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -SLICE_SRCS = Item.ice ItemInfo.ice - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Database.h Database.cpp: ItemInfo.ice $(SLICE2FREEZE) - del /q Database.h Database.cpp - $(SLICE2FREEZE) -I$(slicedir) --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice - -clean:: - del /q Item.h Item.cpp - del /q ItemInfo.h ItemInfo.cpp - del /q Database.h Database.cpp - for %f in (db\*) do if not %f == db\DB_CONFIG del /q %f - -include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Item.obj
+
+COBJS = Client.obj
+
+SOBJS = ItemInfo.obj \
+ Database.obj \
+ CurrentDatabase.obj \
+ ItemI.obj \
+ Evictor.obj \
+ EvictorBase.obj \
+ SimpleEvictor.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+SLICE_SRCS = Item.ice ItemInfo.ice
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Database.h Database.cpp: ItemInfo.ice $(SLICE2FREEZE)
+ del /q Database.h Database.cpp
+ $(SLICE2FREEZE) -I$(slicedir) --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
+
+clean::
+ del /q Item.h Item.cpp
+ del /q ItemInfo.h ItemInfo.cpp
+ del /q Database.h Database.cpp
+ for %f in (db\*) do if not %f == db\DB_CONFIG del /q %f
+
+include .depend
diff --git a/cpp/demo/Freeze/library/Makefile.mak b/cpp/demo/Freeze/library/Makefile.mak index 4d3d6bedecb..9e0e9011cea 100644 --- a/cpp/demo/Freeze/library/Makefile.mak +++ b/cpp/demo/Freeze/library/Makefile.mak @@ -1,98 +1,98 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -COLLOCATED = collocated.exe - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -OBJS = Library.obj - -COBJS = Grammar.obj \ - Scanner.obj \ - Parser.obj \ - RunParser.obj \ - Client.obj \ - -SOBJS = LibraryI.obj \ - LibraryTypes.obj \ - BookFactory.obj \ - Server.obj - -COLOBJS = Grammar.obj \ - Scanner.obj \ - Parser.obj \ - RunParser.obj \ - LibraryI.obj \ - LibraryTypes.obj \ - BookFactory.obj \ - Collocated.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(COLOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -SLICE2CPPFLAGS = --ice $(SLICE2CPPFLAGS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(COLLOCATED): $(OBJS) $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(OBJS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -LibraryTypes.h LibraryTypes.cpp: Library.ice $(SLICE2FREEZE) - del /q LibraryTypes.h LibraryTypes.cpp - $(SLICE2FREEZE) --ice -I$(slicedir) --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes $(slicedir)/Ice/BuiltinSequences.ice Library.ice - -Scanner.cpp : Scanner.l - flex Scanner.l - del /q $@ - echo #include "IceUtil/Config.h" > Scanner.cpp - type lex.yy.c >> Scanner.cpp - del /q lex.yy.c - -Grammar.cpp Grammar.h: Grammar.y - del /q Grammar.h Grammar.cpp - bison -dvt Grammar.y - move Grammar.tab.c Grammar.cpp - move Grammar.tab.h Grammar.h - del /q Grammar.output - -clean:: - del /q Library.cpp Library.h - -clean:: - -del /q LibraryTypes.h LibraryTypes.cpp - -del /q Grammar.cpp Grammar.h - -del /q Scanner.cpp - -for %f in (db\*) do if not %f == db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+COLLOCATED = collocated.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
+
+OBJS = Library.obj
+
+COBJS = Grammar.obj \
+ Scanner.obj \
+ Parser.obj \
+ RunParser.obj \
+ Client.obj \
+
+SOBJS = LibraryI.obj \
+ LibraryTypes.obj \
+ BookFactory.obj \
+ Server.obj
+
+COLOBJS = Grammar.obj \
+ Scanner.obj \
+ Parser.obj \
+ RunParser.obj \
+ LibraryI.obj \
+ LibraryTypes.obj \
+ BookFactory.obj \
+ Collocated.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(COLOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+SLICE2CPPFLAGS = --ice $(SLICE2CPPFLAGS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(COLLOCATED): $(OBJS) $(COLOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(OBJS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+LibraryTypes.h LibraryTypes.cpp: Library.ice $(SLICE2FREEZE)
+ del /q LibraryTypes.h LibraryTypes.cpp
+ $(SLICE2FREEZE) --ice -I$(slicedir) --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes $(slicedir)/Ice/BuiltinSequences.ice Library.ice
+
+Scanner.cpp : Scanner.l
+ flex Scanner.l
+ del /q $@
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
+ del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+ del /q Grammar.h Grammar.cpp
+ bison -dvt Grammar.y
+ move Grammar.tab.c Grammar.cpp
+ move Grammar.tab.h Grammar.h
+ del /q Grammar.output
+
+clean::
+ del /q Library.cpp Library.h
+
+clean::
+ -del /q LibraryTypes.h LibraryTypes.cpp
+ -del /q Grammar.cpp Grammar.h
+ -del /q Scanner.cpp
+ -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/demo/Freeze/phonebook/Makefile.mak b/cpp/demo/Freeze/phonebook/Makefile.mak index 0d86e12efd6..635e8e578b8 100644 --- a/cpp/demo/Freeze/phonebook/Makefile.mak +++ b/cpp/demo/Freeze/phonebook/Makefile.mak @@ -1,97 +1,97 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -COLLOCATED = collocated.exe - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -OBJS = PhoneBook.obj - -COBJS = Grammar.obj \ - Scanner.obj \ - Parser.obj \ - RunParser.obj \ - Client.obj \ - -SOBJS = PhoneBookI.obj \ - ContactFactory.obj \ - NameIndex.obj \ - Server.obj - -COLOBJS = Grammar.obj \ - Scanner.obj \ - Parser.obj \ - RunParser.obj \ - PhoneBookI.obj \ - ContactFactory.obj \ - NameIndex.obj \ - Collocated.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(COLOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(COLLOCATED): $(OBJS) $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(OBJS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -NameIndex.h NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE) - del /q NameIndex.h NameIndex.cpp - $(SLICE2FREEZE) $(ICECPPFLAGS) --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice - -Scanner.cpp : Scanner.l - flex Scanner.l - del /q $@ - echo #include "IceUtil/Config.h" > Scanner.cpp - type lex.yy.c >> Scanner.cpp - del /q lex.yy.c - -Grammar.cpp Grammar.h: Grammar.y - del /q Grammar.h Grammar.cpp - bison -dvt Grammar.y - move Grammar.tab.c Grammar.cpp - move Grammar.tab.h Grammar.h - del /q Grammar.output - -clean:: - del /q PhoneBook.cpp PhoneBook.h - -clean:: - -del /q NameIndex.h NameIndex.cpp - -del /q Grammar.cpp Grammar.h - -del /q Scanner.cpp - -for %f in (db\*) do if not %f == db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+COLLOCATED = collocated.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
+
+OBJS = PhoneBook.obj
+
+COBJS = Grammar.obj \
+ Scanner.obj \
+ Parser.obj \
+ RunParser.obj \
+ Client.obj \
+
+SOBJS = PhoneBookI.obj \
+ ContactFactory.obj \
+ NameIndex.obj \
+ Server.obj
+
+COLOBJS = Grammar.obj \
+ Scanner.obj \
+ Parser.obj \
+ RunParser.obj \
+ PhoneBookI.obj \
+ ContactFactory.obj \
+ NameIndex.obj \
+ Collocated.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(COLOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(COLLOCATED): $(OBJS) $(COLOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(OBJS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+NameIndex.h NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE)
+ del /q NameIndex.h NameIndex.cpp
+ $(SLICE2FREEZE) $(ICECPPFLAGS) --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
+
+Scanner.cpp : Scanner.l
+ flex Scanner.l
+ del /q $@
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
+ del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+ del /q Grammar.h Grammar.cpp
+ bison -dvt Grammar.y
+ move Grammar.tab.c Grammar.cpp
+ move Grammar.tab.h Grammar.h
+ del /q Grammar.output
+
+clean::
+ del /q PhoneBook.cpp PhoneBook.h
+
+clean::
+ -del /q NameIndex.h NameIndex.cpp
+ -del /q Grammar.cpp Grammar.h
+ -del /q Scanner.cpp
+ -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/demo/Freeze/transform/Makefile.mak b/cpp/demo/Freeze/transform/Makefile.mak index 5f06bf570de..5d7a5e6a57e 100755 --- a/cpp/demo/Freeze/transform/Makefile.mak +++ b/cpp/demo/Freeze/transform/Makefile.mak @@ -1,79 +1,79 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CREATE = create.exe -READ = read.exe -READNEW = readnew.exe -RECREATE = recreate.exe - -TARGETS = $(CREATE) $(READ) $(READNEW) $(RECREATE) - -CREATE_OBJS = ContactData.obj Contacts.obj create.obj -READ_OBJS = ContactData.obj Contacts.obj read.obj -READNEW_OBJS = NewContactData.obj NewContacts.obj readnew.obj -RECREATE_OBJS = NewContactData.obj NewContacts.obj recreate.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CREATE_PDBFLAGS = /pdb:$(CREATE:.exe=.pdb) -READ_PDBFLAGS = /pdb:$(READ:.exe=.pdb) -READNEW_PDBFLAGS = /pdb:$(READNEW:.exe=.pdb) -RECREATE_PDBFLAGS = /pdb:$(RECREATE:.exe=.pdb) -!endif - - -$(CREATE): $(CREATE_OBJS) - $(LINK) $(LD_EXEFLAGS) $(CREATE_PDBFLAGS) $(SETARGV) $(CREATE_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(READ): $(READ_OBJS) - $(LINK) $(LD_EXEFLAGS) $(READ_PDBFLAGS) $(SETARGV) $(READ_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(READNEW): $(READNEW_OBJS) - $(LINK) $(LD_EXEFLAGS) $(READNEW_PDBFLAGS) $(SETARGV) $(READNEW_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(RECREATE): $(RECREATE_OBJS) - $(LINK) $(LD_EXEFLAGS) $(RECREATE_PDBFLAGS) $(SETARGV) $(RECREATE_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Contacts.h Contacts.cpp: ContactData.ice $(SLICE2FREEZE) - del /q Contacts.h Contacts.cpp - $(SLICE2FREEZE) -I$(slicedir) --dict Demo::Contacts,string,Demo::ContactData,sort \ - --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice - - -NewContacts.h NewContacts.cpp: NewContactData.ice $(SLICE2FREEZE) - del /q NewContacts.h NewContacts.cpp - $(SLICE2FREEZE) -I$(slicedir) --dict Demo::NewContacts,string,Demo::ContactData,sort \ - --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice - -cleandb:: - -for %f in (db\*) do if not %f == db\.gitignore del /q %f - -for %f in (dbnew\*) do if not %f == dbnew\.gitignore del /q %f - -clean:: cleandb - -del /q ContactData.h ContactData.cpp - -del /q NewContactData.h NewContactData.cpp - -del /q Contacts.h Contacts.cpp - -del /q NewContacts.h NewContacts.cpp - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CREATE = create.exe
+READ = read.exe
+READNEW = readnew.exe
+RECREATE = recreate.exe
+
+TARGETS = $(CREATE) $(READ) $(READNEW) $(RECREATE)
+
+CREATE_OBJS = ContactData.obj Contacts.obj create.obj
+READ_OBJS = ContactData.obj Contacts.obj read.obj
+READNEW_OBJS = NewContactData.obj NewContacts.obj readnew.obj
+RECREATE_OBJS = NewContactData.obj NewContacts.obj recreate.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CREATE_PDBFLAGS = /pdb:$(CREATE:.exe=.pdb)
+READ_PDBFLAGS = /pdb:$(READ:.exe=.pdb)
+READNEW_PDBFLAGS = /pdb:$(READNEW:.exe=.pdb)
+RECREATE_PDBFLAGS = /pdb:$(RECREATE:.exe=.pdb)
+!endif
+
+
+$(CREATE): $(CREATE_OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CREATE_PDBFLAGS) $(SETARGV) $(CREATE_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(READ): $(READ_OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(READ_PDBFLAGS) $(SETARGV) $(READ_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(READNEW): $(READNEW_OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(READNEW_PDBFLAGS) $(SETARGV) $(READNEW_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(RECREATE): $(RECREATE_OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(RECREATE_PDBFLAGS) $(SETARGV) $(RECREATE_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Contacts.h Contacts.cpp: ContactData.ice $(SLICE2FREEZE)
+ del /q Contacts.h Contacts.cpp
+ $(SLICE2FREEZE) -I$(slicedir) --dict Demo::Contacts,string,Demo::ContactData,sort \
+ --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
+
+
+NewContacts.h NewContacts.cpp: NewContactData.ice $(SLICE2FREEZE)
+ del /q NewContacts.h NewContacts.cpp
+ $(SLICE2FREEZE) -I$(slicedir) --dict Demo::NewContacts,string,Demo::ContactData,sort \
+ --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
+
+cleandb::
+ -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ -for %f in (dbnew\*) do if not %f == dbnew\.gitignore del /q %f
+
+clean:: cleandb
+ -del /q ContactData.h ContactData.cpp
+ -del /q NewContactData.h NewContactData.cpp
+ -del /q Contacts.h Contacts.cpp
+ -del /q NewContacts.h NewContacts.cpp
+
+!include .depend
diff --git a/cpp/demo/Glacier2/Makefile.mak b/cpp/demo/Glacier2/Makefile.mak index 5a45da86376..2bb7f2b862c 100644 --- a/cpp/demo/Glacier2/Makefile.mak +++ b/cpp/demo/Glacier2/Makefile.mak @@ -1,19 +1,19 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = callback chat - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = callback chat
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/Glacier2/callback/Makefile.mak b/cpp/demo/Glacier2/callback/Makefile.mak index 2bc3216980a..b0f8e5af775 100644 --- a/cpp/demo/Glacier2/callback/Makefile.mak +++ b/cpp/demo/Glacier2/callback/Makefile.mak @@ -1,62 +1,62 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -SESSION_SERVER = sessionserver.exe - -TARGETS = $(CLIENT) $(SERVER) $(SESSION_SERVER) - -OBJS = Callback.obj \ - CallbackI.obj - -COBJS = Client.obj - -SOBJS = Server.obj - -SSOBJS = SessionServer.obj \ - SessionI.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(SSOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -SSPDBFLAGS = /pdb:$(SESSION_SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SESSION_SERVER): $(SSOBJS) - $(LINK) $(LD_EXEFLAGS) $(SSPDBFLAGS) $(SETARGV) $(SSOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Callback.cpp Callback.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+SESSION_SERVER = sessionserver.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(SESSION_SERVER)
+
+OBJS = Callback.obj \
+ CallbackI.obj
+
+COBJS = Client.obj
+
+SOBJS = Server.obj
+
+SSOBJS = SessionServer.obj \
+ SessionI.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(SSOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+SSPDBFLAGS = /pdb:$(SESSION_SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SESSION_SERVER): $(SSOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SSPDBFLAGS) $(SETARGV) $(SSOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+ glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Callback.cpp Callback.h
+
+!include .depend
diff --git a/cpp/demo/Glacier2/chat/Makefile.mak b/cpp/demo/Glacier2/chat/Makefile.mak index 92ce149278a..5bb3181236d 100644 --- a/cpp/demo/Glacier2/chat/Makefile.mak +++ b/cpp/demo/Glacier2/chat/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Chat.obj - -COBJS = Client.obj - -SOBJS = Server.obj \ - ChatSessionI.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Chat.cpp Chat.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Chat.obj
+
+COBJS = Client.obj
+
+SOBJS = Server.obj \
+ ChatSessionI.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Chat.cpp Chat.h
+
+!include .depend
diff --git a/cpp/demo/Ice/MFC/Makefile.mak b/cpp/demo/Ice/MFC/Makefile.mak index eb18c27453f..27ee90aab10 100755 --- a/cpp/demo/Ice/MFC/Makefile.mak +++ b/cpp/demo/Ice/MFC/Makefile.mak @@ -1,20 +1,20 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = client \ - server - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = client \
+ server
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/Ice/MFC/client/Makefile.mak b/cpp/demo/Ice/MFC/client/Makefile.mak index 67981fe4eb4..0a2006266fb 100755 --- a/cpp/demo/Ice/MFC/client/Makefile.mak +++ b/cpp/demo/Ice/MFC/client/Makefile.mak @@ -1,44 +1,44 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = Hello.obj \ - HelloClient.obj \ - HelloClientDlg.obj \ - stdafx.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) HelloClient.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) /subsystem:windows $(OBJS) $(COBJS) HelloClient.res \ - $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -HelloClient.res: HelloClient.rc - rc.exe HelloClient.rc - -clean:: - del /q Hello.cpp Hello.h - del /q HelloClient.res - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = Hello.obj \
+ HelloClient.obj \
+ HelloClientDlg.obj \
+ stdafx.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS) HelloClient.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) /subsystem:windows $(OBJS) $(COBJS) HelloClient.res \
+ $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+HelloClient.res: HelloClient.rc
+ rc.exe HelloClient.rc
+
+clean::
+ del /q Hello.cpp Hello.h
+ del /q HelloClient.res
+
+!include .depend
diff --git a/cpp/demo/Ice/MFC/server/Makefile.mak b/cpp/demo/Ice/MFC/server/Makefile.mak index c5353d476d7..3fdc551ebe5 100755 --- a/cpp/demo/Ice/MFC/server/Makefile.mak +++ b/cpp/demo/Ice/MFC/server/Makefile.mak @@ -1,46 +1,46 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\..\.. - -SERVER = server.exe - -TARGETS = $(SERVER) - -OBJS = Hello.obj \ - HelloI.obj \ - HelloServer.obj \ - HelloServerDlg.obj \ - LogI.obj \ - stdafx.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(SERVER): $(OBJS) $(COBJS) HelloServer.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) /subsystem:windows $(OBJS) $(COBJS) HelloServer.res \ - $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -HelloServer.res: HelloServer.rc - rc.exe HelloServer.rc - -clean:: - del /q Hello.cpp Hello.h - del /q HelloServer.res - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..\..
+
+SERVER = server.exe
+
+TARGETS = $(SERVER)
+
+OBJS = Hello.obj \
+ HelloI.obj \
+ HelloServer.obj \
+ HelloServerDlg.obj \
+ LogI.obj \
+ stdafx.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(SERVER): $(OBJS) $(COBJS) HelloServer.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) /subsystem:windows $(OBJS) $(COBJS) HelloServer.res \
+ $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+HelloServer.res: HelloServer.rc
+ rc.exe HelloServer.rc
+
+clean::
+ del /q Hello.cpp Hello.h
+ del /q HelloServer.res
+
+!include .depend
diff --git a/cpp/demo/Ice/Makefile.mak b/cpp/demo/Ice/Makefile.mak index ecdb8b50d0b..7ded1105a51 100644 --- a/cpp/demo/Ice/Makefile.mak +++ b/cpp/demo/Ice/Makefile.mak @@ -1,35 +1,35 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = minimal \ - hello \ - latency \ - throughput \ - value \ - callback \ - nested \ - invoke \ - bidir \ - session \ - converter \ - async \ - multicast - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(CPP_COMPILER)" != "VC80_EXPRESS" && "$(CPP_COMPILER)" != "VC90_EXPRESS" -SUBDIRS = $(SUBDIRS) MFC -!endif - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = minimal \
+ hello \
+ latency \
+ throughput \
+ value \
+ callback \
+ nested \
+ invoke \
+ bidir \
+ session \
+ converter \
+ async \
+ multicast
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(CPP_COMPILER)" != "VC80_EXPRESS" && "$(CPP_COMPILER)" != "VC90_EXPRESS"
+SUBDIRS = $(SUBDIRS) MFC
+!endif
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/Ice/async/Makefile.mak b/cpp/demo/Ice/async/Makefile.mak index 5ab2958411b..871ad05ec24 100644 --- a/cpp/demo/Ice/async/Makefile.mak +++ b/cpp/demo/Ice/async/Makefile.mak @@ -1,51 +1,51 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Hello.obj - -COBJS = Client.obj - -SOBJS = HelloI.obj \ - Server.obj \ - WorkQueue.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Hello.cpp Hello.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Hello.obj
+
+COBJS = Client.obj
+
+SOBJS = HelloI.obj \
+ Server.obj \
+ WorkQueue.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Hello.cpp Hello.h
+
+!include .depend
diff --git a/cpp/demo/Ice/bidir/Makefile.mak b/cpp/demo/Ice/bidir/Makefile.mak index 088e8e486d3..3694489b8f4 100644 --- a/cpp/demo/Ice/bidir/Makefile.mak +++ b/cpp/demo/Ice/bidir/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Callback.obj - -COBJS = Client.obj - -SOBJS = CallbackI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Callback.cpp Callback.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Callback.obj
+
+COBJS = Client.obj
+
+SOBJS = CallbackI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Callback.cpp Callback.h
+
+!include .depend
diff --git a/cpp/demo/Ice/callback/Makefile.mak b/cpp/demo/Ice/callback/Makefile.mak index 8e8992cfff7..ba726a03529 100644 --- a/cpp/demo/Ice/callback/Makefile.mak +++ b/cpp/demo/Ice/callback/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Callback.obj - -COBJS = Client.obj - -SOBJS = CallbackSenderI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Callback.cpp Callback.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Callback.obj
+
+COBJS = Client.obj
+
+SOBJS = CallbackSenderI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Callback.cpp Callback.h
+
+!include .depend
diff --git a/cpp/demo/Ice/converter/Makefile.mak b/cpp/demo/Ice/converter/Makefile.mak index 87289dbd3d0..7c0c01192f3 100644 --- a/cpp/demo/Ice/converter/Makefile.mak +++ b/cpp/demo/Ice/converter/Makefile.mak @@ -1,51 +1,51 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Greet.obj \ - StringConverterI.obj - -COBJS = Client.obj - -SOBJS = GreetI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Greet.cpp Greet.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Greet.obj \
+ StringConverterI.obj
+
+COBJS = Client.obj
+
+SOBJS = GreetI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Greet.cpp Greet.h
+
+!include .depend
diff --git a/cpp/demo/Ice/hello/Makefile.mak b/cpp/demo/Ice/hello/Makefile.mak index 6feca22bdc2..8a0700dc53a 100644 --- a/cpp/demo/Ice/hello/Makefile.mak +++ b/cpp/demo/Ice/hello/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Hello.obj - -COBJS = Client.obj - -SOBJS = HelloI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Hello.cpp Hello.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Hello.obj
+
+COBJS = Client.obj
+
+SOBJS = HelloI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Hello.cpp Hello.h
+
+!include .depend
diff --git a/cpp/demo/Ice/invoke/Makefile.mak b/cpp/demo/Ice/invoke/Makefile.mak index b9094706a78..407fe369890 100644 --- a/cpp/demo/Ice/invoke/Makefile.mak +++ b/cpp/demo/Ice/invoke/Makefile.mak @@ -1,51 +1,51 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Printer.obj - -COBJS = Client.obj - -SOBJS = PrinterI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS) -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Printer.cpp Printer.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Printer.obj
+
+COBJS = Client.obj
+
+SOBJS = PrinterI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS)
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Printer.cpp Printer.h
+
+!include .depend
diff --git a/cpp/demo/Ice/latency/Makefile.mak b/cpp/demo/Ice/latency/Makefile.mak index 44cfcb1aa0a..5a5403f1f38 100644 --- a/cpp/demo/Ice/latency/Makefile.mak +++ b/cpp/demo/Ice/latency/Makefile.mak @@ -1,49 +1,49 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Latency.obj - -COBJS = Client.obj - -SOBJS = Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Latency.cpp Latency.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Latency.obj
+
+COBJS = Client.obj
+
+SOBJS = Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Latency.cpp Latency.h
+
+!include .depend
diff --git a/cpp/demo/Ice/minimal/Makefile.mak b/cpp/demo/Ice/minimal/Makefile.mak index 6feca22bdc2..8a0700dc53a 100644 --- a/cpp/demo/Ice/minimal/Makefile.mak +++ b/cpp/demo/Ice/minimal/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Hello.obj - -COBJS = Client.obj - -SOBJS = HelloI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Hello.cpp Hello.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Hello.obj
+
+COBJS = Client.obj
+
+SOBJS = HelloI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Hello.cpp Hello.h
+
+!include .depend
diff --git a/cpp/demo/Ice/multicast/Makefile.mak b/cpp/demo/Ice/multicast/Makefile.mak index 260b466be30..dd8a79c1d70 100644 --- a/cpp/demo/Ice/multicast/Makefile.mak +++ b/cpp/demo/Ice/multicast/Makefile.mak @@ -1,51 +1,51 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Hello.obj \ - Discovery.obj - -COBJS = Client.obj - -SOBJS = Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Hello.cpp Hello.h - del /q Discovery.cpp Discovery.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Hello.obj \
+ Discovery.obj
+
+COBJS = Client.obj
+
+SOBJS = Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Hello.cpp Hello.h
+ del /q Discovery.cpp Discovery.h
+
+!include .depend
diff --git a/cpp/demo/Ice/nested/Makefile.mak b/cpp/demo/Ice/nested/Makefile.mak index d64266f4f9f..654b0fc5662 100644 --- a/cpp/demo/Ice/nested/Makefile.mak +++ b/cpp/demo/Ice/nested/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Nested.obj \ - NestedI.obj - -COBJS = Client.obj - -SOBJS = Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Nested.cpp Nested.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Nested.obj \
+ NestedI.obj
+
+COBJS = Client.obj
+
+SOBJS = Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Nested.cpp Nested.h
+
+!include .depend
diff --git a/cpp/demo/Ice/session/Makefile.mak b/cpp/demo/Ice/session/Makefile.mak index 9d9a823e660..07043b8d4f1 100644 --- a/cpp/demo/Ice/session/Makefile.mak +++ b/cpp/demo/Ice/session/Makefile.mak @@ -1,52 +1,52 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Session.obj - -COBJS = Client.obj - -SOBJS = ReapThread.obj \ - SessionFactoryI.obj \ - SessionI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Session.cpp Session.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Session.obj
+
+COBJS = Client.obj
+
+SOBJS = ReapThread.obj \
+ SessionFactoryI.obj \
+ SessionI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Session.cpp Session.h
+
+!include .depend
diff --git a/cpp/demo/Ice/throughput/Makefile.mak b/cpp/demo/Ice/throughput/Makefile.mak index 9a0c3938b80..1227e337b8a 100644 --- a/cpp/demo/Ice/throughput/Makefile.mak +++ b/cpp/demo/Ice/throughput/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Throughput.obj - -COBJS = Client.obj - -SOBJS = ThroughputI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Throughput.cpp Throughput.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Throughput.obj
+
+COBJS = Client.obj
+
+SOBJS = ThroughputI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Throughput.cpp Throughput.h
+
+!include .depend
diff --git a/cpp/demo/Ice/value/Makefile.mak b/cpp/demo/Ice/value/Makefile.mak index 3c26643053d..177a9163588 100644 --- a/cpp/demo/Ice/value/Makefile.mak +++ b/cpp/demo/Ice/value/Makefile.mak @@ -1,51 +1,51 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Value.obj \ - ValueI.obj - -COBJS = Client.obj \ - ObjectFactory.obj - -SOBJS = Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Value.cpp Value.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Value.obj \
+ ValueI.obj
+
+COBJS = Client.obj \
+ ObjectFactory.obj
+
+SOBJS = Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Value.cpp Value.h
+
+!include .depend
diff --git a/cpp/demo/IceBox/Makefile.mak b/cpp/demo/IceBox/Makefile.mak index 09dc448f03c..f069041d5d0 100644 --- a/cpp/demo/IceBox/Makefile.mak +++ b/cpp/demo/IceBox/Makefile.mak @@ -1,19 +1,19 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = hello - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = hello
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/IceBox/hello/Makefile.mak b/cpp/demo/IceBox/hello/Makefile.mak index 93df92b4842..88f8a52d1b3 100644 --- a/cpp/demo/IceBox/hello/Makefile.mak +++ b/cpp/demo/IceBox/hello/Makefile.mak @@ -1,58 +1,58 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -LIBNAME = helloservice$(LIBSUFFIX).lib -DLLNAME = helloservice$(LIBSUFFIX).dll - -TARGETS = $(CLIENT) $(LIBNAME) $(DLLNAME) - -OBJS = Hello.obj - -COBJS = Client.obj - -SOBJS = HelloI.obj \ - HelloServiceI.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -SLICE_SRCS = Hello.ice - -!include $(top_srcdir)\config\Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(LIBNAME) : $(DLLNAME) - -$(DLLNAME): $(OBJS) $(SOBJS) - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Hello.cpp Hello.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+LIBNAME = helloservice$(LIBSUFFIX).lib
+DLLNAME = helloservice$(LIBSUFFIX).dll
+
+TARGETS = $(CLIENT) $(LIBNAME) $(DLLNAME)
+
+OBJS = Hello.obj
+
+COBJS = Client.obj
+
+SOBJS = HelloI.obj \
+ HelloServiceI.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+SLICE_SRCS = Hello.ice
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(LIBNAME) : $(DLLNAME)
+
+$(DLLNAME): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Hello.cpp Hello.h
+
+!include .depend
diff --git a/cpp/demo/IceGrid/Makefile.mak b/cpp/demo/IceGrid/Makefile.mak index c47fe368262..5ad1ebf534f 100644 --- a/cpp/demo/IceGrid/Makefile.mak +++ b/cpp/demo/IceGrid/Makefile.mak @@ -1,19 +1,19 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = allocate sessionActivation simple replication icebox - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = allocate sessionActivation simple replication icebox
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/IceGrid/allocate/Makefile.mak b/cpp/demo/IceGrid/allocate/Makefile.mak index 900d380721e..e623b30b330 100644 --- a/cpp/demo/IceGrid/allocate/Makefile.mak +++ b/cpp/demo/IceGrid/allocate/Makefile.mak @@ -1,55 +1,55 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Hello.obj - -COBJS = Client.obj - -SOBJS = HelloI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - -del /q Hello.cpp Hello.h - -clean:: - -for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f - -for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Hello.obj
+
+COBJS = Client.obj
+
+SOBJS = HelloI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+ icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ -del /q Hello.cpp Hello.h
+
+clean::
+ -for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
+ -for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
+
+!include .depend
diff --git a/cpp/demo/IceGrid/icebox/Makefile.mak b/cpp/demo/IceGrid/icebox/Makefile.mak index 93df92b4842..88f8a52d1b3 100644 --- a/cpp/demo/IceGrid/icebox/Makefile.mak +++ b/cpp/demo/IceGrid/icebox/Makefile.mak @@ -1,58 +1,58 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -LIBNAME = helloservice$(LIBSUFFIX).lib -DLLNAME = helloservice$(LIBSUFFIX).dll - -TARGETS = $(CLIENT) $(LIBNAME) $(DLLNAME) - -OBJS = Hello.obj - -COBJS = Client.obj - -SOBJS = HelloI.obj \ - HelloServiceI.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -SLICE_SRCS = Hello.ice - -!include $(top_srcdir)\config\Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(LIBNAME) : $(DLLNAME) - -$(DLLNAME): $(OBJS) $(SOBJS) - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Hello.cpp Hello.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+LIBNAME = helloservice$(LIBSUFFIX).lib
+DLLNAME = helloservice$(LIBSUFFIX).dll
+
+TARGETS = $(CLIENT) $(LIBNAME) $(DLLNAME)
+
+OBJS = Hello.obj
+
+COBJS = Client.obj
+
+SOBJS = HelloI.obj \
+ HelloServiceI.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+SLICE_SRCS = Hello.ice
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(LIBNAME) : $(DLLNAME)
+
+$(DLLNAME): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Hello.cpp Hello.h
+
+!include .depend
diff --git a/cpp/demo/IceGrid/replication/Makefile.mak b/cpp/demo/IceGrid/replication/Makefile.mak index 1b00bb286fa..ff1c269a648 100644 --- a/cpp/demo/IceGrid/replication/Makefile.mak +++ b/cpp/demo/IceGrid/replication/Makefile.mak @@ -1,58 +1,58 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Hello.obj - -COBJS = Client.obj - -SOBJS = HelloI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Hello.cpp Hello.h - -clean:: - -for %d in (master replica1 replica2) do \ - for %f in (db\%d\*) do if not %f == db\%d\.gitignore del /q %f - -for %d in (node1 node2) do \ - for %f in (db\%d\*) do if not %f == db\%d\.gitignore del /q %f - -for %f in (distrib servers tmp) do if exist db\%d\%f rmdir /s /q db\%d\%f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Hello.obj
+
+COBJS = Client.obj
+
+SOBJS = HelloI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+ icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Hello.cpp Hello.h
+
+clean::
+ -for %d in (master replica1 replica2) do \
+ for %f in (db\%d\*) do if not %f == db\%d\.gitignore del /q %f
+ -for %d in (node1 node2) do \
+ for %f in (db\%d\*) do if not %f == db\%d\.gitignore del /q %f
+ -for %f in (distrib servers tmp) do if exist db\%d\%f rmdir /s /q db\%d\%f
+
+!include .depend
diff --git a/cpp/demo/IceGrid/sessionActivation/Makefile.mak b/cpp/demo/IceGrid/sessionActivation/Makefile.mak index 944a54ceffa..731c101174b 100644 --- a/cpp/demo/IceGrid/sessionActivation/Makefile.mak +++ b/cpp/demo/IceGrid/sessionActivation/Makefile.mak @@ -1,55 +1,55 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Hello.obj - -COBJS = Client.obj - -SOBJS = HelloI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - -del /q Hello.cpp Hello.h - -clean:: - -for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f - -for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Hello.obj
+
+COBJS = Client.obj
+
+SOBJS = HelloI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+ icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ -del /q Hello.cpp Hello.h
+
+clean::
+ -for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
+ -for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
+
+!include .depend
diff --git a/cpp/demo/IceGrid/simple/Makefile.mak b/cpp/demo/IceGrid/simple/Makefile.mak index 900d380721e..e623b30b330 100644 --- a/cpp/demo/IceGrid/simple/Makefile.mak +++ b/cpp/demo/IceGrid/simple/Makefile.mak @@ -1,55 +1,55 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Hello.obj - -COBJS = Client.obj - -SOBJS = HelloI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - -del /q Hello.cpp Hello.h - -clean:: - -for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f - -for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Hello.obj
+
+COBJS = Client.obj
+
+SOBJS = HelloI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+ icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ -del /q Hello.cpp Hello.h
+
+clean::
+ -for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
+ -for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
+
+!include .depend
diff --git a/cpp/demo/IcePatch2/MFC/Makefile.mak b/cpp/demo/IcePatch2/MFC/Makefile.mak index ed4317586c1..dce0e9b2396 100755 --- a/cpp/demo/IcePatch2/MFC/Makefile.mak +++ b/cpp/demo/IcePatch2/MFC/Makefile.mak @@ -1,43 +1,43 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = PatchClient.obj \ - PatchClientDlg.obj \ - stdafx.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN -D_UNICODE -LINKWITH = icepatch2$(LIBSUFFIX).lib $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) PatchClient.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) /entry:wWinMainCRTStartup /subsystem:windows $(OBJS) $(COBJS) \ - PatchClient.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -PatchClient.res: PatchClient.rc - rc.exe PatchClient.rc - -clean:: - del /q PatchClient.res - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = PatchClient.obj \
+ PatchClientDlg.obj \
+ stdafx.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN -D_UNICODE
+LINKWITH = icepatch2$(LIBSUFFIX).lib $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS) PatchClient.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) /entry:wWinMainCRTStartup /subsystem:windows $(OBJS) $(COBJS) \
+ PatchClient.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+PatchClient.res: PatchClient.rc
+ rc.exe PatchClient.rc
+
+clean::
+ del /q PatchClient.res
+
+!include .depend
diff --git a/cpp/demo/IcePatch2/Makefile.mak b/cpp/demo/IcePatch2/Makefile.mak index 28baa7a056c..9f7cad5e369 100644 --- a/cpp/demo/IcePatch2/Makefile.mak +++ b/cpp/demo/IcePatch2/Makefile.mak @@ -1,19 +1,19 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = MFC - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = MFC
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/IceStorm/Makefile.mak b/cpp/demo/IceStorm/Makefile.mak index 569a0a60a5c..35b6b232d45 100644 --- a/cpp/demo/IceStorm/Makefile.mak +++ b/cpp/demo/IceStorm/Makefile.mak @@ -1,19 +1,19 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = clock counter replicated replicated2 - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = clock counter replicated replicated2
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/IceStorm/clock/Makefile.mak b/cpp/demo/IceStorm/clock/Makefile.mak index ca6def8c722..1e19c7cbe45 100644 --- a/cpp/demo/IceStorm/clock/Makefile.mak +++ b/cpp/demo/IceStorm/clock/Makefile.mak @@ -1,54 +1,54 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -PUBLISHER = publisher.exe -SUBSCRIBER = subscriber.exe - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -OBJS = Clock.obj - -POBJS = Publisher.obj - -SOBJS = Subscriber.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(POBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = $(libdir)\icestorm$(LIBSUFFIX).lib $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) -SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) -!endif - -$(PUBLISHER): $(OBJS) $(POBJS) - $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SUBSCRIBER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - -del /q Clock.cpp Clock.h - -clean:: - -for %f in (db\*) do if not %f == db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+PUBLISHER = publisher.exe
+SUBSCRIBER = subscriber.exe
+
+TARGETS = $(PUBLISHER) $(SUBSCRIBER)
+
+OBJS = Clock.obj
+
+POBJS = Publisher.obj
+
+SOBJS = Subscriber.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(POBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LIBS = $(libdir)\icestorm$(LIBSUFFIX).lib $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb)
+!endif
+
+$(PUBLISHER): $(OBJS) $(POBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SUBSCRIBER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ -del /q Clock.cpp Clock.h
+
+clean::
+ -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/demo/IceStorm/counter/Makefile.mak b/cpp/demo/IceStorm/counter/Makefile.mak index ef14ad3fbf8..efd1853a9d9 100644 --- a/cpp/demo/IceStorm/counter/Makefile.mak +++ b/cpp/demo/IceStorm/counter/Makefile.mak @@ -1,56 +1,56 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Counter.obj - -COBJS = Client.obj \ - CounterObserverI.obj - -SOBJS = Server.obj \ - CounterI.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -IS_LIBS = $(libdir)\icestorm$(LIBSUFFIX).lib $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(IS_LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - -del /q Counter.cpp Counter.h - -clean:: - -for %f in (db\*) do if not %f == db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Counter.obj
+
+COBJS = Client.obj \
+ CounterObserverI.obj
+
+SOBJS = Server.obj \
+ CounterI.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+IS_LIBS = $(libdir)\icestorm$(LIBSUFFIX).lib $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(IS_LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ -del /q Counter.cpp Counter.h
+
+clean::
+ -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/demo/IceStorm/replicated/Makefile.mak b/cpp/demo/IceStorm/replicated/Makefile.mak index 7c21a02396e..f29692b0207 100644 --- a/cpp/demo/IceStorm/replicated/Makefile.mak +++ b/cpp/demo/IceStorm/replicated/Makefile.mak @@ -1,55 +1,55 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -PUBLISHER = publisher.exe -SUBSCRIBER = subscriber.exe - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -OBJS = Clock.obj - -POBJS = Publisher.obj - -SOBJS = Subscriber.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(POBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = $(libdir)\icestorm$(LIBSUFFIX).lib $(libdir)\icegrid$(LIBSUFFIX).lib $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) -SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) -!endif - -$(PUBLISHER): $(OBJS) $(POBJS) - $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SUBSCRIBER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Clock.cpp Clock.h - -clean:: - -for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f - -for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+PUBLISHER = publisher.exe
+SUBSCRIBER = subscriber.exe
+
+TARGETS = $(PUBLISHER) $(SUBSCRIBER)
+
+OBJS = Clock.obj
+
+POBJS = Publisher.obj
+
+SOBJS = Subscriber.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(POBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LIBS = $(libdir)\icestorm$(LIBSUFFIX).lib $(libdir)\icegrid$(LIBSUFFIX).lib $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb)
+!endif
+
+$(PUBLISHER): $(OBJS) $(POBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SUBSCRIBER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Clock.cpp Clock.h
+
+clean::
+ -for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
+ -for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
+
+!include .depend
diff --git a/cpp/demo/IceStorm/replicated2/Makefile.mak b/cpp/demo/IceStorm/replicated2/Makefile.mak index a9e74475207..e636ef7f538 100644 --- a/cpp/demo/IceStorm/replicated2/Makefile.mak +++ b/cpp/demo/IceStorm/replicated2/Makefile.mak @@ -1,54 +1,54 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -PUBLISHER = publisher.exe -SUBSCRIBER = subscriber.exe - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -OBJS = Clock.obj - -POBJS = Publisher.obj - -SOBJS = Subscriber.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(POBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = $(libdir)\icestorm$(LIBSUFFIX).lib $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) -SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) -!endif - -$(PUBLISHER): $(OBJS) $(POBJS) - $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SUBSCRIBER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - -del /q Clock.cpp Clock.h - -clean:: - -for %f in (db\*) do if not %f == db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+PUBLISHER = publisher.exe
+SUBSCRIBER = subscriber.exe
+
+TARGETS = $(PUBLISHER) $(SUBSCRIBER)
+
+OBJS = Clock.obj
+
+POBJS = Publisher.obj
+
+SOBJS = Subscriber.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(POBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LIBS = $(libdir)\icestorm$(LIBSUFFIX).lib $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb)
+!endif
+
+$(PUBLISHER): $(OBJS) $(POBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SUBSCRIBER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ -del /q Clock.cpp Clock.h
+
+clean::
+ -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/demo/IceUtil/Makefile.mak b/cpp/demo/IceUtil/Makefile.mak index e47f8986349..4fd05c9e6d3 100644 --- a/cpp/demo/IceUtil/Makefile.mak +++ b/cpp/demo/IceUtil/Makefile.mak @@ -1,19 +1,19 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -SUBDIRS = workqueue - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SUBDIRS = workqueue
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/IceUtil/workqueue/Makefile.mak b/cpp/demo/IceUtil/workqueue/Makefile.mak index 826f5a60e4c..cd5fa5c4b06 100644 --- a/cpp/demo/IceUtil/workqueue/Makefile.mak +++ b/cpp/demo/IceUtil/workqueue/Makefile.mak @@ -1,33 +1,33 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = workqueue.exe - -TARGETS = $(CLIENT) - -OBJS = WorkQueue.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = workqueue.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = WorkQueue.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!include .depend
diff --git a/cpp/demo/Makefile.mak b/cpp/demo/Makefile.mak index 98f652cec84..0cfeb7510b4 100644 --- a/cpp/demo/Makefile.mak +++ b/cpp/demo/Makefile.mak @@ -1,30 +1,30 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = .. - -!include $(top_srcdir)/config/Make.rules.mak - -SUBDIRS = IceUtil \ - Ice \ - IceBox \ - Glacier2 \ - Freeze \ - IceStorm \ - IceGrid \ - book - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(CPP_COMPILER)" != "VC80_EXPRESS" && "$(CPP_COMPILER)" != "VC90_EXPRESS" -SUBDIRS = $(SUBDIRS) IcePatch2 -!endif - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SUBDIRS = IceUtil \
+ Ice \
+ IceBox \
+ Glacier2 \
+ Freeze \
+ IceStorm \
+ IceGrid \
+ book
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(CPP_COMPILER)" != "VC80_EXPRESS" && "$(CPP_COMPILER)" != "VC90_EXPRESS"
+SUBDIRS = $(SUBDIRS) IcePatch2
+!endif
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/book/Makefile.mak b/cpp/demo/book/Makefile.mak index ceb0099a91f..31c8a94191b 100644 --- a/cpp/demo/book/Makefile.mak +++ b/cpp/demo/book/Makefile.mak @@ -1,19 +1,19 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = printer simple_filesystem lifecycle freeze_filesystem - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = printer simple_filesystem lifecycle freeze_filesystem
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/book/freeze_filesystem/Makefile.mak b/cpp/demo/book/freeze_filesystem/Makefile.mak index 35bc5966668..d436a44ded8 100644 --- a/cpp/demo/book/freeze_filesystem/Makefile.mak +++ b/cpp/demo/book/freeze_filesystem/Makefile.mak @@ -1,57 +1,57 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Filesystem.obj - -COBJS = Client.obj - -SOBJS = PersistentFilesystem.obj \ - PersistentFilesystemI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(COLOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -SLICE2CPPFLAGS = -I. $(SLICE2CPPFLAGS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - -del /q Filesystem.cpp Filesystem.h - -del /q PersistentFilesystem.cpp PersistentFilesystem.h - -clean:: - -for %f in (db\*) do if not %f == db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Filesystem.obj
+
+COBJS = Client.obj
+
+SOBJS = PersistentFilesystem.obj \
+ PersistentFilesystemI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(COLOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+SLICE2CPPFLAGS = -I. $(SLICE2CPPFLAGS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ -del /q Filesystem.cpp Filesystem.h
+ -del /q PersistentFilesystem.cpp PersistentFilesystem.h
+
+clean::
+ -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/demo/book/lifecycle/Makefile.mak b/cpp/demo/book/lifecycle/Makefile.mak index 0618293f93d..39c1a2972f5 100644 --- a/cpp/demo/book/lifecycle/Makefile.mak +++ b/cpp/demo/book/lifecycle/Makefile.mak @@ -1,69 +1,69 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Filesystem.obj - -COBJS = Scanner.obj \ - Grammar.obj \ - Parser.obj \ - Client.obj - -SOBJS = FilesystemI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Scanner.cpp: Scanner.l - flex Scanner.l - -del /q $@ - echo #include "IceUtil/Config.h" > Scanner.cpp - type lex.yy.c >> Scanner.cpp - -del /q lex.yy.c - -Grammar.cpp Grammar.h: Grammar.y - -del /q Grammar.h Grammar.cpp - bison -dvt Grammar.y - move Grammar.tab.c Grammar.cpp - move Grammar.tab.h Grammar.h - -del /q Grammar.output - -clean:: - -del /q Filesystem.cpp Filesystem.h - -del /q Scanner.cpp Scanner.h - -del /q Grammar.cpp Grammar.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Filesystem.obj
+
+COBJS = Scanner.obj \
+ Grammar.obj \
+ Parser.obj \
+ Client.obj
+
+SOBJS = FilesystemI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Scanner.cpp: Scanner.l
+ flex Scanner.l
+ -del /q $@
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
+ -del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+ -del /q Grammar.h Grammar.cpp
+ bison -dvt Grammar.y
+ move Grammar.tab.c Grammar.cpp
+ move Grammar.tab.h Grammar.h
+ -del /q Grammar.output
+
+clean::
+ -del /q Filesystem.cpp Filesystem.h
+ -del /q Scanner.cpp Scanner.h
+ -del /q Grammar.cpp Grammar.h
+
+!include .depend
diff --git a/cpp/demo/book/printer/Makefile.mak b/cpp/demo/book/printer/Makefile.mak index d76944011b3..92e0c0f9f7f 100644 --- a/cpp/demo/book/printer/Makefile.mak +++ b/cpp/demo/book/printer/Makefile.mak @@ -1,49 +1,49 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Printer.obj - -COBJS = Client.obj - -SOBJS = Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Printer.cpp Printer.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Printer.obj
+
+COBJS = Client.obj
+
+SOBJS = Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Printer.cpp Printer.h
+
+!include .depend
diff --git a/cpp/demo/book/simple_filesystem/Makefile.mak b/cpp/demo/book/simple_filesystem/Makefile.mak index 0a7698bcb20..5f125378e84 100644 --- a/cpp/demo/book/simple_filesystem/Makefile.mak +++ b/cpp/demo/book/simple_filesystem/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Filesystem.obj - -COBJS = Client.obj - -SOBJS = FilesystemI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Filesystem.cpp Filesystem.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Filesystem.obj
+
+COBJS = Client.obj
+
+SOBJS = FilesystemI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Filesystem.cpp Filesystem.h
+
+!include .depend
diff --git a/cpp/doc/Makefile.mak b/cpp/doc/Makefile.mak index d6904a639c1..43822589b96 100644 --- a/cpp/doc/Makefile.mak +++ b/cpp/doc/Makefile.mak @@ -1,42 +1,42 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = .. - -TARGETS = reference\index.html - -!include $(top_srcdir)\config\Make.rules.mak - -IMAGES = images -JAVASCRIPT = symboltree.js - -!include slicefiles - -all:: - @python $(top_srcdir)\config\findSliceFiles.py $(slicedir) slicefiles - @nmake -nologo -f Makefile.mak reference\index.html - -reference\index.html: $(SLICEFILES) - @$(MAKE) -nologo -f Makefile.mak clean - $(bindir)\slice2html --ice -I$(slicedir) --hdr=htmlHeader --indexhdr=indexHeader --indexftr=indexFooter \ - --image-dir=images --logo-url="http://www.zeroc.com" --output-dir=reference --index=3 \ - --summary=120 $(SLICEFILES) - -mkdir reference\$(IMAGES) - copy $(IMAGES)\*.gif reference\$(IMAGES) - copy $(JAVASCRIPT) reference - -clean:: - -rd /s /q reference - -install:: reference\index.html - @if not exist $(install_docdir)\reference \ - @echo "Creating $(install_docdir)\reference..." && \ - mkdir $(install_docdir)\reference - copy reference\index.html $(install_docdir)\reference - xcopy /i /s /y reference $(install_docdir)\reference +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..
+
+TARGETS = reference\index.html
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+IMAGES = images
+JAVASCRIPT = symboltree.js
+
+!include slicefiles
+
+all::
+ @python $(top_srcdir)\config\findSliceFiles.py $(slicedir) slicefiles
+ @nmake -nologo -f Makefile.mak reference\index.html
+
+reference\index.html: $(SLICEFILES)
+ @$(MAKE) -nologo -f Makefile.mak clean
+ $(bindir)\slice2html --ice -I$(slicedir) --hdr=htmlHeader --indexhdr=indexHeader --indexftr=indexFooter \
+ --image-dir=images --logo-url="http://www.zeroc.com" --output-dir=reference --index=3 \
+ --summary=120 $(SLICEFILES)
+ -mkdir reference\$(IMAGES)
+ copy $(IMAGES)\*.gif reference\$(IMAGES)
+ copy $(JAVASCRIPT) reference
+
+clean::
+ -rd /s /q reference
+
+install:: reference\index.html
+ @if not exist $(install_docdir)\reference \
+ @echo "Creating $(install_docdir)\reference..." && \
+ mkdir $(install_docdir)\reference
+ copy reference\index.html $(install_docdir)\reference
+ xcopy /i /s /y reference $(install_docdir)\reference
diff --git a/cpp/include/Freeze/Makefile.mak b/cpp/include/Freeze/Makefile.mak index 31e224a41bb..708a7d78c0f 100644 --- a/cpp/include/Freeze/Makefile.mak +++ b/cpp/include/Freeze/Makefile.mak @@ -1,21 +1,21 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -install:: - @if not exist $(install_includedir)\Freeze \ - @echo "Creating $(install_includedir)\Freeze..." && \ - mkdir $(install_includedir)\Freeze - - @for %i in ( *.h ) do \ - @echo Installing %i && \ - copy %i $(install_includedir)\Freeze +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+install::
+ @if not exist $(install_includedir)\Freeze \
+ @echo "Creating $(install_includedir)\Freeze..." && \
+ mkdir $(install_includedir)\Freeze
+
+ @for %i in ( *.h ) do \
+ @echo Installing %i && \
+ copy %i $(install_includedir)\Freeze
diff --git a/cpp/include/Glacier2/Makefile.mak b/cpp/include/Glacier2/Makefile.mak index 36d61b71272..f2b57feef0c 100644 --- a/cpp/include/Glacier2/Makefile.mak +++ b/cpp/include/Glacier2/Makefile.mak @@ -1,21 +1,21 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -install:: - @if not exist $(install_includedir)\Glacier2 \ - @echo "Creating $(install_includedir)\Glacier2..." && \ - mkdir $(install_includedir)\Glacier2 - - @for %i in ( *.h ) do \ - @echo Installing %i && \ - copy %i $(install_includedir)\Glacier2 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+install::
+ @if not exist $(install_includedir)\Glacier2 \
+ @echo "Creating $(install_includedir)\Glacier2..." && \
+ mkdir $(install_includedir)\Glacier2
+
+ @for %i in ( *.h ) do \
+ @echo Installing %i && \
+ copy %i $(install_includedir)\Glacier2
diff --git a/cpp/include/Ice/Makefile.mak b/cpp/include/Ice/Makefile.mak index aa5e1059c27..cd713371f4f 100644 --- a/cpp/include/Ice/Makefile.mak +++ b/cpp/include/Ice/Makefile.mak @@ -1,21 +1,21 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -install:: - @if not exist $(install_includedir)\Ice \ - @echo "Creating $(install_includedir)\Ice..." && \ - mkdir $(install_includedir)\Ice - - @for %i in ( *.h ) do \ - @echo Installing %i && \ - copy %i $(install_includedir)\Ice +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+install::
+ @if not exist $(install_includedir)\Ice \
+ @echo "Creating $(install_includedir)\Ice..." && \
+ mkdir $(install_includedir)\Ice
+
+ @for %i in ( *.h ) do \
+ @echo Installing %i && \
+ copy %i $(install_includedir)\Ice
diff --git a/cpp/include/IceBox/Makefile.mak b/cpp/include/IceBox/Makefile.mak index 2ea9aca333b..1baa7c78d8e 100644 --- a/cpp/include/IceBox/Makefile.mak +++ b/cpp/include/IceBox/Makefile.mak @@ -1,21 +1,21 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -install:: - @if not exist $(install_includedir)\IceBox \ - @echo "Creating $(install_includedir)\IceBox..." && \ - mkdir $(install_includedir)\IceBox - - @for %i in ( *.h ) do \ - @echo Installing %i && \ - copy %i $(install_includedir)\IceBox +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+install::
+ @if not exist $(install_includedir)\IceBox \
+ @echo "Creating $(install_includedir)\IceBox..." && \
+ mkdir $(install_includedir)\IceBox
+
+ @for %i in ( *.h ) do \
+ @echo Installing %i && \
+ copy %i $(install_includedir)\IceBox
diff --git a/cpp/include/IceGrid/Makefile.mak b/cpp/include/IceGrid/Makefile.mak index 69f5a4bfcc4..5661c61f762 100644 --- a/cpp/include/IceGrid/Makefile.mak +++ b/cpp/include/IceGrid/Makefile.mak @@ -1,21 +1,21 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -install:: - @if not exist $(install_includedir)\IceGrid \ - @echo "Creating $(install_includedir)\IceGrid..." && \ - mkdir $(install_includedir)\IceGrid - - @for %i in ( *.h ) do \ - @echo Installing %i && \ - copy %i $(install_includedir)\IceGrid +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+install::
+ @if not exist $(install_includedir)\IceGrid \
+ @echo "Creating $(install_includedir)\IceGrid..." && \
+ mkdir $(install_includedir)\IceGrid
+
+ @for %i in ( *.h ) do \
+ @echo Installing %i && \
+ copy %i $(install_includedir)\IceGrid
diff --git a/cpp/include/IcePatch2/Makefile.mak b/cpp/include/IcePatch2/Makefile.mak index 748a85a53e1..ab2202aa853 100644 --- a/cpp/include/IcePatch2/Makefile.mak +++ b/cpp/include/IcePatch2/Makefile.mak @@ -1,21 +1,21 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -install:: - @if not exist $(install_includedir)\IcePatch2 \ - @echo "Creating $(install_includedir)\IcePatch2..." && \ - mkdir $(install_includedir)\IcePatch2 - - @for %i in ( *.h ) do \ - @echo Installing %i && \ - copy %i $(install_includedir)\IcePatch2 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+install::
+ @if not exist $(install_includedir)\IcePatch2 \
+ @echo "Creating $(install_includedir)\IcePatch2..." && \
+ mkdir $(install_includedir)\IcePatch2
+
+ @for %i in ( *.h ) do \
+ @echo Installing %i && \
+ copy %i $(install_includedir)\IcePatch2
diff --git a/cpp/include/IceSSL/Makefile.mak b/cpp/include/IceSSL/Makefile.mak index bc3129cd7e4..16fa4aa1ed7 100644 --- a/cpp/include/IceSSL/Makefile.mak +++ b/cpp/include/IceSSL/Makefile.mak @@ -1,21 +1,21 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -install:: - @if not exist $(install_includedir)\IceSSL \ - @echo "Creating $(install_includedir)\IceSSL..." && \ - mkdir $(install_includedir)\IceSSL - - @for %i in ( *.h ) do \ - @echo Installing %i && \ - copy %i $(install_includedir)\IceSSL +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+install::
+ @if not exist $(install_includedir)\IceSSL \
+ @echo "Creating $(install_includedir)\IceSSL..." && \
+ mkdir $(install_includedir)\IceSSL
+
+ @for %i in ( *.h ) do \
+ @echo Installing %i && \
+ copy %i $(install_includedir)\IceSSL
diff --git a/cpp/include/IceStorm/Makefile.mak b/cpp/include/IceStorm/Makefile.mak index 5b39393aa3e..02d69d76015 100644 --- a/cpp/include/IceStorm/Makefile.mak +++ b/cpp/include/IceStorm/Makefile.mak @@ -1,21 +1,21 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -install:: - @if not exist $(install_includedir)\IceStorm \ - @echo "Creating $(install_includedir)\IceStorm..." && \ - mkdir $(install_includedir)\IceStorm - - @for %i in ( *.h ) do \ - @echo Installing %i && \ - copy %i $(install_includedir)\IceStorm +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+install::
+ @if not exist $(install_includedir)\IceStorm \
+ @echo "Creating $(install_includedir)\IceStorm..." && \
+ mkdir $(install_includedir)\IceStorm
+
+ @for %i in ( *.h ) do \
+ @echo Installing %i && \
+ copy %i $(install_includedir)\IceStorm
diff --git a/cpp/include/IceUtil/Makefile.mak b/cpp/include/IceUtil/Makefile.mak index a00ec18e21c..fa32ff788e4 100644 --- a/cpp/include/IceUtil/Makefile.mak +++ b/cpp/include/IceUtil/Makefile.mak @@ -1,21 +1,21 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -install:: - @if not exist $(install_includedir)\IceUtil \ - @echo "Creating $(install_includedir)\IceUtil..." && \ - mkdir $(install_includedir)\IceUtil - - @for %i in ( *.h ) do \ - @echo Installing %i && \ - copy %i $(install_includedir)\IceUtil +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+install::
+ @if not exist $(install_includedir)\IceUtil \
+ @echo "Creating $(install_includedir)\IceUtil..." && \
+ mkdir $(install_includedir)\IceUtil
+
+ @for %i in ( *.h ) do \
+ @echo Installing %i && \
+ copy %i $(install_includedir)\IceUtil
diff --git a/cpp/include/IceXML/Makefile.mak b/cpp/include/IceXML/Makefile.mak index 853ff1fbc41..918fff79c9b 100644 --- a/cpp/include/IceXML/Makefile.mak +++ b/cpp/include/IceXML/Makefile.mak @@ -1,21 +1,21 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -install:: - @if not exist $(install_includedir)\IceXML \ - @echo "Creating $(install_includedir)\IceXML..." && \ - mkdir $(install_includedir)\IceXML - - @for %i in ( *.h ) do \ - @echo Installing %i && \ - copy %i $(install_includedir)\IceXML +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+install::
+ @if not exist $(install_includedir)\IceXML \
+ @echo "Creating $(install_includedir)\IceXML..." && \
+ mkdir $(install_includedir)\IceXML
+
+ @for %i in ( *.h ) do \
+ @echo Installing %i && \
+ copy %i $(install_includedir)\IceXML
diff --git a/cpp/include/Makefile.mak b/cpp/include/Makefile.mak index 955928e89ff..4c5bcd0b35f 100644 --- a/cpp/include/Makefile.mak +++ b/cpp/include/Makefile.mak @@ -1,29 +1,29 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = .. - -!include $(top_srcdir)/config/Make.rules.mak - -SUBDIRS = Freeze \ - Glacier2 \ - Ice \ - IceBox \ - IceGrid \ - IcePatch2 \ - IceSSL \ - IceStorm \ - IceUtil \ - IceXML \ - Slice - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SUBDIRS = Freeze \
+ Glacier2 \
+ Ice \
+ IceBox \
+ IceGrid \
+ IcePatch2 \
+ IceSSL \
+ IceStorm \
+ IceUtil \
+ IceXML \
+ Slice
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/include/Slice/Makefile.mak b/cpp/include/Slice/Makefile.mak index bda2db845f1..51427e41cef 100644 --- a/cpp/include/Slice/Makefile.mak +++ b/cpp/include/Slice/Makefile.mak @@ -1,21 +1,21 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -install:: - @if not exist $(install_includedir)\Slice \ - @echo "Creating $(install_includedir)\Slice..." && \ - mkdir $(install_includedir)\Slice - - @for %i in ( *.h ) do \ - @echo Installing %i && \ - copy %i $(install_includedir)\Slice +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+install::
+ @if not exist $(install_includedir)\Slice \
+ @echo "Creating $(install_includedir)\Slice..." && \
+ mkdir $(install_includedir)\Slice
+
+ @for %i in ( *.h ) do \
+ @echo Installing %i && \
+ copy %i $(install_includedir)\Slice
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak index ba975019bba..b77ffc77bdb 100644 --- a/cpp/src/Freeze/Makefile.mak +++ b/cpp/src/Freeze/Makefile.mak @@ -1,128 +1,128 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\freeze$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\freeze$(SOVERSION)$(LIBSUFFIX).dll - - -TARGETS = $(LIBNAME) $(DLLNAME) - - -OBJS = BackgroundSaveEvictor.obj \ - BackgroundSaveEvictorI.obj \ - CatalogData.obj \ - Catalog.obj \ - CatalogIndexList.obj \ - ConnectionI.obj \ - Connection.obj \ - DB.obj \ - EvictorI.obj \ - EvictorIteratorI.obj \ - Evictor.obj \ - EvictorStorage.obj \ - Exception.obj \ - IndexI.obj \ - Index.obj \ - MapDb.obj \ - MapI.obj \ - ObjectStore.obj \ - PingObject.obj \ - SharedDbEnv.obj \ - TransactionalEvictor.obj \ - TransactionalEvictorI.obj \ - TransactionalEvictorContext.obj \ - TransactionHolder.obj \ - TransactionI.obj \ - Transaction.obj \ - Util.obj - -SRCS = $(OBJS:.obj=.cpp) - -HDIR = $(includedir)\Freeze -SDIR = $(slicedir)\Freeze - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS -DWIN32_LEAN_AND_MEAN -SLICE2CPPFLAGS = --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS) -LINKWITH = $(LIBS) $(DB_LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -!endif - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(OBJS) Freeze.res - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Freeze.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -$(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice - del /q $(HDIR)\Catalog.h Catalog.cpp - $(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::Catalog,string,Freeze::CatalogData \ - Catalog $(slicedir)/Freeze/CatalogData.ice - move Catalog.h $(HDIR) -clean:: - del /q $(HDIR)\Catalog.h Catalog.cpp - - -$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(SLICE2FREEZE) $(slicedir)/Ice/BuiltinSequences.ice - del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp - $(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::CatalogIndexList,string,Ice::StringSeq \ - CatalogIndexList $(slicedir)/Ice/BuiltinSequences.ice - move CatalogIndexList.h $(HDIR) - -Freeze.res: Freeze.rc - rc.exe $(RCFLAGS) Freeze.rc - -clean:: - del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp - -clean:: - del /q $(DLLNAME:.dll=.*) - del /q DB.cpp $(HDIR)\DB.h - del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h - del /q CatalogData.cpp $(HDIR)\CatalogData.h - del /q Connection.cpp $(HDIR)\Connection.h - del /q ConnectionF.cpp $(HDIR)\ConnectionF.h - del /q Exception.cpp $(HDIR)\Exception.h - del /q EvictorF.cpp $(HDIR)\EvictorF.h - del /q Evictor.cpp $(HDIR)\Evictor.h - del /q EvictorStorage.cpp $(HDIR)\EvictorStorage.h - del /q Transaction.cpp $(HDIR)\Transaction.h - del /q TransactionalEvictor.cpp $(HDIR)\TransactionalEvictor.h - del /q PingObject.cpp PingObject.h - del /q Freeze.res - -install:: all - copy $(LIBNAME) $(install_libdir) - copy $(DLLNAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(DLLNAME:.dll=.tds) $(install_bindir) - -!else - -install:: all - copy $(DLLNAME:.dll=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\freeze$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\freeze$(SOVERSION)$(LIBSUFFIX).dll
+
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+
+OBJS = BackgroundSaveEvictor.obj \
+ BackgroundSaveEvictorI.obj \
+ CatalogData.obj \
+ Catalog.obj \
+ CatalogIndexList.obj \
+ ConnectionI.obj \
+ Connection.obj \
+ DB.obj \
+ EvictorI.obj \
+ EvictorIteratorI.obj \
+ Evictor.obj \
+ EvictorStorage.obj \
+ Exception.obj \
+ IndexI.obj \
+ Index.obj \
+ MapDb.obj \
+ MapI.obj \
+ ObjectStore.obj \
+ PingObject.obj \
+ SharedDbEnv.obj \
+ TransactionalEvictor.obj \
+ TransactionalEvictorI.obj \
+ TransactionalEvictorContext.obj \
+ TransactionHolder.obj \
+ TransactionI.obj \
+ Transaction.obj \
+ Util.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+HDIR = $(includedir)\Freeze
+SDIR = $(slicedir)\Freeze
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS -DWIN32_LEAN_AND_MEAN
+SLICE2CPPFLAGS = --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS)
+LINKWITH = $(LIBS) $(DB_LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) Freeze.res
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Freeze.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+$(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice
+ del /q $(HDIR)\Catalog.h Catalog.cpp
+ $(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::Catalog,string,Freeze::CatalogData \
+ Catalog $(slicedir)/Freeze/CatalogData.ice
+ move Catalog.h $(HDIR)
+clean::
+ del /q $(HDIR)\Catalog.h Catalog.cpp
+
+
+$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(SLICE2FREEZE) $(slicedir)/Ice/BuiltinSequences.ice
+ del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp
+ $(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::CatalogIndexList,string,Ice::StringSeq \
+ CatalogIndexList $(slicedir)/Ice/BuiltinSequences.ice
+ move CatalogIndexList.h $(HDIR)
+
+Freeze.res: Freeze.rc
+ rc.exe $(RCFLAGS) Freeze.rc
+
+clean::
+ del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp
+
+clean::
+ del /q $(DLLNAME:.dll=.*)
+ del /q DB.cpp $(HDIR)\DB.h
+ del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h
+ del /q CatalogData.cpp $(HDIR)\CatalogData.h
+ del /q Connection.cpp $(HDIR)\Connection.h
+ del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
+ del /q Exception.cpp $(HDIR)\Exception.h
+ del /q EvictorF.cpp $(HDIR)\EvictorF.h
+ del /q Evictor.cpp $(HDIR)\Evictor.h
+ del /q EvictorStorage.cpp $(HDIR)\EvictorStorage.h
+ del /q Transaction.cpp $(HDIR)\Transaction.h
+ del /q TransactionalEvictor.cpp $(HDIR)\TransactionalEvictor.h
+ del /q PingObject.cpp PingObject.h
+ del /q Freeze.res
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+ copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak index 00db110d7e8..61fd4574e54 100644 --- a/cpp/src/FreezeScript/Makefile.mak +++ b/cpp/src/FreezeScript/Makefile.mak @@ -1,111 +1,111 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -TRANSFORMDB = $(top_srcdir)\bin\transformdb.exe -DUMPDB = $(top_srcdir)\bin\dumpdb.exe - -TARGETS = $(TRANSFORMDB) $(DUMPDB) - -COMMON_OBJS = Grammar.obj \ - Scanner.obj \ - AssignVisitor.obj \ - Data.obj \ - Error.obj \ - Functions.obj \ - Exception.obj \ - Parser.obj \ - Print.obj \ - Util.obj - -TRANSFORM_OBJS = TransformAnalyzer.obj \ - TransformVisitor.obj \ - Transformer.obj \ - transformdb.obj - -DUMP_OBJS = DumpDescriptors.obj \ - DumpDB.obj - -SRCS = $(COMMON_OBJS:.obj=.cpp) $(TRANSFORM_OBJS:.obj=.cpp) $(DUMP_OBJS:.obj=.cpp) - -HDIR = $(includedir)\FreezeScript - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = slice$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS) $(DB_LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -TPDBFLAGS = /pdb:$(TRANSFORMDB:.exe=.pdb) -DPDBFLAGS = /pdb:$(DUMPDB:.exe=.pdb) -!endif - -$(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS) TransformDB.res - $(LINK) $(LD_EXEFLAGS) $(TPDBFLAGS) $(TRANSFORM_OBJS) $(COMMON_OBJS) TransformDB.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) DumpDB.res - $(LINK) $(LD_EXEFLAGS) $(DPDBFLAGS) $(DUMP_OBJS) $(COMMON_OBJS) DumpDB.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Scanner.cpp : Scanner.l - flex Scanner.l - del /q $@ - echo #include "IceUtil/Config.h" > Scanner.cpp - type lex.yy.c >> Scanner.cpp - del /q lex.yy.c - -Grammar.cpp Grammar.h: Grammar.y - del /q Grammar.h Grammar.cpp - bison -dvt --name-prefix "freeze_script_" Grammar.y - move Grammar.tab.c Grammar.cpp - move Grammar.tab.h Grammar.h - del /q Grammar.output - -TransformDB.res: TransformDB.rc - rc.exe $(RCFLAGS) TransformDB.rc - -DumpDB.res: DumpDB.rc - rc.exe $(RCFLAGS) DumpDB.rc - -clean:: - del /q $(TRANSFORMDB:.exe=.*) - del /q $(DUMPDB:.exe=.*) - del /q Grammar.cpp Grammar.h - del /q Scanner.cpp - del /q TransformDB.res DumpDB.res - -install:: all - copy $(TRANSFORMDB) $(install_bindir) - copy $(DUMPDB) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(TRANSFORMDB:.exe=.tds) $(install_bindir) - copy $(DUMPDB:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(TRANSFORMDB:.exe=.pdb) $(install_bindir) - copy $(DUMPDB:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+TRANSFORMDB = $(top_srcdir)\bin\transformdb.exe
+DUMPDB = $(top_srcdir)\bin\dumpdb.exe
+
+TARGETS = $(TRANSFORMDB) $(DUMPDB)
+
+COMMON_OBJS = Grammar.obj \
+ Scanner.obj \
+ AssignVisitor.obj \
+ Data.obj \
+ Error.obj \
+ Functions.obj \
+ Exception.obj \
+ Parser.obj \
+ Print.obj \
+ Util.obj
+
+TRANSFORM_OBJS = TransformAnalyzer.obj \
+ TransformVisitor.obj \
+ Transformer.obj \
+ transformdb.obj
+
+DUMP_OBJS = DumpDescriptors.obj \
+ DumpDB.obj
+
+SRCS = $(COMMON_OBJS:.obj=.cpp) $(TRANSFORM_OBJS:.obj=.cpp) $(DUMP_OBJS:.obj=.cpp)
+
+HDIR = $(includedir)\FreezeScript
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = slice$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS) $(DB_LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+TPDBFLAGS = /pdb:$(TRANSFORMDB:.exe=.pdb)
+DPDBFLAGS = /pdb:$(DUMPDB:.exe=.pdb)
+!endif
+
+$(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS) TransformDB.res
+ $(LINK) $(LD_EXEFLAGS) $(TPDBFLAGS) $(TRANSFORM_OBJS) $(COMMON_OBJS) TransformDB.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) DumpDB.res
+ $(LINK) $(LD_EXEFLAGS) $(DPDBFLAGS) $(DUMP_OBJS) $(COMMON_OBJS) DumpDB.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Scanner.cpp : Scanner.l
+ flex Scanner.l
+ del /q $@
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
+ del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+ del /q Grammar.h Grammar.cpp
+ bison -dvt --name-prefix "freeze_script_" Grammar.y
+ move Grammar.tab.c Grammar.cpp
+ move Grammar.tab.h Grammar.h
+ del /q Grammar.output
+
+TransformDB.res: TransformDB.rc
+ rc.exe $(RCFLAGS) TransformDB.rc
+
+DumpDB.res: DumpDB.rc
+ rc.exe $(RCFLAGS) DumpDB.rc
+
+clean::
+ del /q $(TRANSFORMDB:.exe=.*)
+ del /q $(DUMPDB:.exe=.*)
+ del /q Grammar.cpp Grammar.h
+ del /q Scanner.cpp
+ del /q TransformDB.res DumpDB.res
+
+install:: all
+ copy $(TRANSFORMDB) $(install_bindir)
+ copy $(DUMPDB) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(TRANSFORMDB:.exe=.tds) $(install_bindir)
+ copy $(DUMPDB:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(TRANSFORMDB:.exe=.pdb) $(install_bindir)
+ copy $(DUMPDB:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak index 8c958cc43fc..9e8c87fa454 100644 --- a/cpp/src/Glacier2/Makefile.mak +++ b/cpp/src/Glacier2/Makefile.mak @@ -1,141 +1,141 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\glacier2$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\glacier2$(SOVERSION)$(LIBSUFFIX).dll - -ROUTER = $(top_srcdir)\bin\glacier2router.exe - -!ifdef BUILD_UTILS - -TARGETS = $(ROUTER) - -!else - -TARGETS = $(LIBNAME) $(DLLNAME) - -!endif - -OBJS = PermissionsVerifier.obj \ - Router.obj \ - SSLInfo.obj \ - Session.obj - -ROBJS = Blobject.obj \ - ClientBlobject.obj \ - CryptPermissionsVerifierI.obj \ - Glacier2Router.obj \ - Instance.obj \ - ProxyVerifier.obj \ - RequestQueue.obj \ - RouterI.obj \ - RoutingTable.obj \ - FilterI.obj \ - FilterManager.obj \ - ServerBlobject.obj \ - SessionRouterI.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(ROBJS:.obj=.cpp) - -HDIR = $(includedir)\Glacier2 -SDIR = $(slicedir)\Glacier2 - -!include $(top_srcdir)\config\Make.rules.mak - -!ifdef BUILD_UTILS - -CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) $(OPENSSL_LIBS) glacier2$(LIBSUFFIX).lib icessl$(LIBSUFFIX).lib -!if "$(CPP_COMPILER)" != "BCC2006" -LINKWITH = $(LINKWITH) ws2_32.lib -!endif - -!else - -CPPFLAGS = -I.. $(CPPFLAGS) -DGLACIER2_API_EXPORTS - -!endif - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -RPDBFLAGS = /pdb:$(ROUTER:.exe=.pdb) -!endif - -SLICE2CPPFLAGS = --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS) - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(OBJS) Glacier2.res - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Glacier2.res $(PREOUT)$@ $(PRELIBS)$(LIBS) - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -$(ROUTER): $(ROBJS) Glacier2Router.res - $(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(ROBJS) Glacier2Router.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Glacier2.res: Glacier2.rc - rc.exe $(RCFLAGS) Glacier2.rc - -Glacier2Router.res: Glacier2Router.rc - rc.exe $(RCFLAGS) Glacier2Router.rc - -!ifdef BUILD_UTILS - -clean:: - del /q PermissionsVerifierF.cpp $(HDIR)\PermissionsVerifierF.h - del /q PermissionsVerifier.cpp $(HDIR)\PermissionsVerifier.h - del /q RouterF.cpp $(HDIR)\RouterF.h - del /q Router.cpp $(HDIR)\Router.h - del /q SessionF.cpp $(HDIR)\SessionF.h - del /q Session.cpp $(HDIR)\Session.h - del /q SSLInfo.cpp $(HDIR)\SSLInfo.h - del /q Glacier2Router.res Glacier2.res - del /q $(DLLNAME:.dll=.*) - del /q $(ROUTER:.exe=.*) - -install:: all - copy $(LIBNAME) $(install_libdir) - copy $(DLLNAME) $(install_bindir) - copy $(ROUTER) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(DLLNAME:.dll=.tds) $(install_bindir) - copy $(ROUTER:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(DLLNAME:.dll=.pdb) $(install_bindir) - copy $(ROUTER:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!else - -install:: all - -$(EVERYTHING):: - @$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@ - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\glacier2$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\glacier2$(SOVERSION)$(LIBSUFFIX).dll
+
+ROUTER = $(top_srcdir)\bin\glacier2router.exe
+
+!ifdef BUILD_UTILS
+
+TARGETS = $(ROUTER)
+
+!else
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+!endif
+
+OBJS = PermissionsVerifier.obj \
+ Router.obj \
+ SSLInfo.obj \
+ Session.obj
+
+ROBJS = Blobject.obj \
+ ClientBlobject.obj \
+ CryptPermissionsVerifierI.obj \
+ Glacier2Router.obj \
+ Instance.obj \
+ ProxyVerifier.obj \
+ RequestQueue.obj \
+ RouterI.obj \
+ RoutingTable.obj \
+ FilterI.obj \
+ FilterManager.obj \
+ ServerBlobject.obj \
+ SessionRouterI.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(ROBJS:.obj=.cpp)
+
+HDIR = $(includedir)\Glacier2
+SDIR = $(slicedir)\Glacier2
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+!ifdef BUILD_UTILS
+
+CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) $(OPENSSL_LIBS) glacier2$(LIBSUFFIX).lib icessl$(LIBSUFFIX).lib
+!if "$(CPP_COMPILER)" != "BCC2006"
+LINKWITH = $(LINKWITH) ws2_32.lib
+!endif
+
+!else
+
+CPPFLAGS = -I.. $(CPPFLAGS) -DGLACIER2_API_EXPORTS
+
+!endif
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+RPDBFLAGS = /pdb:$(ROUTER:.exe=.pdb)
+!endif
+
+SLICE2CPPFLAGS = --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS)
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) Glacier2.res
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Glacier2.res $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+$(ROUTER): $(ROBJS) Glacier2Router.res
+ $(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(ROBJS) Glacier2Router.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Glacier2.res: Glacier2.rc
+ rc.exe $(RCFLAGS) Glacier2.rc
+
+Glacier2Router.res: Glacier2Router.rc
+ rc.exe $(RCFLAGS) Glacier2Router.rc
+
+!ifdef BUILD_UTILS
+
+clean::
+ del /q PermissionsVerifierF.cpp $(HDIR)\PermissionsVerifierF.h
+ del /q PermissionsVerifier.cpp $(HDIR)\PermissionsVerifier.h
+ del /q RouterF.cpp $(HDIR)\RouterF.h
+ del /q Router.cpp $(HDIR)\Router.h
+ del /q SessionF.cpp $(HDIR)\SessionF.h
+ del /q Session.cpp $(HDIR)\Session.h
+ del /q SSLInfo.cpp $(HDIR)\SSLInfo.h
+ del /q Glacier2Router.res Glacier2.res
+ del /q $(DLLNAME:.dll=.*)
+ del /q $(ROUTER:.exe=.*)
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+ copy $(DLLNAME) $(install_bindir)
+ copy $(ROUTER) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(DLLNAME:.dll=.tds) $(install_bindir)
+ copy $(ROUTER:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+ copy $(ROUTER:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!else
+
+install:: all
+
+$(EVERYTHING)::
+ @$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@
+
+!endif
+
+!include .depend
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index 6594ca73f7a..3d638b323cb 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -1,211 +1,211 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\ice$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\ice$(SOVERSION)$(LIBSUFFIX).dll - -TARGETS = $(LIBNAME) $(DLLNAME) - -OBJS = Acceptor.obj \ - Application.obj \ - Base64.obj \ - Buffer.obj \ - BasicStream.obj \ - BuiltinSequences.obj \ - CommunicatorI.obj \ - Communicator.obj \ - ConnectRequestHandler.obj \ - ConnectionFactory.obj \ - ConnectionI.obj \ - ConnectionMonitor.obj \ - Connection.obj \ - Connector.obj \ - ConnectionRequestHandler.obj \ - Current.obj \ - DefaultsAndOverrides.obj \ - Direct.obj \ - DispatchInterceptor.obj \ - DLLMain.obj \ - DynamicLibrary.obj \ - EndpointFactoryManager.obj \ - EndpointFactory.obj \ - Endpoint.obj \ - EndpointI.obj \ - EventHandler.obj \ - EventLoggerI.obj \ - Exception.obj \ - FacetMap.obj \ - FactoryTableDef.obj \ - FactoryTable.obj \ - GC.obj \ - Identity.obj \ - ImplicitContextI.obj \ - ImplicitContext.obj \ - IncomingAsync.obj \ - Incoming.obj \ - Initialize.obj \ - Instance.obj \ - LocalException.obj \ - LocalObject.obj \ - LocatorInfo.obj \ - Locator.obj \ - LoggerI.obj \ - Logger.obj \ - LoggerUtil.obj \ - Network.obj \ - ObjectAdapterFactory.obj \ - ObjectAdapterI.obj \ - ObjectAdapter.obj \ - ObjectFactoryManager.obj \ - ObjectFactory.obj \ - Object.obj \ - OutgoingAsync.obj \ - Outgoing.obj \ - PluginManagerI.obj \ - Plugin.obj \ - Process.obj \ - PropertiesI.obj \ - Properties.obj \ - PropertyNames.obj \ - Protocol.obj \ - ProtocolPluginFacade.obj \ - ProxyFactory.obj \ - Proxy.obj \ - ReferenceFactory.obj \ - Reference.obj \ - RequestHandler.obj \ - RouterInfo.obj \ - Router.obj \ - SelectorThread.obj \ - ServantLocator.obj \ - ServantManager.obj \ - Service.obj \ - SliceChecksumDict.obj \ - SliceChecksums.obj \ - Stats.obj \ - StreamI.obj \ - Stream.obj \ - StringConverter.obj \ - TcpAcceptor.obj \ - TcpConnector.obj \ - TcpEndpointI.obj \ - TcpTransceiver.obj \ - ThreadPool.obj \ - TraceLevels.obj \ - TraceUtil.obj \ - Transceiver.obj \ - UdpConnector.obj \ - UdpEndpointI.obj \ - UdpTransceiver.obj \ - UnknownEndpointI.obj - -SRCS = $(OBJS:.obj=.cpp) - -HDIR = $(includedir)\Ice -SDIR = $(slicedir)\Ice - -!include $(top_srcdir)\config\Make.rules.mak - -CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND_MEAN -SLICE2CPPFLAGS = --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS) -LINKWITH = $(BASELIBS) $(BZIP2_LIBS) $(ICE_OS_LIBS) ws2_32.lib Iphlpapi.lib - -!if "$(CPP_COMPILER)" == "BCC2006" -RES_FILE = ,, EventLoggerMsg.res -!else -!if "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -!endif -LD_DLLFLAGS = $(LD_DLLFLAGS) /entry:"ice_DLL_Main" -RES_FILE = EventLoggerMsg.res -!endif - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(OBJS) Ice.res - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Ice.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE) - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -$(HDIR)\BuiltinSequences.h BuiltinSequences.cpp: $(SDIR)\BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) - del /q $(HDIR)\BuiltinSequences.h BuiltinSequences.cpp - $(SLICE2CPP) $(SLICE2CPPFLAGS) --stream $(SDIR)\BuiltinSequences.ice - move BuiltinSequences.h $(HDIR) - -EventLoggerI.obj: EventLoggerMsg.h - -EventLoggerMsg.h EventLoggerMsg.res: EventLoggerMsg.mc - mc EventLoggerMsg.mc - $(RC) -r -fo EventLoggerMsg.res EventLoggerMsg.rc - -Ice.res: Ice.rc - rc.exe $(RCFLAGS) Ice.rc - -clean:: - del /q BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h - del /q CommunicatorF.cpp $(HDIR)\CommunicatorF.h - del /q Communicator.cpp $(HDIR)\Communicator.h - del /q ConnectionF.cpp $(HDIR)\ConnectionF.h - del /q Connection.cpp $(HDIR)\Connection.h - del /q Current.cpp $(HDIR)\Current.h - del /q Endpoint.cpp $(HDIR)\Endpoint.h - del /q FacetMap.cpp $(HDIR)\FacetMap.h - del /q ImplicitContextF.cpp $(HDIR)\ImplicitContextF.h - del /q ImplicitContext.cpp $(HDIR)\ImplicitContext.h - del /q Identity.cpp $(HDIR)\Identity.h - del /q LocalException.cpp $(HDIR)\LocalException.h - del /q LocatorF.cpp $(HDIR)\LocatorF.h - del /q Locator.cpp $(HDIR)\Locator.h - del /q LoggerF.cpp $(HDIR)\LoggerF.h - del /q Logger.cpp $(HDIR)\Logger.h - del /q ObjectAdapterF.cpp $(HDIR)\ObjectAdapterF.h - del /q ObjectAdapter.cpp $(HDIR)\ObjectAdapter.h - del /q ObjectFactoryF.cpp $(HDIR)\ObjectFactoryF.h - del /q ObjectFactory.cpp $(HDIR)\ObjectFactory.h - del /q PluginF.cpp $(HDIR)\PluginF.h - del /q Plugin.cpp $(HDIR)\Plugin.h - del /q ProcessF.cpp $(HDIR)\ProcessF.h - del /q Process.cpp $(HDIR)\Process.h - del /q PropertiesF.cpp $(HDIR)\PropertiesF.h - del /q Properties.cpp $(HDIR)\Properties.h - del /q RouterF.cpp $(HDIR)\RouterF.h - del /q Router.cpp $(HDIR)\Router.h - del /q ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h - del /q ServantLocator.cpp $(HDIR)\ServantLocator.h - del /q SliceChecksumDict.cpp $(HDIR)\SliceChecksumDict.h - del /q StatsF.cpp $(HDIR)\StatsF.h - del /q Stats.cpp $(HDIR)\Stats.h - del /q $(DLLNAME:.dll=.*) - del /q Ice.res - -install:: all - copy $(LIBNAME) $(install_libdir) - copy $(DLLNAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(DLLNAME:.dll=.tds) $(install_bindir) - -!else - -install:: all - copy $(DLLNAME:.dll=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\ice$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\ice$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+OBJS = Acceptor.obj \
+ Application.obj \
+ Base64.obj \
+ Buffer.obj \
+ BasicStream.obj \
+ BuiltinSequences.obj \
+ CommunicatorI.obj \
+ Communicator.obj \
+ ConnectRequestHandler.obj \
+ ConnectionFactory.obj \
+ ConnectionI.obj \
+ ConnectionMonitor.obj \
+ Connection.obj \
+ Connector.obj \
+ ConnectionRequestHandler.obj \
+ Current.obj \
+ DefaultsAndOverrides.obj \
+ Direct.obj \
+ DispatchInterceptor.obj \
+ DLLMain.obj \
+ DynamicLibrary.obj \
+ EndpointFactoryManager.obj \
+ EndpointFactory.obj \
+ Endpoint.obj \
+ EndpointI.obj \
+ EventHandler.obj \
+ EventLoggerI.obj \
+ Exception.obj \
+ FacetMap.obj \
+ FactoryTableDef.obj \
+ FactoryTable.obj \
+ GC.obj \
+ Identity.obj \
+ ImplicitContextI.obj \
+ ImplicitContext.obj \
+ IncomingAsync.obj \
+ Incoming.obj \
+ Initialize.obj \
+ Instance.obj \
+ LocalException.obj \
+ LocalObject.obj \
+ LocatorInfo.obj \
+ Locator.obj \
+ LoggerI.obj \
+ Logger.obj \
+ LoggerUtil.obj \
+ Network.obj \
+ ObjectAdapterFactory.obj \
+ ObjectAdapterI.obj \
+ ObjectAdapter.obj \
+ ObjectFactoryManager.obj \
+ ObjectFactory.obj \
+ Object.obj \
+ OutgoingAsync.obj \
+ Outgoing.obj \
+ PluginManagerI.obj \
+ Plugin.obj \
+ Process.obj \
+ PropertiesI.obj \
+ Properties.obj \
+ PropertyNames.obj \
+ Protocol.obj \
+ ProtocolPluginFacade.obj \
+ ProxyFactory.obj \
+ Proxy.obj \
+ ReferenceFactory.obj \
+ Reference.obj \
+ RequestHandler.obj \
+ RouterInfo.obj \
+ Router.obj \
+ SelectorThread.obj \
+ ServantLocator.obj \
+ ServantManager.obj \
+ Service.obj \
+ SliceChecksumDict.obj \
+ SliceChecksums.obj \
+ Stats.obj \
+ StreamI.obj \
+ Stream.obj \
+ StringConverter.obj \
+ TcpAcceptor.obj \
+ TcpConnector.obj \
+ TcpEndpointI.obj \
+ TcpTransceiver.obj \
+ ThreadPool.obj \
+ TraceLevels.obj \
+ TraceUtil.obj \
+ Transceiver.obj \
+ UdpConnector.obj \
+ UdpEndpointI.obj \
+ UdpTransceiver.obj \
+ UnknownEndpointI.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+HDIR = $(includedir)\Ice
+SDIR = $(slicedir)\Ice
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND_MEAN
+SLICE2CPPFLAGS = --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS)
+LINKWITH = $(BASELIBS) $(BZIP2_LIBS) $(ICE_OS_LIBS) ws2_32.lib Iphlpapi.lib
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+RES_FILE = ,, EventLoggerMsg.res
+!else
+!if "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+LD_DLLFLAGS = $(LD_DLLFLAGS) /entry:"ice_DLL_Main"
+RES_FILE = EventLoggerMsg.res
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) Ice.res
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Ice.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+$(HDIR)\BuiltinSequences.h BuiltinSequences.cpp: $(SDIR)\BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB)
+ del /q $(HDIR)\BuiltinSequences.h BuiltinSequences.cpp
+ $(SLICE2CPP) $(SLICE2CPPFLAGS) --stream $(SDIR)\BuiltinSequences.ice
+ move BuiltinSequences.h $(HDIR)
+
+EventLoggerI.obj: EventLoggerMsg.h
+
+EventLoggerMsg.h EventLoggerMsg.res: EventLoggerMsg.mc
+ mc EventLoggerMsg.mc
+ $(RC) -r -fo EventLoggerMsg.res EventLoggerMsg.rc
+
+Ice.res: Ice.rc
+ rc.exe $(RCFLAGS) Ice.rc
+
+clean::
+ del /q BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h
+ del /q CommunicatorF.cpp $(HDIR)\CommunicatorF.h
+ del /q Communicator.cpp $(HDIR)\Communicator.h
+ del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
+ del /q Connection.cpp $(HDIR)\Connection.h
+ del /q Current.cpp $(HDIR)\Current.h
+ del /q Endpoint.cpp $(HDIR)\Endpoint.h
+ del /q FacetMap.cpp $(HDIR)\FacetMap.h
+ del /q ImplicitContextF.cpp $(HDIR)\ImplicitContextF.h
+ del /q ImplicitContext.cpp $(HDIR)\ImplicitContext.h
+ del /q Identity.cpp $(HDIR)\Identity.h
+ del /q LocalException.cpp $(HDIR)\LocalException.h
+ del /q LocatorF.cpp $(HDIR)\LocatorF.h
+ del /q Locator.cpp $(HDIR)\Locator.h
+ del /q LoggerF.cpp $(HDIR)\LoggerF.h
+ del /q Logger.cpp $(HDIR)\Logger.h
+ del /q ObjectAdapterF.cpp $(HDIR)\ObjectAdapterF.h
+ del /q ObjectAdapter.cpp $(HDIR)\ObjectAdapter.h
+ del /q ObjectFactoryF.cpp $(HDIR)\ObjectFactoryF.h
+ del /q ObjectFactory.cpp $(HDIR)\ObjectFactory.h
+ del /q PluginF.cpp $(HDIR)\PluginF.h
+ del /q Plugin.cpp $(HDIR)\Plugin.h
+ del /q ProcessF.cpp $(HDIR)\ProcessF.h
+ del /q Process.cpp $(HDIR)\Process.h
+ del /q PropertiesF.cpp $(HDIR)\PropertiesF.h
+ del /q Properties.cpp $(HDIR)\Properties.h
+ del /q RouterF.cpp $(HDIR)\RouterF.h
+ del /q Router.cpp $(HDIR)\Router.h
+ del /q ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h
+ del /q ServantLocator.cpp $(HDIR)\ServantLocator.h
+ del /q SliceChecksumDict.cpp $(HDIR)\SliceChecksumDict.h
+ del /q StatsF.cpp $(HDIR)\StatsF.h
+ del /q Stats.cpp $(HDIR)\Stats.h
+ del /q $(DLLNAME:.dll=.*)
+ del /q Ice.res
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+ copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak index 7379d22454f..d9a59c8193a 100644 --- a/cpp/src/IceBox/Makefile.mak +++ b/cpp/src/IceBox/Makefile.mak @@ -1,137 +1,137 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\icebox$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\icebox$(SOVERSION)$(LIBSUFFIX).dll - -SERVER = $(top_srcdir)\bin\icebox$(LIBSUFFIX).exe -ADMIN = $(top_srcdir)\bin\iceboxadmin.exe - -!ifdef BUILD_UTILS - -TARGETS = $(SERVER) $(ADMIN) - -!else - -TARGETS = $(LIBNAME) $(DLLNAME) - -!endif - -OBJS = IceBox.obj \ - Exception.obj - -SOBJS = ServiceManagerI.obj \ - Service.obj - -AOBJS = Admin.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(AOBJS:.obj=.cpp) - -HDIR = $(includedir)\IceBox -SDIR = $(slicedir)\IceBox - -!include $(top_srcdir)\config\Make.rules.mak - -!ifdef BUILD_UTILS - -CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!else - -CPPFLAGS = -I.. $(CPPFLAGS) -DICE_BOX_API_EXPORTS - -!endif - -SLICE2CPPFLAGS = --checksum --ice --dll-export ICE_BOX_API --include-dir IceBox $(SLICE2CPPFLAGS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -APDBFLAGS = /pdb:$(ADMIN:.exe=.pdb) -!endif - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(OBJS) IceBox.res - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceBox.res $(PREOUT)$@ $(PRELIBS)$(LIBS) - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -$(SERVER): $(SOBJS) IceBoxExe.res - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) IceBoxExe.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icebox$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(ADMIN): $(AOBJS) IceBoxAdmin.res - $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) IceBoxAdmin.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icebox$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -IceBox.res: IceBox.rc - rc.exe $(RCFLAGS) IceBox.rc - -IceBoxExe.res: IceBoxExe.rc - rc.exe $(RCFLAGS) IceBoxExe.rc - -IceBoxAdmin.res: IceBoxAdmin.rc - rc.exe $(RCFLAGS) IceBoxAdmin.rc - -!ifdef BUILD_UTILS - -clean:: - del /q IceBox.cpp $(HDIR)\IceBox.h - del /q $(DLLNAME:.dll=.*) - del /q $(SERVER:.exe=.*) - del /q $(ADMIN:.exe=.*) - del /q IceBox.res IceBoxAdmin.res IceBoxExe.res - -install:: all - copy $(LIBNAME) $(install_libdir) - copy $(DLLNAME) $(install_bindir) - copy $(SERVER) $(install_bindir) - copy $(ADMIN) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(DLLNAME:.dll=.tds) $(install_bindir) - copy $(SERVER:.exe=.tds) $(install_bindir) - copy $(ADMIN:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(DLLNAME:.dll=.pdb) $(install_bindir) - copy $(SERVER:.exe=.pdb) $(install_bindir) - copy $(ADMIN:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!else - -install:: all - -$(EVERYTHING):: - @$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@ - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\icebox$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\icebox$(SOVERSION)$(LIBSUFFIX).dll
+
+SERVER = $(top_srcdir)\bin\icebox$(LIBSUFFIX).exe
+ADMIN = $(top_srcdir)\bin\iceboxadmin.exe
+
+!ifdef BUILD_UTILS
+
+TARGETS = $(SERVER) $(ADMIN)
+
+!else
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+!endif
+
+OBJS = IceBox.obj \
+ Exception.obj
+
+SOBJS = ServiceManagerI.obj \
+ Service.obj
+
+AOBJS = Admin.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(AOBJS:.obj=.cpp)
+
+HDIR = $(includedir)\IceBox
+SDIR = $(slicedir)\IceBox
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+!ifdef BUILD_UTILS
+
+CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!else
+
+CPPFLAGS = -I.. $(CPPFLAGS) -DICE_BOX_API_EXPORTS
+
+!endif
+
+SLICE2CPPFLAGS = --checksum --ice --dll-export ICE_BOX_API --include-dir IceBox $(SLICE2CPPFLAGS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+APDBFLAGS = /pdb:$(ADMIN:.exe=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) IceBox.res
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceBox.res $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+$(SERVER): $(SOBJS) IceBoxExe.res
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) IceBoxExe.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+ icebox$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(ADMIN): $(AOBJS) IceBoxAdmin.res
+ $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) IceBoxAdmin.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+ icebox$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+IceBox.res: IceBox.rc
+ rc.exe $(RCFLAGS) IceBox.rc
+
+IceBoxExe.res: IceBoxExe.rc
+ rc.exe $(RCFLAGS) IceBoxExe.rc
+
+IceBoxAdmin.res: IceBoxAdmin.rc
+ rc.exe $(RCFLAGS) IceBoxAdmin.rc
+
+!ifdef BUILD_UTILS
+
+clean::
+ del /q IceBox.cpp $(HDIR)\IceBox.h
+ del /q $(DLLNAME:.dll=.*)
+ del /q $(SERVER:.exe=.*)
+ del /q $(ADMIN:.exe=.*)
+ del /q IceBox.res IceBoxAdmin.res IceBoxExe.res
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+ copy $(DLLNAME) $(install_bindir)
+ copy $(SERVER) $(install_bindir)
+ copy $(ADMIN) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(DLLNAME:.dll=.tds) $(install_bindir)
+ copy $(SERVER:.exe=.tds) $(install_bindir)
+ copy $(ADMIN:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+ copy $(SERVER:.exe=.pdb) $(install_bindir)
+ copy $(ADMIN:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!else
+
+install:: all
+
+$(EVERYTHING)::
+ @$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index c1c8a4e4051..7362990109f 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -1,217 +1,217 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -ADMIN = $(top_srcdir)\bin\icegridadmin.exe -NODE_SERVER = $(top_srcdir)\bin\icegridnode.exe -REGISTRY_SERVER = $(top_srcdir)\bin\icegridregistry.exe - -TARGETS = $(ADMIN) $(NODE_SERVER) $(REGISTRY_SERVER) - -ADMIN_OBJS = Grammar.obj \ - Scanner.obj \ - Parser.obj \ - DescriptorParser.obj \ - DescriptorBuilder.obj \ - DescriptorHelper.obj \ - FileParserI.obj \ - Util.obj \ - Internal.obj \ - Client.obj - -COMMON_OBJS = Internal.obj \ - DescriptorParser.obj \ - DescriptorBuilder.obj \ - FileCache.obj \ - TraceLevels.obj \ - PlatformInfo.obj - -NODE_OBJS = NodeI.obj \ - NodeServerAdminRouter.obj \ - ServerI.obj \ - ServerAdapterI.obj \ - Activator.obj \ - NodeSessionManager.obj - -REGISTRY_OBJS = AdminCallbackRouter.obj \ - RegistryI.obj \ - RegistryServerAdminRouter.obj \ - InternalRegistryI.obj \ - StringApplicationInfoDict.obj \ - IdentityObjectInfoDict.obj \ - StringAdapterInfoDict.obj \ - Database.obj \ - Allocatable.obj \ - AdapterCache.obj \ - ObjectCache.obj \ - AllocatableObjectCache.obj \ - ServerCache.obj \ - NodeCache.obj \ - ReplicaCache.obj \ - LocatorI.obj \ - LocatorRegistryI.obj \ - AdminI.obj \ - Util.obj \ - DescriptorHelper.obj \ - NodeSessionI.obj \ - ReplicaSessionI.obj \ - ReapThread.obj \ - SessionI.obj \ - AdminSessionI.obj \ - SessionServantManager.obj \ - Topics.obj \ - QueryI.obj \ - FileUserAccountMapperI.obj \ - ReplicaSessionManager.obj \ - WellKnownObjectsManager.obj - -NODE_SVR_OBJS = $(COMMON_OBJS) \ - $(NODE_OBJS) \ - $(REGISTRY_OBJS) \ - IceGridNode.obj - -REGISTRY_SVR_OBJS = \ - $(COMMON_OBJS) \ - $(REGISTRY_OBJS) \ - IceGridRegistry.obj - -SRCS = $(ADMIN_OBJS:.obj=.cpp) \ - $(COMMON_OBJS:.obj=.cpp) \ - $(NODE_OBJS:.obj=.cpp) \ - $(REGISTRY_OBJS:.obj=.cpp) \ - IceGridNode.cpp \ - IceGridRegistry.cpp - -HDIR = $(includedir)\IceGrid -SDIR = $(slicedir)\IceGrid - -SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceGrid $(ICECPPFLAGS) - -!include $(top_srcdir)\config\Make.rules.mak - -LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib -ALINKWITH = $(LINKWITH) icegrid$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib icepatch2$(LIBSUFFIX).lib \ - icebox$(LIBSUFFIX).lib -NLINKWITH = $(ALINKWITH) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib \ - icessl$(LIBSUFFIX).lib icestormservice$(LIBSUFFIX).lib $(OPENSSL_LIBS) -!if "$(CPP_COMPILER)" != "BCC2006" -NLINKWITH = $(NLINKWITH) pdh.lib ws2_32.lib -!endif - -SLICE2CPPFLAGS = --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS) -CPPFLAGS = -I. -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(CPP_COMPILER)" != "BCC2006" -CPPFLAGS = $(CPPFLAGS) -Zm200 -!endif - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -APDBFLAGS = /pdb:$(ADMIN:.exe=.pdb) -RPDBFLAGS = /pdb:$(REGISTRY_SERVER:.exe=.pdb) -NPDBFLAGS = /pdb:$(NODE_SERVER:.exe=.pdb) -!endif - -$(ADMIN): $(ADMIN_OBJS) IceGridAdmin.res - $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(ADMIN_OBJS) IceGridAdmin.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) &&\ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) IceGridRegistry.res - $(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(REGISTRY_SVR_OBJS) IceGridRegistry.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)$(NLINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(NODE_SERVER): $(NODE_SVR_OBJS) IceGridNode.res - $(LINK) $(LD_EXEFLAGS) $(NPDBFLAGS) $(NODE_SVR_OBJS) IceGridNode.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)$(NLINKWITH) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE2FREEZE) - del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp - $(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \ - StringApplicationInfoDict Internal.ice - -IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZE) - del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp - $(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \ - --dict-index IceGrid::IdentityObjectInfoDict,type \ - IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice Internal.ice - -StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SLICE2FREEZE) - del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp - $(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \ - --dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)\Admin.ice - -Scanner.cpp : Scanner.l - flex Scanner.l - del /q $@ - echo #include "IceUtil/Config.h" > Scanner.cpp - type lex.yy.c >> Scanner.cpp - del /q lex.yy.c - -Grammar.cpp Grammar.h: Grammar.y - del /q Grammar.h Grammar.cpp - bison -dvt Grammar.y - move Grammar.tab.c Grammar.cpp - move Grammar.tab.h Grammar.h - del /q Grammar.output - -IceGridAdmin.res: IceGridAdmin.rc - rc.exe $(RCFLAGS) IceGridAdmin.rc - -IceGridNode.res: IceGridNode.rc - rc.exe $(RCFLAGS) IceGridNode.rc - -IceGridRegistry.res: IceGridRegistry.rc - rc.exe IceGridRegistry.rc - -clean:: - del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp - del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp - del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp - -clean:: - del /q Internal.cpp Internal.h - del /q $(ADMIN:.exe=.*) - del /q $(NODE_SERVER:.exe=.*) - del /q $(REGISTRY_SERVER:.exe=.*) - del /q IceGridAdmin.res IceGridNode.res IceGridRegistry.res - -clean:: - del /q Grammar.cpp Grammar.h - del /q Scanner.cpp - -install:: all - copy $(ADMIN) $(install_bindir) - copy $(NODE_SERVER) $(install_bindir) - copy $(REGISTRY_SERVER) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(ADMIN:.exe=.tds) $(install_bindir) - copy $(NODE_SERVER:.exe=.tds) $(install_bindir) - copy $(REGISTRY_SERVER:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(ADMIN:.exe=.pdb) $(install_bindir) - copy $(NODE_SERVER:.exe=.pdb) $(install_bindir) - copy $(REGISTRY_SERVER:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+ADMIN = $(top_srcdir)\bin\icegridadmin.exe
+NODE_SERVER = $(top_srcdir)\bin\icegridnode.exe
+REGISTRY_SERVER = $(top_srcdir)\bin\icegridregistry.exe
+
+TARGETS = $(ADMIN) $(NODE_SERVER) $(REGISTRY_SERVER)
+
+ADMIN_OBJS = Grammar.obj \
+ Scanner.obj \
+ Parser.obj \
+ DescriptorParser.obj \
+ DescriptorBuilder.obj \
+ DescriptorHelper.obj \
+ FileParserI.obj \
+ Util.obj \
+ Internal.obj \
+ Client.obj
+
+COMMON_OBJS = Internal.obj \
+ DescriptorParser.obj \
+ DescriptorBuilder.obj \
+ FileCache.obj \
+ TraceLevels.obj \
+ PlatformInfo.obj
+
+NODE_OBJS = NodeI.obj \
+ NodeServerAdminRouter.obj \
+ ServerI.obj \
+ ServerAdapterI.obj \
+ Activator.obj \
+ NodeSessionManager.obj
+
+REGISTRY_OBJS = AdminCallbackRouter.obj \
+ RegistryI.obj \
+ RegistryServerAdminRouter.obj \
+ InternalRegistryI.obj \
+ StringApplicationInfoDict.obj \
+ IdentityObjectInfoDict.obj \
+ StringAdapterInfoDict.obj \
+ Database.obj \
+ Allocatable.obj \
+ AdapterCache.obj \
+ ObjectCache.obj \
+ AllocatableObjectCache.obj \
+ ServerCache.obj \
+ NodeCache.obj \
+ ReplicaCache.obj \
+ LocatorI.obj \
+ LocatorRegistryI.obj \
+ AdminI.obj \
+ Util.obj \
+ DescriptorHelper.obj \
+ NodeSessionI.obj \
+ ReplicaSessionI.obj \
+ ReapThread.obj \
+ SessionI.obj \
+ AdminSessionI.obj \
+ SessionServantManager.obj \
+ Topics.obj \
+ QueryI.obj \
+ FileUserAccountMapperI.obj \
+ ReplicaSessionManager.obj \
+ WellKnownObjectsManager.obj
+
+NODE_SVR_OBJS = $(COMMON_OBJS) \
+ $(NODE_OBJS) \
+ $(REGISTRY_OBJS) \
+ IceGridNode.obj
+
+REGISTRY_SVR_OBJS = \
+ $(COMMON_OBJS) \
+ $(REGISTRY_OBJS) \
+ IceGridRegistry.obj
+
+SRCS = $(ADMIN_OBJS:.obj=.cpp) \
+ $(COMMON_OBJS:.obj=.cpp) \
+ $(NODE_OBJS:.obj=.cpp) \
+ $(REGISTRY_OBJS:.obj=.cpp) \
+ IceGridNode.cpp \
+ IceGridRegistry.cpp
+
+HDIR = $(includedir)\IceGrid
+SDIR = $(slicedir)\IceGrid
+
+SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceGrid $(ICECPPFLAGS)
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib
+ALINKWITH = $(LINKWITH) icegrid$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib icepatch2$(LIBSUFFIX).lib \
+ icebox$(LIBSUFFIX).lib
+NLINKWITH = $(ALINKWITH) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib \
+ icessl$(LIBSUFFIX).lib icestormservice$(LIBSUFFIX).lib $(OPENSSL_LIBS)
+!if "$(CPP_COMPILER)" != "BCC2006"
+NLINKWITH = $(NLINKWITH) pdh.lib ws2_32.lib
+!endif
+
+SLICE2CPPFLAGS = --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS)
+CPPFLAGS = -I. -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+!if "$(CPP_COMPILER)" != "BCC2006"
+CPPFLAGS = $(CPPFLAGS) -Zm200
+!endif
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+APDBFLAGS = /pdb:$(ADMIN:.exe=.pdb)
+RPDBFLAGS = /pdb:$(REGISTRY_SERVER:.exe=.pdb)
+NPDBFLAGS = /pdb:$(NODE_SERVER:.exe=.pdb)
+!endif
+
+$(ADMIN): $(ADMIN_OBJS) IceGridAdmin.res
+ $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(ADMIN_OBJS) IceGridAdmin.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) &&\
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) IceGridRegistry.res
+ $(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(REGISTRY_SVR_OBJS) IceGridRegistry.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)$(NLINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(NODE_SERVER): $(NODE_SVR_OBJS) IceGridNode.res
+ $(LINK) $(LD_EXEFLAGS) $(NPDBFLAGS) $(NODE_SVR_OBJS) IceGridNode.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)$(NLINKWITH)
+ @if exist $@.manifest \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE2FREEZE)
+ del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
+ $(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \
+ StringApplicationInfoDict Internal.ice
+
+IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZE)
+ del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
+ $(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \
+ --dict-index IceGrid::IdentityObjectInfoDict,type \
+ IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice Internal.ice
+
+StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SLICE2FREEZE)
+ del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
+ $(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \
+ --dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)\Admin.ice
+
+Scanner.cpp : Scanner.l
+ flex Scanner.l
+ del /q $@
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
+ del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+ del /q Grammar.h Grammar.cpp
+ bison -dvt Grammar.y
+ move Grammar.tab.c Grammar.cpp
+ move Grammar.tab.h Grammar.h
+ del /q Grammar.output
+
+IceGridAdmin.res: IceGridAdmin.rc
+ rc.exe $(RCFLAGS) IceGridAdmin.rc
+
+IceGridNode.res: IceGridNode.rc
+ rc.exe $(RCFLAGS) IceGridNode.rc
+
+IceGridRegistry.res: IceGridRegistry.rc
+ rc.exe IceGridRegistry.rc
+
+clean::
+ del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
+ del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
+ del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
+
+clean::
+ del /q Internal.cpp Internal.h
+ del /q $(ADMIN:.exe=.*)
+ del /q $(NODE_SERVER:.exe=.*)
+ del /q $(REGISTRY_SERVER:.exe=.*)
+ del /q IceGridAdmin.res IceGridNode.res IceGridRegistry.res
+
+clean::
+ del /q Grammar.cpp Grammar.h
+ del /q Scanner.cpp
+
+install:: all
+ copy $(ADMIN) $(install_bindir)
+ copy $(NODE_SERVER) $(install_bindir)
+ copy $(REGISTRY_SERVER) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(ADMIN:.exe=.tds) $(install_bindir)
+ copy $(NODE_SERVER:.exe=.tds) $(install_bindir)
+ copy $(REGISTRY_SERVER:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(ADMIN:.exe=.pdb) $(install_bindir)
+ copy $(NODE_SERVER:.exe=.pdb) $(install_bindir)
+ copy $(REGISTRY_SERVER:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceGridLib/Makefile.mak b/cpp/src/IceGridLib/Makefile.mak index 8135b396c03..fb3febe4255 100644 --- a/cpp/src/IceGridLib/Makefile.mak +++ b/cpp/src/IceGridLib/Makefile.mak @@ -1,88 +1,88 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\icegrid$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\icegrid$(SOVERSION)$(LIBSUFFIX).dll - -TARGETS = $(LIBNAME) $(DLLNAME) - -LIB_OBJS = Admin.obj \ - Locator.obj \ - Query.obj \ - Exception.obj \ - Descriptor.obj \ - FileParser.obj \ - Observer.obj \ - Session.obj \ - Registry.obj \ - UserAccountMapper.obj - -SRCS = $(LIB_OBJS:.obj=.cpp) - -HDIR = $(includedir)\IceGrid -SDIR = $(slicedir)\IceGrid - -!include $(top_srcdir)\config\Make.rules.mak - -LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib - -SLICE2CPPFLAGS = --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API $(SLICE2CPPFLAGS) -CPPFLAGS = -I.. -DICE_GRID_API_EXPORTS $(CPPFLAGS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -!endif - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(LIB_OBJS) IceGrid.res - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(LIB_OBJS) IceGrid.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -IceGrid.res: IceGrid.rc - rc.exe $(RCFLAGS) IceGrid.rc -clean:: - del /q Admin.cpp $(HDIR)\Admin.h - del /q Descriptor.cpp $(HDIR)\Descriptor.h - del /q Exception.cpp $(HDIR)\Exception.h - del /q Locator.cpp $(HDIR)\Locator.h - del /q Observer.cpp $(HDIR)\Observer.h - del /q Query.cpp $(HDIR)\Query.h - del /q Session.cpp $(HDIR)\Session.h - del /q Registry.cpp $(HDIR)\Registry.h - del /q UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h - del /q $(DLLNAME:.dll=.*) - del /q IceGrid.res - -install:: all - copy $(LIBNAME) $(install_libdir) - copy $(DLLNAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(DLLNAME:.dll=.tds) $(install_bindir) - -!else - -install:: all - copy $(DLLNAME:.dll=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\icegrid$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\icegrid$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+LIB_OBJS = Admin.obj \
+ Locator.obj \
+ Query.obj \
+ Exception.obj \
+ Descriptor.obj \
+ FileParser.obj \
+ Observer.obj \
+ Session.obj \
+ Registry.obj \
+ UserAccountMapper.obj
+
+SRCS = $(LIB_OBJS:.obj=.cpp)
+
+HDIR = $(includedir)\IceGrid
+SDIR = $(slicedir)\IceGrid
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib
+
+SLICE2CPPFLAGS = --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API $(SLICE2CPPFLAGS)
+CPPFLAGS = -I.. -DICE_GRID_API_EXPORTS $(CPPFLAGS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(LIB_OBJS) IceGrid.res
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(LIB_OBJS) IceGrid.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+IceGrid.res: IceGrid.rc
+ rc.exe $(RCFLAGS) IceGrid.rc
+clean::
+ del /q Admin.cpp $(HDIR)\Admin.h
+ del /q Descriptor.cpp $(HDIR)\Descriptor.h
+ del /q Exception.cpp $(HDIR)\Exception.h
+ del /q Locator.cpp $(HDIR)\Locator.h
+ del /q Observer.cpp $(HDIR)\Observer.h
+ del /q Query.cpp $(HDIR)\Query.h
+ del /q Session.cpp $(HDIR)\Session.h
+ del /q Registry.cpp $(HDIR)\Registry.h
+ del /q UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h
+ del /q $(DLLNAME:.dll=.*)
+ del /q IceGrid.res
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+ copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak index 24bff8dd03e..ed139aee154 100644 --- a/cpp/src/IcePatch2/Makefile.mak +++ b/cpp/src/IcePatch2/Makefile.mak @@ -1,160 +1,160 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\icepatch2$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\icepatch2$(SOVERSION)$(LIBSUFFIX).dll - -SERVER = $(top_srcdir)\bin\icepatch2server.exe -CLIENT = $(top_srcdir)\bin\icepatch2client.exe -CALC = $(top_srcdir)\bin\icepatch2calc.exe - -!ifdef BUILD_UTILS - -TARGETS = $(SERVER) $(CLIENT) $(CALC) - -!else - -TARGETS = $(LIBNAME) $(DLLNAME) - -!endif - -OBJS = Util.obj \ - ClientUtil.obj \ - FileInfo.obj \ - FileServer.obj \ - OS.obj - -SOBJS = Server.obj \ - FileServerI.obj - -COBJS = Client.obj - -CALCOBJS = Calc.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(CALCOBJS:.obj=.cpp) - -HDIR = $(includedir)\IcePatch2 -SDIR = $(slicedir)\IcePatch2 - -!include $(top_srcdir)\config\Make.rules.mak - -!ifdef BUILD_UTILS - -CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!else - -CPPFLAGS = -I. -I.. $(CPPFLAGS) -DICE_PATCH2_API_EXPORTS -DWIN32_LEAN_AND_MEAN - -!endif - -SLICE2CPPFLAGS = --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLICE2CPPFLAGS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -CAPDBFLAGS = /pdb:$(CALC:.exe=.pdb) -!endif - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(OBJS) IcePatch2.res - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IcePatch2.res $(PREOUT)$@ $(PRELIBS)$(LIBS) $(BZIP2_LIBS) \ - $(OPENSSL_LIBS) - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -$(SERVER): $(SOBJS) IcePatch2Server.res - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) IcePatch2Server.res $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icepatch2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(CLIENT): $(COBJS) IcePatch2Client.res - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) IcePatch2Client.res $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icepatch2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(CALC): $(CALCOBJS) IcePatch2Calc.res - $(LINK) $(LD_EXEFLAGS) $(CAPDBFLAGS) $(SETARGV) $(CALCOBJS) IcePatch2Calc.res $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icepatch2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest - -IcePatch2.res: IcePatch2.rc - rc.exe $(RCFLAGS) IcePatch2.rc - -IcePatch2Server.res: IcePatch2Server.rc - rc.exe $(RCFLAGS) IcePatch2Server.rc - -IcePatch2Client.res: IcePatch2Client.rc - rc.exe $(RCFLAGS) IcePatch2Client.rc - -IcePatch2Calc.res: IcePatch2Calc.rc - rc.exe $(RCFLAGS) IcePatch2Calc.rc - -!ifdef BUILD_UTILS - -clean:: - del /q FileInfo.cpp $(HDIR)\FileInfo.h - del /q FileServer.cpp $(HDIR)\FileServer.h - del /q $(DLLNAME:.dll=.*) - del /q $(SERVER:.exe=.*) - del /q $(CLIENT:.exe=.*) - del /q $(CALC:.exe=.*) - del /q IcePatch.res IcePatch2Server.res IcePatch2Client.res IcePatch2Calc.res - -install:: all - copy $(LIBNAME) $(install_libdir) - copy $(DLLNAME) $(install_bindir) - copy $(SERVER) $(install_bindir) - copy $(CLIENT) $(install_bindir) - copy $(CALC) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(DLLNAME:.dll=.tds) $(install_bindir) - copy $(SERVER:.exe=.tds) $(install_bindir) - copy $(CLIENT:.exe=.tds) $(install_bindir) - copy $(CALC:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(DLLNAME:.dll=.pdb) $(install_bindir) - copy $(SERVER:.exe=.pdb) $(install_bindir) - copy $(CLIENT:.exe=.pdb) $(install_bindir) - copy $(CALC:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!else - -install:: all - -$(EVERYTHING):: - @$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@ - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\icepatch2$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\icepatch2$(SOVERSION)$(LIBSUFFIX).dll
+
+SERVER = $(top_srcdir)\bin\icepatch2server.exe
+CLIENT = $(top_srcdir)\bin\icepatch2client.exe
+CALC = $(top_srcdir)\bin\icepatch2calc.exe
+
+!ifdef BUILD_UTILS
+
+TARGETS = $(SERVER) $(CLIENT) $(CALC)
+
+!else
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+!endif
+
+OBJS = Util.obj \
+ ClientUtil.obj \
+ FileInfo.obj \
+ FileServer.obj \
+ OS.obj
+
+SOBJS = Server.obj \
+ FileServerI.obj
+
+COBJS = Client.obj
+
+CALCOBJS = Calc.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(CALCOBJS:.obj=.cpp)
+
+HDIR = $(includedir)\IcePatch2
+SDIR = $(slicedir)\IcePatch2
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+!ifdef BUILD_UTILS
+
+CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!else
+
+CPPFLAGS = -I. -I.. $(CPPFLAGS) -DICE_PATCH2_API_EXPORTS -DWIN32_LEAN_AND_MEAN
+
+!endif
+
+SLICE2CPPFLAGS = --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLICE2CPPFLAGS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+CAPDBFLAGS = /pdb:$(CALC:.exe=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) IcePatch2.res
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IcePatch2.res $(PREOUT)$@ $(PRELIBS)$(LIBS) $(BZIP2_LIBS) \
+ $(OPENSSL_LIBS)
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+$(SERVER): $(SOBJS) IcePatch2Server.res
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) IcePatch2Server.res $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+ icepatch2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(CLIENT): $(COBJS) IcePatch2Client.res
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) IcePatch2Client.res $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+ icepatch2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(CALC): $(CALCOBJS) IcePatch2Calc.res
+ $(LINK) $(LD_EXEFLAGS) $(CAPDBFLAGS) $(SETARGV) $(CALCOBJS) IcePatch2Calc.res $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+ icepatch2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+IcePatch2.res: IcePatch2.rc
+ rc.exe $(RCFLAGS) IcePatch2.rc
+
+IcePatch2Server.res: IcePatch2Server.rc
+ rc.exe $(RCFLAGS) IcePatch2Server.rc
+
+IcePatch2Client.res: IcePatch2Client.rc
+ rc.exe $(RCFLAGS) IcePatch2Client.rc
+
+IcePatch2Calc.res: IcePatch2Calc.rc
+ rc.exe $(RCFLAGS) IcePatch2Calc.rc
+
+!ifdef BUILD_UTILS
+
+clean::
+ del /q FileInfo.cpp $(HDIR)\FileInfo.h
+ del /q FileServer.cpp $(HDIR)\FileServer.h
+ del /q $(DLLNAME:.dll=.*)
+ del /q $(SERVER:.exe=.*)
+ del /q $(CLIENT:.exe=.*)
+ del /q $(CALC:.exe=.*)
+ del /q IcePatch.res IcePatch2Server.res IcePatch2Client.res IcePatch2Calc.res
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+ copy $(DLLNAME) $(install_bindir)
+ copy $(SERVER) $(install_bindir)
+ copy $(CLIENT) $(install_bindir)
+ copy $(CALC) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(DLLNAME:.dll=.tds) $(install_bindir)
+ copy $(SERVER:.exe=.tds) $(install_bindir)
+ copy $(CLIENT:.exe=.tds) $(install_bindir)
+ copy $(CALC:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+ copy $(SERVER:.exe=.pdb) $(install_bindir)
+ copy $(CLIENT:.exe=.pdb) $(install_bindir)
+ copy $(CALC:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!else
+
+install:: all
+
+$(EVERYTHING)::
+ @$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak index 4126c4141b9..ab915c88e3e 100644 --- a/cpp/src/IceSSL/Makefile.mak +++ b/cpp/src/IceSSL/Makefile.mak @@ -1,81 +1,81 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\icessl$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\icessl$(SOVERSION)$(LIBSUFFIX).dll - -TARGETS = $(LIBNAME) $(DLLNAME) - -OBJS = AcceptorI.obj \ - Certificate.obj \ - ConnectorI.obj \ - EndpointI.obj \ - Instance.obj \ - PluginI.obj \ - TransceiverI.obj \ - Util.obj \ - RFC2253.obj \ - TrustManager.obj - -SRCS = $(OBJS:.obj=.cpp) - -HDIR = $(includedir)\IceSSL - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND_MEAN - -LINKWITH = $(OPENSSL_LIBS) $(LIBS) -!if "$(CPP_COMPILER)" != "BCC2006" -LINKWITH = $(LINKWITH) ws2_32.lib -!endif - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -!endif - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(OBJS) IceSSL.res - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceSSL.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -IceSSL.res: IceSSL.rc - rc.exe $(RCFLAGS) IceSSL.res - -clean:: - del /q $(DLLNAME:.dll=.*) - del /q IceSSL.res - -install:: all - copy $(LIBNAME) $(install_libdir) - copy $(DLLNAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(DLLNAME:.dll=.tds) $(install_bindir) - -!else - -install:: all - copy $(DLLNAME:.dll=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\icessl$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\icessl$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+OBJS = AcceptorI.obj \
+ Certificate.obj \
+ ConnectorI.obj \
+ EndpointI.obj \
+ Instance.obj \
+ PluginI.obj \
+ TransceiverI.obj \
+ Util.obj \
+ RFC2253.obj \
+ TrustManager.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+HDIR = $(includedir)\IceSSL
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND_MEAN
+
+LINKWITH = $(OPENSSL_LIBS) $(LIBS)
+!if "$(CPP_COMPILER)" != "BCC2006"
+LINKWITH = $(LINKWITH) ws2_32.lib
+!endif
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) IceSSL.res
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceSSL.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+IceSSL.res: IceSSL.rc
+ rc.exe $(RCFLAGS) IceSSL.res
+
+clean::
+ del /q $(DLLNAME:.dll=.*)
+ del /q IceSSL.res
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+ copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index 2d077288767..61fa5ec1efc 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -1,262 +1,262 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\icestorm$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\icestorm$(SOVERSION)$(LIBSUFFIX).dll - -SVCLIBNAME = $(top_srcdir)\lib\icestormservice$(LIBSUFFIX).lib -SVCDLLNAME = $(top_srcdir)\bin\icestormservice$(SOVERSION)$(LIBSUFFIX).dll - -ADMIN = $(top_srcdir)\bin\icestormadmin.exe -MIGRATE = $(top_srcdir)\bin\icestormmigrate.exe - -!ifdef BUILD_UTILS - -TARGETS = $(SVCLIBNAME) $(SVCDLLNAME) $(ADMIN) $(MIGRATE) - -!else - -TARGETS = $(LIBNAME) $(DLLNAME) - -!endif - -OBJS = IceStorm.obj - -SERVICE_OBJS = NodeI.obj \ - Observers.obj \ - LLUMap.obj \ - Election.obj \ - Instance.obj \ - TraceLevels.obj \ - Subscriber.obj \ - TopicI.obj \ - TopicManagerI.obj \ - TransientTopicI.obj \ - TransientTopicManagerI.obj \ - SubscriberMap.obj \ - SubscriberRecord.obj \ - IceStormInternal.obj \ - Service.obj - -AOBJS = Admin.obj \ - Grammar.obj \ - Scanner.obj \ - Parser.obj \ - Election.obj \ - SubscriberRecord.obj \ - IceStormInternal.obj - -MOBJS = Migrate.obj \ - SubscriberRecord.obj \ - SubscriberMap.obj \ - LLUMap.obj \ - LinkRecord.obj \ - IceStormInternal.obj \ - Election.obj \ - V32FormatDB.obj \ - V31FormatDB.obj \ - V32Format.obj \ - V31Format.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(AOBJS:.obj=.cpp) \ - $(MOBJS:.obj=.cpp) - -HDIR = $(includedir)\IceStorm -SDIR = $(slicedir)\IceStorm - -!include $(top_srcdir)\config\Make.rules.mak - -CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -SLICE2CPPFLAGS = --ice --include-dir IceStorm $(SLICE2CPPFLAGS) -I.. -LINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib -ALINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib -MLINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib - -SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceStorm -I.. -I$(slicedir) - -!ifdef BUILD_UTILS - -CPPFLAGS = $(CPPFLAGS) -DICE_STORM_API_EXPORTS - -!else - -CPPFLAGS = $(CPPFLAGS) -DICE_STORM_LIB_API_EXPORTS - -!endif - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -SPDBFLAGS = /pdb:$(SVCDLLNAME:.dll=.pdb) -APDBFLAGS = /pdb:$(ADMIN:.exe=.pdb) -MPDBFLAGS = /pdb:$(MIGRATE:.exe=.pdb) -!endif - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(OBJS) IceStorm.res - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceStorm.res $(PREOUT)$@ $(PRELIBS)$(LIBS) - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -$(SVCLIBNAME): $(SVCDLLNAME) - -$(SVCDLLNAME): $(SERVICE_OBJS) IceStormService.res - $(LINK) $(LD_DLLFLAGS) $(SPDBFLAGS) $(SERVICE_OBJS) IceStormService.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - move $(SVCDLLNAME:.dll=.lib) $(SVCLIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(SVCDLLNAME:.dll=.exp) del /q $(SVCDLLNAME:.dll=.exp) - -$(ADMIN): $(AOBJS) IceStormAdmin.res - $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) IceStormAdmin.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(MIGRATE): $(MOBJS) IceStormMigrate.res - $(LINK) $(LD_EXEFLAGS) $(MPDBFLAGS) $(MOBJS) IceStormMigrate.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(MLINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -LLUMap.h LLUMap.cpp: $(SLICE2FREEZE) ..\IceStorm\Election.ice - del /q LLUMap.h LLUMap.cpp - $(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate LLUMap ..\IceStorm\Election.ice - -..\IceStorm\SubscriberMap.h SubscriberMap.cpp: ..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE) - del /q SubscriberMap.h SubscriberMap.cpp - $(SLICE2FREEZECMD) \ - --dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \ - SubscriberMap ..\IceStorm\SubscriberRecord.ice - -# Needed for migration. -V32FormatDB.h V32FormatDB.cpp: ..\IceStorm\V32Format.ice $(SLICE2FREEZE) - del /q V32FormatDB.h V32FormatDB.cpp - $(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \ - V32FormatDB ..\IceStorm\V32Format.ice - -V31FormatDB.h V31FormatDB.cpp: ..\IceStorm\V31Format.ice $(SLICE2FREEZE) - del /q V31FormatDB.h V31FormatDB.cpp - $(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \ - V31FormatDB ..\IceStorm\V31Format.ice - -V32Migrate.cpp ..\IceStorm\V32Migrate.h: ..\IceStorm\V32Migrate.ice - $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\V32Migrate.ice - -V31Migrate.cpp ..\IceStorm\V31Migrate.h: ..\IceStorm\V31Migrate.ice - $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\V31Migrate.ice - -LinkRecord.cpp ..\IceStorm\LinkRecord.h: ..\IceStorm\LinkRecord.ice - $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\LinkRecord.ice - -SubscriberRecord.cpp ..\IceStorm\SubscriberRecord.h: ..\IceStorm\SubscriberRecord.ice - $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\SubscriberRecord.ice - -IceStorm.cpp $(HDIR)\IceStorm.h: $(SDIR)\IceStorm.ice - $(SLICE2CPP) --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) $(SDIR)\IceStorm.ice - move IceStorm.h $(HDIR) - -Election.cpp ..\IceStorm\Election.h: ..\IceStorm\Election.ice - $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\Election.ice - -Scanner.cpp : Scanner.l - flex Scanner.l - del /q $@ - echo #include "IceUtil/Config.h" > Scanner.cpp - type lex.yy.c >> Scanner.cpp - del /q lex.yy.c - -Grammar.cpp Grammar.h: Grammar.y - del /q Grammar.h Grammar.cpp - bison -dvt Grammar.y - move Grammar.tab.c Grammar.cpp - move Grammar.tab.h Grammar.h - del /q Grammar.output - -IceStorm.res: IceStorm.rc - rc.exe $(RCFLAGS) IceStorm.rc - -IceStormService.res: IceStormService.rc - rc.exe $(RCFLAGS) IceStormService.rc - -IceStormAdmin.res: IceStormAdmin.rc - rc.exe $(RCFLAGS) IceStormAdmin.rc - -IceStormMigrate.res: IceStormMigrate.rc - rc.exe $(RCFLAGS) IceStormMigrate.rc - -!ifdef BUILD_UTILS - -clean:: - del /q LLUMap.h LLUMap.cpp - del /q SubscriberMap.h SubscriberMap.cpp - del /q V32FormatDB.cpp V31FormatDB.cpp V31FormatDB.h V31FormatDB.h - -clean:: - del /q IceStorm.cpp $(HDIR)\IceStorm.h - del /q IceStormInternal.cpp IceStormInternal.h - del /q V32Migrate.cpp V32Migrate.h - del /q V31Migrate.cpp V31Migrate.h - del /q LinkRecord.cpp LinkRecord.h - del /q Election.cpp Election.h - del /q SubscriberRecord.cpp SubscriberRecord.h - del /q $(DLLNAME:.dll=.*) - del /q $(SVCDLLNAME:.dll=.*) - del /q $(ADMIN:.exe=.*) - del /q $(MIGRATE:.exe=.*) - del /q IceStormAdmin.res IceStormMigrate.res IceStorm.res IceStormService.res - -clean:: - del /q Grammar.cpp Grammar.h - del /q Scanner.cpp - -install:: all - copy $(LIBNAME) $(install_libdir) - copy $(DLLNAME) $(install_bindir) - copy $(SVCLIBNAME) $(install_libdir) - copy $(SVCDLLNAME) $(install_bindir) - copy $(ADMIN) $(install_bindir) - copy $(MIGRATE) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(DLLNAME:.dll=.tds) $(install_bindir) - copy $(SVCDLLNAME:.dll=.tds) $(install_bindir) - copy $(ADMIN:.exe=.tds) $(install_bindir) - copy $(MIGRATE:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(DLLNAME:.dll=.pdb) $(install_bindir) - copy $(SVCDLLNAME:.dll=.pdb) $(install_bindir) - copy $(ADMIN:.exe=.pdb) $(install_bindir) - copy $(MIGRATE:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!else - -install:: all - -$(EVERYTHING):: - $(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@ - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\icestorm$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\icestorm$(SOVERSION)$(LIBSUFFIX).dll
+
+SVCLIBNAME = $(top_srcdir)\lib\icestormservice$(LIBSUFFIX).lib
+SVCDLLNAME = $(top_srcdir)\bin\icestormservice$(SOVERSION)$(LIBSUFFIX).dll
+
+ADMIN = $(top_srcdir)\bin\icestormadmin.exe
+MIGRATE = $(top_srcdir)\bin\icestormmigrate.exe
+
+!ifdef BUILD_UTILS
+
+TARGETS = $(SVCLIBNAME) $(SVCDLLNAME) $(ADMIN) $(MIGRATE)
+
+!else
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+!endif
+
+OBJS = IceStorm.obj
+
+SERVICE_OBJS = NodeI.obj \
+ Observers.obj \
+ LLUMap.obj \
+ Election.obj \
+ Instance.obj \
+ TraceLevels.obj \
+ Subscriber.obj \
+ TopicI.obj \
+ TopicManagerI.obj \
+ TransientTopicI.obj \
+ TransientTopicManagerI.obj \
+ SubscriberMap.obj \
+ SubscriberRecord.obj \
+ IceStormInternal.obj \
+ Service.obj
+
+AOBJS = Admin.obj \
+ Grammar.obj \
+ Scanner.obj \
+ Parser.obj \
+ Election.obj \
+ SubscriberRecord.obj \
+ IceStormInternal.obj
+
+MOBJS = Migrate.obj \
+ SubscriberRecord.obj \
+ SubscriberMap.obj \
+ LLUMap.obj \
+ LinkRecord.obj \
+ IceStormInternal.obj \
+ Election.obj \
+ V32FormatDB.obj \
+ V31FormatDB.obj \
+ V32Format.obj \
+ V31Format.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(AOBJS:.obj=.cpp) \
+ $(MOBJS:.obj=.cpp)
+
+HDIR = $(includedir)\IceStorm
+SDIR = $(slicedir)\IceStorm
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+SLICE2CPPFLAGS = --ice --include-dir IceStorm $(SLICE2CPPFLAGS) -I..
+LINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib
+ALINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib
+MLINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib
+
+SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceStorm -I.. -I$(slicedir)
+
+!ifdef BUILD_UTILS
+
+CPPFLAGS = $(CPPFLAGS) -DICE_STORM_API_EXPORTS
+
+!else
+
+CPPFLAGS = $(CPPFLAGS) -DICE_STORM_LIB_API_EXPORTS
+
+!endif
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+SPDBFLAGS = /pdb:$(SVCDLLNAME:.dll=.pdb)
+APDBFLAGS = /pdb:$(ADMIN:.exe=.pdb)
+MPDBFLAGS = /pdb:$(MIGRATE:.exe=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) IceStorm.res
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceStorm.res $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+$(SVCLIBNAME): $(SVCDLLNAME)
+
+$(SVCDLLNAME): $(SERVICE_OBJS) IceStormService.res
+ $(LINK) $(LD_DLLFLAGS) $(SPDBFLAGS) $(SERVICE_OBJS) IceStormService.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ move $(SVCDLLNAME:.dll=.lib) $(SVCLIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(SVCDLLNAME:.dll=.exp) del /q $(SVCDLLNAME:.dll=.exp)
+
+$(ADMIN): $(AOBJS) IceStormAdmin.res
+ $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) IceStormAdmin.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(MIGRATE): $(MOBJS) IceStormMigrate.res
+ $(LINK) $(LD_EXEFLAGS) $(MPDBFLAGS) $(MOBJS) IceStormMigrate.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(MLINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+LLUMap.h LLUMap.cpp: $(SLICE2FREEZE) ..\IceStorm\Election.ice
+ del /q LLUMap.h LLUMap.cpp
+ $(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate LLUMap ..\IceStorm\Election.ice
+
+..\IceStorm\SubscriberMap.h SubscriberMap.cpp: ..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE)
+ del /q SubscriberMap.h SubscriberMap.cpp
+ $(SLICE2FREEZECMD) \
+ --dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \
+ SubscriberMap ..\IceStorm\SubscriberRecord.ice
+
+# Needed for migration.
+V32FormatDB.h V32FormatDB.cpp: ..\IceStorm\V32Format.ice $(SLICE2FREEZE)
+ del /q V32FormatDB.h V32FormatDB.cpp
+ $(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \
+ V32FormatDB ..\IceStorm\V32Format.ice
+
+V31FormatDB.h V31FormatDB.cpp: ..\IceStorm\V31Format.ice $(SLICE2FREEZE)
+ del /q V31FormatDB.h V31FormatDB.cpp
+ $(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \
+ V31FormatDB ..\IceStorm\V31Format.ice
+
+V32Migrate.cpp ..\IceStorm\V32Migrate.h: ..\IceStorm\V32Migrate.ice
+ $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\V32Migrate.ice
+
+V31Migrate.cpp ..\IceStorm\V31Migrate.h: ..\IceStorm\V31Migrate.ice
+ $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\V31Migrate.ice
+
+LinkRecord.cpp ..\IceStorm\LinkRecord.h: ..\IceStorm\LinkRecord.ice
+ $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\LinkRecord.ice
+
+SubscriberRecord.cpp ..\IceStorm\SubscriberRecord.h: ..\IceStorm\SubscriberRecord.ice
+ $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\SubscriberRecord.ice
+
+IceStorm.cpp $(HDIR)\IceStorm.h: $(SDIR)\IceStorm.ice
+ $(SLICE2CPP) --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) $(SDIR)\IceStorm.ice
+ move IceStorm.h $(HDIR)
+
+Election.cpp ..\IceStorm\Election.h: ..\IceStorm\Election.ice
+ $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\Election.ice
+
+Scanner.cpp : Scanner.l
+ flex Scanner.l
+ del /q $@
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
+ del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+ del /q Grammar.h Grammar.cpp
+ bison -dvt Grammar.y
+ move Grammar.tab.c Grammar.cpp
+ move Grammar.tab.h Grammar.h
+ del /q Grammar.output
+
+IceStorm.res: IceStorm.rc
+ rc.exe $(RCFLAGS) IceStorm.rc
+
+IceStormService.res: IceStormService.rc
+ rc.exe $(RCFLAGS) IceStormService.rc
+
+IceStormAdmin.res: IceStormAdmin.rc
+ rc.exe $(RCFLAGS) IceStormAdmin.rc
+
+IceStormMigrate.res: IceStormMigrate.rc
+ rc.exe $(RCFLAGS) IceStormMigrate.rc
+
+!ifdef BUILD_UTILS
+
+clean::
+ del /q LLUMap.h LLUMap.cpp
+ del /q SubscriberMap.h SubscriberMap.cpp
+ del /q V32FormatDB.cpp V31FormatDB.cpp V31FormatDB.h V31FormatDB.h
+
+clean::
+ del /q IceStorm.cpp $(HDIR)\IceStorm.h
+ del /q IceStormInternal.cpp IceStormInternal.h
+ del /q V32Migrate.cpp V32Migrate.h
+ del /q V31Migrate.cpp V31Migrate.h
+ del /q LinkRecord.cpp LinkRecord.h
+ del /q Election.cpp Election.h
+ del /q SubscriberRecord.cpp SubscriberRecord.h
+ del /q $(DLLNAME:.dll=.*)
+ del /q $(SVCDLLNAME:.dll=.*)
+ del /q $(ADMIN:.exe=.*)
+ del /q $(MIGRATE:.exe=.*)
+ del /q IceStormAdmin.res IceStormMigrate.res IceStorm.res IceStormService.res
+
+clean::
+ del /q Grammar.cpp Grammar.h
+ del /q Scanner.cpp
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+ copy $(DLLNAME) $(install_bindir)
+ copy $(SVCLIBNAME) $(install_libdir)
+ copy $(SVCDLLNAME) $(install_bindir)
+ copy $(ADMIN) $(install_bindir)
+ copy $(MIGRATE) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(DLLNAME:.dll=.tds) $(install_bindir)
+ copy $(SVCDLLNAME:.dll=.tds) $(install_bindir)
+ copy $(ADMIN:.exe=.tds) $(install_bindir)
+ copy $(MIGRATE:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+ copy $(SVCDLLNAME:.dll=.pdb) $(install_bindir)
+ copy $(ADMIN:.exe=.pdb) $(install_bindir)
+ copy $(MIGRATE:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!else
+
+install:: all
+
+$(EVERYTHING)::
+ $(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak index 0cc876e18ad..4df4397d710 100644 --- a/cpp/src/IceUtil/Makefile.mak +++ b/cpp/src/IceUtil/Makefile.mak @@ -1,96 +1,96 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\iceutil$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\iceutil$(SOVERSION)$(LIBSUFFIX).dll - -TARGETS = $(LIBNAME) $(DLLNAME) - -OBJS = ArgVector.obj \ - Cond.obj \ - ConvertUTF.obj \ - CountDownLatch.obj \ - CtrlCHandler.obj \ - Exception.obj \ - Shared.obj \ - InputUtil.obj \ - Options.obj \ - OutputUtil.obj \ - Random.obj \ - RWRecMutex.obj \ - RecMutex.obj \ - StaticMutex.obj \ - StringUtil.obj \ - Thread.obj \ - ThreadException.obj \ - Time.obj \ - Timer.obj \ - UUID.obj \ - Unicode.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = $(CPPFLAGS) -DICE_UTIL_API_EXPORTS -I.. -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -!endif - -!if "$(STATICLIBS)" == "yes" - -$(DLLNAME): - -$(LIBNAME): $(OBJS) - $(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ - -!else - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(OBJS) IceUtil.res - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceUtil.res $(PREOUT)$@ $(PRELIBS)$(ICE_OS_LIBS) - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -!endif - -IceUtil.res: IceUtil.rc - rc.exe $(RCFLAGS) IceUtil.rc - -clean:: - del /q $(DLLNAME:.dll=.*) - del /q IceUtil.res - -install:: all - copy $(LIBNAME) $(install_libdir) - copy $(DLLNAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(DLLNAME:.dll=.tds) $(install_bindir) - -!else - -install:: all - copy $(DLLNAME:.dll=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\iceutil$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\iceutil$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+OBJS = ArgVector.obj \
+ Cond.obj \
+ ConvertUTF.obj \
+ CountDownLatch.obj \
+ CtrlCHandler.obj \
+ Exception.obj \
+ Shared.obj \
+ InputUtil.obj \
+ Options.obj \
+ OutputUtil.obj \
+ Random.obj \
+ RWRecMutex.obj \
+ RecMutex.obj \
+ StaticMutex.obj \
+ StringUtil.obj \
+ Thread.obj \
+ ThreadException.obj \
+ Time.obj \
+ Timer.obj \
+ UUID.obj \
+ Unicode.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = $(CPPFLAGS) -DICE_UTIL_API_EXPORTS -I.. -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+!if "$(STATICLIBS)" == "yes"
+
+$(DLLNAME):
+
+$(LIBNAME): $(OBJS)
+ $(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@
+
+!else
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) IceUtil.res
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceUtil.res $(PREOUT)$@ $(PRELIBS)$(ICE_OS_LIBS)
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+!endif
+
+IceUtil.res: IceUtil.rc
+ rc.exe $(RCFLAGS) IceUtil.rc
+
+clean::
+ del /q $(DLLNAME:.dll=.*)
+ del /q IceUtil.res
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+ copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak index 9252022a713..ea81ddd4a9d 100644 --- a/cpp/src/IceXML/Makefile.mak +++ b/cpp/src/IceXML/Makefile.mak @@ -1,67 +1,67 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\icexml$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\icexml$(SOVERSION)$(LIBSUFFIX).dll - -TARGETS = $(LIBNAME) $(DLLNAME) - -OBJS = Parser.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = $(CPPFLAGS) -DICE_XML_API_EXPORTS -DWIN32_LEAN_AND_MEAN - -LINKWITH = $(EXPAT_LIBS) $(BASELIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -!endif - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(OBJS) IceXML.res - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceXML.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -IceXML.res: IceXML.rc - rc.exe $(RCFLAGS) IceXML.rc - -clean:: - del /q $(DLLNAME:.dll=.*) - del /q IceXML.res - -install:: all - copy $(LIBNAME) $(install_libdir) - copy $(DLLNAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(DLLNAME:.dll=.tds) $(install_bindir) - -!else - -install:: all - copy $(DLLNAME:.dll=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\icexml$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\icexml$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+OBJS = Parser.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = $(CPPFLAGS) -DICE_XML_API_EXPORTS -DWIN32_LEAN_AND_MEAN
+
+LINKWITH = $(EXPAT_LIBS) $(BASELIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) IceXML.res
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceXML.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+IceXML.res: IceXML.rc
+ rc.exe $(RCFLAGS) IceXML.rc
+
+clean::
+ del /q $(DLLNAME:.dll=.*)
+ del /q IceXML.res
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+ copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak index 41995cd14f9..1c88d6b12fb 100644 --- a/cpp/src/Makefile.mak +++ b/cpp/src/Makefile.mak @@ -1,46 +1,46 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = .. - -!include $(top_srcdir)/config/Make.rules.mak - -SUBDIRS = IceUtil \ - Slice \ - slice2cpp \ - slice2cppe \ - slice2cs \ - slice2freeze \ - slice2freezej \ - slice2docbook \ - slice2java \ - slice2javae \ - slice2py \ - slice2rb \ - slice2sl \ - slice2html \ - Ice \ - IceXML \ - IceSSL \ - IceBox \ - IcePatch2 \ - Glacier2 \ - Freeze \ - FreezeScript \ - IceGridLib \ - IceStorm \ - IceGrid \ - iceserviceinstall \ - ca - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @if exist %i \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SUBDIRS = IceUtil \
+ Slice \
+ slice2cpp \
+ slice2cppe \
+ slice2cs \
+ slice2freeze \
+ slice2freezej \
+ slice2docbook \
+ slice2java \
+ slice2javae \
+ slice2py \
+ slice2rb \
+ slice2sl \
+ slice2html \
+ Ice \
+ IceXML \
+ IceSSL \
+ IceBox \
+ IcePatch2 \
+ Glacier2 \
+ Freeze \
+ FreezeScript \
+ IceGridLib \
+ IceStorm \
+ IceGrid \
+ iceserviceinstall \
+ ca
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @if exist %i \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak index b8fa565c781..169f97b3a52 100644 --- a/cpp/src/Slice/Makefile.mak +++ b/cpp/src/Slice/Makefile.mak @@ -1,106 +1,106 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\slice$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\slice$(SOVERSION)$(LIBSUFFIX).dll - -TARGETS = $(LIBNAME) $(DLLNAME) - -OBJS = Scanner.obj \ - Grammar.obj \ - Parser.obj \ - CPlusPlusUtil.obj \ - CsUtil.obj \ - JavaUtil.obj \ - Preprocessor.obj \ - Checksum.obj \ - PythonUtil.obj \ - DotNetNames.obj \ - RubyUtil.obj \ - Util.obj \ - MD5.obj \ - MD5I.obj \ - SignalHandler.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) -DSLICE_API_EXPORTS -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -!endif - -!if "$(STATICLIBS)" == "yes" - -$(DLLNAME): - -$(LIBNAME): $(OBJS) - $(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ - -!else - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(OBJS) Slice.res - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Slice.res $(PREOUT)$@ $(PRELIBS)$(BASELIBS) mcpp$(LIBSUFFIX).lib - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -!endif - -Scanner.cpp : Scanner.l - flex Scanner.l - del /q $@ - echo #include "IceUtil/Config.h" > Scanner.cpp - type lex.yy.c >> Scanner.cpp - del /q lex.yy.c - -Grammar.cpp Grammar.h: Grammar.y - del /q Grammar.h Grammar.cpp - bison -dvt --name-prefix "slice_" Grammar.y - move Grammar.tab.c Grammar.cpp - move Grammar.tab.h Grammar.h - del /q Grammar.output - -Slice.res: Slice.rc - rc.exe $(RCFLAGS) Slice.rc - -clean:: - del /q Grammar.cpp Grammar.h - del /q Scanner.cpp - del /q $(DLLNAME:.dll=.*) - del /q Slice.res - -install:: all - copy $(LIBNAME) $(install_libdir) - copy $(DLLNAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(DLLNAME:.dll=.tds) $(install_bindir) - -!else - -install:: all - copy $(DLLNAME:.dll=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\slice$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\slice$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+OBJS = Scanner.obj \
+ Grammar.obj \
+ Parser.obj \
+ CPlusPlusUtil.obj \
+ CsUtil.obj \
+ JavaUtil.obj \
+ Preprocessor.obj \
+ Checksum.obj \
+ PythonUtil.obj \
+ DotNetNames.obj \
+ RubyUtil.obj \
+ Util.obj \
+ MD5.obj \
+ MD5I.obj \
+ SignalHandler.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) -DSLICE_API_EXPORTS -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+!if "$(STATICLIBS)" == "yes"
+
+$(DLLNAME):
+
+$(LIBNAME): $(OBJS)
+ $(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@
+
+!else
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) Slice.res
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Slice.res $(PREOUT)$@ $(PRELIBS)$(BASELIBS) mcpp$(LIBSUFFIX).lib
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+!endif
+
+Scanner.cpp : Scanner.l
+ flex Scanner.l
+ del /q $@
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
+ del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+ del /q Grammar.h Grammar.cpp
+ bison -dvt --name-prefix "slice_" Grammar.y
+ move Grammar.tab.c Grammar.cpp
+ move Grammar.tab.h Grammar.h
+ del /q Grammar.output
+
+Slice.res: Slice.rc
+ rc.exe $(RCFLAGS) Slice.rc
+
+clean::
+ del /q Grammar.cpp Grammar.h
+ del /q Scanner.cpp
+ del /q $(DLLNAME:.dll=.*)
+ del /q Slice.res
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+ copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/ca/Makefile.mak b/cpp/src/ca/Makefile.mak index cd6c618a561..a0e46327c58 100644 --- a/cpp/src/ca/Makefile.mak +++ b/cpp/src/ca/Makefile.mak @@ -1,25 +1,25 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -CA_FILES = iceca \ - iceca.bat - -CLASS_FILES=ImportKey.class - -install:: - @for %i in ( $(CA_FILES) ) do \ - @echo "Installing %i" && \ - copy %i $(prefix)\bin - @for %i in ( $(CLASS_FILES) ) do \ - @echo "Installing %i" && \ - copy %i $(prefix)\lib +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CA_FILES = iceca \
+ iceca.bat
+
+CLASS_FILES=ImportKey.class
+
+install::
+ @for %i in ( $(CA_FILES) ) do \
+ @echo "Installing %i" && \
+ copy %i $(prefix)\bin
+ @for %i in ( $(CLASS_FILES) ) do \
+ @echo "Installing %i" && \
+ copy %i $(prefix)\lib
diff --git a/cpp/src/iceserviceinstall/Makefile.mak b/cpp/src/iceserviceinstall/Makefile.mak index 750e0cb562d..e8e9b3250ff 100755 --- a/cpp/src/iceserviceinstall/Makefile.mak +++ b/cpp/src/iceserviceinstall/Makefile.mak @@ -1,70 +1,70 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -TOOL = $(top_srcdir)\bin\iceserviceinstall.exe - -TARGETS = $(TOOL) - -OBJS = ServiceInstaller.obj \ - Install.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)\config\Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -LINKWITH = $(LIBS) -!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" -LINKWITH = /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(LINKWITH) -!else -EXTRA_MANIFEST = security.manifest -!endif - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(TOOL:.exe=.pdb) -!endif - -$(TOOL): $(OBJS) IceServiceInstall.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) IceServiceInstall.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest $(EXTRA_MANIFEST) -outputresource:$@;#1 && del /q $@.manifest - -IceServiceInstall.res: IceServiceInstall.rc - rc.exe $(RCFLAGS) IceServiceInstall.rc - - -clean:: - del /q $(TOOL:.exe=.*) - del /q IceServiceInstall.res - -install:: all - copy $(TOOL) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(TOOL:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(TOOL:.exe=.pdb) $(install_bindir) - -!endif - -!endif - - -!include .depend - +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+TOOL = $(top_srcdir)\bin\iceserviceinstall.exe
+
+TARGETS = $(TOOL)
+
+OBJS = ServiceInstaller.obj \
+ Install.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+LINKWITH = $(LIBS)
+!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"
+LINKWITH = /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(LINKWITH)
+!else
+EXTRA_MANIFEST = security.manifest
+!endif
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(TOOL:.exe=.pdb)
+!endif
+
+$(TOOL): $(OBJS) IceServiceInstall.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) IceServiceInstall.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest $(EXTRA_MANIFEST) -outputresource:$@;#1 && del /q $@.manifest
+
+IceServiceInstall.res: IceServiceInstall.rc
+ rc.exe $(RCFLAGS) IceServiceInstall.rc
+
+
+clean::
+ del /q $(TOOL:.exe=.*)
+ del /q IceServiceInstall.res
+
+install:: all
+ copy $(TOOL) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(TOOL:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(TOOL:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+
+!include .depend
+
diff --git a/cpp/src/slice2cpp/Makefile.mak b/cpp/src/slice2cpp/Makefile.mak index 5005387c740..16b28dacd30 100644 --- a/cpp/src/slice2cpp/Makefile.mak +++ b/cpp/src/slice2cpp/Makefile.mak @@ -1,61 +1,61 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -NAME = $(top_srcdir)\bin\slice2cpp.exe - -TARGETS = $(NAME) - -OBJS = Gen.obj \ - Main.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(NAME:.exe=.pdb) -!endif - -$(NAME): $(OBJS) Slice2Cpp.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Cpp.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Slice2Cpp.res: Slice2Cpp.rc - rc.exe $(RCFLAGS) Slice2Cpp.rc - -clean:: - del /q $(NAME:.exe=.*) - del /q Slice2Cpp.res - -install:: all - copy $(NAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(NAME:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(NAME:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+NAME = $(top_srcdir)\bin\slice2cpp.exe
+
+TARGETS = $(NAME)
+
+OBJS = Gen.obj \
+ Main.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Cpp.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Cpp.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Cpp.res: Slice2Cpp.rc
+ rc.exe $(RCFLAGS) Slice2Cpp.rc
+
+clean::
+ del /q $(NAME:.exe=.*)
+ del /q Slice2Cpp.res
+
+install:: all
+ copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2cppe/Makefile.mak b/cpp/src/slice2cppe/Makefile.mak index 05eb58a4124..d9d5a35f7ea 100644 --- a/cpp/src/slice2cppe/Makefile.mak +++ b/cpp/src/slice2cppe/Makefile.mak @@ -1,61 +1,61 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -NAME = $(top_srcdir)\bin\slice2cppe.exe - -TARGETS = $(NAME) - -OBJS = Gen.obj \ - Main.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(NAME:.exe=.pdb) -!endif - -$(NAME): $(OBJS) Slice2CppE.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2CppE.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Slice2CppE.res: Slice2CppE.rc - rc.exe $(RCFLAGS) Slice2CppE.rc - -clean:: - del /q $(NAME:.exe=.*) - del /q Slice2CppE.res - -install:: all - copy $(NAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(NAME:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(NAME:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+NAME = $(top_srcdir)\bin\slice2cppe.exe
+
+TARGETS = $(NAME)
+
+OBJS = Gen.obj \
+ Main.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2CppE.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2CppE.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2CppE.res: Slice2CppE.rc
+ rc.exe $(RCFLAGS) Slice2CppE.rc
+
+clean::
+ del /q $(NAME:.exe=.*)
+ del /q Slice2CppE.res
+
+install:: all
+ copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2cs/Makefile.mak b/cpp/src/slice2cs/Makefile.mak index b73bd03aa2e..358b81b5a90 100644 --- a/cpp/src/slice2cs/Makefile.mak +++ b/cpp/src/slice2cs/Makefile.mak @@ -1,61 +1,61 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -NAME = $(top_srcdir)\bin\slice2cs.exe - -TARGETS = $(NAME) - -OBJS = Gen.obj \ - Main.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(NAME:.exe=.pdb) -!endif - -$(NAME): $(OBJS) Slice2Cs.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Cs.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Slice2Cs.res: Slice2Cs.rc - rc.exe $(RCFLAGS) Slice2Cs.rc - -clean:: - del /q $(NAME:.exe=.*) - del /q Slice2Cs.res - -install:: all - copy $(NAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(NAME:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(NAME:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+NAME = $(top_srcdir)\bin\slice2cs.exe
+
+TARGETS = $(NAME)
+
+OBJS = Gen.obj \
+ Main.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Cs.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Cs.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Cs.res: Slice2Cs.rc
+ rc.exe $(RCFLAGS) Slice2Cs.rc
+
+clean::
+ del /q $(NAME:.exe=.*)
+ del /q Slice2Cs.res
+
+install:: all
+ copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2docbook/Makefile.mak b/cpp/src/slice2docbook/Makefile.mak index c616f3dce11..108ed0f1521 100644 --- a/cpp/src/slice2docbook/Makefile.mak +++ b/cpp/src/slice2docbook/Makefile.mak @@ -1,61 +1,61 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -NAME = $(top_srcdir)\bin\slice2docbook.exe - -TARGETS = $(NAME) - -OBJS = Gen.obj \ - Main.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(NAME:.exe=.pdb) -!endif - -$(NAME): $(OBJS) Slice2Docbook.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Docbook.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Slice2Docbook.res: Slice2Docbook.rc - rc.exe $(RCFLAGS) Slice2Docbook.rc - -clean:: - del /q $(NAME:.exe=.*) - del /q Slice2Docbook.res - -install:: all - copy $(NAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(NAME:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(NAME:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+NAME = $(top_srcdir)\bin\slice2docbook.exe
+
+TARGETS = $(NAME)
+
+OBJS = Gen.obj \
+ Main.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Docbook.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Docbook.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Docbook.res: Slice2Docbook.rc
+ rc.exe $(RCFLAGS) Slice2Docbook.rc
+
+clean::
+ del /q $(NAME:.exe=.*)
+ del /q Slice2Docbook.res
+
+install:: all
+ copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2freeze/Makefile.mak b/cpp/src/slice2freeze/Makefile.mak index 869a3916475..3646472a8b3 100644 --- a/cpp/src/slice2freeze/Makefile.mak +++ b/cpp/src/slice2freeze/Makefile.mak @@ -1,56 +1,56 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -NAME = $(top_srcdir)\bin\slice2freeze.exe - -TARGETS = $(NAME) - -OBJS = Main.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -$(NAME): $(OBJS) Slice2Freeze.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Freeze.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Slice2Freeze.res: Slice2Freeze.rc - rc.exe $(RCFLAGS) Slice2Freeze.rc - -clean:: - del /q $(NAME:.exe=.*) - del /q Slice2Freeze.res - -install:: all - copy $(NAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(NAME:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(NAME:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+NAME = $(top_srcdir)\bin\slice2freeze.exe
+
+TARGETS = $(NAME)
+
+OBJS = Main.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+$(NAME): $(OBJS) Slice2Freeze.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Freeze.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Freeze.res: Slice2Freeze.rc
+ rc.exe $(RCFLAGS) Slice2Freeze.rc
+
+clean::
+ del /q $(NAME:.exe=.*)
+ del /q Slice2Freeze.res
+
+install:: all
+ copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2freezej/Makefile.mak b/cpp/src/slice2freezej/Makefile.mak index 82bd5cc0b00..d0864681d3f 100644 --- a/cpp/src/slice2freezej/Makefile.mak +++ b/cpp/src/slice2freezej/Makefile.mak @@ -1,60 +1,60 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -NAME = $(top_srcdir)\bin\slice2freezej.exe - -TARGETS = $(NAME) - -OBJS = Main.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(NAME:.exe=.pdb) -!endif - -$(NAME): $(OBJS) Slice2FreezeJ.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2FreezeJ.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Slice2FreezeJ.res: Slice2FreezeJ.rc - rc.exe $(RCFLAGS) Slice2FreezeJ.rc - -clean:: - del /q $(NAME:.exe=.*) - del /q Slice2FreezeJ.res - -install:: all - copy $(NAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(NAME:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(NAME:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+NAME = $(top_srcdir)\bin\slice2freezej.exe
+
+TARGETS = $(NAME)
+
+OBJS = Main.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2FreezeJ.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2FreezeJ.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2FreezeJ.res: Slice2FreezeJ.rc
+ rc.exe $(RCFLAGS) Slice2FreezeJ.rc
+
+clean::
+ del /q $(NAME:.exe=.*)
+ del /q Slice2FreezeJ.res
+
+install:: all
+ copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2html/Makefile.mak b/cpp/src/slice2html/Makefile.mak index ef9f5e8a393..7b35976070e 100644 --- a/cpp/src/slice2html/Makefile.mak +++ b/cpp/src/slice2html/Makefile.mak @@ -1,61 +1,61 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -NAME = $(top_srcdir)\bin\slice2html.exe - -TARGETS = $(NAME) - -OBJS = Gen.obj \ - Main.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(NAME:.exe=.pdb) -!endif - -$(NAME): $(OBJS) Slice2Html.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Html.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Slice2Html.res: Slice2Html.rc - rc.exe $(RCFLAGS) Slice2Html.rc - -clean:: - del /q $(NAME:.exe=.*) - del /q Slice2Html.res - -install:: all - copy $(NAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(NAME:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(NAME:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+NAME = $(top_srcdir)\bin\slice2html.exe
+
+TARGETS = $(NAME)
+
+OBJS = Gen.obj \
+ Main.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Html.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Html.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Html.res: Slice2Html.rc
+ rc.exe $(RCFLAGS) Slice2Html.rc
+
+clean::
+ del /q $(NAME:.exe=.*)
+ del /q Slice2Html.res
+
+install:: all
+ copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2java/Makefile.mak b/cpp/src/slice2java/Makefile.mak index 02523b8f8e6..5123296d2c5 100644 --- a/cpp/src/slice2java/Makefile.mak +++ b/cpp/src/slice2java/Makefile.mak @@ -1,61 +1,61 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -NAME = $(top_srcdir)\bin\slice2java.exe - -TARGETS = $(NAME) - -OBJS = Gen.obj \ - Main.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(NAME:.exe=.pdb) -!endif - -$(NAME): $(OBJS) Slice2Java.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Java.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Slice2Java.res: Slice2Java.rc - rc.exe $(RCFLAGS) Slice2Java.rc - -clean:: - del /q $(NAME:.exe=.*) - del /q Slice2Java.res - -install:: all - copy $(NAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(NAME:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(NAME:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+NAME = $(top_srcdir)\bin\slice2java.exe
+
+TARGETS = $(NAME)
+
+OBJS = Gen.obj \
+ Main.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Java.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Java.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Java.res: Slice2Java.rc
+ rc.exe $(RCFLAGS) Slice2Java.rc
+
+clean::
+ del /q $(NAME:.exe=.*)
+ del /q Slice2Java.res
+
+install:: all
+ copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2javae/Makefile.mak b/cpp/src/slice2javae/Makefile.mak index 9b18d57c716..24f4d8c184d 100644 --- a/cpp/src/slice2javae/Makefile.mak +++ b/cpp/src/slice2javae/Makefile.mak @@ -1,61 +1,61 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -NAME = $(top_srcdir)\bin\slice2javae.exe - -TARGETS = $(NAME) - -OBJS = Gen.obj \ - Main.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(NAME:.exe=.pdb) -!endif - -$(NAME): $(OBJS) Slice2JavaE.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2JavaE.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Slice2JavaE.res: Slice2JavaE.rc - rc.exe $(RCFLAGS) Slice2JavaE.rc - -clean:: - del /q $(NAME:.exe=.*) - del /q Slice2JavaE.res - -install:: all - copy $(NAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(NAME:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(NAME:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+NAME = $(top_srcdir)\bin\slice2javae.exe
+
+TARGETS = $(NAME)
+
+OBJS = Gen.obj \
+ Main.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2JavaE.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2JavaE.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2JavaE.res: Slice2JavaE.rc
+ rc.exe $(RCFLAGS) Slice2JavaE.rc
+
+clean::
+ del /q $(NAME:.exe=.*)
+ del /q Slice2JavaE.res
+
+install:: all
+ copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2py/Makefile.mak b/cpp/src/slice2py/Makefile.mak index 764ad2f759a..b630110b1d7 100644 --- a/cpp/src/slice2py/Makefile.mak +++ b/cpp/src/slice2py/Makefile.mak @@ -1,60 +1,60 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -NAME = $(top_srcdir)\bin\slice2py.exe - -TARGETS = $(NAME) - -OBJS = Main.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(NAME:.exe=.pdb) -!endif - -$(NAME): $(OBJS) Slice2Py.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Py.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Slice2Py.res: Slice2Py.rc - rc.exe $(RCFLAGS) Slice2Py.rc - -clean:: - del /q $(NAME:.exe=.*) - del /q Slice2Py.res - -install:: all - copy $(NAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(NAME:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(NAME:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+NAME = $(top_srcdir)\bin\slice2py.exe
+
+TARGETS = $(NAME)
+
+OBJS = Main.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Py.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Py.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Py.res: Slice2Py.rc
+ rc.exe $(RCFLAGS) Slice2Py.rc
+
+clean::
+ del /q $(NAME:.exe=.*)
+ del /q Slice2Py.res
+
+install:: all
+ copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2rb/Makefile.mak b/cpp/src/slice2rb/Makefile.mak index da2b77b302e..02a6daf9f51 100755 --- a/cpp/src/slice2rb/Makefile.mak +++ b/cpp/src/slice2rb/Makefile.mak @@ -1,60 +1,60 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -NAME = $(top_srcdir)\bin\slice2rb.exe - -TARGETS = $(NAME) - -OBJS = Main.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(NAME:.exe=.pdb) -!endif - -$(NAME): $(OBJS) Slice2Rb.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Rb.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Slice2Rb.res: Slice2Rb.rc - rc.exe $(RCFLAGS) Slice2Rb.rc - -clean:: - del /q $(NAME:.exe=.*) - del /q Slice2Rb.res - -install:: all - copy $(NAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(NAME:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(NAME:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+NAME = $(top_srcdir)\bin\slice2rb.exe
+
+TARGETS = $(NAME)
+
+OBJS = Main.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Rb.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Rb.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Rb.res: Slice2Rb.rc
+ rc.exe $(RCFLAGS) Slice2Rb.rc
+
+clean::
+ del /q $(NAME:.exe=.*)
+ del /q Slice2Rb.res
+
+install:: all
+ copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2sl/Makefile.mak b/cpp/src/slice2sl/Makefile.mak index 37f04230ac4..3b6b04b72e0 100644 --- a/cpp/src/slice2sl/Makefile.mak +++ b/cpp/src/slice2sl/Makefile.mak @@ -1,61 +1,61 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -NAME = $(top_srcdir)\bin\slice2sl.exe - -TARGETS = $(NAME) - -OBJS = Gen.obj \ - Main.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(NAME:.exe=.pdb) -!endif - -$(NAME): $(OBJS) Slice2Sl.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Sl.res $(SETARGV) $(PREOUT)$@ \ - $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -Slice2Sl.res: Slice2Sl.rc - rc.exe $(RCFLAGS) Slice2Sl.rc - -clean:: - del /q $(NAME:.exe=.*) - del /q Slice2Sl.res - -install:: all - copy $(NAME) $(install_bindir) - -!if "$(OPTIMIZE)" != "yes" - -!if "$(CPP_COMPILER)" == "BCC2006" - -install:: all - copy $(NAME:.exe=.tds) $(install_bindir) - -!else - -install:: all - copy $(NAME:.exe=.pdb) $(install_bindir) - -!endif - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+NAME = $(top_srcdir)\bin\slice2sl.exe
+
+TARGETS = $(NAME)
+
+OBJS = Gen.obj \
+ Main.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Sl.res
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Sl.res $(SETARGV) $(PREOUT)$@ \
+ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Sl.res: Slice2Sl.rc
+ rc.exe $(RCFLAGS) Slice2Sl.rc
+
+clean::
+ del /q $(NAME:.exe=.*)
+ del /q Slice2Sl.res
+
+install:: all
+ copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+ copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+ copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/test/Freeze/Makefile.mak b/cpp/test/Freeze/Makefile.mak index 1f29d0287f3..9f380803dcc 100644 --- a/cpp/test/Freeze/Makefile.mak +++ b/cpp/test/Freeze/Makefile.mak @@ -1,22 +1,22 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = dbmap \ - complex \ - evictor \ - oldevictor - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = dbmap \
+ complex \
+ evictor \
+ oldevictor
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/Freeze/complex/Makefile.mak b/cpp/test/Freeze/complex/Makefile.mak index 6408486642f..91ca6fa3742 100644 --- a/cpp/test/Freeze/complex/Makefile.mak +++ b/cpp/test/Freeze/complex/Makefile.mak @@ -1,63 +1,63 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = ComplexDict.obj \ - Complex.obj \ - Grammar.obj \ - Scanner.obj \ - Parser.obj \ - Client.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)\config\Make.rules.mak - -CPPFLAGS = -I. -Idummyinclude -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -ComplexDict.h ComplexDict.cpp: Complex.ice $(SLICE2FREEZE) - del /q ComplexDict.h ComplexDict.cpp - $(SLICE2FREEZE) -I$(slicedir) --dict Complex::ComplexDict,Complex::Key,Complex::Node ComplexDict Complex.ice - -Scanner.cpp : Scanner.l - flex Scanner.l - del /q $@ - echo #include "IceUtil/Config.h" > Scanner.cpp - type lex.yy.c >> Scanner.cpp - del /q lex.yy.c - -Grammar.cpp Grammar.h: Grammar.y - del /q Grammar.h Grammar.cpp - bison -dvt Grammar.y - move Grammar.tab.c Grammar.cpp - move Grammar.tab.h Grammar.h - del /q Grammar.output - -clean:: - del /q Complex.cpp Complex.h - del /q Grammar.cpp Grammar.h - del /q Scanner.cpp - del /q ComplexDict.h ComplexDict.cpp - for %f in (db\*) do if not %f == db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = ComplexDict.obj \
+ Complex.obj \
+ Grammar.obj \
+ Scanner.obj \
+ Parser.obj \
+ Client.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS = -I. -Idummyinclude -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+ComplexDict.h ComplexDict.cpp: Complex.ice $(SLICE2FREEZE)
+ del /q ComplexDict.h ComplexDict.cpp
+ $(SLICE2FREEZE) -I$(slicedir) --dict Complex::ComplexDict,Complex::Key,Complex::Node ComplexDict Complex.ice
+
+Scanner.cpp : Scanner.l
+ flex Scanner.l
+ del /q $@
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
+ del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+ del /q Grammar.h Grammar.cpp
+ bison -dvt Grammar.y
+ move Grammar.tab.c Grammar.cpp
+ move Grammar.tab.h Grammar.h
+ del /q Grammar.output
+
+clean::
+ del /q Complex.cpp Complex.h
+ del /q Grammar.cpp Grammar.h
+ del /q Scanner.cpp
+ del /q ComplexDict.h ComplexDict.cpp
+ for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/test/Freeze/dbmap/Makefile.mak b/cpp/test/Freeze/dbmap/Makefile.mak index 77e1786526f..523ef0da6e3 100644 --- a/cpp/test/Freeze/dbmap/Makefile.mak +++ b/cpp/test/Freeze/dbmap/Makefile.mak @@ -1,66 +1,66 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = Client.obj \ - ByteIntMap.obj \ - IntIdentityMap.obj \ - IntIdentityMapWithIndex.obj \ - SortedMap.obj \ - WstringWstringMap.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)\config\Make.rules.mak - -CPPFLAGS = -I. -I..\..\include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -ByteIntMap.h ByteIntMap.cpp: $(SLICE2FREEZE) - del /q ByteIntMap.h ByteIntMap.cpp - $(SLICE2FREEZE) --dict Test::ByteIntMap,byte,int --dict-index Test::ByteIntMap,sort ByteIntMap - -IntIdentityMap.h IntIdentityMap.cpp: $(SLICE2FREEZE) - del /q IntIdentityMap.h IntIdentityMap.cpp - $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::IntIdentityMap,int,Ice::Identity IntIdentityMap $(slicedir)\Ice\Identity.ice - -IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp: $(SLICE2FREEZE) - del /q IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp - $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::IntIdentityMapWithIndex,int,Ice::Identity --dict-index Test::IntIdentityMapWithIndex,category IntIdentityMapWithIndex $(slicedir)\Ice\Identity.ice - -SortedMap.h SortedMap.cpp: $(SLICE2FREEZE) - del /q SortedMap.h SortedMap.cpp - $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::SortedMap,int,Ice::Identity,sort SortedMap --dict-index "Test::SortedMap,category,sort,std::greater<std::string>" $(slicedir)\Ice\Identity.ice - -WstringWstringMap.h WstringWstringMap.cpp: $(SLICE2FREEZE) - del /q WstringWstringMap.h WstringWstringMap.cpp - $(SLICE2FREEZE) --dict Test::WstringWstringMap,[\"cpp:type:wstring\"]string,[\"cpp:type:wstring\"]string --dict-index Test::WstringWstringMap WstringWstringMap - -clean:: - -clean:: - del /q ByteIntMap.h ByteIntMap.cpp IntIdentityMap.h IntIdentityMap.cpp - del /q IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp SortedMap.h SortedMap.cpp - del /q WstringWstringMap.h WstringWstringMap.cpp - for %f in (db\*) do if not %f == db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = Client.obj \
+ ByteIntMap.obj \
+ IntIdentityMap.obj \
+ IntIdentityMapWithIndex.obj \
+ SortedMap.obj \
+ WstringWstringMap.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS = -I. -I..\..\include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+ByteIntMap.h ByteIntMap.cpp: $(SLICE2FREEZE)
+ del /q ByteIntMap.h ByteIntMap.cpp
+ $(SLICE2FREEZE) --dict Test::ByteIntMap,byte,int --dict-index Test::ByteIntMap,sort ByteIntMap
+
+IntIdentityMap.h IntIdentityMap.cpp: $(SLICE2FREEZE)
+ del /q IntIdentityMap.h IntIdentityMap.cpp
+ $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::IntIdentityMap,int,Ice::Identity IntIdentityMap $(slicedir)\Ice\Identity.ice
+
+IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp: $(SLICE2FREEZE)
+ del /q IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp
+ $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::IntIdentityMapWithIndex,int,Ice::Identity --dict-index Test::IntIdentityMapWithIndex,category IntIdentityMapWithIndex $(slicedir)\Ice\Identity.ice
+
+SortedMap.h SortedMap.cpp: $(SLICE2FREEZE)
+ del /q SortedMap.h SortedMap.cpp
+ $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::SortedMap,int,Ice::Identity,sort SortedMap --dict-index "Test::SortedMap,category,sort,std::greater<std::string>" $(slicedir)\Ice\Identity.ice
+
+WstringWstringMap.h WstringWstringMap.cpp: $(SLICE2FREEZE)
+ del /q WstringWstringMap.h WstringWstringMap.cpp
+ $(SLICE2FREEZE) --dict Test::WstringWstringMap,[\"cpp:type:wstring\"]string,[\"cpp:type:wstring\"]string --dict-index Test::WstringWstringMap WstringWstringMap
+
+clean::
+
+clean::
+ del /q ByteIntMap.h ByteIntMap.cpp IntIdentityMap.h IntIdentityMap.cpp
+ del /q IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp SortedMap.h SortedMap.cpp
+ del /q WstringWstringMap.h WstringWstringMap.cpp
+ for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/test/Freeze/evictor/Makefile.mak b/cpp/test/Freeze/evictor/Makefile.mak index d6cbaba33f7..5e10f69ff3d 100644 --- a/cpp/test/Freeze/evictor/Makefile.mak +++ b/cpp/test/Freeze/evictor/Makefile.mak @@ -1,51 +1,51 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Test.obj - -COBJS = Client.obj - -SOBJS = TestI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - for %f in (db\*) do if not %f == db\DB_CONFIG del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Test.obj
+
+COBJS = Client.obj
+
+SOBJS = TestI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+ for %f in (db\*) do if not %f == db\DB_CONFIG del /q %f
+
+!include .depend
diff --git a/cpp/test/Freeze/oldevictor/Makefile.mak b/cpp/test/Freeze/oldevictor/Makefile.mak index ac76bcb25c8..bbd67099219 100644 --- a/cpp/test/Freeze/oldevictor/Makefile.mak +++ b/cpp/test/Freeze/oldevictor/Makefile.mak @@ -1,51 +1,51 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Test.obj - -COBJS = Client.obj - -SOBJS = TestI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - for %f in (db\*) do if not %f == db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Test.obj
+
+COBJS = Client.obj
+
+SOBJS = TestI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+ for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/test/FreezeScript/Makefile.mak b/cpp/test/FreezeScript/Makefile.mak index c8dab477317..51703a6ffae 100644 --- a/cpp/test/FreezeScript/Makefile.mak +++ b/cpp/test/FreezeScript/Makefile.mak @@ -1,19 +1,19 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = dbmap evictor - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = dbmap evictor
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/FreezeScript/dbmap/Makefile.mak b/cpp/test/FreezeScript/dbmap/Makefile.mak index 9035c1079fc..214caf5036d 100644 --- a/cpp/test/FreezeScript/dbmap/Makefile.mak +++ b/cpp/test/FreezeScript/dbmap/Makefile.mak @@ -1,53 +1,53 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = makedb.exe - -TARGETS = $(CLIENT) - -OBJS = TestOld.obj \ - makedb.obj \ - IntSMap.obj - -SRCS = $(OBJS:.obj=.cpp) - -SLICE_SRCS = TestOld.ice - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -IntSMap.h IntSMap.cpp: $(SLICE2FREEZE) - del /q IntSMap.h IntSMap.cpp - $(SLICE2FREEZE) --dict IntSMap,int,::Test::S IntSMap TestOld.ice - -clean:: - del /q IntSMap.h IntSMap.cpp - -clean:: - del /q TestOld.cpp TestOld.h - -clean:: - del /q db\*.db db\log.* db\__catalog - if exist db_init rmdir /s /q db_init - if exist db_check rmdir /s /q db_check - if exist db_tmp rmdir /s /q db_tmp - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = makedb.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = TestOld.obj \
+ makedb.obj \
+ IntSMap.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+SLICE_SRCS = TestOld.ice
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+IntSMap.h IntSMap.cpp: $(SLICE2FREEZE)
+ del /q IntSMap.h IntSMap.cpp
+ $(SLICE2FREEZE) --dict IntSMap,int,::Test::S IntSMap TestOld.ice
+
+clean::
+ del /q IntSMap.h IntSMap.cpp
+
+clean::
+ del /q TestOld.cpp TestOld.h
+
+clean::
+ del /q db\*.db db\log.* db\__catalog
+ if exist db_init rmdir /s /q db_init
+ if exist db_check rmdir /s /q db_check
+ if exist db_tmp rmdir /s /q db_tmp
+
+!include .depend
diff --git a/cpp/test/FreezeScript/evictor/Makefile.mak b/cpp/test/FreezeScript/evictor/Makefile.mak index cf960b861c4..948c067ffc8 100644 --- a/cpp/test/FreezeScript/evictor/Makefile.mak +++ b/cpp/test/FreezeScript/evictor/Makefile.mak @@ -1,44 +1,44 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = makedb.exe - -TARGETS = $(CLIENT) - -OBJS = TestOld.obj \ - makedb.obj - -SRCS = $(OBJS:.obj=.cpp) - -SLICE_SRCS = TestOld.ice - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q TestOld.cpp TestOld.h - -clean:: - del /q db\*.db db\log.* db\__catalog - if exist db_check rmdir /s /q db_check - if exist db_tmp rmdir /s /q db_tmp - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = makedb.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = TestOld.obj \
+ makedb.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+SLICE_SRCS = TestOld.ice
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q TestOld.cpp TestOld.h
+
+clean::
+ del /q db\*.db db\log.* db\__catalog
+ if exist db_check rmdir /s /q db_check
+ if exist db_tmp rmdir /s /q db_tmp
+
+!include .depend
diff --git a/cpp/test/Glacier2/Makefile.mak b/cpp/test/Glacier2/Makefile.mak index 6d22383b0d7..df30cc3bd96 100644 --- a/cpp/test/Glacier2/Makefile.mak +++ b/cpp/test/Glacier2/Makefile.mak @@ -1,24 +1,24 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = router \ - attack \ - staticFiltering \ - dynamicFiltering \ - sessionControl \ - ssl - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = router \
+ attack \
+ staticFiltering \
+ dynamicFiltering \
+ sessionControl \
+ ssl
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/Glacier2/attack/Makefile.mak b/cpp/test/Glacier2/attack/Makefile.mak index 754fb26605e..ac1c3a2c406 100644 --- a/cpp/test/Glacier2/attack/Makefile.mak +++ b/cpp/test/Glacier2/attack/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Backend.obj \ - BackendI.obj - -COBJS = Client.obj - -SOBJS = Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Backend.cpp Backend.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Backend.obj \
+ BackendI.obj
+
+COBJS = Client.obj
+
+SOBJS = Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Backend.cpp Backend.h
+
+!include .depend
diff --git a/cpp/test/Glacier2/dynamicFiltering/Makefile.mak b/cpp/test/Glacier2/dynamicFiltering/Makefile.mak index 0b4f55b15d1..52ba4d8e107 100644 --- a/cpp/test/Glacier2/dynamicFiltering/Makefile.mak +++ b/cpp/test/Glacier2/dynamicFiltering/Makefile.mak @@ -1,51 +1,51 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Client.obj \ - Test.obj - -SOBJS = Server.obj \ - Test.obj \ - SessionI.obj \ - BackendI.obj \ - TestControllerI.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Client.obj \
+ Test.obj
+
+SOBJS = Server.obj \
+ Test.obj \
+ SessionI.obj \
+ BackendI.obj \
+ TestControllerI.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Glacier2/router/Makefile.mak b/cpp/test/Glacier2/router/Makefile.mak index 94abb5da1d5..53e41610970 100644 --- a/cpp/test/Glacier2/router/Makefile.mak +++ b/cpp/test/Glacier2/router/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Callback.obj \ - CallbackI.obj - -COBJS = Client.obj - -SOBJS = Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Callback.cpp Callback.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Callback.obj \
+ CallbackI.obj
+
+COBJS = Client.obj
+
+SOBJS = Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Callback.cpp Callback.h
+
+!include .depend
diff --git a/cpp/test/Glacier2/sessionControl/Makefile.mak b/cpp/test/Glacier2/sessionControl/Makefile.mak index a59d590d273..5324c4826b2 100644 --- a/cpp/test/Glacier2/sessionControl/Makefile.mak +++ b/cpp/test/Glacier2/sessionControl/Makefile.mak @@ -1,49 +1,49 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Client.obj \ - Session.obj - -SOBJS = Server.obj \ - Session.obj \ - SessionI.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Session.cpp Session.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Client.obj \
+ Session.obj
+
+SOBJS = Server.obj \
+ Session.obj \
+ SessionI.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Session.cpp Session.h
+
+!include .depend
diff --git a/cpp/test/Glacier2/ssl/Makefile.mak b/cpp/test/Glacier2/ssl/Makefile.mak index 0b82ecdb64d..f5af7bb8bb1 100644 --- a/cpp/test/Glacier2/ssl/Makefile.mak +++ b/cpp/test/Glacier2/ssl/Makefile.mak @@ -1,44 +1,44 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Client.obj - -SOBJS = Server.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) icessl$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Client.obj
+
+SOBJS = Server.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) icessl$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!include .depend
diff --git a/cpp/test/Glacier2/staticFiltering/Makefile.mak b/cpp/test/Glacier2/staticFiltering/Makefile.mak index 3797b8a3cc1..702adf24d3d 100644 --- a/cpp/test/Glacier2/staticFiltering/Makefile.mak +++ b/cpp/test/Glacier2/staticFiltering/Makefile.mak @@ -1,53 +1,53 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Backend.obj \ - BackendI.obj - -COBJS = Client.obj - -SOBJS = Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Backend.cpp Backend.h - -clean:: - del /q attack.cfg router.cfg server.cfg - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Backend.obj \
+ BackendI.obj
+
+COBJS = Client.obj
+
+SOBJS = Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Backend.cpp Backend.h
+
+clean::
+ del /q attack.cfg router.cfg server.cfg
+
+!include .depend
diff --git a/cpp/test/Ice/Makefile.mak b/cpp/test/Ice/Makefile.mak index b5a6967c202..08e2e0d839a 100644 --- a/cpp/test/Ice/Makefile.mak +++ b/cpp/test/Ice/Makefile.mak @@ -1,40 +1,40 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = proxy \ - operations \ - exceptions \ - inheritance \ - facets \ - objects \ - faultTolerance \ - location \ - adapterDeactivation \ - slicing \ - gc \ - checksum \ - stream \ - hold \ - custom \ - binding \ - retry \ - timeout \ - servantLocator \ - interceptor \ - stringConverter \ - background - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = proxy \
+ operations \
+ exceptions \
+ inheritance \
+ facets \
+ objects \
+ faultTolerance \
+ location \
+ adapterDeactivation \
+ slicing \
+ gc \
+ checksum \
+ stream \
+ hold \
+ custom \
+ binding \
+ retry \
+ timeout \
+ servantLocator \
+ interceptor \
+ stringConverter \
+ background
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/Ice/adapterDeactivation/Makefile.mak b/cpp/test/Ice/adapterDeactivation/Makefile.mak index 9fab09216d1..a1257e2d26d 100644 --- a/cpp/test/Ice/adapterDeactivation/Makefile.mak +++ b/cpp/test/Ice/adapterDeactivation/Makefile.mak @@ -1,65 +1,65 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -COLLOCATED = collocated.exe - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - ServantLocatorI.obj \ - Server.obj - -COLOBJS = Test.obj \ - TestI.obj \ - ServantLocatorI.obj \ - Collocated.obj \ - AllTests.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(COLOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(COLLOCATED): $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+COLLOCATED = collocated.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ ServantLocatorI.obj \
+ Server.obj
+
+COLOBJS = Test.obj \
+ TestI.obj \
+ ServantLocatorI.obj \
+ Collocated.obj \
+ AllTests.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(COLOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(COLLOCATED): $(COLOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/background/Makefile.mak b/cpp/test/Ice/background/Makefile.mak index 5fc7b63075d..cb7ed561445 100644 --- a/cpp/test/Ice/background/Makefile.mak +++ b/cpp/test/Ice/background/Makefile.mak @@ -1,73 +1,73 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -LIBNAME = testtransport$(LIBSUFFIX).lib -DLLNAME = testtransport$(SOVERSION)$(LIBSUFFIX).dll - -TARGETS = $(CLIENT) $(SERVER) $(LIBNAME) $(DLLNAME) - -COBJS = Configuration.obj \ - Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Configuration.obj \ - Test.obj \ - TestI.obj \ - Server.obj - -TRANSPORT_OBJS = Configuration.obj \ - Connector.obj \ - Acceptor.obj \ - EndpointI.obj \ - Transceiver.obj \ - EndpointFactory.obj \ - PluginI.obj - -SRCS = $(TRANSPORT_OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include -I../../../src $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -TPDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(LIBNAME) : $(DLLNAME) - -$(DLLNAME): $(OBJS) $(TRANSPORT_OBJS) - $(LINK) $(LD_DLLFLAGS) $(TPDBFLAGS) $(SETARGV) $(OBJS) $(TRANSPORT_OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+LIBNAME = testtransport$(LIBSUFFIX).lib
+DLLNAME = testtransport$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS = $(CLIENT) $(SERVER) $(LIBNAME) $(DLLNAME)
+
+COBJS = Configuration.obj \
+ Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Configuration.obj \
+ Test.obj \
+ TestI.obj \
+ Server.obj
+
+TRANSPORT_OBJS = Configuration.obj \
+ Connector.obj \
+ Acceptor.obj \
+ EndpointI.obj \
+ Transceiver.obj \
+ EndpointFactory.obj \
+ PluginI.obj
+
+SRCS = $(TRANSPORT_OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include -I../../../src $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+TPDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(LIBNAME) : $(DLLNAME)
+
+$(DLLNAME): $(OBJS) $(TRANSPORT_OBJS)
+ $(LINK) $(LD_DLLFLAGS) $(TPDBFLAGS) $(SETARGV) $(OBJS) $(TRANSPORT_OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/binding/Makefile.mak b/cpp/test/Ice/binding/Makefile.mak index 790d9608e2a..7d17657e77c 100644 --- a/cpp/test/Ice/binding/Makefile.mak +++ b/cpp/test/Ice/binding/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/checksum/Makefile.mak b/cpp/test/Ice/checksum/Makefile.mak index eb18c27453f..27ee90aab10 100644 --- a/cpp/test/Ice/checksum/Makefile.mak +++ b/cpp/test/Ice/checksum/Makefile.mak @@ -1,20 +1,20 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = client \ - server - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = client \
+ server
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/Ice/checksum/client/Makefile.mak b/cpp/test/Ice/checksum/client/Makefile.mak index 4596de5c362..7354293fd6b 100644 --- a/cpp/test/Ice/checksum/client/Makefile.mak +++ b/cpp/test/Ice/checksum/client/Makefile.mak @@ -1,41 +1,41 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -COBJS = Test.obj \ - Types.obj \ - Client.obj \ - AllTests.obj - -SRCS = $(COBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -SLICE2CPPFLAGS = --checksum $(SLICE2CPPFLAGS) -CPPFLAGS = -I. -I../../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - del /q Types.cpp Types.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+COBJS = Test.obj \
+ Types.obj \
+ Client.obj \
+ AllTests.obj
+
+SRCS = $(COBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SLICE2CPPFLAGS = --checksum $(SLICE2CPPFLAGS)
+CPPFLAGS = -I. -I../../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+ del /q Types.cpp Types.h
+
+!include .depend
diff --git a/cpp/test/Ice/checksum/server/Makefile.mak b/cpp/test/Ice/checksum/server/Makefile.mak index 3a1e5481091..c5162f28a45 100644 --- a/cpp/test/Ice/checksum/server/Makefile.mak +++ b/cpp/test/Ice/checksum/server/Makefile.mak @@ -1,41 +1,41 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\..\.. - -SERVER = server.exe - -TARGETS = $(SERVER) - -SOBJS = Test.obj \ - Types.obj \ - TestI.obj \ - Server.obj - -SRCS = $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -SLICE2CPPFLAGS = --checksum $(SLICE2CPPFLAGS) -CPPFLAGS = -I. -I../../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - del /q Types.cpp Types.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..\..
+
+SERVER = server.exe
+
+TARGETS = $(SERVER)
+
+SOBJS = Test.obj \
+ Types.obj \
+ TestI.obj \
+ Server.obj
+
+SRCS = $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SLICE2CPPFLAGS = --checksum $(SLICE2CPPFLAGS)
+CPPFLAGS = -I. -I../../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+ del /q Types.cpp Types.h
+
+!include .depend
diff --git a/cpp/test/Ice/custom/Makefile.mak b/cpp/test/Ice/custom/Makefile.mak index 02d34b3fd0e..874391f327a 100644 --- a/cpp/test/Ice/custom/Makefile.mak +++ b/cpp/test/Ice/custom/Makefile.mak @@ -1,97 +1,97 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -SERVERAMD = serveramd.exe -COLLOCATED = collocated.exe - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED) - -COBJS = Test.obj \ - Wstring.obj \ - Client.obj \ - AllTests.obj \ - MyByteSeq.obj \ - StringConverterI.obj - -SOBJS = Test.obj \ - Wstring.obj \ - TestI.obj \ - WstringI.obj \ - Server.obj \ - MyByteSeq.obj \ - StringConverterI.obj - -SAMDOBJS = TestAMD.obj \ - TestAMDI.obj \ - WstringAMD.obj \ - WstringAMDI.obj \ - ServerAMD.obj \ - MyByteSeq.obj \ - StringConverterI.obj - -COLOBJS = Test.obj \ - Wstring.obj \ - TestI.obj \ - WstringI.obj \ - Collocated.obj \ - AllTests.obj \ - MyByteSeq.obj \ - StringConverterI.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(SAMDOBJS:.obj=.cpp) \ - $(COLOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS) -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(CPP_COMPILER)" != "BCC2006" -CPPFLAGS = $(CPPFLAGS) -Zm200 -!endif - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -SAPDBFLAGS = /pdb:$(SERVERAMD:.exe=.pdb) -COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVERAMD): $(SAMDOBJS) - $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(COLLOCATED): $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - del /q TestAMD.cpp TestAMD.h - del /q Wstring.cpp Wstring.h - del /q WstringAMD.cpp WstringAMD.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+SERVERAMD = serveramd.exe
+COLLOCATED = collocated.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
+
+COBJS = Test.obj \
+ Wstring.obj \
+ Client.obj \
+ AllTests.obj \
+ MyByteSeq.obj \
+ StringConverterI.obj
+
+SOBJS = Test.obj \
+ Wstring.obj \
+ TestI.obj \
+ WstringI.obj \
+ Server.obj \
+ MyByteSeq.obj \
+ StringConverterI.obj
+
+SAMDOBJS = TestAMD.obj \
+ TestAMDI.obj \
+ WstringAMD.obj \
+ WstringAMDI.obj \
+ ServerAMD.obj \
+ MyByteSeq.obj \
+ StringConverterI.obj
+
+COLOBJS = Test.obj \
+ Wstring.obj \
+ TestI.obj \
+ WstringI.obj \
+ Collocated.obj \
+ AllTests.obj \
+ MyByteSeq.obj \
+ StringConverterI.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(SAMDOBJS:.obj=.cpp) \
+ $(COLOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS)
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+!if "$(CPP_COMPILER)" != "BCC2006"
+CPPFLAGS = $(CPPFLAGS) -Zm200
+!endif
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+SAPDBFLAGS = /pdb:$(SERVERAMD:.exe=.pdb)
+COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVERAMD): $(SAMDOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(COLLOCATED): $(COLOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+ del /q TestAMD.cpp TestAMD.h
+ del /q Wstring.cpp Wstring.h
+ del /q WstringAMD.cpp WstringAMD.h
+
+!include .depend
diff --git a/cpp/test/Ice/exceptions/Makefile.mak b/cpp/test/Ice/exceptions/Makefile.mak index b0726388ad6..8575056466f 100644 --- a/cpp/test/Ice/exceptions/Makefile.mak +++ b/cpp/test/Ice/exceptions/Makefile.mak @@ -1,76 +1,76 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -SERVERAMD = serveramd.exe -COLLOCATED = collocated.exe - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SAMDOBJS = TestAMD.obj \ - TestAMDI.obj \ - ServerAMD.obj - -COLOBJS = Test.obj \ - TestI.obj \ - Collocated.obj \ - AllTests.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(SAMDOBJS:.obj=.cpp) \ - $(COLOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -SAPDBFLAGS = /pdb:$(SERVERAMD:.exe=.pdb) -COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVERAMD): $(SAMDOBJS) - $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(COLLOCATED): $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - del /q TestAMD.cpp TestAMD.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+SERVERAMD = serveramd.exe
+COLLOCATED = collocated.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SAMDOBJS = TestAMD.obj \
+ TestAMDI.obj \
+ ServerAMD.obj
+
+COLOBJS = Test.obj \
+ TestI.obj \
+ Collocated.obj \
+ AllTests.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(SAMDOBJS:.obj=.cpp) \
+ $(COLOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+SAPDBFLAGS = /pdb:$(SERVERAMD:.exe=.pdb)
+COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVERAMD): $(SAMDOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(COLLOCATED): $(COLOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+ del /q TestAMD.cpp TestAMD.h
+
+!include .depend
diff --git a/cpp/test/Ice/facets/Makefile.mak b/cpp/test/Ice/facets/Makefile.mak index bf97b7d64d4..859cf32bb85 100644 --- a/cpp/test/Ice/facets/Makefile.mak +++ b/cpp/test/Ice/facets/Makefile.mak @@ -1,63 +1,63 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -COLLOCATED = collocated.exe - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -COLOBJS = Test.obj \ - TestI.obj \ - Collocated.obj \ - AllTests.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(COLOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(COLLOCATED): $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+COLLOCATED = collocated.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+COLOBJS = Test.obj \
+ TestI.obj \
+ Collocated.obj \
+ AllTests.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(COLOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(COLLOCATED): $(COLOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/faultTolerance/Makefile.mak b/cpp/test/Ice/faultTolerance/Makefile.mak index 790d9608e2a..7d17657e77c 100644 --- a/cpp/test/Ice/faultTolerance/Makefile.mak +++ b/cpp/test/Ice/faultTolerance/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/gc/Makefile.mak b/cpp/test/Ice/gc/Makefile.mak index 3c8bd0cf615..4ef2a1790ff 100644 --- a/cpp/test/Ice/gc/Makefile.mak +++ b/cpp/test/Ice/gc/Makefile.mak @@ -1,40 +1,40 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -COBJS = Test.obj \ - Client.obj - -SRCS = $(COBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -clean:: - del /q seed - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+COBJS = Test.obj \
+ Client.obj
+
+SRCS = $(COBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+clean::
+ del /q seed
+
+!include .depend
diff --git a/cpp/test/Ice/hold/Makefile.mak b/cpp/test/Ice/hold/Makefile.mak index 790d9608e2a..7d17657e77c 100644 --- a/cpp/test/Ice/hold/Makefile.mak +++ b/cpp/test/Ice/hold/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/inheritance/Makefile.mak b/cpp/test/Ice/inheritance/Makefile.mak index bf97b7d64d4..859cf32bb85 100644 --- a/cpp/test/Ice/inheritance/Makefile.mak +++ b/cpp/test/Ice/inheritance/Makefile.mak @@ -1,63 +1,63 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -COLLOCATED = collocated.exe - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -COLOBJS = Test.obj \ - TestI.obj \ - Collocated.obj \ - AllTests.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(COLOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(COLLOCATED): $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+COLLOCATED = collocated.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+COLOBJS = Test.obj \
+ TestI.obj \
+ Collocated.obj \
+ AllTests.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(COLOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(COLLOCATED): $(COLOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/interceptor/Makefile.mak b/cpp/test/Ice/interceptor/Makefile.mak index 51fb583df3a..c85e40c590f 100755 --- a/cpp/test/Ice/interceptor/Makefile.mak +++ b/cpp/test/Ice/interceptor/Makefile.mak @@ -1,11 +1,11 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
top_srcdir = ..\..\..
diff --git a/cpp/test/Ice/location/Makefile.mak b/cpp/test/Ice/location/Makefile.mak index a5612f905cd..e49b4171fc6 100644 --- a/cpp/test/Ice/location/Makefile.mak +++ b/cpp/test/Ice/location/Makefile.mak @@ -1,51 +1,51 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - ServerLocator.obj \ - Server.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ ServerLocator.obj \
+ Server.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/objects/Makefile.mak b/cpp/test/Ice/objects/Makefile.mak index ec7bc950e95..2558538098d 100644 --- a/cpp/test/Ice/objects/Makefile.mak +++ b/cpp/test/Ice/objects/Makefile.mak @@ -1,65 +1,65 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -COLLOCATED = collocated.exe - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -COBJS = Test.obj \ - TestI.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -COLOBJS = Test.obj \ - TestI.obj \ - Collocated.obj \ - AllTests.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(COLOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS) -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(COLLOCATED): $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+COLLOCATED = collocated.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
+
+COBJS = Test.obj \
+ TestI.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+COLOBJS = Test.obj \
+ TestI.obj \
+ Collocated.obj \
+ AllTests.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(COLOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS)
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(COLLOCATED): $(COLOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/operations/Makefile.mak b/cpp/test/Ice/operations/Makefile.mak index 8ebe467283b..b6043d7d692 100644 --- a/cpp/test/Ice/operations/Makefile.mak +++ b/cpp/test/Ice/operations/Makefile.mak @@ -1,86 +1,86 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -SERVERAMD = serveramd.exe -COLLOCATED = collocated.exe - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj \ - Twoways.obj \ - Oneways.obj \ - TwowaysAMI.obj \ - OnewaysAMI.obj \ - BatchOneways.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SAMDOBJS = TestAMD.obj \ - TestAMDI.obj \ - ServerAMD.obj - -COLOBJS = Test.obj \ - TestI.obj \ - Collocated.obj \ - AllTests.obj \ - Twoways.obj \ - Oneways.obj \ - TwowaysAMI.obj \ - OnewaysAMI.obj \ - BatchOneways.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(SAMDOBJS:.obj=.cpp) \ - $(COLOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -SAPDBFLAGS = /pdb:$(SERVERAMD:.exe=.pdb) -COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVERAMD): $(SAMDOBJS) - $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(COLLOCATED): $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - del /q TestAMD.cpp TestAMD.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+SERVERAMD = serveramd.exe
+COLLOCATED = collocated.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj \
+ Twoways.obj \
+ Oneways.obj \
+ TwowaysAMI.obj \
+ OnewaysAMI.obj \
+ BatchOneways.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SAMDOBJS = TestAMD.obj \
+ TestAMDI.obj \
+ ServerAMD.obj
+
+COLOBJS = Test.obj \
+ TestI.obj \
+ Collocated.obj \
+ AllTests.obj \
+ Twoways.obj \
+ Oneways.obj \
+ TwowaysAMI.obj \
+ OnewaysAMI.obj \
+ BatchOneways.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(SAMDOBJS:.obj=.cpp) \
+ $(COLOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+SAPDBFLAGS = /pdb:$(SERVERAMD:.exe=.pdb)
+COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVERAMD): $(SAMDOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(COLLOCATED): $(COLOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+ del /q TestAMD.cpp TestAMD.h
+
+!include .depend
diff --git a/cpp/test/Ice/proxy/Makefile.mak b/cpp/test/Ice/proxy/Makefile.mak index b0726388ad6..8575056466f 100644 --- a/cpp/test/Ice/proxy/Makefile.mak +++ b/cpp/test/Ice/proxy/Makefile.mak @@ -1,76 +1,76 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -SERVERAMD = serveramd.exe -COLLOCATED = collocated.exe - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SAMDOBJS = TestAMD.obj \ - TestAMDI.obj \ - ServerAMD.obj - -COLOBJS = Test.obj \ - TestI.obj \ - Collocated.obj \ - AllTests.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(SAMDOBJS:.obj=.cpp) \ - $(COLOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -SAPDBFLAGS = /pdb:$(SERVERAMD:.exe=.pdb) -COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVERAMD): $(SAMDOBJS) - $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(COLLOCATED): $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - del /q TestAMD.cpp TestAMD.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+SERVERAMD = serveramd.exe
+COLLOCATED = collocated.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SAMDOBJS = TestAMD.obj \
+ TestAMDI.obj \
+ ServerAMD.obj
+
+COLOBJS = Test.obj \
+ TestI.obj \
+ Collocated.obj \
+ AllTests.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(SAMDOBJS:.obj=.cpp) \
+ $(COLOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+SAPDBFLAGS = /pdb:$(SERVERAMD:.exe=.pdb)
+COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVERAMD): $(SAMDOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(COLLOCATED): $(COLOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+ del /q TestAMD.cpp TestAMD.h
+
+!include .depend
diff --git a/cpp/test/Ice/retry/Makefile.mak b/cpp/test/Ice/retry/Makefile.mak index 790d9608e2a..7d17657e77c 100644 --- a/cpp/test/Ice/retry/Makefile.mak +++ b/cpp/test/Ice/retry/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/servantLocator/Makefile.mak b/cpp/test/Ice/servantLocator/Makefile.mak index 4bac7ff628f..93e386f852c 100644 --- a/cpp/test/Ice/servantLocator/Makefile.mak +++ b/cpp/test/Ice/servantLocator/Makefile.mak @@ -1,77 +1,77 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -SERVERAMD = serveramd.exe -COLLOCATED = collocated.exe - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - ServantLocatorI.obj \ - Server.obj - -SAMDOBJS = TestAMD.obj \ - TestAMDI.obj \ - ServantLocatorI.obj \ - ServerAMD.obj - -COLOBJS = Test.obj \ - TestI.obj \ - ServantLocatorI.obj \ - Collocated.obj \ - AllTests.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(SAMDOBJS:.obj=.cpp) \ - $(COLOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVERAMD): $(SAMDOBJS) - $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(COLLOCATED): $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+SERVERAMD = serveramd.exe
+COLLOCATED = collocated.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ ServantLocatorI.obj \
+ Server.obj
+
+SAMDOBJS = TestAMD.obj \
+ TestAMDI.obj \
+ ServantLocatorI.obj \
+ ServerAMD.obj
+
+COLOBJS = Test.obj \
+ TestI.obj \
+ ServantLocatorI.obj \
+ Collocated.obj \
+ AllTests.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(SAMDOBJS:.obj=.cpp) \
+ $(COLOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVERAMD): $(SAMDOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(COLLOCATED): $(COLOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/slicing/Makefile.mak b/cpp/test/Ice/slicing/Makefile.mak index 32af1699f82..0f872430199 100644 --- a/cpp/test/Ice/slicing/Makefile.mak +++ b/cpp/test/Ice/slicing/Makefile.mak @@ -1,20 +1,20 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = exceptions \ - objects - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = exceptions \
+ objects
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/Ice/slicing/exceptions/Makefile.mak b/cpp/test/Ice/slicing/exceptions/Makefile.mak index fffad9b16d3..30ffd569f57 100644 --- a/cpp/test/Ice/slicing/exceptions/Makefile.mak +++ b/cpp/test/Ice/slicing/exceptions/Makefile.mak @@ -1,69 +1,69 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\..\.. - -CLIENT = client.exe -SERVER = server.exe -SERVERAMD = serveramd.exe - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - ServerPrivate.obj \ - TestI.obj \ - Server.obj - -SAMDOBJS = TestAMD.obj \ - ServerPrivateAMD.obj \ - TestAMDI.obj \ - ServerAMD.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(SAMDOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -ICECPPFLAGS = -I. $(ICECPPFLAGS) - -CPPFLAGS = -I. -I../../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -SAPDBFLAGS = /pdb:$(SERVERAMD:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVERAMD): $(SAMDOBJS) - $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - del /q TestAMD.cpp TestAMD.h - del /q ServerPrivate.cpp ServerPrivate.h - del /q ServerPrivateAMD.cpp ServerPrivateAMD.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+SERVERAMD = serveramd.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ ServerPrivate.obj \
+ TestI.obj \
+ Server.obj
+
+SAMDOBJS = TestAMD.obj \
+ ServerPrivateAMD.obj \
+ TestAMDI.obj \
+ ServerAMD.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(SAMDOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+ICECPPFLAGS = -I. $(ICECPPFLAGS)
+
+CPPFLAGS = -I. -I../../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+SAPDBFLAGS = /pdb:$(SERVERAMD:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVERAMD): $(SAMDOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+ del /q TestAMD.cpp TestAMD.h
+ del /q ServerPrivate.cpp ServerPrivate.h
+ del /q ServerPrivateAMD.cpp ServerPrivateAMD.h
+
+!include .depend
diff --git a/cpp/test/Ice/slicing/objects/Makefile.mak b/cpp/test/Ice/slicing/objects/Makefile.mak index ae645b0a386..3141eaceda2 100644 --- a/cpp/test/Ice/slicing/objects/Makefile.mak +++ b/cpp/test/Ice/slicing/objects/Makefile.mak @@ -1,75 +1,75 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\..\.. - -CLIENT = client.exe -SERVER = server.exe -SERVERAMD = serveramd.exe - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) - -COBJS = Test.obj \ - ClientPrivate.obj \ - Client.obj \ - AllTests.obj \ - Forward.obj - -SOBJS = Test.obj \ - ServerPrivate.obj \ - TestI.obj \ - Server.obj \ - Forward.obj - -SAMDOBJS = TestAMD.obj \ - ServerPrivateAMD.obj \ - TestAMDI.obj \ - ServerAMD.obj \ - Forward.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(SAMDOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -ICECPPFLAGS = -I. $(ICECPPFLAGS) - -CPPFLAGS = -I. -I../../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -SAPDBFLAGS = /pdb:$(SERVERAMD:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVERAMD): $(SAMDOBJS) - $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - del /q TestAMD.cpp TestAMD.h - del /q ClientPrivate.cpp ClientPrivate.h - del /q ServerPrivate.cpp ServerPrivate.h - del /q ServerPrivateAMD.cpp ServerPrivateAMD.h - del /q Forward.cpp Forward.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+SERVERAMD = serveramd.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD)
+
+COBJS = Test.obj \
+ ClientPrivate.obj \
+ Client.obj \
+ AllTests.obj \
+ Forward.obj
+
+SOBJS = Test.obj \
+ ServerPrivate.obj \
+ TestI.obj \
+ Server.obj \
+ Forward.obj
+
+SAMDOBJS = TestAMD.obj \
+ ServerPrivateAMD.obj \
+ TestAMDI.obj \
+ ServerAMD.obj \
+ Forward.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(SAMDOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+ICECPPFLAGS = -I. $(ICECPPFLAGS)
+
+CPPFLAGS = -I. -I../../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+SAPDBFLAGS = /pdb:$(SERVERAMD:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVERAMD): $(SAMDOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+ del /q TestAMD.cpp TestAMD.h
+ del /q ClientPrivate.cpp ClientPrivate.h
+ del /q ServerPrivate.cpp ServerPrivate.h
+ del /q ServerPrivateAMD.cpp ServerPrivateAMD.h
+ del /q Forward.cpp Forward.h
+
+!include .depend
diff --git a/cpp/test/Ice/stream/Makefile.mak b/cpp/test/Ice/stream/Makefile.mak index cbc7749343b..c86dc2b0ca5 100644 --- a/cpp/test/Ice/stream/Makefile.mak +++ b/cpp/test/Ice/stream/Makefile.mak @@ -1,38 +1,38 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -COBJS = Test.obj \ - Client.obj - -SRCS = $(COBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS) -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+COBJS = Test.obj \
+ Client.obj
+
+SRCS = $(COBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS)
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/stringConverter/Makefile.mak b/cpp/test/Ice/stringConverter/Makefile.mak index a1850597e9d..cbb6ee6ccf8 100755 --- a/cpp/test/Ice/stringConverter/Makefile.mak +++ b/cpp/test/Ice/stringConverter/Makefile.mak @@ -1,42 +1,42 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - - -OBJS = Client.obj \ - Test.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(ICONV_HOME)" != "" -CPPFLAGS = $(CPPFLAGS) -I$(ICONV_HOME)\include -DICONV_ON_WINDOWS -DICE_NO_ERRNO -LIBS = $(LIBS) -LIBPATH:$(ICONV_HOME)\lib $(ICONV_LIB) -!endif - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBNAME) $(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -all:: $(CLIENT) - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+
+OBJS = Client.obj \
+ Test.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+!if "$(ICONV_HOME)" != ""
+CPPFLAGS = $(CPPFLAGS) -I$(ICONV_HOME)\include -DICONV_ON_WINDOWS -DICE_NO_ERRNO
+LIBS = $(LIBS) -LIBPATH:$(ICONV_HOME)\lib $(ICONV_LIB)
+!endif
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBNAME) $(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+all:: $(CLIENT)
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/Ice/timeout/Makefile.mak b/cpp/test/Ice/timeout/Makefile.mak index 790d9608e2a..7d17657e77c 100644 --- a/cpp/test/Ice/timeout/Makefile.mak +++ b/cpp/test/Ice/timeout/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/IceBox/Makefile.mak b/cpp/test/IceBox/Makefile.mak index 6f409dcbc72..603939d1aba 100644 --- a/cpp/test/IceBox/Makefile.mak +++ b/cpp/test/IceBox/Makefile.mak @@ -1,20 +1,20 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - - -SUBDIRS = configuration - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+
+SUBDIRS = configuration
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/IceBox/configuration/Makefile.mak b/cpp/test/IceBox/configuration/Makefile.mak index 3372ce4a15b..39b29421c8e 100644 --- a/cpp/test/IceBox/configuration/Makefile.mak +++ b/cpp/test/IceBox/configuration/Makefile.mak @@ -1,73 +1,73 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -LIBNAME = testservice$(LIBSUFFIX).lib -DLLNAME = testservice$(LIBSUFFIX).dll - -TARGETS = $(CLIENT) $(LIBNAME) $(DLLNAME) - -OBJS = Test.obj - -COBJS = Client.obj \ - AllTests.obj - -SERVICE_OBJS = TestI.obj \ - Service.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SERVICE_OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(LIBNAME) : $(DLLNAME) - -$(DLLNAME): $(OBJS) $(SERVICE_OBJS) - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(SERVICE_OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH) \ - freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - del /q build.txt - -!if "$(OPTIMIZE)" == "yes" - -all:: - @echo release > build.txt - -!else - -all:: - @echo debug > build.txt - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+LIBNAME = testservice$(LIBSUFFIX).lib
+DLLNAME = testservice$(LIBSUFFIX).dll
+
+TARGETS = $(CLIENT) $(LIBNAME) $(DLLNAME)
+
+OBJS = Test.obj
+
+COBJS = Client.obj \
+ AllTests.obj
+
+SERVICE_OBJS = TestI.obj \
+ Service.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SERVICE_OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(LIBNAME) : $(DLLNAME)
+
+$(DLLNAME): $(OBJS) $(SERVICE_OBJS)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(SERVICE_OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH) \
+ freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \
+ icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+ del /q build.txt
+
+!if "$(OPTIMIZE)" == "yes"
+
+all::
+ @echo release > build.txt
+
+!else
+
+all::
+ @echo debug > build.txt
+
+!endif
+
+!include .depend
diff --git a/cpp/test/IceGrid/Makefile.mak b/cpp/test/IceGrid/Makefile.mak index 1ac1fd01986..e362ebceaa6 100644 --- a/cpp/test/IceGrid/Makefile.mak +++ b/cpp/test/IceGrid/Makefile.mak @@ -1,20 +1,20 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - - -SUBDIRS = simple deployer session update activation replicaGroup allocation replication distribution - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+
+SUBDIRS = simple deployer session update activation replicaGroup allocation replication distribution
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/IceGrid/activation/Makefile.mak b/cpp/test/IceGrid/activation/Makefile.mak index 6aa8d088842..90f60358e16 100644 --- a/cpp/test/IceGrid/activation/Makefile.mak +++ b/cpp/test/IceGrid/activation/Makefile.mak @@ -1,56 +1,56 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -clean:: - if exist db\node rmdir /s /q db\node - if exist db\registry rmdir /s /q db\registry - if exist db\replica-1 rmdir /s /q db\replica-1 - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+clean::
+ if exist db\node rmdir /s /q db\node
+ if exist db\registry rmdir /s /q db\registry
+ if exist db\replica-1 rmdir /s /q db\replica-1
+
+!include .depend
diff --git a/cpp/test/IceGrid/allocation/Makefile.mak b/cpp/test/IceGrid/allocation/Makefile.mak index c58d8f819e9..138d6b84c2a 100644 --- a/cpp/test/IceGrid/allocation/Makefile.mak +++ b/cpp/test/IceGrid/allocation/Makefile.mak @@ -1,68 +1,68 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -VERIFIER = verifier.exe - -TARGETS = $(CLIENT) $(SERVER) $(VERIFIER) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -VOBJS = PermissionsVerifier.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(VOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -VPDBFLAGS = /pdb:$(VERIFIER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(VERIFIER): $(VOBJS) - $(LINK) $(LD_EXEFLAGS) $(VPDBFLAGS) $(SETARGV) $(VOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -clean:: - if exist db\node rmdir /s /q db\node - if exist db\registry rmdir /s /q db\registry - if exist db\node-1 rmdir /s /q db\node-1 - if exist db\node-2 rmdir /s /q db\node-2 - if exist db\replica-1 rmdir /s /q db\replica-1 - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+VERIFIER = verifier.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(VERIFIER)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+VOBJS = PermissionsVerifier.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(VOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+VPDBFLAGS = /pdb:$(VERIFIER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(VERIFIER): $(VOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(VPDBFLAGS) $(SETARGV) $(VOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+clean::
+ if exist db\node rmdir /s /q db\node
+ if exist db\registry rmdir /s /q db\registry
+ if exist db\node-1 rmdir /s /q db\node-1
+ if exist db\node-2 rmdir /s /q db\node-2
+ if exist db\replica-1 rmdir /s /q db\replica-1
+
+!include .depend
diff --git a/cpp/test/IceGrid/deployer/Makefile.mak b/cpp/test/IceGrid/deployer/Makefile.mak index 51b43a6a2c7..8d8d3f31f77 100644 --- a/cpp/test/IceGrid/deployer/Makefile.mak +++ b/cpp/test/IceGrid/deployer/Makefile.mak @@ -1,88 +1,88 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -LIBNAME = testservice$(LIBSUFFIX).lib -DLLNAME = testservice$(LIBSUFFIX).dll - -TARGETS = $(CLIENT) $(SERVER) $(LIBNAME) $(DLLNAME) - -OBJS = Test.obj - -COBJS = Client.obj \ - AllTests.obj - -SOBJS = TestI.obj \ - Server.obj - -SERVICE_OBJS = TestI.obj \ - Service.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(SERVICE_OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(LIBNAME) : $(DLLNAME) - -$(DLLNAME): $(OBJS) $(SERVICE_OBJS) - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(SERVICE_OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH) \ - freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!if "$(OPTIMIZE)" == "yes" - -all:: - @echo release > build.txt - -!else - -all:: - @echo debug > build.txt - -!endif - -clean:: - del /q build.txt log1.txt log2.txt log3.txt log4.txt - if exist db\node rmdir /s /q db\node - if exist db\registry rmdir /s /q db\registry - if exist db\replica-1 rmdir /s /q db\replica-1 - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+LIBNAME = testservice$(LIBSUFFIX).lib
+DLLNAME = testservice$(LIBSUFFIX).dll
+
+TARGETS = $(CLIENT) $(SERVER) $(LIBNAME) $(DLLNAME)
+
+OBJS = Test.obj
+
+COBJS = Client.obj \
+ AllTests.obj
+
+SOBJS = TestI.obj \
+ Server.obj
+
+SERVICE_OBJS = TestI.obj \
+ Service.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(SERVICE_OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(LIBNAME) : $(DLLNAME)
+
+$(DLLNAME): $(OBJS) $(SERVICE_OBJS)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(SERVICE_OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH) \
+ freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \
+ icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!if "$(OPTIMIZE)" == "yes"
+
+all::
+ @echo release > build.txt
+
+!else
+
+all::
+ @echo debug > build.txt
+
+!endif
+
+clean::
+ del /q build.txt log1.txt log2.txt log3.txt log4.txt
+ if exist db\node rmdir /s /q db\node
+ if exist db\registry rmdir /s /q db\registry
+ if exist db\replica-1 rmdir /s /q db\replica-1
+
+!include .depend
diff --git a/cpp/test/IceGrid/distribution/Makefile.mak b/cpp/test/IceGrid/distribution/Makefile.mak index d8b123731cc..2b9a8da6935 100644 --- a/cpp/test/IceGrid/distribution/Makefile.mak +++ b/cpp/test/IceGrid/distribution/Makefile.mak @@ -1,58 +1,58 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -clean:: - if exist db\node rmdir /s /q db\node - if exist db\registry rmdir /s /q db\registry - if exist db\node-1 rmdir /s /q db\node-1 - if exist db\node-2 rmdir /s /q db\node-2 - if exist db\replica-1 rmdir /s /q db\replica-1 - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS)
+LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+clean::
+ if exist db\node rmdir /s /q db\node
+ if exist db\registry rmdir /s /q db\registry
+ if exist db\node-1 rmdir /s /q db\node-1
+ if exist db\node-2 rmdir /s /q db\node-2
+ if exist db\replica-1 rmdir /s /q db\replica-1
+
+!include .depend
diff --git a/cpp/test/IceGrid/replicaGroup/Makefile.mak b/cpp/test/IceGrid/replicaGroup/Makefile.mak index 919d1ae3ea2..3aeeabee5d6 100644 --- a/cpp/test/IceGrid/replicaGroup/Makefile.mak +++ b/cpp/test/IceGrid/replicaGroup/Makefile.mak @@ -1,88 +1,88 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -LIBNAME = testservice$(LIBSUFFIX).lib -DLLNAME = testservice$(LIBSUFFIX).dll - -TARGETS = $(CLIENT) $(SERVER) $(LIBNAME) $(DLLNAME) - -OBJS = Test.obj - -COBJS = Client.obj \ - AllTests.obj - -SOBJS = TestI.obj \ - Server.obj - -SERVICE_OBJS = TestI.obj \ - Service.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(SERVICE_OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(LIBNAME) : $(DLLNAME) - -$(DLLNAME): $(OBJS) $(SERVICE_OBJS) - $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(SERVICE_OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH) \ - freeze$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!if "$(OPTIMIZE)" == "yes" - -all:: - @echo release > build.txt - -!else - -all:: - @echo debug > build.txt - -!endif - -clean:: - del /q build.txt - if exist db\node rmdir /s /q db\node - if exist db\registry rmdir /s /q db\registry - if exist db\replica-1 rmdir /s /q db\replica-1 - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+LIBNAME = testservice$(LIBSUFFIX).lib
+DLLNAME = testservice$(LIBSUFFIX).dll
+
+TARGETS = $(CLIENT) $(SERVER) $(LIBNAME) $(DLLNAME)
+
+OBJS = Test.obj
+
+COBJS = Client.obj \
+ AllTests.obj
+
+SOBJS = TestI.obj \
+ Server.obj
+
+SERVICE_OBJS = TestI.obj \
+ Service.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(SERVICE_OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(LIBNAME) : $(DLLNAME)
+
+$(DLLNAME): $(OBJS) $(SERVICE_OBJS)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(SERVICE_OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH) \
+ freeze$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \
+ icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!if "$(OPTIMIZE)" == "yes"
+
+all::
+ @echo release > build.txt
+
+!else
+
+all::
+ @echo debug > build.txt
+
+!endif
+
+clean::
+ del /q build.txt
+ if exist db\node rmdir /s /q db\node
+ if exist db\registry rmdir /s /q db\registry
+ if exist db\replica-1 rmdir /s /q db\replica-1
+
+!include .depend
diff --git a/cpp/test/IceGrid/replication/Makefile.mak b/cpp/test/IceGrid/replication/Makefile.mak index f8851b5fcca..f029356028f 100644 --- a/cpp/test/IceGrid/replication/Makefile.mak +++ b/cpp/test/IceGrid/replication/Makefile.mak @@ -1,71 +1,71 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Test.obj - -COBJS = Client.obj \ - AllTests.obj - -SOBJS = TestI.obj \ - Server.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!if "$(OPTIMIZE)" == "yes" - -all:: - @echo release > build.txt - -!else - -all:: - @echo debug > build.txt - -!endif - -clean:: - del /q build.txt - if exist db\node rmdir /s /q db\node - if exist db\registry rmdir /s /q db\registry - if exist db\replica-1 rmdir /s /q db\replica-1 - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+OBJS = Test.obj
+
+COBJS = Client.obj \
+ AllTests.obj
+
+SOBJS = TestI.obj \
+ Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \
+ icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!if "$(OPTIMIZE)" == "yes"
+
+all::
+ @echo release > build.txt
+
+!else
+
+all::
+ @echo debug > build.txt
+
+!endif
+
+clean::
+ del /q build.txt
+ if exist db\node rmdir /s /q db\node
+ if exist db\registry rmdir /s /q db\registry
+ if exist db\replica-1 rmdir /s /q db\replica-1
+
+!include .depend
diff --git a/cpp/test/IceGrid/session/Makefile.mak b/cpp/test/IceGrid/session/Makefile.mak index 2bd201bac4e..d3101b4b8d6 100644 --- a/cpp/test/IceGrid/session/Makefile.mak +++ b/cpp/test/IceGrid/session/Makefile.mak @@ -1,61 +1,61 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe -VERIFIER = verifier.exe - -TARGETS = $(CLIENT) $(SERVER) $(VERIFIER) - -COBJS = Client.obj \ - AllTests.obj - -SOBJS = Server.obj - -VOBJS = PermissionsVerifier.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(VOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -VPDBFLAGS = /pdb:$(VERIFIER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) icegrid$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(VERIFIER): $(VOBJS) - $(LINK) $(LD_EXEFLAGS) $(VPDBFLAGS) $(SETARGV) $(VOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) icessl$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - if exist db\node rmdir /s /q db\node - if exist db\registry rmdir /s /q db\registry - if exist db\node-1 rmdir /s /q db\node-1 - if exist db\replica-1 rmdir /s /q db\replica-1 - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+VERIFIER = verifier.exe
+
+TARGETS = $(CLIENT) $(SERVER) $(VERIFIER)
+
+COBJS = Client.obj \
+ AllTests.obj
+
+SOBJS = Server.obj
+
+VOBJS = PermissionsVerifier.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(VOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+VPDBFLAGS = /pdb:$(VERIFIER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) icegrid$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(VERIFIER): $(VOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(VPDBFLAGS) $(SETARGV) $(VOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) icessl$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ if exist db\node rmdir /s /q db\node
+ if exist db\registry rmdir /s /q db\registry
+ if exist db\node-1 rmdir /s /q db\node-1
+ if exist db\replica-1 rmdir /s /q db\replica-1
+
+!include .depend
diff --git a/cpp/test/IceGrid/simple/Makefile.mak b/cpp/test/IceGrid/simple/Makefile.mak index 6aa8d088842..90f60358e16 100644 --- a/cpp/test/IceGrid/simple/Makefile.mak +++ b/cpp/test/IceGrid/simple/Makefile.mak @@ -1,56 +1,56 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -clean:: - if exist db\node rmdir /s /q db\node - if exist db\registry rmdir /s /q db\registry - if exist db\replica-1 rmdir /s /q db\replica-1 - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+clean::
+ if exist db\node rmdir /s /q db\node
+ if exist db\registry rmdir /s /q db\registry
+ if exist db\replica-1 rmdir /s /q db\replica-1
+
+!include .depend
diff --git a/cpp/test/IceGrid/update/Makefile.mak b/cpp/test/IceGrid/update/Makefile.mak index f096c04c92d..d463061dcc0 100644 --- a/cpp/test/IceGrid/update/Makefile.mak +++ b/cpp/test/IceGrid/update/Makefile.mak @@ -1,58 +1,58 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -clean:: - if exist db\node rmdir /s /q db\node - if exist db\registry rmdir /s /q db\registry - if exist db\node-1 rmdir /s /q db\node-1 - if exist db\node-2 rmdir /s /q db\node-2 - if exist db\replica-1 rmdir /s /q db\replica-1 - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+clean::
+ if exist db\node rmdir /s /q db\node
+ if exist db\registry rmdir /s /q db\registry
+ if exist db\node-1 rmdir /s /q db\node-1
+ if exist db\node-2 rmdir /s /q db\node-2
+ if exist db\replica-1 rmdir /s /q db\replica-1
+
+!include .depend
diff --git a/cpp/test/IceSSL/Makefile.mak b/cpp/test/IceSSL/Makefile.mak index 0273b8e514a..a7ab3bb96b3 100644 --- a/cpp/test/IceSSL/Makefile.mak +++ b/cpp/test/IceSSL/Makefile.mak @@ -1,19 +1,19 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)/config/Make.rules.mak - -SUBDIRS = configuration - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SUBDIRS = configuration
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/IceSSL/configuration/Makefile.mak b/cpp/test/IceSSL/configuration/Makefile.mak index eedc4db1d8e..295db756e52 100644 --- a/cpp/test/IceSSL/configuration/Makefile.mak +++ b/cpp/test/IceSSL/configuration/Makefile.mak @@ -1,50 +1,50 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.obj \ - Client.obj \ - AllTests.obj - -SOBJS = Test.obj \ - TestI.obj \ - Server.obj - -SRCS = $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icessl$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icessl$(LIBSUFFIX).lib - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+SERVER = server.exe
+
+TARGETS = $(CLIENT) $(SERVER)
+
+COBJS = Test.obj \
+ Client.obj \
+ AllTests.obj
+
+SOBJS = Test.obj \
+ TestI.obj \
+ Server.obj
+
+SRCS = $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icessl$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icessl$(LIBSUFFIX).lib
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend
diff --git a/cpp/test/IceStorm/Makefile.mak b/cpp/test/IceStorm/Makefile.mak index 189028c5bc6..368c7f5993a 100644 --- a/cpp/test/IceStorm/Makefile.mak +++ b/cpp/test/IceStorm/Makefile.mak @@ -1,25 +1,25 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = single \ - federation \ - federation2 \ - stress \ - rep1 \ - repstress \ - repgrid - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = single \
+ federation \
+ federation2 \
+ stress \
+ rep1 \
+ repstress \
+ repgrid
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/IceStorm/federation/Makefile.mak b/cpp/test/IceStorm/federation/Makefile.mak index fa8da0b91a0..0da20588a05 100644 --- a/cpp/test/IceStorm/federation/Makefile.mak +++ b/cpp/test/IceStorm/federation/Makefile.mak @@ -1,68 +1,68 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -PUBLISHER = publisher.exe -SUBSCRIBER = subscriber.exe - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -OBJS = Event.obj - -POBJS = Publisher.obj - -SOBJS = Subscriber.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(POBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) -SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) -!endif - -$(PUBLISHER): $(OBJS) $(POBJS) - $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SUBSCRIBER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!if "$(OPTIMIZE)" == "yes" - -all:: - @echo release > build.txt - -!else - -all:: - @echo debug > build.txt -!endif - -clean:: - del /q build.txt - del /q Event.cpp Event.h - del /q db\topicmanager db\log.* - for %f in (db\*) do if not %f == db\.gitignore del /q %f - for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+PUBLISHER = publisher.exe
+SUBSCRIBER = subscriber.exe
+
+TARGETS = $(PUBLISHER) $(SUBSCRIBER)
+
+OBJS = Event.obj
+
+POBJS = Publisher.obj
+
+SOBJS = Subscriber.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(POBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LIBS = icestorm$(LIBSUFFIX).lib $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb)
+!endif
+
+$(PUBLISHER): $(OBJS) $(POBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SUBSCRIBER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!if "$(OPTIMIZE)" == "yes"
+
+all::
+ @echo release > build.txt
+
+!else
+
+all::
+ @echo debug > build.txt
+!endif
+
+clean::
+ del /q build.txt
+ del /q Event.cpp Event.h
+ del /q db\topicmanager db\log.*
+ for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/test/IceStorm/federation2/Makefile.mak b/cpp/test/IceStorm/federation2/Makefile.mak index ddc23c4ef4d..3daf814e537 100644 --- a/cpp/test/IceStorm/federation2/Makefile.mak +++ b/cpp/test/IceStorm/federation2/Makefile.mak @@ -1,71 +1,71 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -PUBLISHER = publisher.exe -SUBSCRIBER = subscriber.exe - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -OBJS = Event.obj - -POBJS = Publisher.obj - -SOBJS = Subscriber.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(POBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) -SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) -!endif - -$(PUBLISHER): $(OBJS) $(POBJS) - $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SUBSCRIBER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!if "$(OPTIMIZE)" == "yes" - -all:: - @echo release > build.txt - -!else - -all:: - @echo debug > build.txt -!endif - -clean:: - del /q build.txt - del /q Event.cpp Event.h - for %f in (db\*) do if not %f == db\.gitignore del /q %f - for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f - for %f in (db2\*) do if not %f == db2\.gitignore del /q %f - for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f - for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f - for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+PUBLISHER = publisher.exe
+SUBSCRIBER = subscriber.exe
+
+TARGETS = $(PUBLISHER) $(SUBSCRIBER)
+
+OBJS = Event.obj
+
+POBJS = Publisher.obj
+
+SOBJS = Subscriber.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(POBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LIBS = icestorm$(LIBSUFFIX).lib $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb)
+!endif
+
+$(PUBLISHER): $(OBJS) $(POBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SUBSCRIBER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!if "$(OPTIMIZE)" == "yes"
+
+all::
+ @echo release > build.txt
+
+!else
+
+all::
+ @echo debug > build.txt
+!endif
+
+clean::
+ del /q build.txt
+ del /q Event.cpp Event.h
+ for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+ for %f in (db2\*) do if not %f == db2\.gitignore del /q %f
+ for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f
+ for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f
+ for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/test/IceStorm/rep1/Makefile.mak b/cpp/test/IceStorm/rep1/Makefile.mak index 566c9d4868e..4809c968d98 100644 --- a/cpp/test/IceStorm/rep1/Makefile.mak +++ b/cpp/test/IceStorm/rep1/Makefile.mak @@ -1,76 +1,76 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -PUBLISHER = publisher.exe -SUBSCRIBER = subscriber.exe -SUB = sub.exe - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) $(SUB) - -OBJS = Single.obj - -POBJS = Publisher.obj - -SOBJS = Subscriber.obj - -SUB_OBJS = Sub.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(POBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(SUB_OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) -SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) -SUB_PDBFLAGS = /pdb:$(SUB:.exe=.pdb) -!endif - -$(PUBLISHER): $(OBJS) $(POBJS) - $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SUBSCRIBER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SUB): $(OBJS) $(SUB_OBJS) - $(LINK) $(LD_EXEFLAGS) $(SUB_PDBFLAGS) $(SETARGV) $(OBJS) $(SUB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!if "$(OPTIMIZE)" == "yes" - -all:: - @echo release > build.txt - -!else - -all:: - @echo debug > build.txt - -!endif - -clean:: - del /q build.txt - del /q Single.cpp Single.h - for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+PUBLISHER = publisher.exe
+SUBSCRIBER = subscriber.exe
+SUB = sub.exe
+
+TARGETS = $(PUBLISHER) $(SUBSCRIBER) $(SUB)
+
+OBJS = Single.obj
+
+POBJS = Publisher.obj
+
+SOBJS = Subscriber.obj
+
+SUB_OBJS = Sub.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(POBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(SUB_OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LIBS = icestorm$(LIBSUFFIX).lib $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb)
+SUB_PDBFLAGS = /pdb:$(SUB:.exe=.pdb)
+!endif
+
+$(PUBLISHER): $(OBJS) $(POBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SUBSCRIBER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SUB): $(OBJS) $(SUB_OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SUB_PDBFLAGS) $(SETARGV) $(OBJS) $(SUB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!if "$(OPTIMIZE)" == "yes"
+
+all::
+ @echo release > build.txt
+
+!else
+
+all::
+ @echo debug > build.txt
+
+!endif
+
+clean::
+ del /q build.txt
+ del /q Single.cpp Single.h
+ for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/test/IceStorm/repgrid/Makefile.mak b/cpp/test/IceStorm/repgrid/Makefile.mak index efc9e82ea1e..3dbbaa99ca0 100644 --- a/cpp/test/IceStorm/repgrid/Makefile.mak +++ b/cpp/test/IceStorm/repgrid/Makefile.mak @@ -1,56 +1,56 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = Single.obj - -COBJS = Client.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!if "$(OPTIMIZE)" == "yes" - -all:: - @echo release > build.txt - -!else - -all:: - @echo debug > build.txt - -!endif - -clean:: - del /q build.txt - del /q Single.cpp Single.h - if exist db\node rmdir /s /q db\node - if exist db\registry rmdir /s /q db\registry - if exist db\replica-1 rmdir /s /q db\replica-1 - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = Single.obj
+
+COBJS = Client.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LIBS = icestorm$(LIBSUFFIX).lib $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!if "$(OPTIMIZE)" == "yes"
+
+all::
+ @echo release > build.txt
+
+!else
+
+all::
+ @echo debug > build.txt
+
+!endif
+
+clean::
+ del /q build.txt
+ del /q Single.cpp Single.h
+ if exist db\node rmdir /s /q db\node
+ if exist db\registry rmdir /s /q db\registry
+ if exist db\replica-1 rmdir /s /q db\replica-1
+
+!include .depend
diff --git a/cpp/test/IceStorm/repstress/Makefile.mak b/cpp/test/IceStorm/repstress/Makefile.mak index 57024e2910b..9049a3ad4bf 100644 --- a/cpp/test/IceStorm/repstress/Makefile.mak +++ b/cpp/test/IceStorm/repstress/Makefile.mak @@ -1,78 +1,78 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -PUBLISHER = publisher.exe -SUBSCRIBER = subscriber.exe -CONTROL = control.exe - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) $(CONTROL) - -OBJS = Single.obj \ - Controller.obj - -POBJS = Publisher.obj - -SOBJS = Subscriber.obj - -COBJS = Control.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(POBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) -SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) -CPDBFLAGS = /pdb:$(CONTROL:.exe=.pdb) -!endif - -$(PUBLISHER): $(OBJS) $(POBJS) - $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SUBSCRIBER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(CONTROL): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!if "$(OPTIMIZE)" == "yes" - -all:: - @echo release > build.txt - -!else - -all:: - @echo debug > build.txt - -!endif - -clean:: - del /q build.txt - del /q Single.cpp Single.h - del /q Controller.cpp Controller.h - for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+PUBLISHER = publisher.exe
+SUBSCRIBER = subscriber.exe
+CONTROL = control.exe
+
+TARGETS = $(PUBLISHER) $(SUBSCRIBER) $(CONTROL)
+
+OBJS = Single.obj \
+ Controller.obj
+
+POBJS = Publisher.obj
+
+SOBJS = Subscriber.obj
+
+COBJS = Control.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(POBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LIBS = icestorm$(LIBSUFFIX).lib $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb)
+CPDBFLAGS = /pdb:$(CONTROL:.exe=.pdb)
+!endif
+
+$(PUBLISHER): $(OBJS) $(POBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SUBSCRIBER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(CONTROL): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!if "$(OPTIMIZE)" == "yes"
+
+all::
+ @echo release > build.txt
+
+!else
+
+all::
+ @echo debug > build.txt
+
+!endif
+
+clean::
+ del /q build.txt
+ del /q Single.cpp Single.h
+ del /q Controller.cpp Controller.h
+ for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/test/IceStorm/single/Makefile.mak b/cpp/test/IceStorm/single/Makefile.mak index 86dad95ee73..2f145c4f91f 100644 --- a/cpp/test/IceStorm/single/Makefile.mak +++ b/cpp/test/IceStorm/single/Makefile.mak @@ -1,68 +1,68 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -PUBLISHER = publisher.exe -SUBSCRIBER = subscriber.exe - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -OBJS = Single.obj - -POBJS = Publisher.obj - -SOBJS = Subscriber.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(POBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) -SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) -!endif - -$(PUBLISHER): $(OBJS) $(POBJS) - $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SUBSCRIBER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!if "$(OPTIMIZE)" == "yes" - -all:: - @echo release > build.txt - -!else - -all:: - @echo debug > build.txt - -!endif - -clean:: - del /q build.txt - del /q Single.cpp Single.h - for %f in (db\*) do if not %f == db\.gitignore del /q %f - for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+PUBLISHER = publisher.exe
+SUBSCRIBER = subscriber.exe
+
+TARGETS = $(PUBLISHER) $(SUBSCRIBER)
+
+OBJS = Single.obj
+
+POBJS = Publisher.obj
+
+SOBJS = Subscriber.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(POBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LIBS = icestorm$(LIBSUFFIX).lib $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb)
+!endif
+
+$(PUBLISHER): $(OBJS) $(POBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SUBSCRIBER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!if "$(OPTIMIZE)" == "yes"
+
+all::
+ @echo release > build.txt
+
+!else
+
+all::
+ @echo debug > build.txt
+
+!endif
+
+clean::
+ del /q build.txt
+ del /q Single.cpp Single.h
+ for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/test/IceStorm/stress/Makefile.mak b/cpp/test/IceStorm/stress/Makefile.mak index ddc23c4ef4d..3daf814e537 100644 --- a/cpp/test/IceStorm/stress/Makefile.mak +++ b/cpp/test/IceStorm/stress/Makefile.mak @@ -1,71 +1,71 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -PUBLISHER = publisher.exe -SUBSCRIBER = subscriber.exe - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -OBJS = Event.obj - -POBJS = Publisher.obj - -SOBJS = Subscriber.obj - -SRCS = $(OBJS:.obj=.cpp) \ - $(POBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) - - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) -SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) -!endif - -$(PUBLISHER): $(OBJS) $(POBJS) - $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SUBSCRIBER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!if "$(OPTIMIZE)" == "yes" - -all:: - @echo release > build.txt - -!else - -all:: - @echo debug > build.txt -!endif - -clean:: - del /q build.txt - del /q Event.cpp Event.h - for %f in (db\*) do if not %f == db\.gitignore del /q %f - for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f - for %f in (db2\*) do if not %f == db2\.gitignore del /q %f - for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f - for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f - for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+PUBLISHER = publisher.exe
+SUBSCRIBER = subscriber.exe
+
+TARGETS = $(PUBLISHER) $(SUBSCRIBER)
+
+OBJS = Event.obj
+
+POBJS = Publisher.obj
+
+SOBJS = Subscriber.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(POBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
+
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LIBS = icestorm$(LIBSUFFIX).lib $(LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb)
+SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb)
+!endif
+
+$(PUBLISHER): $(OBJS) $(POBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SUBSCRIBER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!if "$(OPTIMIZE)" == "yes"
+
+all::
+ @echo release > build.txt
+
+!else
+
+all::
+ @echo debug > build.txt
+!endif
+
+clean::
+ del /q build.txt
+ del /q Event.cpp Event.h
+ for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+ for %f in (db2\*) do if not %f == db2\.gitignore del /q %f
+ for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f
+ for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f
+ for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f
+
+!include .depend
diff --git a/cpp/test/IceUtil/Makefile.mak b/cpp/test/IceUtil/Makefile.mak index 76f960169b1..b06e099f8f1 100644 --- a/cpp/test/IceUtil/Makefile.mak +++ b/cpp/test/IceUtil/Makefile.mak @@ -1,25 +1,25 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = condvar \ - thread \ - unicode \ - inputUtil \ - uuid \ - ctrlCHandler \ - timer - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = condvar \
+ thread \
+ unicode \
+ inputUtil \
+ uuid \
+ ctrlCHandler \
+ timer
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/IceUtil/condvar/Makefile.mak b/cpp/test/IceUtil/condvar/Makefile.mak index f53c61f6456..a113e2f992c 100644 --- a/cpp/test/IceUtil/condvar/Makefile.mak +++ b/cpp/test/IceUtil/condvar/Makefile.mak @@ -1,42 +1,42 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -WQ = workqueue.exe -MATCH = match.exe - -TARGETS = $(WQ) $(MATCH) - -OBJS = WorkQueue.obj \ - Match.obj - - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -WQ_PDBFLAGS = /pdb:$(WQ:.exe=.pdb) -MATCH_PDBFLAGS = /pdb:$(MATCH:.exe=.pdb) -!endif - -$(WQ): WorkQueue.obj - $(LINK) $(LD_EXEFLAGS) $(WQ_PDBFLAGS) $(SETARGV) WorkQueue.obj $(PREOUT)$@ $(PRELIBS)$(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(MATCH): Match.obj - $(LINK) $(LD_EXEFLAGS) $(MATCH_PDBFLAGS) $(SETARGV) Match.obj $(PREOUT)$@ $(PRELIBS)$(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+WQ = workqueue.exe
+MATCH = match.exe
+
+TARGETS = $(WQ) $(MATCH)
+
+OBJS = WorkQueue.obj \
+ Match.obj
+
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+WQ_PDBFLAGS = /pdb:$(WQ:.exe=.pdb)
+MATCH_PDBFLAGS = /pdb:$(MATCH:.exe=.pdb)
+!endif
+
+$(WQ): WorkQueue.obj
+ $(LINK) $(LD_EXEFLAGS) $(WQ_PDBFLAGS) $(SETARGV) WorkQueue.obj $(PREOUT)$@ $(PRELIBS)$(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(MATCH): Match.obj
+ $(LINK) $(LD_EXEFLAGS) $(MATCH_PDBFLAGS) $(SETARGV) Match.obj $(PREOUT)$@ $(PRELIBS)$(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!include .depend
diff --git a/cpp/test/IceUtil/ctrlCHandler/Makefile.mak b/cpp/test/IceUtil/ctrlCHandler/Makefile.mak index 8ad79161f71..5918a579742 100644 --- a/cpp/test/IceUtil/ctrlCHandler/Makefile.mak +++ b/cpp/test/IceUtil/ctrlCHandler/Makefile.mak @@ -1,33 +1,33 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = Client.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = Client.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!include .depend
diff --git a/cpp/test/IceUtil/inputUtil/Makefile.mak b/cpp/test/IceUtil/inputUtil/Makefile.mak index 8ad79161f71..5918a579742 100644 --- a/cpp/test/IceUtil/inputUtil/Makefile.mak +++ b/cpp/test/IceUtil/inputUtil/Makefile.mak @@ -1,33 +1,33 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = Client.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = Client.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!include .depend
diff --git a/cpp/test/IceUtil/thread/Makefile.mak b/cpp/test/IceUtil/thread/Makefile.mak index f4c73223d9f..a5cbfc78b0e 100644 --- a/cpp/test/IceUtil/thread/Makefile.mak +++ b/cpp/test/IceUtil/thread/Makefile.mak @@ -1,45 +1,45 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = TestBase.obj \ - CreateTest.obj \ - AliveTest.obj \ - StartTest.obj \ - RWRecMutexTest.obj \ - RecMutexTest.obj \ - StaticMutexTest.obj \ - MutexTest.obj \ - MonitorMutexTest.obj \ - MonitorRecMutexTest.obj \ - CountDownLatchTest.obj \ - TestSuite.obj \ - Client.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = TestBase.obj \
+ CreateTest.obj \
+ AliveTest.obj \
+ StartTest.obj \
+ RWRecMutexTest.obj \
+ RecMutexTest.obj \
+ StaticMutexTest.obj \
+ MutexTest.obj \
+ MonitorMutexTest.obj \
+ MonitorRecMutexTest.obj \
+ CountDownLatchTest.obj \
+ TestSuite.obj \
+ Client.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!include .depend
diff --git a/cpp/test/IceUtil/timer/Makefile.mak b/cpp/test/IceUtil/timer/Makefile.mak index 8ad79161f71..5918a579742 100644 --- a/cpp/test/IceUtil/timer/Makefile.mak +++ b/cpp/test/IceUtil/timer/Makefile.mak @@ -1,33 +1,33 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = Client.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = Client.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!include .depend
diff --git a/cpp/test/IceUtil/unicode/Makefile.mak b/cpp/test/IceUtil/unicode/Makefile.mak index 8ad79161f71..5918a579742 100644 --- a/cpp/test/IceUtil/unicode/Makefile.mak +++ b/cpp/test/IceUtil/unicode/Makefile.mak @@ -1,33 +1,33 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = Client.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = Client.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!include .depend
diff --git a/cpp/test/IceUtil/uuid/Makefile.mak b/cpp/test/IceUtil/uuid/Makefile.mak index 8ad79161f71..5918a579742 100644 --- a/cpp/test/IceUtil/uuid/Makefile.mak +++ b/cpp/test/IceUtil/uuid/Makefile.mak @@ -1,33 +1,33 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = Client.obj - -SRCS = $(OBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = Client.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+!include .depend
diff --git a/cpp/test/Makefile.mak b/cpp/test/Makefile.mak index 97e108724f6..f0abc32546b 100644 --- a/cpp/test/Makefile.mak +++ b/cpp/test/Makefile.mak @@ -1,28 +1,28 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = .. - -!include $(top_srcdir)/config/Make.rules.mak - -SUBDIRS = IceUtil \ - Slice \ - Ice \ - IceSSL \ - IceBox \ - Glacier2 \ - Freeze \ - IceStorm \ - FreezeScript \ - IceGrid - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SUBDIRS = IceUtil \
+ Slice \
+ Ice \
+ IceSSL \
+ IceBox \
+ Glacier2 \
+ Freeze \
+ IceStorm \
+ FreezeScript \
+ IceGrid
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/Slice/Makefile.mak b/cpp/test/Slice/Makefile.mak index 41b3fb90aac..ce4e2467269 100644 --- a/cpp/test/Slice/Makefile.mak +++ b/cpp/test/Slice/Makefile.mak @@ -1,19 +1,19 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = keyword - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS = keyword
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/test/Slice/keyword/Makefile.mak b/cpp/test/Slice/keyword/Makefile.mak index 813f04222a2..fb9c0028d60 100644 --- a/cpp/test/Slice/keyword/Makefile.mak +++ b/cpp/test/Slice/keyword/Makefile.mak @@ -1,38 +1,38 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -COBJS = Key.obj \ - Client.obj - -SRCS = $(COBJS:.obj=.cpp) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS) - -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Key.cpp Key.h - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+CLIENT = client.exe
+
+TARGETS = $(CLIENT)
+
+COBJS = Key.obj \
+ Client.obj
+
+SRCS = $(COBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+$(CLIENT): $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Key.cpp Key.h
+
+!include .depend
|