Menu
▾
▴
[MICO/mt-commit] CVS: mico/daemon Makefile,1.3,1.4 Makefile.win32,1.2,1.3 imr_client.cc,1.3,1.4 imr_impl.cc,1.2,1.3 main.cc,1.4,1.5 poamediator.h,1.6,1.7
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:48
|
Update of /cvsroot/micomt/mico/daemon In directory usw-pr-cvs1:/tmp/cvs-serv31844/daemon Modified Files: Makefile Makefile.win32 imr_client.cc imr_impl.cc main.cc poamediator.h Log Message: - merged with MICO 2.3.7 Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/daemon/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile 29 Jul 2001 21:36:54 -0000 1.3 --- Makefile 23 Mar 2002 20:17:10 -0000 1.4 *************** *** 1,5 **** # ! # MICO --- a free CORBA implementation ! # Copyright (C) 1997 Kay Roemer & Arno Puder # # This program is free software; you can redistribute it and/or modify --- 1,5 ---- # ! # MICO --- an Open Source CORBA implementation ! # Copyright (c) 1997-2002 by The Mico Team # # This program is free software; you can redistribute it and/or modify *************** *** 17,22 **** # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # Send comments and/or bug reports to: ! # mi...@in... # --- 17,22 ---- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # For more information, visit the MICO Home Page at ! # http://www.mico.org/ # *************** *** 24,29 **** LDFLAGS := -L../orb $(LDFLAGS) - LDLIBS := -lmico$(VERSION) $(CONFLIBS) CXXFLAGS := -I. -I../include $(CXXFLAGS) #ifeq ($HAVE_THREADS), yes) --- 24,29 ---- LDFLAGS := -L../orb $(LDFLAGS) CXXFLAGS := -I. -I../include $(CXXFLAGS) + LDLIBS := $(LDMICO) $(CONFLIBS) #ifeq ($HAVE_THREADS), yes) *************** *** 50,54 **** generate: ! mv imr.cc imr.cc.backup cd ../include/mico; mv imr.h imr.h.backup $(IDL) --no-poa --boa --any --name imr --windows-dll --mico-core \ --- 50,54 ---- generate: ! cd ../orb; mv imr.cc imr.cc.backup cd ../include/mico; mv imr.h imr.h.backup $(IDL) --no-poa --boa --any --name imr --windows-dll --mico-core \ *************** *** 58,64 **** $(RM) imr.*.orig mv imr.h ../include/mico ungenerate: ! mv imr.cc.backup imr.cc mv ../include/mico/imr.h.backup ../include/mico/imr.h --- 58,65 ---- $(RM) imr.*.orig mv imr.h ../include/mico + mv imr.cc ../orb ungenerate: ! mv ../orb/imr.cc.backup ../orb/imr.cc mv ../include/mico/imr.h.backup ../include/mico/imr.h *************** *** 67,73 **** --windows-dll --mico-core ../../include/mico/imr.idl $(RM) imr.cc.diffs ! cd ../include/mico; diff -c ../../imr/orig/imr.h imr.h \ ! > ../../imr/imr.cc.diffs || true ! diff -c orig/imr.cc imr.cc >> imr.cc.diffs || true $(RM) -rf orig --- 68,75 ---- --windows-dll --mico-core ../../include/mico/imr.idl $(RM) imr.cc.diffs ! cd ../include/mico; diff -c ../../daemon/orig/imr.h imr.h \ ! > ../../daemon/imr.cc.diffs || true ! cd ../orb; diff -c ../daemon/orig/imr.cc imr.cc \ ! >> imr.cc.diffs || true $(RM) -rf orig *************** *** 75,79 **** clean: ! -$(RM) *.o *.a *~ *.rpo micod imr -$(RM) .depend TAGS core nohup.out --- 77,82 ---- clean: ! -$(RM) micod imr ! -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.objid -$(RM) .depend TAGS core nohup.out Index: Makefile.win32 =================================================================== RCS file: /cvsroot/micomt/mico/daemon/Makefile.win32,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile.win32 26 Oct 2001 19:59:55 -0000 1.2 --- Makefile.win32 23 Mar 2002 20:17:10 -0000 1.3 *************** *** 29,38 **** SRCS = mediator.cc poamediator.cc main.cc STATIC_OBJS = $(SRCS:.cc=.obj) ! prg: micod.exe copy micod.exe ..\win32-bin micod.exe: $(STATIC_OBJS) --- 29,44 ---- SRCS = mediator.cc poamediator.cc main.cc + IMRCLOBJS = imr_client.obj STATIC_OBJS = $(SRCS:.cc=.obj) ! prg: micod.exe imr.exe copy micod.exe ..\win32-bin + copy imr.exe ..\win32-bin + + imr.exe: $(IMRCLOBJS) + $(LINK) $(LINKFLAGS) /subsystem:console /out:imr.exe $(IMRCLOBJS) \ + $(LINK_BUG_OBJS) ..\orb\mico$(VERSION).lib micod.exe: $(STATIC_OBJS) Index: imr_client.cc =================================================================== RCS file: /cvsroot/micomt/mico/daemon/imr_client.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** imr_client.cc 26 Oct 2001 19:59:55 -0000 1.3 --- imr_client.cc 23 Mar 2002 20:17:10 -0000 1.4 *************** *** 26,31 **** --- 26,36 ---- #include <string.h> #include <stdlib.h> + #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS + #include <iostream> + #include <iomanip> + #else #include <iostream.h> #include <iomanip.h> + #endif #include <mico/template_impl.h> Index: imr_impl.cc =================================================================== RCS file: /cvsroot/micomt/mico/daemon/imr_impl.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** imr_impl.cc 26 Oct 2001 19:59:55 -0000 1.2 --- imr_impl.cc 23 Mar 2002 20:17:10 -0000 1.3 *************** *** 26,30 **** --- 26,34 ---- #include <string.h> #include <ctype.h> + #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS + #include <iostream> + #else #include <iostream.h> + #endif #include <mico/util.h> #include <mico/template_impl.h> Index: main.cc =================================================================== RCS file: /cvsroot/micomt/mico/daemon/main.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** main.cc 26 Oct 2001 19:59:55 -0000 1.4 --- main.cc 23 Mar 2002 20:17:10 -0000 1.5 *************** *** 21,31 **** */ #include <sys/types.h> #include <signal.h> #include <iostream.h> #include <fstream.h> ! #include <CORBA.h> ! #include <mico/util.h> ! #include <mico/template_impl.h> #ifndef HAVE_THREADS --- 21,38 ---- */ + #include <CORBA.h> + #include <mico/util.h> + #include <mico/template_impl.h> #include <sys/types.h> #include <signal.h> + #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS + #include <iostream> + #include <iomanip> + #include <fstream> + #else #include <iostream.h> + #include <iomanip.h> #include <fstream.h> ! #endif #ifndef HAVE_THREADS *************** *** 214,224 **** } else { ! ofstream out (reffile.c_str()); ! if (!out) { cerr << "error: cannot open output file " << reffile << endl; ! } ! else { out << imrior << endl; ! out.close (); } } --- 221,231 ---- } else { ! ofstream out (reffile.c_str()); ! if (!out) { cerr << "error: cannot open output file " << reffile << endl; ! } ! else { out << imrior << endl; ! out.close (); } } Index: poamediator.h =================================================================== RCS file: /cvsroot/micomt/mico/daemon/poamediator.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** poamediator.h 26 Oct 2001 19:59:55 -0000 1.6 --- poamediator.h 23 Mar 2002 20:17:10 -0000 1.7 *************** *** 26,30 **** #define __poamediator_h__ - #include <iostream.h> #include <CORBA.h> #include <mico/impl.h> --- 26,29 ---- |
