cvs diff -cR cvs diff: Diffing . cvs diff: Diffing bin cvs diff: Diffing certs cvs diff: Diffing config Index: config/Make.rules =================================================================== RCS file: /tilde/basraij/work/irad/cvsroot/zeroc/ice/config/Make.rules,v retrieving revision 1.1.1.1 diff -c -r1.1.1.1 Make.rules *** config/Make.rules 3 Feb 2005 21:58:43 -0000 1.1.1.1 --- config/Make.rules 9 Feb 2005 22:52:13 -0000 *************** *** 1,3 **** --- 1,4 ---- + # -*- mode: makefile -*- # ********************************************************************** # # Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. *************** *** 12,25 **** # if it does not exist. # prefix = /opt/Ice-$(VERSION) # # Define OPTIMIZE as yes if you want to build with # optimization. Otherwise Ice is build with debug information. # #OPTIMIZE = yes # # Define LP64 as yes if you want to build in 64 bit mode on a platform --- 13,35 ---- # if it does not exist. # prefix = /opt/Ice-$(VERSION) # # Define OPTIMIZE as yes if you want to build with # optimization. Otherwise Ice is build with debug information. # #OPTIMIZE = yes ! ! # ! # Define USE_GCC as yes if you want to use G++/GCC to build. Gcc is ! # the default on Linux so this option is ignored on that platform. ! # Currently only implemented for SunOS (Solaris). To use it for ! # other platforms create a Make.rules.-gcc makefile. ! # ! ! USE_GCC = yes # # Define LP64 as yes if you want to build in 64 bit mode on a platform *************** *** 159,168 **** UNAME := $(shell uname) # # Platform specific definitions # ! include $(top_srcdir)/config/Make.rules.$(UNAME) ifeq ($(LP64),yes) libsubdir := lib$(lp64suffix) --- 169,186 ---- UNAME := $(shell uname) + Make-Rules-Uname := Make.rules.$(UNAME) + ifneq (Linux,$(UNAME)) + ifeq (yes,$(USE_GCC)) + # platform uses gnu compilers (gcc/g++). + Make-Rules-Uname := Make.rules.$(UNAME)-gcc + endif + endif + # # Platform specific definitions # ! include $(top_srcdir)/config/$(Make-Rules-Uname) ifeq ($(LP64),yes) libsubdir := lib$(lp64suffix) *************** *** 203,209 **** endif ifneq ($(DB_HOME),) ! DB_FLAGS = -I$(DB_HOME)/include DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx else DB_FLAGS = --- 221,227 ---- endif ifneq ($(DB_HOME),) ! DB_FLAGS = -I$(DB_HOME)/include -DHAVE_CXX_STDHEADERS DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx else DB_FLAGS = *************** *** 211,217 **** endif ifneq ($(EXPAT_HOME),) ! EXPAT_FLAGS = -I$(EXPAT_HOME)/include EXPAT_LIBS = -L$(EXPAT_HOME)/$(libsubdir) -lexpat else EXPAT_FLAGS = --- 229,235 ---- endif ifneq ($(EXPAT_HOME),) ! EXPAT_FLAGS = -I$(EXPAT_HOME)/include -DICE_USE_XMLPARSEAPI EXPAT_LIBS = -L$(EXPAT_HOME)/$(libsubdir) -lexpat else EXPAT_FLAGS = *************** *** 280,286 **** endif ifeq ($(mkshlib),) ! $(error You need to define mkshlib in Make.rules.$(UNAME)) endif ifeq ($(installlib),) --- 298,304 ---- endif ifeq ($(mkshlib),) ! $(error You need to define mkshlib in $(Make-Rules-Uname)) endif ifeq ($(installlib),) Index: config/Make.rules.AIX =================================================================== RCS file: /tilde/basraij/work/irad/cvsroot/zeroc/ice/config/Make.rules.AIX,v retrieving revision 1.1.1.1 diff -c -r1.1.1.1 Make.rules.AIX *** config/Make.rules.AIX 3 Feb 2005 21:58:43 -0000 1.1.1.1 --- config/Make.rules.AIX 3 Feb 2005 22:24:48 -0000 *************** *** 1,3 **** --- 1,4 ---- + # -*- mode: makefile -*- # ********************************************************************** # # Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. Index: config/Make.rules.Darwin =================================================================== RCS file: /tilde/basraij/work/irad/cvsroot/zeroc/ice/config/Make.rules.Darwin,v retrieving revision 1.1.1.1 diff -c -r1.1.1.1 Make.rules.Darwin *** config/Make.rules.Darwin 3 Feb 2005 21:58:43 -0000 1.1.1.1 --- config/Make.rules.Darwin 3 Feb 2005 22:24:50 -0000 *************** *** 1,3 **** --- 1,4 ---- + # -*- mode: makefile -*- # ********************************************************************** # # Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. Index: config/Make.rules.FreeBSD =================================================================== RCS file: /tilde/basraij/work/irad/cvsroot/zeroc/ice/config/Make.rules.FreeBSD,v retrieving revision 1.1.1.1 diff -c -r1.1.1.1 Make.rules.FreeBSD *** config/Make.rules.FreeBSD 3 Feb 2005 21:58:43 -0000 1.1.1.1 --- config/Make.rules.FreeBSD 3 Feb 2005 22:24:51 -0000 *************** *** 1,3 **** --- 1,4 ---- + # -*- mode: makefile -*- # ********************************************************************** # # Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. Index: config/Make.rules.HP-UX =================================================================== RCS file: /tilde/basraij/work/irad/cvsroot/zeroc/ice/config/Make.rules.HP-UX,v retrieving revision 1.1.1.1 diff -c -r1.1.1.1 Make.rules.HP-UX *** config/Make.rules.HP-UX 3 Feb 2005 21:58:43 -0000 1.1.1.1 --- config/Make.rules.HP-UX 3 Feb 2005 22:24:51 -0000 *************** *** 1,3 **** --- 1,4 ---- + # -*- mode: makefile -*- # ********************************************************************** # # Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. Index: config/Make.rules.Linux =================================================================== RCS file: /tilde/basraij/work/irad/cvsroot/zeroc/ice/config/Make.rules.Linux,v retrieving revision 1.1.1.1 diff -c -r1.1.1.1 Make.rules.Linux *** config/Make.rules.Linux 3 Feb 2005 21:58:43 -0000 1.1.1.1 --- config/Make.rules.Linux 3 Feb 2005 22:24:51 -0000 *************** *** 1,3 **** --- 1,4 ---- + # -*- mode: makefile -*- # ********************************************************************** # # Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. Index: config/Make.rules.SunOS =================================================================== RCS file: /tilde/basraij/work/irad/cvsroot/zeroc/ice/config/Make.rules.SunOS,v retrieving revision 1.1.1.1 diff -c -r1.1.1.1 Make.rules.SunOS *** config/Make.rules.SunOS 3 Feb 2005 21:58:43 -0000 1.1.1.1 --- config/Make.rules.SunOS 3 Feb 2005 22:24:51 -0000 *************** *** 1,3 **** --- 1,4 ---- + # -*- mode: makefile -*- # ********************************************************************** # # Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved. cvs diff: Diffing demo cvs diff: Diffing demo/Freeze cvs diff: Diffing demo/Freeze/backup Index: demo/Freeze/backup/Makefile =================================================================== RCS file: /tilde/basraij/work/irad/cvsroot/zeroc/ice/demo/Freeze/backup/Makefile,v retrieving revision 1.1.1.1 diff -c -r1.1.1.1 Makefile *** demo/Freeze/backup/Makefile 3 Feb 2005 21:58:42 -0000 1.1.1.1 --- demo/Freeze/backup/Makefile 9 Feb 2005 21:52:17 -0000 *************** *** 23,29 **** CPPFLAGS := -I. $(DB_FLAGS) $(CPPFLAGS) ! $(CLIENT): $(OBJS) $(COBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lFreeze $(DB_LIBS) $(LIBS) --- 23,29 ---- CPPFLAGS := -I. $(DB_FLAGS) $(CPPFLAGS) ! $(CLIENT): $(OBJS) $(COBJS) full incremental rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lFreeze $(DB_LIBS) $(LIBS) *************** *** 34,39 **** clean:: rm -f IntLongMap.h IntLongMap.cpp rm -f db/data/IntLongMap db/logs/log* ! rm -rf full/* incremental/* include .depend --- 34,42 ---- clean:: rm -f IntLongMap.h IntLongMap.cpp rm -f db/data/IntLongMap db/logs/log* ! rm -rf full incremental include .depend + + full incremental: + mkdir -p $@ cvs diff: Diffing demo/Freeze/bench cvs diff: Diffing demo/Freeze/bench/db cvs diff: Diffing demo/Freeze/library cvs diff: Diffing demo/Freeze/library/db cvs diff: Diffing demo/Freeze/library/dummyinclude cvs diff: Diffing demo/Freeze/phonebook cvs diff: Diffing demo/Freeze/phonebook/db cvs diff: Diffing demo/Freeze/phonebook/dummyinclude cvs diff: Diffing demo/Glacier cvs diff: Diffing demo/Glacier/session cvs diff: Diffing demo/Glacier2 cvs diff: Diffing demo/Glacier2/callback cvs diff: Diffing demo/Ice cvs diff: Diffing demo/Ice/MFC cvs diff: Diffing demo/Ice/MFC/client cvs diff: Diffing demo/Ice/MFC/client/res cvs diff: Diffing demo/Ice/MFC/server cvs diff: Diffing demo/Ice/MFC/server/res cvs diff: Diffing demo/Ice/callback cvs diff: Diffing demo/Ice/hello cvs diff: Diffing demo/Ice/invoke cvs diff: Diffing demo/Ice/latency cvs diff: Diffing demo/Ice/nested cvs diff: Diffing demo/Ice/throughput cvs diff: Diffing demo/Ice/value cvs diff: Diffing demo/IceBox cvs diff: Diffing demo/IceBox/hello cvs diff: Diffing demo/IcePack cvs diff: Diffing demo/IcePack/hello cvs diff: Diffing demo/IcePack/hello/db cvs diff: Diffing demo/IcePack/hello/db/node cvs diff: Diffing demo/IcePack/hello/db/registry cvs diff: Diffing demo/IcePack/simple cvs diff: Diffing demo/IcePack/simple/db cvs diff: Diffing demo/IcePack/simple/db/node cvs diff: Diffing demo/IcePack/simple/db/registry cvs diff: Diffing demo/IceStorm cvs diff: Diffing demo/IceStorm/clock cvs diff: Diffing demo/IceStorm/clock/db cvs diff: Diffing demo/IceUtil cvs diff: Diffing demo/IceUtil/workqueue cvs diff: Diffing demo/book cvs diff: Diffing demo/book/evictor cvs diff: Diffing demo/book/printer cvs diff: Diffing demo/book/simple_filesystem cvs diff: Diffing doc cvs diff: Diffing doc/images cvs diff: Diffing doc/manual cvs diff: Diffing include cvs diff: Diffing include/Freeze cvs diff: Diffing include/Glacier cvs diff: Diffing include/Glacier2 cvs diff: Diffing include/Ice cvs diff: Diffing include/IceBox cvs diff: Diffing include/IcePack cvs diff: Diffing include/IcePatch cvs diff: Diffing include/IceSSL cvs diff: Diffing include/IceStorm cvs diff: Diffing include/IceUtil cvs diff: Diffing include/IceXML cvs diff: Diffing include/Slice cvs diff: Diffing install cvs diff: Diffing install/common cvs diff: Diffing install/vc70 cvs diff: Diffing install/vc70/BerkeleyDBDevKit cvs diff: Diffing install/vc70/BerkeleyDBRuntime cvs diff: Diffing install/vc70/BerkeleyDBRuntimeDebug cvs diff: Diffing install/vc70/Bzip2DevKit cvs diff: Diffing install/vc70/ExpatDevKit cvs diff: Diffing install/vc70/ExpatRuntime cvs diff: Diffing install/vc70/Ice cvs diff: Diffing install/vc70/IceCS cvs diff: Diffing install/vc70/IceDevKit cvs diff: Diffing install/vc70/IcePDB cvs diff: Diffing install/vc70/IceRuntime cvs diff: Diffing install/vc70/IceRuntimeDebug cvs diff: Diffing install/vc70/IceRuntimeDebugPDB cvs diff: Diffing install/vc70/OpenSSLDevKit cvs diff: Diffing install/vc70/OpenSSLRuntime cvs diff: Diffing install/vc70/ThirdParty cvs diff: Diffing install/vc70/ThirdPartyPDB cvs diff: Diffing install/vc71 cvs diff: Diffing lib cvs diff: Diffing slice cvs diff: Diffing slice/Glacier cvs diff: Diffing slice/Glacier2 cvs diff: Diffing slice/Ice cvs diff: Diffing slice/IceBox cvs diff: Diffing slice/IcePack cvs diff: Diffing slice/IcePatch cvs diff: Diffing slice/IceSSL cvs diff: Diffing slice/IceStorm cvs diff: Diffing src cvs diff: Diffing src/Freeze cvs diff: Diffing src/FreezeScript cvs diff: Diffing src/FreezeScript/dummyinclude cvs diff: Diffing src/Glacier cvs diff: Diffing src/Glacier2 cvs diff: Diffing src/Ice cvs diff: Diffing src/IceBox cvs diff: Diffing src/IcePack cvs diff: Diffing src/IcePack/dummyinclude cvs diff: Diffing src/IcePatch cvs diff: Diffing src/IceSSL cvs diff: Diffing src/IceStorm cvs diff: Diffing src/IceStorm/dummyinclude cvs diff: Diffing src/IceUtil cvs diff: Diffing src/IceWall cvs diff: Diffing src/IceXML Index: src/IceXML/Parser.cpp =================================================================== RCS file: /tilde/basraij/work/irad/cvsroot/zeroc/ice/src/IceXML/Parser.cpp,v retrieving revision 1.1.1.1 diff -c -r1.1.1.1 Parser.cpp *** src/IceXML/Parser.cpp 3 Feb 2005 21:58:45 -0000 1.1.1.1 --- src/IceXML/Parser.cpp 9 Feb 2005 22:52:22 -0000 *************** *** 8,14 **** // ********************************************************************** #include ! #include #include #include --- 8,18 ---- // ********************************************************************** #include ! #ifdef ICE_USE_XMLPARSEAPI ! # include ! #else ! # include ! #endif #include #include cvs diff: Diffing src/Slice cvs diff: Diffing src/Slice/dummyinclude cvs diff: Diffing src/icecpp cvs diff: Diffing src/slice2cpp cvs diff: Diffing src/slice2cs cvs diff: Diffing src/slice2docbook cvs diff: Diffing src/slice2freeze cvs diff: Diffing src/slice2freezej cvs diff: Diffing src/slice2java cvs diff: Diffing src/slice2py cvs diff: Diffing src/slice2vb cvs diff: Diffing test cvs diff: Diffing test/Freeze cvs diff: Diffing test/Freeze/complex cvs diff: Diffing test/Freeze/complex/db cvs diff: Diffing test/Freeze/complex/dummyinclude cvs diff: Diffing test/Freeze/dbmap cvs diff: Diffing test/Freeze/dbmap/db cvs diff: Diffing test/Freeze/evictor cvs diff: Diffing test/Freeze/evictor/db cvs diff: Diffing test/FreezeScript cvs diff: Diffing test/FreezeScript/dbmap cvs diff: Diffing test/FreezeScript/dbmap/db cvs diff: Diffing test/FreezeScript/dbmap/fail cvs diff: Diffing test/FreezeScript/evictor cvs diff: Diffing test/FreezeScript/evictor/db cvs diff: Diffing test/Glacier cvs diff: Diffing test/Glacier/starter cvs diff: Diffing test/Glacier2 cvs diff: Diffing test/Glacier2/router cvs diff: Diffing test/Ice cvs diff: Diffing test/Ice/adapterDeactivation cvs diff: Diffing test/Ice/checksum cvs diff: Diffing test/Ice/checksum/client cvs diff: Diffing test/Ice/checksum/server cvs diff: Diffing test/Ice/exceptions cvs diff: Diffing test/Ice/facets cvs diff: Diffing test/Ice/faultTolerance cvs diff: Diffing test/Ice/gc cvs diff: Diffing test/Ice/inheritance cvs diff: Diffing test/Ice/location cvs diff: Diffing test/Ice/objects cvs diff: Diffing test/Ice/operations cvs diff: Diffing test/Ice/slicing cvs diff: Diffing test/Ice/slicing/exceptions cvs diff: Diffing test/Ice/slicing/objects cvs diff: Diffing test/Ice/stream cvs diff: Diffing test/IcePack cvs diff: Diffing test/IcePack/deployer cvs diff: Diffing test/IcePack/deployer/db cvs diff: Diffing test/IcePack/deployer/db/db cvs diff: Diffing test/IcePack/simple cvs diff: Diffing test/IcePack/simple/db cvs diff: Diffing test/IcePack/simple/db/db cvs diff: Diffing test/IceSSL cvs diff: Diffing test/IceSSL/certificateAndKeyParsing cvs diff: Diffing test/IceSSL/certificateVerification cvs diff: Diffing test/IceSSL/certificateVerifier cvs diff: Diffing test/IceSSL/certs cvs diff: Diffing test/IceSSL/configuration cvs diff: Diffing test/IceSSL/loadPEM cvs diff: Diffing test/IceStorm cvs diff: Diffing test/IceStorm/federation cvs diff: Diffing test/IceStorm/federation/db cvs diff: Diffing test/IceStorm/federation2 cvs diff: Diffing test/IceStorm/federation2/db cvs diff: Diffing test/IceStorm/single cvs diff: Diffing test/IceStorm/single/db cvs diff: Diffing test/IceUtil cvs diff: Diffing test/IceUtil/ctrlCHandler cvs diff: Diffing test/IceUtil/inputUtil cvs diff: Diffing test/IceUtil/thread cvs diff: Diffing test/IceUtil/unicode cvs diff: Diffing test/IceUtil/uuid cvs diff: Diffing test/Slice cvs diff: Diffing test/Slice/errorDetection cvs diff: Diffing test/Slice/errorDetection/include cvs diff: Diffing test/include