Menu
▾
▴
micomt-commit — MICO/mt commit notices
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(15) |
Dec
(15) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(23) |
Feb
|
Mar
(25) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Karel G. <kg...@us...> - 2002-05-14 07:43:20
|
Update of /cvsroot/micomt/mico/coss/naming In directory usw-pr-cvs1:/tmp/cvs-serv30780 Modified Files: Makefile Log Message: - fix compilation of nsadmin Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/coss/naming/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Makefile 23 Mar 2002 20:17:10 -0000 1.8 --- Makefile 14 May 2002 07:43:15 -0000 1.9 *************** *** 55,59 **** nsadmin: $(CLNT_OBJS) ../../orb/$(LIBMICO) ! $(CXX) $(CXXFLAGS) $(LDFLAGS) $(CLNT_OBJS) $(ALLLIBS) -o nsadmin $(POSTLD) $@ --- 55,59 ---- nsadmin: $(CLNT_OBJS) ../../orb/$(LIBMICO) ! $(CXX) $(CXXFLAGS) $(LDFLAGS) $(CLNT_OBJS) $(LDLIBS) -o nsadmin $(POSTLD) $@ |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:51
|
Update of /cvsroot/micomt/mico/demo/poa/account-1 In directory usw-pr-cvs1:/tmp/cvs-serv31844/demo/poa/account-1 Modified Files: account Log Message: - merged with MICO 2.3.7 Index: account =================================================================== RCS file: /cvsroot/micomt/mico/demo/poa/account-1/account,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** account 26 Oct 2001 19:59:57 -0000 1.2 --- account 23 Mar 2002 20:17:11 -0000 1.3 *************** *** 6,10 **** # run Server rm -f Bank.ref ! ./server -ORBIIOPAddr inet:localhost:6666 & server_pid=$! --- 6,10 ---- # run Server rm -f Bank.ref ! ./server & server_pid=$! |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:50
|
Update of /cvsroot/micomt/mico/demo/ccm/hello
In directory usw-pr-cvs1:/tmp/cvs-serv31844/demo/ccm/hello
Modified Files:
Makefile README hello_impl.cc
Log Message:
- merged with MICO 2.3.7
Index: Makefile
===================================================================
RCS file: /cvsroot/micomt/mico/demo/ccm/hello/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile 6 Jul 2001 22:15:07 -0000 1.1
--- Makefile 23 Mar 2002 20:17:11 -0000 1.2
***************
*** 6,10 ****
INSTALL_DIR = ccm/hello
! INSTALL_SRCS = Makefile client.cc hello.idl
INSTALL_SCRIPTS = hello
--- 6,10 ----
INSTALL_DIR = ccm/hello
! INSTALL_SRCS = README Makefile client.cc hello.idl hello_impl.cc
INSTALL_SCRIPTS = hello
***************
*** 27,31 ****
hello_ccm.cc hello_ccm.h: hello.idl
! $(CCMGEN) $^
hello.cc hello.h: hello.idl
--- 27,31 ----
hello_ccm.cc hello_ccm.h: hello.idl
! $(CCMGEN) --standalone $^
hello.cc hello.h: hello.idl
Index: README
===================================================================
RCS file: /cvsroot/micomt/mico/demo/ccm/hello/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** README 6 Jul 2001 22:15:07 -0000 1.1
--- README 23 Mar 2002 20:17:11 -0000 1.2
***************
*** 11,12 ****
--- 11,13 ----
interface, configures the message to "Hello World", and then calls sayHello.
+ This one builds the component into a standalone server.
Index: hello_impl.cc
===================================================================
RCS file: /cvsroot/micomt/mico/demo/ccm/hello/hello_impl.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** hello_impl.cc 6 Jul 2001 22:15:07 -0000 1.1
--- hello_impl.cc 23 Mar 2002 20:17:11 -0000 1.2
***************
*** 1,4 ****
! #include "hello_ccm.h"
class HelloWorld_impl : virtual public CCM_HelloWorld {
--- 1,4 ----
! #include "hello.h"
class HelloWorld_impl : virtual public CCM_HelloWorld {
***************
*** 23,27 ****
class HelloHome_impl : virtual public CCM_HelloHome {
public:
! CCM_HelloWorld * create ()
{
return new HelloWorld_impl;
--- 23,27 ----
class HelloHome_impl : virtual public CCM_HelloHome {
public:
! Components::EnterpriseComponent_ptr create ()
{
return new HelloWorld_impl;
***************
*** 30,35 ****
extern "C" {
! CCM_HelloHome *
! create_HelloHome ()
{
return new HelloHome_impl;
--- 30,34 ----
extern "C" {
! Components::HomeExecutorBase_ptr create_HelloHome ()
{
return new HelloHome_impl;
|
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:50
|
Update of /cvsroot/micomt/mico/doc
In directory usw-pr-cvs1:/tmp/cvs-serv31844/doc
Modified Files:
FrameDescription.html
Log Message:
- merged with MICO 2.3.7
Index: FrameDescription.html
===================================================================
RCS file: /cvsroot/micomt/mico/doc/FrameDescription.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FrameDescription.html 26 Oct 2001 19:59:57 -0000 1.2
--- FrameDescription.html 23 Mar 2002 20:17:12 -0000 1.3
***************
*** 71,83 ****
<LI> Interface Repository (IR)
<LI> IIOP as native protocol (ORB prepared for multiprotocol support)
- <LI> Support for nested method invocations
- <LI> <TT>Any</TT> offers an interface for inserting and extracting
- constructed types that were not known at compile time
- <LI> Full BOA implementation, including all activation modes,
- support for object migration and the implementation repository
- <LI> BOA can load object implementations into clients at runtime using
- loadable modules
<LI> Portable Object Adapter (POA)
<LI> Objects by Value (OBV)
<LI> Support for using MICO from within X11 applications (Xt, Qt, and Gtk)
and Tcl/Tk
--- 71,77 ----
<LI> Interface Repository (IR)
<LI> IIOP as native protocol (ORB prepared for multiprotocol support)
<LI> Portable Object Adapter (POA)
<LI> Objects by Value (OBV)
+ <LI> CORBA Components (CCM)
<LI> Support for using MICO from within X11 applications (Xt, Qt, and Gtk)
and Tcl/Tk
***************
*** 85,88 ****
--- 79,89 ----
<LI> Interceptors
<LI> Support for secure communication and authentication using SSL
+ <LI> Support for nested method invocations
+ <LI> <TT>Any</TT> offers an interface for inserting and extracting
+ constructed types that were not known at compile time
+ <LI> Full BOA implementation, including all activation modes,
+ support for object migration and the implementation repository
+ <LI> BOA can load object implementations into clients at runtime using
+ loadable modules
<LI> CORBA Services:
<UL>
***************
*** 109,113 ****
<LI> MICO/MT (funded by AT&T Broadband)
<LI> CORBASec L2 (funded by Deutsche Telekom)
! <LI> CORBA Components (funded by Alcatel)
</UL>
--- 110,114 ----
<LI> MICO/MT (funded by AT&T Broadband)
<LI> CORBASec L2 (funded by Deutsche Telekom)
! <LI> <a href="http://www.fpx.de/MicoCCM/" TARGET="_top">CORBA Components</a> (funded by Alcatel)
</UL>
***************
*** 166,170 ****
<li> SGI-IRIX on DEC Mips (gcc 2.95, native C++ compiler)
<li> PowerMax OS (native C++ compiler)
! <li> Windows 95/NT (Visual-C++ 5+SP3 and 6+SP1, Cygwin or MinGW)
<li> FreeBSD 3.x on Intel x86 (gcc 2.95)
</ul>
--- 167,171 ----
<li> SGI-IRIX on DEC Mips (gcc 2.95, native C++ compiler)
<li> PowerMax OS (native C++ compiler)
! <li> Windows 9x/NT (Visual-C++ 5+SP3 and 6+SP1, Cygwin or MinGW)
<li> FreeBSD 3.x on Intel x86 (gcc 2.95)
</ul>
***************
*** 289,300 ****
<UL>
- <LI> <A HREF="doc/doc.html">Online documentation</A>
<LI> <A HREF="doc.ps.gz">Single PostScript file</A>
<LI> <A HREF="doc-book.ps.gz">PostScript file in booklet form
(requires two sided printing capabilities)</A>
! <LI> <A HREF="doc-html.tar.gz">Set of downloadable HTML pages</A>
! <LI> <A HREF="http://www.mico.org/mailman/listinfo/">Searchable
mailing list archive</A>
<LI> <A HREF="FAQ">Frequently Asked Questions (FAQ)</A>
</UL>
--- 290,301 ----
<UL>
<LI> <A HREF="doc.ps.gz">Single PostScript file</A>
<LI> <A HREF="doc-book.ps.gz">PostScript file in booklet form
(requires two sided printing capabilities)</A>
! <LI> <A HREF="http://www.mico.org/mailman/listinfo/mico-devel">Searchable
mailing list archive</A>
<LI> <A HREF="FAQ">Frequently Asked Questions (FAQ)</A>
+ <LI> <A HREF="doc/doc.html">Online documentation</A>
+ <LI> <A HREF="doc-html.tar.gz">Set of downloadable HTML pages</A>
</UL>
|
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:50
|
Update of /cvsroot/micomt/mico/demo/codesets
In directory usw-pr-cvs1:/tmp/cvs-serv31844/demo/codesets
Modified Files:
client.cc hello.idl runit server.cc
Log Message:
- merged with MICO 2.3.7
Index: client.cc
===================================================================
RCS file: /cvsroot/micomt/mico/demo/codesets/client.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** client.cc 3 Nov 1999 23:20:52 -0000 1.1.1.1
--- client.cc 23 Mar 2002 20:17:11 -0000 1.2
***************
*** 4,7 ****
--- 4,15 ----
#include "hello.h"
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+
+ #ifdef _WINDOWS
+ #include <direct.h>
+ #endif
+
int
***************
*** 11,23 ****
CORBA::BOA_var boa = orb->BOA_init (argc, argv, "mico-local-boa");
! assert (argc == 2);
! CORBA::Object_var obj = orb->bind ("IDL:Hello:1.0", argv[1]);
if (CORBA::is_nil (obj)) {
! cerr << "cannot bind to " << argv[1] << endl;
return 1;
}
Hello_var hello = Hello::_narrow (obj);
! CORBA::String_var s = hello->hello ("öäü");
cout << s.in() << endl;
--- 19,37 ----
CORBA::BOA_var boa = orb->BOA_init (argc, argv, "mico-local-boa");
! /*
! * IOR is in server.ref in the local directory
! */
!
! char pwd[256], uri[300];
! sprintf (uri, "file://%s/server.ref", getcwd(pwd, 256));
!
! CORBA::Object_var obj = orb->string_to_object (uri);
if (CORBA::is_nil (obj)) {
! cerr << "cannot bind to " << uri << endl;
return 1;
}
Hello_var hello = Hello::_narrow (obj);
! CORBA::String_var s = hello->sayHello ("öäü");
cout << s.in() << endl;
Index: hello.idl
===================================================================
RCS file: /cvsroot/micomt/mico/demo/codesets/hello.idl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** hello.idl 3 Nov 1999 23:20:52 -0000 1.1.1.1
--- hello.idl 23 Mar 2002 20:17:11 -0000 1.2
***************
*** 1,3 ****
interface Hello {
! string hello (in string s);
};
--- 1,3 ----
interface Hello {
! string sayHello (in string s);
};
Index: runit
===================================================================
RCS file: /cvsroot/micomt/mico/demo/codesets/runit,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** runit 3 Nov 1999 23:20:52 -0000 1.1.1.1
--- runit 23 Mar 2002 20:17:11 -0000 1.2
***************
*** 4,9 ****
export MICORC
- ADDR=inet:`uname -n`:12123
-
#
# there are two ORB options to specify the code sets the application
--- 4,7 ----
***************
*** 17,21 ****
# server speaks ISO-8859-1 (Latin1)
! ./server -ORBIIOPAddr $ADDR -ORBNativeCS '*8859-1*' &
server_pid=$!
--- 15,19 ----
# server speaks ISO-8859-1 (Latin1)
! ./server -ORBNativeCS '*8859-1*' -ORBGIOPVersion 1.2 -ORBIIOPVersion 1.2 &
server_pid=$!
***************
*** 25,28 ****
# client speaks HTML
! ./client $ADDR -ORBNativeCS '*HTML*'
--- 23,26 ----
# client speaks HTML
! ./client -ORBNativeCS '*HTML*' -ORBGIOPVersion 1.2 -ORBIIOPVersion 1.2
Index: server.cc
===================================================================
RCS file: /cvsroot/micomt/mico/demo/codesets/server.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** server.cc 3 Nov 1999 23:20:52 -0000 1.1.1.1
--- server.cc 23 Mar 2002 20:17:11 -0000 1.2
***************
*** 2,10 ****
#include <CORBA-SMALL.h>
#include <iostream.h>
#include "hello.h"
class Hello_impl : virtual public Hello_skel {
public:
! char *hello (const char *s)
{
cout << s << endl;
--- 2,11 ----
#include <CORBA-SMALL.h>
#include <iostream.h>
+ #include <fstream.h>
#include "hello.h"
class Hello_impl : virtual public Hello_skel {
public:
! char *sayHello (const char *s)
{
cout << s << endl;
***************
*** 19,23 ****
CORBA::BOA_var boa = orb->BOA_init (argc, argv, "mico-local-boa");
! (void)new Hello_impl;
boa->impl_is_ready (CORBA::ImplementationDef::_nil());
--- 20,29 ----
CORBA::BOA_var boa = orb->BOA_init (argc, argv, "mico-local-boa");
! Hello_impl * hi = new Hello_impl;
!
! ofstream of ("server.ref");
! CORBA::String_var str = orb->object_to_string (hi);
! of << str.in() << endl;
! of.close ();
boa->impl_is_ready (CORBA::ImplementationDef::_nil());
|
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:50
|
Update of /cvsroot/micomt/mico/demo/shlib
In directory usw-pr-cvs1:/tmp/cvs-serv31844/demo/shlib
Modified Files:
client.cc hello hello.idl server.cc
Log Message:
- merged with MICO 2.3.7
Index: client.cc
===================================================================
RCS file: /cvsroot/micomt/mico/demo/shlib/client.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** client.cc 3 Nov 1999 23:20:52 -0000 1.1.1.1
--- client.cc 23 Mar 2002 20:17:11 -0000 1.2
***************
*** 37,41 ****
return 1;
}
! Hello_var h = Hello::_narrow (obj);
h->hello ("hello world");
return 0;
--- 37,41 ----
return 1;
}
! HelloWorld_var h = HelloWorld::_narrow (obj);
h->hello ("hello world");
return 0;
Index: hello
===================================================================
RCS file: /cvsroot/micomt/mico/demo/shlib/hello,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** hello 3 Nov 1999 23:20:52 -0000 1.1.1.1
--- hello 23 Mar 2002 20:17:11 -0000 1.2
***************
*** 11,15 ****
trap "kill $micod_pid" 0
! imr create Hello library `pwd`/server.s? IDL:Hello:1.0 \
-ORBImplRepoAddr $ADDR
--- 11,15 ----
trap "kill $micod_pid" 0
! imr create HelloWorld library `pwd`/server.s? IDL:HelloWorld:1.0 \
-ORBImplRepoAddr $ADDR
Index: hello.idl
===================================================================
RCS file: /cvsroot/micomt/mico/demo/shlib/hello.idl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** hello.idl 3 Nov 1999 23:20:52 -0000 1.1.1.1
--- hello.idl 23 Mar 2002 20:17:11 -0000 1.2
***************
*** 1,3 ****
! interface Hello {
void hello (in string s);
};
--- 1,3 ----
! interface HelloWorld {
void hello (in string s);
};
Index: server.cc
===================================================================
RCS file: /cvsroot/micomt/mico/demo/shlib/server.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** server.cc 3 Nov 1999 23:20:52 -0000 1.1.1.1
--- server.cc 23 Mar 2002 20:17:11 -0000 1.2
***************
*** 26,30 ****
#include "hello.h"
! class Hello_impl : virtual public Hello_skel {
public:
void hello (const char *s)
--- 26,30 ----
#include "hello.h"
! class HelloWorld_impl : virtual public HelloWorld_skel {
public:
void hello (const char *s)
***************
*** 34,38 ****
};
! static Hello_ptr server = Hello::_nil();
extern "C" CORBA::Boolean
--- 34,38 ----
};
! static HelloWorld_ptr server = HelloWorld::_nil();
extern "C" CORBA::Boolean
***************
*** 41,45 ****
if (strcmp (version, MICO_VERSION))
return FALSE;
! server = new Hello_impl;
return TRUE;
}
--- 41,45 ----
if (strcmp (version, MICO_VERSION))
return FALSE;
! server = new HelloWorld_impl;
return TRUE;
}
|
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:49
|
Update of /cvsroot/micomt/mico/demo/ccm In directory usw-pr-cvs1:/tmp/cvs-serv31844/demo/ccm Modified Files: Makefile Log Message: - merged with MICO 2.3.7 Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/demo/ccm/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Makefile 6 Jul 2001 22:15:07 -0000 1.1 --- Makefile 23 Mar 2002 20:17:11 -0000 1.2 *************** *** 4,8 **** include ../MakeVars ! DIRS=hello philo subs: --- 4,8 ---- include ../MakeVars ! DIRS=hello hello2 philo events subs: |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:48
|
Update of /cvsroot/micomt/mico/cpp In directory usw-pr-cvs1:/tmp/cvs-serv31844/cpp Modified Files: Makefile cccp.c config.h Log Message: - merged with MICO 2.3.7 Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/cpp/Makefile,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** Makefile 6 Jan 2001 23:17:47 -0000 1.1.1.2 --- Makefile 23 Mar 2002 20:17:10 -0000 1.2 *************** *** 27,31 **** ! LDFLAGS := -L. -L../orb $(LDFLAGS) LDLIBS := CFLAGS := -DHAVE_CONFIG_H -I. -I../include $(CFLAGS) --- 27,31 ---- ! LDFLAGS := -L. $(LDFLAGS) LDLIBS := CFLAGS := -DHAVE_CONFIG_H -I. -I../include $(CFLAGS) Index: cccp.c =================================================================== RCS file: /cvsroot/micomt/mico/cpp/cccp.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** cccp.c 3 Nov 1999 23:20:51 -0000 1.1.1.1 --- cccp.c 23 Mar 2002 20:17:10 -0000 1.2 *************** *** 317,320 **** --- 317,325 ---- HOST_WIDE_INT parse_c_expression PROTO((char *)); + #ifdef _WINDOWS + #define index strchr + #define rindex strrchr + #endif + #ifndef errno extern int errno; Index: config.h =================================================================== RCS file: /cvsroot/micomt/mico/cpp/config.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** config.h 6 Jan 2001 23:17:49 -0000 1.1.1.2 --- config.h 23 Mar 2002 20:17:10 -0000 1.2 *************** *** 1,3 **** ! #ifdef _WINDOWS #include <mico/config-win32.h> #include <io.h> --- 1,3 ---- ! #if defined(_WINDOWS) && !defined(__MINGW32__) #include <mico/config-win32.h> #include <io.h> *************** *** 5,19 **** #include <stdlib.h> - #ifndef __MINGW32__ #pragma warning (disable: 4018) char *index( char *s, char c ); char *rindex( char *s, char c ); #else #define index(s,c) strchr(s,c) #define rindex(s,c) strrchr(s,c) #endif - #else - #include <mico/config.h> #endif --- 5,21 ---- #include <stdlib.h> #pragma warning (disable: 4018) char *index( char *s, char c ); char *rindex( char *s, char c ); + #else + + #include <mico/config.h> + + #ifdef __MINGW32__ #define index(s,c) strchr(s,c) #define rindex(s,c) strrchr(s,c) #endif #endif |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:48
|
Update of /cvsroot/micomt/mico/demo In directory usw-pr-cvs1:/tmp/cvs-serv31844/demo Modified Files: MakeVars MakeVars.install.in Log Message: - merged with MICO 2.3.7 Index: MakeVars =================================================================== RCS file: /cvsroot/micomt/mico/demo/MakeVars,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** MakeVars 3 Nov 1999 23:20:52 -0000 1.1.1.1 --- MakeVars 23 Mar 2002 20:17:11 -0000 1.2 *************** *** 1,6 **** # -*- Makefile -*- # ! # MICO --- a CORBA 2.0 implementation ! # Copyright (C) 1997 Kay Roemer & Arno Puder # # This program is free software; you can redistribute it and/or modify --- 1,6 ---- # -*- Makefile -*- # ! # 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 *************** *** 18,23 **** # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # Send comments and/or bug reports to: ! # mi...@in... # --- 18,23 ---- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # For more information, visit the MICO Home Page at ! # http://www.mico.org/ # *************** *** 28,32 **** CXXFLAGS := -I. -I$(DIR_PREFIX)../../include $(CXXFLAGS) $(EHFLAGS) CFLAGS := -I. -I$(DIR_PREFIX)../../include $(CFLAGS) ! LDLIBS := -lmico$(VERSION) $(CONFLIBS) LDFLAGS := -L$(DIR_PREFIX)../../libs $(LDFLAGS) DEPS := $(DIR_PREFIX)../../orb/$(LIBMICO) --- 28,32 ---- CXXFLAGS := -I. -I$(DIR_PREFIX)../../include $(CXXFLAGS) $(EHFLAGS) CFLAGS := -I. -I$(DIR_PREFIX)../../include $(CFLAGS) ! LDLIBS := $(LDMICO) $(CONFLIBS) LDFLAGS := -L$(DIR_PREFIX)../../libs $(LDFLAGS) DEPS := $(DIR_PREFIX)../../orb/$(LIBMICO) *************** *** 34,44 **** AUX_CXXFLAGS = ! AUX_LDLIBS = -lmicoaux$(VERSION) AUX_LDFLAGS = ! ifeq ($(HAVE_STATIC), yes) ! AUX_DEPS = $(DIR_PREFIX)../../auxdir/libmicoaux$(VERSION).a ! else ! AUX_DEPS = $(DIR_PREFIX)../../auxdir/libmicoaux$(VERSION).$(SOEXT) ! endif X11_CXXFLAGS = $(X_CFLAGS) --- 34,40 ---- AUX_CXXFLAGS = ! AUX_LDLIBS = $(LDMICOAUX) AUX_LDFLAGS = ! AUX_DEPS = $(DIR_PREFIX)../../auxdir/$(LIBMICOAUX) X11_CXXFLAGS = $(X_CFLAGS) Index: MakeVars.install.in =================================================================== RCS file: /cvsroot/micomt/mico/demo/MakeVars.install.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** MakeVars.install.in 6 Jul 2001 22:15:06 -0000 1.2 --- MakeVars.install.in 23 Mar 2002 20:17:11 -0000 1.3 *************** *** 1,6 **** # -*- Makefile -*- # ! # MICO --- a CORBA 2.0 implementation ! # Copyright (C) 1997 Kay Roemer & Arno Puder # # This program is free software; you can redistribute it and/or modify --- 1,6 ---- # -*- Makefile -*- # ! # MICO --- an Open Source CORBA implementation ! # Copyright (c) 1997-2001 by The Mico Team # # This program is free software; you can redistribute it and/or modify *************** *** 18,23 **** # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # Send comments and/or bug reports to: ! # mi...@in... # --- 18,23 ---- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # For more information, visit the MICO Home Page at ! # http://www.mico.org/ # |
|
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 ---- |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:48
|
Update of /cvsroot/micomt/mico/coss/naming In directory usw-pr-cvs1:/tmp/cvs-serv31844/coss/naming Modified Files: Makefile NamingClient.cc Naming_impl.cc nsd.cc Log Message: - merged with MICO 2.3.7 Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/coss/naming/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Makefile 15 Mar 2001 18:52:13 -0000 1.7 --- Makefile 23 Mar 2002 20:17:10 -0000 1.8 *************** *** 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-2001 by The Mico Team # # This program is free software; you can redistribute it and/or modify *************** *** 17,28 **** # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # Send comments and/or bug reports to: ! # mi...@in... # include ../../MakeVars ! LDLIBS = -lmicocoss$(VERSION) -lmico$(VERSION) $(CONFLIBS) ! ALLLIBS = -lmicocoss$(VERSION) -lmico$(VERSION) $(CURSESLIBS) $(CONFLIBS) LDFLAGS := -L.. -L../../orb $(LDFLAGS) CXXFLAGS := -I. -I../../include $(CXXFLAGS) $(EHFLAGS) --- 17,28 ---- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # For more information, visit the MICO Home Page at ! # http://www.mico.org/ # include ../../MakeVars ! LDLIBS = $(LDMICOCOSS) $(LDMICO) $(CONFLIBS) ! ALLLIBS = $(LDMICOCOSS) $(LDMICO) $(CURSESLIBS) LDFLAGS := -L.. -L../../orb $(LDFLAGS) CXXFLAGS := -I. -I../../include $(CXXFLAGS) $(EHFLAGS) Index: NamingClient.cc =================================================================== RCS file: /cvsroot/micomt/mico/coss/naming/NamingClient.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** NamingClient.cc 15 Mar 2001 18:52:13 -0000 1.10 --- NamingClient.cc 23 Mar 2002 20:17:10 -0000 1.11 *************** *** 342,347 **** { if(i<0) str << '/'; ! str << name[i].id; ! if(strlen(name[i].kind)>0) str << '.' << name[i].kind; } } --- 342,347 ---- { if(i<0) str << '/'; ! str << name[i].id.in(); ! if(strlen(name[i].kind.in())>0) str << '.' << name[i].kind.in(); } } Index: Naming_impl.cc =================================================================== RCS file: /cvsroot/micomt/mico/coss/naming/Naming_impl.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** Naming_impl.cc 8 Jan 2001 16:55:31 -0000 1.11 --- Naming_impl.cc 23 Mar 2002 20:17:10 -0000 1.12 *************** *** 23,28 **** --- 23,33 ---- #include <CORBA.h> + #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS + #include <iostream> + #include <fstream> + #else #include <iostream.h> #include <fstream.h> + #endif #include <Naming_impl.h> #include <mico/util.h> Index: nsd.cc =================================================================== RCS file: /cvsroot/micomt/mico/coss/naming/nsd.cc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** nsd.cc 25 Aug 2001 18:41:15 -0000 1.12 --- nsd.cc 23 Mar 2002 20:17:10 -0000 1.13 *************** *** 28,33 **** --- 28,38 ---- #include <signal.h> #include <unistd.h> + #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS + #include <iostream> + #include <fstream> + #else #include <iostream.h> #include <fstream.h> + #endif #include <mico/template_impl.h> #include <mico/util.h> *************** *** 195,205 **** } else { ! ofstream out (reffile.c_str()); ! if (!out) { cerr << "error: cannot open output file " << reffile << endl; ! } ! else { out << nsior << endl; ! out.close (); } } --- 200,210 ---- } else { ! ofstream out (reffile.c_str()); ! if (!out) { cerr << "error: cannot open output file " << reffile << endl; ! } ! else { out << nsior << endl; ! out.close (); } } |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:47
|
Update of /cvsroot/micomt/mico/coss/events
In directory usw-pr-cvs1:/tmp/cvs-serv31844/coss/events
Modified Files:
CosEvent_impl.cc Makefile main.cc
Log Message:
- merged with MICO 2.3.7
Index: CosEvent_impl.cc
===================================================================
RCS file: /cvsroot/micomt/mico/coss/events/CosEvent_impl.cc,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -C2 -r1.1.1.3 -r1.2
*** CosEvent_impl.cc 6 Jan 2001 23:17:42 -0000 1.1.1.3
--- CosEvent_impl.cc 23 Mar 2002 20:17:10 -0000 1.2
***************
*** 55,60 ****
void ProxyPushConsumer_impl::disconnect_push_consumer ()
{
! if (!CORBA::is_nil (supplier) && !supplier->_non_existent()) {
supplier->disconnect_push_supplier();
}
supplier = CosEventComm::PushSupplier::_nil();
--- 55,67 ----
void ProxyPushConsumer_impl::disconnect_push_consumer ()
{
! if (!CORBA::is_nil (supplier)) {
! #ifdef HAVE_EXCEPTIONS
! try {
! #endif
supplier->disconnect_push_supplier();
+ #ifdef HAVE_EXCEPTIONS
+ } catch (...) {
+ }
+ #endif
}
supplier = CosEventComm::PushSupplier::_nil();
***************
*** 80,85 ****
void ProxyPushSupplier_impl::disconnect_push_supplier ()
{
! if (!CORBA::is_nil (consumer) && !consumer->_non_existent()) {
consumer->disconnect_push_consumer();
}
int was_connected = !CORBA::is_nil (consumer);
--- 87,99 ----
void ProxyPushSupplier_impl::disconnect_push_supplier ()
{
! if (!CORBA::is_nil (consumer)) {
! #ifdef HAVE_EXCEPTIONS
! try {
! #endif
consumer->disconnect_push_consumer();
+ #ifdef HAVE_EXCEPTIONS
+ } catch (...) {
+ }
+ #endif
}
int was_connected = !CORBA::is_nil (consumer);
Index: Makefile
===================================================================
RCS file: /cvsroot/micomt/mico/coss/events/Makefile,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -C2 -r1.1.1.3 -r1.2
*** Makefile 8 Feb 2001 15:06:16 -0000 1.1.1.3
--- Makefile 23 Mar 2002 20:17:10 -0000 1.2
***************
*** 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-2001 by The Mico Team
#
# This program is free software; you can redistribute it and/or modify
***************
*** 17,27 ****
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
! # Send comments and/or bug reports to:
! # mi...@in...
#
include ../../MakeVars
! LDLIBS = -lmicocoss$(VERSION) -lmico$(VERSION) $(CONFLIBS)
LDFLAGS := -L.. -L.. -L../../orb $(LDFLAGS)
CXXFLAGS := -I. -I../../include $(CXXFLAGS) $(EHFLAGS)
--- 17,27 ----
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
! # For more information, visit the MICO Home Page at
! # http://www.mico.org/
#
include ../../MakeVars
! LDLIBS = $(LDMICOCOSS) $(LDMICO) $(CONFLIBS)
LDFLAGS := -L.. -L.. -L../../orb $(LDFLAGS)
CXXFLAGS := -I. -I../../include $(CXXFLAGS) $(EHFLAGS)
Index: main.cc
===================================================================
RCS file: /cvsroot/micomt/mico/coss/events/main.cc,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -r1.1.1.2 -r1.2
*** main.cc 6 Jan 2001 23:17:42 -0000 1.1.1.2
--- main.cc 23 Mar 2002 20:17:10 -0000 1.2
***************
*** 27,32 ****
--- 27,37 ----
#include <signal.h>
#include <unistd.h>
+ #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS
+ #include <iostream>
+ #include <fstream>
+ #else
#include <iostream.h>
#include <fstream.h>
+ #endif
#include <mico/template_impl.h>
#include <mico/util.h>
|
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:46
|
Update of /cvsroot/micomt/mico/coss/externalization In directory usw-pr-cvs1:/tmp/cvs-serv31844/coss/externalization Modified Files: Stream_impl.cc extcriteriad.cc Log Message: - merged with MICO 2.3.7 Index: Stream_impl.cc =================================================================== RCS file: /cvsroot/micomt/mico/coss/externalization/Stream_impl.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Stream_impl.cc 6 Jan 2001 23:17:43 -0000 1.1.1.1 --- Stream_impl.cc 23 Mar 2002 20:17:10 -0000 1.2 *************** *** 32,36 **** --- 32,40 ---- #include <list> #include <algorithm> + #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS #include <iostream> + #else + #include <iostream.h> + #endif typedef map<RoleNameKey,CosGraphs::Traversal::TraversalScopedId,less<RoleNameKey> > WorkedRoles; Index: extcriteriad.cc =================================================================== RCS file: /cvsroot/micomt/mico/coss/externalization/extcriteriad.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** extcriteriad.cc 6 Jan 2001 23:17:43 -0000 1.1.1.1 --- extcriteriad.cc 23 Mar 2002 20:17:10 -0000 1.2 *************** *** 24,29 **** --- 24,35 ---- + #include <CORBA.h> + #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS + #include <iostream> + #include <fstream> + #else #include <iostream.h> #include <fstream.h> + #endif #include <unistd.h> #include <mico/ExternalizationPropagationCriteriaFactory_impl.h> |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:46
|
Update of /cvsroot/micomt/mico/coss/lifecycle In directory usw-pr-cvs1:/tmp/cvs-serv31844/coss/lifecycle Modified Files: lifecriteriad.cc Log Message: - merged with MICO 2.3.7 Index: lifecriteriad.cc =================================================================== RCS file: /cvsroot/micomt/mico/coss/lifecycle/lifecriteriad.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** lifecriteriad.cc 6 Jan 2001 23:17:43 -0000 1.1.1.1 --- lifecriteriad.cc 23 Mar 2002 20:17:10 -0000 1.2 *************** *** 24,29 **** --- 24,35 ---- + #include <CORBA.h> + #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS + #include <iostream> + #include <fstream> + #else #include <iostream.h> #include <fstream.h> + #endif #include <unistd.h> #include <mico/CosCompoundLifeCycle.h> |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:45
|
Update of /cvsroot/micomt/mico In directory usw-pr-cvs1:/tmp/cvs-serv31844 Modified Files: CHANGES CHANGES.mt INSTALL MakeVars.in MakeVars.win32 Makefile README-WIN32 VERSION acconfig.h aclocal.m4 configure configure.in Log Message: - merged with MICO 2.3.7 Index: CHANGES =================================================================== RCS file: /cvsroot/micomt/mico/CHANGES,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** CHANGES 26 Oct 2001 19:59:54 -0000 1.6 --- CHANGES 23 Mar 2002 20:17:09 -0000 1.7 *************** *** 1,3 **** --- 1,43 ---- + version 2.3.7 + + - plug memory leak for strings in skeletons (Jens Horstmann) + - avoid redoing completed invocations from within their completion + callback (Rob Ratcliff) + - fix problem in UnknownUserException (David Eriksson) + - fix problem with forward declarations in a different file (Uwe Maurer) + - some more support for MinGW; see INSTALL + - fix assert in the DII if an unknown exception is received + - improve const correctness (Christian Loose) + - initial implementation of ORB::destroy (Uwe Maurer) + - prefix parameter names in stub and skeleton to avoid name clashes + - fix handling native in IDL code generator + - fix problem feeding native types to an IR (Frank Bielig) + - fix StringValue problem in Windows (Eric) + - fix digraph problem in generated code (Vsevolod Novikov) + - fix negative integer constants (Sergey Volk) + - fix bug with multi-byte native character sets (Ulrich Hoffmann) + - make the Interface Repository use a persistent reference + - fix IDL problem with inheriting an interface with the same name but + in a different module + - when an implementation throws an unexpected exception, deliver + UNKNOWN + - make IDL compiler work with mutual inclusion + - fix nsadmin link error on some linux systems (Hann Wei Toh) + - implemented library activation mode for Windows (Denis Pavlina) + - work around a problem in JDK's ORB receiving wstrings from us + - fix aCC problem in the Naming Service (Andrew Marlow) + - avoid infinite recursion in DynamicAny::DynValue + - make -ORBNoCodeSets disable all codeset-related stuff, strings and + wstrings are just copied (the latter as 16-bit shorts) + - support GIOP 1.2 fragments + - some fixes for Ansi C++ (<iostream>, <sstream>, ios::noreplace) + - fix TimeService timezone for FreeBSD + - fix chunked valuetype encoding + - Update Interface Repository to ccm/01-08-01 + - Implement attribute exceptions + - Implement IDL "import" statement as a replacement for #include. + "import CosNaming" is equivalent to #include <CosNaming.idl>. + version 2.3.6 Index: CHANGES.mt =================================================================== RCS file: /cvsroot/micomt/mico/CHANGES.mt,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** CHANGES.mt 5 Jan 2002 12:54:08 -0000 1.37 --- CHANGES.mt 23 Mar 2002 20:17:09 -0000 1.38 *************** *** 1,3 **** --- 1,5 ---- + - merged with MICO 2.3.7 + version 2.3.6 Index: INSTALL =================================================================== RCS file: /cvsroot/micomt/mico/INSTALL,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** INSTALL 26 Oct 2001 19:59:54 -0000 1.2 --- INSTALL 23 Mar 2002 20:17:09 -0000 1.3 *************** *** 23,28 **** ! Win32 (Windows 95/98/ME/NT/2000) ! -------------------------------- On Win32, you have several options for compiling Mico. The most common --- 23,28 ---- ! Win32 (Windows 95/98/ME/NT/2000/XP) ! ----------------------------------- On Win32, you have several options for compiling Mico. The most common *************** *** 39,47 **** to the Windows environment. Other than Cygwin, MinGW does not include a Posix emulation library but is based on the standard Win32 API ! (for more details, see http://www.mingw.org/). You will have to ! install Cygwin to get access to its shell and its command-line tools ! such as make, and then to set up your PATH so that the MinGW compiler ! and its libraries are picked up instead of Cygwin's. Read the note ! about MinGW in the CHANGES file. --- 39,59 ---- to the Windows environment. Other than Cygwin, MinGW does not include a Posix emulation library but is based on the standard Win32 API ! (for more details, see http://www.mingw.org/). Some notes about this ! configuration: ! ! - Install Cygwin for its shell and its command-line tools such as make. ! (MinGW's MSYS may be an alternative, but has not been tested yet.) ! - Install MinGW; versions tested are MinGW-1.1 and mingw-runtime-1.2 ! - Follow instructions for patching MinGW at ! http://www.geocrawler.com/archives/3/6013/2002/1/100/7606374/ ! - Set your PATH so that MinGW's gcc is picked up instead of Cygwin's ! - However, you must use Cygwin's make, because MinGW's make does not ! grok Cygwin's path names (/cygdrive/c/ instead of c:/). You can just ! delete or rename MinGW's make. ! - Configure with --disable-coss --enable-naming --enable-events; other ! services have not been updated yet. (Or edit the Makefiles yourself.) ! - Makefiles and scripts for demos have not been updated yet, so they ! might need editing. ! - "make install" is untested. Index: MakeVars.in =================================================================== RCS file: /cvsroot/micomt/mico/MakeVars.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** MakeVars.in 26 Oct 2001 19:59:54 -0000 1.10 --- MakeVars.in 23 Mar 2002 20:17:09 -0000 1.11 *************** *** 1,23 **** # -*- Makefile -*- # ! # MICO --- a free CORBA implementation ! # Copyright (C) 1997 Kay Roemer & Arno Puder # ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. # ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # Send comments and/or bug reports to: ! # mi...@in... # --- 1,23 ---- # -*- Makefile -*- # ! # MICO --- an Open Source CORBA implementation ! # Copyright (c) 1997-2001 by The Mico Team # ! # This library is free software; you can redistribute it and/or ! # modify it under the terms of the GNU Library General Public ! # License as published by the Free Software Foundation; either ! # version 2 of the License, or (at your option) any later version. # ! # This library is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! # Library General Public License for more details. # ! # You should have received a copy of the GNU Library General Public ! # License along with this library; if not, write to the Free ! # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # For more information, visit the MICO Home Page at ! # http://www.mico.org/ # *************** *** 28,31 **** --- 28,32 ---- SHARED_INSTDIR = @ABSSHRDDIR@ + OSTYPE = @OSTYPE@ HAVE_REPO = @HAVE_REPO@ *************** *** 71,75 **** NOPICFLAGS = EHFLAGS = @EHFLAGS@ - EHNOFLAGS = @EHNOFLAGS@ EHOPTFLAGS = @EHOPTFLAGS@ NOEHFLAGS = @NOEHFLAGS@ --- 72,75 ---- *************** *** 86,95 **** PURE_LDFLAGS = @LDFLAGS@ LDFLAGS = $(PURE_LDFLAGS) $(DLFLAGS) ! LDSO = $(SRCDIR)/admin/mico-shld @LDSOLIBSTAT@ LDSOFLAGS = @LDSOFLAGS@ SOEXT = @SOEXT@ POSTLD = @POSTLD@ ! RM = rm -f ! LN = ln -f -s MKDIR = mkdir JAVAC = javac --- 86,95 ---- PURE_LDFLAGS = @LDFLAGS@ LDFLAGS = $(PURE_LDFLAGS) $(DLFLAGS) ! LDSO = $(SRCDIR)/admin/mico-shld LDSOFLAGS = @LDSOFLAGS@ SOEXT = @SOEXT@ POSTLD = @POSTLD@ ! RM = @RMPROG@ ! LN = @LNPROG@ MKDIR = mkdir JAVAC = javac *************** *** 125,128 **** --- 125,129 ---- export LIBPATH := $(SRCDIR)/libs:$(LIBPATH) export SHLIB_PATH := $(SRCDIR)/libs:$(SHLIB_PATH) + export PATH := $(SRCDIR)/libs:$(PATH) LIBMICO = libmico$(VERSION).$(SOEXT) LIBMICOIR = libmicoir$(VERSION).$(SOEXT) *************** *** 138,141 **** --- 139,160 ---- LIBMICOCOSS = libmicocoss$(VERSION).a LIBMICOAUX = libmicoaux$(VERSION).a + endif + + LDMICO = -lmico$(VERSION) + LDMICOIR = -lmicoir$(VERSION) + LDMICOCOSS = -lmicocoss$(VERSION) + LDMICOAUX = -lmicoaux$(VERSION) + LDMICOCCM = -lmicoccm$(VERSION) + + ifeq ($(OSTYPE), windows) + ifeq ($(HAVE_SHARED), yes) + export PATH := $(SRCDIR)/libs:$(PATH) + NODOTVERSION = $(shell tr -d \. < $(SRCDIR)/VERSION) + LIBMICO := mico$(NODOTVERSION).dll + LDMICO := -lmico$(NODOTVERSION) + LIBMICOIR = libmicoir$(VERSION).a + LIBMICOAUX = libmicoaux$(VERSION).a + LIBMICOCOSS = libmicocoss$(VERSION).a + endif endif Index: MakeVars.win32 =================================================================== RCS file: /cvsroot/micomt/mico/MakeVars.win32,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** MakeVars.win32 26 Oct 2001 19:59:54 -0000 1.2 --- MakeVars.win32 23 Mar 2002 20:17:09 -0000 1.3 *************** *** 1,22 **** # ! # MICO --- a free CORBA implementation ! # Copyright (C) 1997 Kay Roemer & Arno Puder # ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. # ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # Send comments and/or bug reports to: ! # mi...@in... # # Configuration --- 1,22 ---- # ! # MICO --- an Open Source CORBA implementation ! # Copyright (c) 1997-2001 by The Mico Team # ! # This library is free software; you can redistribute it and/or ! # modify it under the terms of the GNU Library General Public ! # License as published by the Free Software Foundation; either ! # version 2 of the License, or (at your option) any later version. # ! # This library is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! # Library General Public License for more details. # ! # You should have received a copy of the GNU Library General Public ! # License along with this library; if not, write to the Free ! # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # For more information, visit the MICO Home Page at ! # http://www.mico.org/ # # Configuration Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** Makefile 4 Jan 2002 16:33:51 -0000 1.10 --- Makefile 23 Mar 2002 20:17:09 -0000 1.11 *************** *** 25,29 **** ADMDIRS = admin include LIBDIRS = orb ir idl auxdir coss ccm ! PRGDIRS = orb ir idl cpp daemon auxdir coss ccm tools EXTRADIRS = test demo ALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm test tools demo --- 25,29 ---- ADMDIRS = admin include LIBDIRS = orb ir idl auxdir coss ccm ! PRGDIRS = orb ir cpp idl daemon auxdir coss ccm tools EXTRADIRS = test demo ALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm test tools demo Index: README-WIN32 =================================================================== RCS file: /cvsroot/micomt/mico/README-WIN32,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** README-WIN32 26 Oct 2001 19:59:54 -0000 1.2 --- README-WIN32 23 Mar 2002 20:17:09 -0000 1.3 *************** *** 13,16 **** --- 13,20 ---- -------- + Before building MICO, please open the file MakeVars.win32 from the + MICO directory in a text editor (like Visual Studio or textpad), and + adjust the setting of SRCDIR to point to the MICO directory. + To build MICO, please open a command shell window, change to the MICO directory and type Index: VERSION =================================================================== RCS file: /cvsroot/micomt/mico/VERSION,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** VERSION 26 Oct 2001 19:59:54 -0000 1.2 --- VERSION 23 Mar 2002 20:17:09 -0000 1.3 *************** *** 1 **** ! 2.3.6 --- 1 ---- ! 2.3.7 Index: acconfig.h =================================================================== RCS file: /cvsroot/micomt/mico/acconfig.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** acconfig.h 15 Mar 2001 18:52:13 -0000 1.9 --- acconfig.h 23 Mar 2002 20:17:09 -0000 1.10 *************** *** 91,94 **** --- 91,97 ---- #undef HAVE_EXPLICIT_STRUCT_OPS + /* whether we can use the advanced memchecker */ + #undef USE_MEMTRACE + /* whether a derived class can override a typedef in the base class */ #undef HAVE_TYPEDEF_OVERLOAD *************** *** 111,112 **** --- 114,125 ---- /* whether we support dynamic_cast<> */ #undef HAVE_DYNAMIC_CAST + + /* whether to build CCM-specific parts */ + #undef USE_CCM + + /* path information */ + #undef ABSEXECDIR + #undef ABSSHRDDIR + + /* whether ANSI C++ header files are present */ + #undef HAVE_ANSI_CPLUSPLUS_HEADERS Index: aclocal.m4 =================================================================== RCS file: /cvsroot/micomt/mico/aclocal.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** aclocal.m4 15 Mar 2001 18:52:13 -0000 1.3 --- aclocal.m4 23 Mar 2002 20:17:09 -0000 1.4 *************** *** 849,879 **** rm -f conf.gtktest ]) - - dnl - dnl check for compiler flags - dnl - AC_DEFUN(MICO_CHECK_CXX_FLAG, - [ - AC_REQUIRE([AC_PROG_CXX]) - AC_MSG_CHECKING(whether $CXX supports -$1) - mico_cache=`echo $1 | sed 'y%./+-%__p_%'` - AC_CACHE_VAL(mico_cv_prog_cxx_$mico_cache, - [ - echo 'void f(){}' >conftest.cc - if test -z "`$CXX -$1 -c conftest.cc 2>&1`"; then - eval "mico_cv_prog_cxx_$mico_cache=yes" - else - eval "mico_cv_prog_cxx_$mico_cache=no" - fi - rm -f conftest* - ]) - if eval "test \"`echo '$mico_cv_prog_cxx_'$mico_cache`\" = yes"; then - AC_MSG_RESULT(yes) - : - $2 - else - AC_MSG_RESULT(no) - : - $3 - fi - ]) \ No newline at end of file --- 849,850 ---- Index: configure =================================================================== RCS file: /cvsroot/micomt/mico/configure,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** configure 5 Jan 2002 07:32:21 -0000 1.20 --- configure 23 Mar 2002 20:17:09 -0000 1.21 *************** *** 65,68 **** --- 65,70 ---- --with-ssl=ssldir use SSLeay installed in ssldir" ac_help="$ac_help + --with-extra-dir=dir add dir(s) into extra dirs" + ac_help="$ac_help --disable-split dont split large source files" ac_help="$ac_help *************** *** 843,846 **** --- 845,857 ---- [...5136 lines suppressed...] EOF ! if { (eval echo configure:8644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then DLRUN=ok --- 8803,8807 ---- } EOF ! if { (eval echo configure:8806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then DLRUN=ok *************** *** 8902,8905 **** --- 9064,9070 ---- s%@CXX@%$CXX%g s%@CXXCPP@%$CXXCPP%g + s%@OSTYPE@%$OSTYPE%g + s%@RMPROG@%$RMPROG%g + s%@LNPROG@%$LNPROG%g s%@EXTRA_LIBS@%$EXTRA_LIBS%g s%@EXTRA_CXXFLAGS@%$EXTRA_CXXFLAGS%g Index: configure.in =================================================================== RCS file: /cvsroot/micomt/mico/configure.in,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -r1.34 -r1.35 *** configure.in 4 Jan 2002 16:37:30 -0000 1.34 --- configure.in 23 Mar 2002 20:17:09 -0000 1.35 *************** *** 1,22 **** # ! # MICO --- a free CORBA implementation ! # Copyright (C) 1997-98 Kay Roemer & Arno Puder # ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. ! # ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! # ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # Send comments and/or bug reports to: ! # mi...@in... # --- 1,22 ---- # ! # MICO --- an Open Source CORBA implementation ! # Copyright (c) 1997-2001 by The Mico Team # ! # This library is free software; you can redistribute it and/or ! # modify it under the terms of the GNU Library General Public ! # License as published by the Free Software Foundation; either ! # version 2 of the License, or (at your option) any later version. ! # ! # This library is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! # Library General Public License for more details. ! # ! # You should have received a copy of the GNU Library General Public ! # License along with this library; if not, write to the Free ! # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # For more information, visit the MICO Home Page at ! # http://www.mico.org/ # *************** *** 132,135 **** --- 132,139 ---- SSLDIR=$withval, SSLDIR="") + AC_ARG_WITH(extra-dir, + [ --with-extra-dir=dir add dir(s) into extra dirs], + EXTRADIR="$withval", EXTRADIR="") + AC_ARG_ENABLE(split, [ --disable-split dont split large source files], *************** *** 202,206 **** # ! wi_EXTRA_DIRS(no, /usr/local /local /user/local /usr/share /opt /opt/local $QTDIR $GTKDIR $TCLDIR $SSLDIR) # --- 206,210 ---- # ! wi_EXTRA_DIRS(no, $EXTRADIR $QTDIR $GTKDIR $TCLDIR $SSLDIR) # *************** *** 267,270 **** --- 271,296 ---- AC_LANG_CPLUSPLUS + AC_MSG_CHECKING(OS Type) + gxxversion=`$CXX -v 2>&1` + case $gxxversion in + *mingw*special*) + # + # This is the MinGW compiler in a Cygwin environment + # + OSTYPE=windows + RMPROG="rm -f" + LNPROG="cp" + ;; + *) + OSTYPE=unix + RMPROG="rm -f" + LNPROG="ln -f -s" + ;; + esac + AC_MSG_RESULT($OSTYPE) + AC_SUBST(OSTYPE) + AC_SUBST(RMPROG) + AC_SUBST(LNPROG) + # # extra libraries ... *************** *** 540,543 **** --- 566,570 ---- fi + CONF_SHARED_CC="$CXX -shared" CONF_PICFLAGS=-fPIC CONF_LDSOFLAGS=-fPIC *************** *** 546,553 **** # workaround for compiling X11 headers with gcc 2.95 - # MICO_CHECK_CXX_FLAG(fpermissive, [CXXFLAGS="$CXXFLAGS -fpermissive"]) SAVE_CXXFLAGS=$CXXFLAGS CXXFLAGS="$SAVE_CXXFLAGS -fpermissive" AC_TRY_COMPILE([],[],, CXXFLAGS=$SAVE_CXXFLAGS) case $target in --- 573,580 ---- # workaround for compiling X11 headers with gcc 2.95 SAVE_CXXFLAGS=$CXXFLAGS CXXFLAGS="$SAVE_CXXFLAGS -fpermissive" AC_TRY_COMPILE([],[],, CXXFLAGS=$SAVE_CXXFLAGS) + case $target in *************** *** 589,594 **** fi ;; ! *cygwin32*) ! have_cdk=yes; ;; *lynxos*) --- 616,638 ---- fi ;; ! *mingw*|*cygwin*) ! # check if the compiler is cygwin or mingw ! gxxversion=`$CXX -v 2>&1` ! case $gxxversion in ! *mingw*) ! CXXFLAGS="-D_WINDOWS $CXXFLAGS" ! CONF_SOEXT=dll ! CONF_PICFLAGS= ! CONF_LDSOFLAGS= ! if test "x$use_shared" = "xyes" ; then ! CXX="$CXX -mthreads" ! CONF_SHARED_CC="$CXX -shared" ! else ! CXXFLAGS="-DBUILD_MICO_DLL $CXXFLAGS" ! fi ! ;; ! *cygwin*) ! ;; ! esac ;; *lynxos*) *************** *** 639,643 **** CONF_SHARED_CC="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -G" CONF_LDFLAGS=-brtl ! CXXFLAGS="$CXXFLAGS -+ -qnotempinc -qlongdouble -qlonglong -w" CFLAGS="$CFLAGS -qlongdouble -qlonglong" ;; --- 683,687 ---- CONF_SHARED_CC="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -G" CONF_LDFLAGS=-brtl ! CXXFLAGS="$CXXFLAGS -+ -qrtti=all -qnotempinc -qlongdouble -qlonglong -w" CFLAGS="$CFLAGS -qlongdouble -qlonglong" ;; *************** *** 846,849 **** --- 890,895 ---- AC_CHECK_LIB(ld, open) + AC_CHECK_LIB(wsock32, open) + # for wide char functions ... # AC_CHECK_LIB(w, open) *************** *** 910,913 **** --- 956,968 ---- AC_CHECK_HEADERS(byteorder.h) + # Ansi C++ + have_ansi_cplusplus_headers=yes + AC_CHECK_HEADERS(iostream map string sstream,,have_ansi_cplusplus_headers=no) + AC_MSG_CHECKING(for Ansi C++ headers) + if test "x$have_ansi_cplusplus_headers" = "xyes" ; then + AC_DEFINE(HAVE_ANSI_CPLUSPLUS_HEADERS) + fi + AC_MSG_RESULT($have_ansi_cplusplus_headers) + # # Checks for typedefs, structures, and compiler characteristics. *************** *** 1070,1076 **** gethostname_pt=no AC_EGREP_HEADER(gethostname, unistd.h, gethostname_pt=yes) ! if test $gethostname_pt = no; then ! AC_EGREP_HEADER(gethostname, sys/socket.h, gethostname_pt=yes) ! fi if test $gethostname_pt = yes; then AC_DEFINE(HAVE_GETHOSTNAME_PROTO) --- 1125,1130 ---- gethostname_pt=no AC_EGREP_HEADER(gethostname, unistd.h, gethostname_pt=yes) ! AC_EGREP_HEADER(gethostname, sys/socket.h, gethostname_pt=yes) ! AC_EGREP_HEADER(gethostname, winsock.h, gethostname_pt=yes) if test $gethostname_pt = yes; then AC_DEFINE(HAVE_GETHOSTNAME_PROTO) *************** *** 1099,1110 **** AC_MSG_CHECKING([for ftime prototype]) ftime_pt=no - - changequote(<<, >>) - ac_tmp='[ \t]ftime' - changequote([, ]) - # solaris 2.5.1 mentions `ftime' it the header but doesnt have a prototype ... ! AC_EGREP_HEADER($ac_tmp, sys/timeb.h, ftime_pt=yes) ! if test $ftime_pt = yes; then AC_DEFINE(HAVE_FTIME_PROTO) --- 1153,1158 ---- AC_MSG_CHECKING([for ftime prototype]) ftime_pt=no # solaris 2.5.1 mentions `ftime' it the header but doesnt have a prototype ... ! AC_EGREP_HEADER(ftime, sys/timeb.h, ftime_pt=yes) if test $ftime_pt = yes; then AC_DEFINE(HAVE_FTIME_PROTO) *************** *** 1324,1328 **** AC_MSG_CHECKING(build of PIC object file) cat > conftest.$ac_ext <<EOF ! [#include <iostream.h> struct Global { --- 1372,1378 ---- AC_MSG_CHECKING(build of PIC object file) cat > conftest.$ac_ext <<EOF ! [#include <iostream> ! ! using namespace std; struct Global { |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:44
|
Update of /cvsroot/micomt/mico/admin
In directory usw-pr-cvs1:/tmp/cvs-serv31844/admin
Modified Files:
mkdepend.cc mkrelease
Added Files:
mkbook
Log Message:
- merged with MICO 2.3.7
--- NEW FILE: mkbook ---
#! /bin/sh
# \
exec tclsh8.3 "$0" ${1+"$@"}
if {[llength $argv] != 2} {
puts "Usage: mkbook <infile> <outfile>"
exit
}
if {[file exists [lindex $argv 0]] == 0} {
puts "File '[lindex $argv 0]' does not exist!"
exit
}
exec pstops "4:-3L@0.7(21cm,0)+0L@0.7(21cm,14.85cm),1R@0.7(0,29.7cm)+-2R@0.7(0,14.85cm)" [lindex $argv 0] /tmp/tmp.ps 2>/tmp/tmp.txt
set output [exec cat /tmp/tmp.txt]
regexp {[ ][0-9]+[ ]} $output match
regsub -all {[ ]} $match "" match_val
set pages {}
for {set i 1} {$i <= $match_val} {incr i} {
lappend pages $i
}
while {$pages != ""} {
lappend page_list [lindex $pages 0]
set pages [lreplace $pages 0 0]
lappend page_list [lindex $pages 0]
set pages [lreplace $pages 0 0]
if {$pages != ""} {
lappend page_list [lindex $pages [expr [llength $pages] - 1]]
lappend page_list [lindex $pages [expr [llength $pages] - 2]]
set pages [lreplace $pages [expr [llength $pages] - 2] [expr [llength $pages] -1 ]]
}
}
set command ""
for {set i 0} {$i < [llength $page_list]} {incr i} {
if {$i != 0} {
set command [append command ","]
}
set command [append command [lindex $page_list $i]]
}
exec psselect -q -p$command /tmp/tmp.ps /tmp/tmp1.ps
exec pstops "4:0,1,2U(21cm,29.7cm),3U(21cm,29.7cm)" /tmp/tmp1.ps [lindex $argv 1] 2>/dev/null
exec rm -f /tmp/tmp.txt /tmp/tmp.ps /tmp/tmp1.ps
Index: mkdepend.cc
===================================================================
RCS file: /cvsroot/micomt/mico/admin/mkdepend.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** mkdepend.cc 3 Nov 1999 23:20:51 -0000 1.1.1.1
--- mkdepend.cc 23 Mar 2002 20:17:09 -0000 1.2
***************
*** 25,30 ****
--- 25,35 ----
#include <stdio.h>
#include <unistd.h>
+ #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS
+ #include <iostream>
+ #include <fstream>
+ #else
#include <iostream.h>
#include <fstream.h>
+ #endif
#include <string>
#include <vector>
Index: mkrelease
===================================================================
RCS file: /cvsroot/micomt/mico/admin/mkrelease,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mkrelease 26 Oct 2001 19:59:54 -0000 1.3
--- mkrelease 23 Mar 2002 20:17:09 -0000 1.4
***************
*** 59,64 ****
> README
cd ..
! tar cf ../${RELEASEDIR}/doc-html.tar doc/README doc/doc/. doc/icons/.
! gzip -f ../${RELEASEDIR}/doc-html.tar
rm -f doc/README
)
--- 59,64 ----
> README
cd ..
! # tar cf ../${RELEASEDIR}/doc-html.tar doc/README doc/doc/. doc/icons/.
! # gzip -f ../${RELEASEDIR}/doc-html.tar
rm -f doc/README
)
|
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:44
|
Update of /cvsroot/micomt/mico/coss In directory usw-pr-cvs1:/tmp/cvs-serv31844/coss Modified Files: Makefile Log Message: - merged with MICO 2.3.7 Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/coss/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile 1 Jan 2002 20:29:21 -0000 1.2 --- Makefile 23 Mar 2002 20:17:10 -0000 1.3 *************** *** 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/ # *************** *** 61,65 **** CLEANDIRS = naming events streams relship property trader time lifecycle externalization ! LDFLAGS := -L../orb -lmico$(VERSION) $(LDFLAGS) #STATIC_OBJS = \ --- 61,66 ---- CLEANDIRS = naming events streams relship property trader time lifecycle externalization ! ! LDLIBS = -L../orb $(LDFLAGS) $(LDMICO) $(CONFLIBS) #STATIC_OBJS = \ *************** *** 137,144 **** SHARED_OBJS = $(STATIC_OBJS:.o=.pic.o) ! all: lib prg lib: --- 138,154 ---- SHARED_OBJS = $(STATIC_OBJS:.o=.pic.o) + # mingw hack ! ifeq ($(OSTYPE), windows) ! ifeq ($(HAVE_SHARED), yes) ! HAVE_SHARED_EXCEPTS := no ! HAVE_SHARED := no ! HAVE_STATIC := yes ! endif ! endif + all: lib prg + lib: *************** *** 173,177 **** $(RM) $@ $(LDSO) -o libmicocoss$(VERSION) $(SHARED_OBJS) \ ! -L../libs -lmico$(VERSION) $(IDIRCMD) ../libs cd ../libs; $(RM) $@; $(LN) ../coss/$@ . --- 183,187 ---- $(RM) $@ $(LDSO) -o libmicocoss$(VERSION) $(SHARED_OBJS) \ ! -L../libs $(LDMICO) $(IDIRCMD) ../libs cd ../libs; $(RM) $@; $(LN) ../coss/$@ . *************** *** 192,196 **** clean: for i in $(CLEANDIRS); do $(MAKE) -C $$i clean || exit 1; done ! $(RM) *.a *.$(SOEXT) install: --- 202,207 ---- clean: for i in $(CLEANDIRS); do $(MAKE) -C $$i clean || exit 1; done ! -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.objid ! -$(RM) .depend TAGS core nohup.out install: *************** *** 209,214 **** install-cd: install - - .depend: - for i in $(SUBDIRS); do $(MAKE) -C $$i .depend || exit 1; done --- 220,222 ---- |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:44
|
Update of /cvsroot/micomt/mico/auxdir In directory usw-pr-cvs1:/tmp/cvs-serv31844/auxdir Modified Files: Makefile Log Message: - merged with MICO 2.3.7 Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/auxdir/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile 10 Dec 2001 20:15:25 -0000 1.2 --- Makefile 23 Mar 2002 20:17:09 -0000 1.3 *************** *** 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,29 **** # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # Send comments and/or bug reports to: ! # mi...@in... # include ../MakeVars - LDLIBS = -lmico$(VERSION) $(CONFLIBS) LDFLAGS := -L../orb $(LDFLAGS) CXXFLAGS := -I. -I../include $(CPPFLAGS) $(CXXFLAGS) $(X_CFLAGS) AUX_SRCS=dynany_impl.cc --- 17,29 ---- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # For more information, visit the MICO Home Page at ! # http://www.mico.org/ # include ../MakeVars LDFLAGS := -L../orb $(LDFLAGS) CXXFLAGS := -I. -I../include $(CPPFLAGS) $(CXXFLAGS) $(X_CFLAGS) + LDLIBS := $(LDMICO) $(CONFLIBS) AUX_SRCS=dynany_impl.cc *************** *** 64,67 **** --- 64,76 ---- SHARED_LIBS = $(STATIC_LIBS:.a=.$(SOEXT)) + # mingw hack + + ifeq ($(OSTYPE), windows) + ifeq ($(HAVE_SHARED), yes) + HAVE_SHARED := no + HAVE_STATIC := yes + endif + endif + # normal rules *************** *** 100,104 **** rm -f $@ $(LDSO) -o libmicoaux$(VERSION) $(SHARED_AUX_OBJS) \ ! -L../libs -lmico$(VERSION) $(IDIRCMD) ../libs cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ . --- 109,113 ---- rm -f $@ $(LDSO) -o libmicoaux$(VERSION) $(SHARED_AUX_OBJS) \ ! -L../libs $(LDMICO) $(IDIRCMD) ../libs cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ . *************** *** 106,114 **** libmicox$(VERSION).$(SOEXT): $(SHARED_X11_OBJS) ifeq ($(HAVE_REPO), yes) ! -$(CXX) $(CXXFLAGS) $(SHARED_X11_OBJS) $(LDFLAGS) $(LDLIBS) endif rm -f $@ ! $(LDSO) -o libmicox$(VERSION) $(SHARED_X11_OBJS) \ ! $(PURE_LDFLAGS) $(X_LIBS) -lXt -lX11 -L../libs -lmico$(VERSION) $(IDIRCMD) ../libs cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ . --- 115,123 ---- libmicox$(VERSION).$(SOEXT): $(SHARED_X11_OBJS) ifeq ($(HAVE_REPO), yes) ! -$(CXX) $(CXXFLAGS) $(SHARED_X11_OBJS) $(LDFLAGS) $(X_LIBS) $(LDLIBS) endif rm -f $@ ! $(LDSO) -o libmicox$(VERSION) $(SHARED_X11_OBJS) $(X_LIBS) \ ! $(PURE_LDFLAGS) -lXt -lX11 -L../libs $(LDMICO) $(IDIRCMD) ../libs cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ . *************** *** 116,124 **** libmicoqt$(VERSION).$(SOEXT): $(SHARED_QT_OBJS) ifeq ($(HAVE_REPO), yes) ! -$(CXX) $(CXXFLAGS) $(SHARED_QT_OBJS) $(LDFLAGS) $(LDLIBS) endif rm -f $@ ! $(LDSO) -o libmicoqt$(VERSION) $(SHARED_QT_OBJS) \ ! $(PURE_LDFLAGS) -lqt -lX11 -L../libs -lmico$(VERSION) $(IDIRCMD) ../libs cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ . --- 125,133 ---- libmicoqt$(VERSION).$(SOEXT): $(SHARED_QT_OBJS) ifeq ($(HAVE_REPO), yes) ! -$(CXX) $(CXXFLAGS) $(SHARED_QT_OBJS) $(LDFLAGS) $(X_LIBS) $(LDLIBS) endif rm -f $@ ! $(LDSO) -o libmicoqt$(VERSION) $(SHARED_QT_OBJS) $(X_LIBS) \ ! $(PURE_LDFLAGS) -lqt -lX11 -L../libs $(LDMICO) $(IDIRCMD) ../libs cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ . *************** *** 126,134 **** libmicogtk$(VERSION).$(SOEXT): $(SHARED_GTK_OBJS) ifeq ($(HAVE_REPO), yes) ! -$(CXX) $(CXXFLAGS) $(SHARED_GTK_OBJS) $(LDFLAGS) $(LDLIBS) endif rm -f $@ ! $(LDSO) -o libmicogtk$(VERSION) $(SHARED_GTK_OBJS) \ ! $(PURE_LDFLAGS) $(GTK_LIBS) -L../libs -lmico$(VERSION) $(IDIRCMD) ../libs cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ . --- 135,143 ---- libmicogtk$(VERSION).$(SOEXT): $(SHARED_GTK_OBJS) ifeq ($(HAVE_REPO), yes) ! -$(CXX) $(CXXFLAGS) $(SHARED_GTK_OBJS) $(LDFLAGS) $(X_LIBS) $(LDLIBS) endif rm -f $@ ! $(LDSO) -o libmicogtk$(VERSION) $(SHARED_GTK_OBJS) $(X_LIBS) \ ! $(PURE_LDFLAGS) $(GTK_LIBS) -L../libs $(LDMICO) $(IDIRCMD) ../libs cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ . *************** *** 140,144 **** rm -f $@ $(LDSO) -o libmicotcl$(VERSION) $(SHARED_TCL_OBJS) \ ! $(PURE_LDFLAGS) $(TCL_LIBS) -L../libs -lmico$(VERSION) $(IDIRCMD) ../libs cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ . --- 149,153 ---- rm -f $@ $(LDSO) -o libmicotcl$(VERSION) $(SHARED_TCL_OBJS) \ ! $(PURE_LDFLAGS) $(TCL_LIBS) -L../libs $(LDMICO) $(IDIRCMD) ../libs cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ . *************** *** 196,200 **** clean: ! -$(RM) *.o *.a *~ *.rpo *.objid *.moc *.$(SOEXT) -$(RM) .depend TAGS core nohup.out -$(RM) *.orig --- 205,209 ---- clean: ! -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.objid *.moc -$(RM) .depend TAGS core nohup.out -$(RM) *.orig |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:22
|
Update of /cvsroot/micomt/mico/tools/iordump In directory usw-pr-cvs1:/tmp/cvs-serv31844/tools/iordump Modified Files: Makefile iordump.cc Log Message: - merged with MICO 2.3.7 Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/tools/iordump/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Makefile 3 Nov 1999 23:20:54 -0000 1.1.1.1 --- Makefile 23 Mar 2002 20:17:16 -0000 1.2 *************** *** 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/ # *************** *** 25,29 **** CXXFLAGS := -I. -I../../include $(CXXFLAGS) $(EHFLAGS) LDFLAGS := -L../../orb $(LDFLAGS) ! LDLIBS = -lmico$(VERSION) $(CONFLIBS) # generated files --- 25,29 ---- CXXFLAGS := -I. -I../../include $(CXXFLAGS) $(EHFLAGS) LDFLAGS := -L../../orb $(LDFLAGS) ! LDLIBS = $(LDMICO) $(CONFLIBS) # generated files Index: iordump.cc =================================================================== RCS file: /cvsroot/micomt/mico/tools/iordump/iordump.cc,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** iordump.cc 6 Jan 2001 23:18:25 -0000 1.1.1.2 --- iordump.cc 23 Mar 2002 20:17:16 -0000 1.2 *************** *** 2,6 **** --- 2,11 ---- #include <string.h> #include <mico/template_impl.h> + + #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS + #include <iostream> + #else #include <iostream.h> + #endif void |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:22
|
Update of /cvsroot/micomt/mico/tools In directory usw-pr-cvs1:/tmp/cvs-serv31844/tools Modified Files: Makefile Log Message: - merged with MICO 2.3.7 Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/tools/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile 1 Jan 2002 20:29:21 -0000 1.2 --- Makefile 23 Mar 2002 20:17:16 -0000 1.3 *************** *** 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/ # |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:20
|
Update of /cvsroot/micomt/mico/include In directory usw-pr-cvs1:/tmp/cvs-serv31844/include Modified Files: CORBA.h Log Message: - merged with MICO 2.3.7 Index: CORBA.h =================================================================== RCS file: /cvsroot/micomt/mico/include/CORBA.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** CORBA.h 4 Jan 2002 09:19:09 -0000 1.24 --- CORBA.h 23 Mar 2002 20:17:14 -0000 1.25 *************** *** 32,36 **** #ifndef _POCKET_PC #include <sys/types.h> - #include <fcntl.h> // Fixes 'fcntl' has not been defined yet message from HP aCC #include <errno.h> #endif --- 32,35 ---- *************** *** 42,46 **** #undef MTDEBUG ! #ifdef _WINDOWS #include <mico/config-win32.h> #elif defined (_POCKET_PC) --- 41,45 ---- #undef MTDEBUG ! #if defined(_WINDOWS) && !defined(__MINGW32__) #include <mico/config-win32.h> #elif defined (_POCKET_PC) *************** *** 133,148 **** #else - #ifdef _WINDOWS - #include <string> - #include <vector> - #include <map> - #include <set> - #include <list> - #if !defined(__MINGW32__) - #include <limits> - #endif - - #else - #include <string> #include <vector> --- 132,135 ---- *************** *** 151,154 **** --- 138,144 ---- #include <list> #include <queue> + + #if defined(_WINDOWS) && !defined(__MINGW32__) + #include <limits> #endif |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:18
|
Update of /cvsroot/micomt/mico/demo/siegel In directory usw-pr-cvs1:/tmp/cvs-serv31844/demo/siegel Removed Files: diffs.in Log Message: - merged with MICO 2.3.7 --- diffs.in DELETED --- |
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:16
|
Update of /cvsroot/micomt/mico/demo/ccm/events
In directory usw-pr-cvs1:/tmp/cvs-serv31844/demo/ccm/events
Added Files:
Makefile README channel.idl channel_impl.cc client.cc
consumer.idl consumer_impl.cc events message.idl
message_impl.cc message_impl.h producer.idl producer_impl.cc
Log Message:
- merged with MICO 2.3.7
--- NEW FILE: Makefile ---
all: all_target
DIR_PREFIX=../
include ../../MakeVars
INSTALL_DIR = ccm/events
INSTALL_SRCS = README Makefile channel.idl channel_impl.cc \
client.cc consumer.idl consumer_impl.cc message.idl \
message_impl.cc message_impl.h producer.idl \
producer_impl.cc
INSTALL_SCRIPTS = events
all_target: .depend channel.$(SOEXT) consumer.$(SOEXT) producer.$(SOEXT) client
channel.$(SOEXT): channel_impl.pic.o channel_ccm.pic.o channel.pic.o \
message_impl.pic.o message.pic.o
$(RM) $@
$(LDSO) $(CXXFLAGS) $(LDFLAGS) -o channel \
channel_impl.pic.o channel_ccm.pic.o channel.pic.o \
message_impl.pic.o message.pic.o \
-lmicoccm$(VERSION) -lmico$(VERSION) $(LDLIBS)
consumer.$(SOEXT): consumer_impl.pic.o consumer_ccm.pic.o consumer.pic.o \
message_impl.pic.o message.pic.o
$(RM) $@
$(LDSO) $(CXXFLAGS) $(LDFLAGS) -o consumer \
consumer_impl.pic.o consumer_ccm.pic.o consumer.pic.o \
message_impl.pic.o message.pic.o \
-lmicoccm$(VERSION) -lmico$(VERSION) $(LDLIBS)
producer.$(SOEXT): producer_impl.pic.o producer_ccm.pic.o producer.pic.o \
message_impl.pic.o message.pic.o
$(RM) $@
$(LDSO) $(CXXFLAGS) $(LDFLAGS) -o producer \
producer_impl.pic.o producer_ccm.pic.o producer.pic.o \
message_impl.pic.o message.pic.o \
-lmicoccm$(VERSION) -lmico$(VERSION) $(LDLIBS)
client: client.o channel.pic.o consumer.pic.o producer.pic.o \
message_impl.pic.o message.pic.o
$(LD) $(CXXFLAGS) $(LDFLAGS) -o $@ client.o channel.pic.o \
consumer.pic.o producer.pic.o message_impl.pic.o \
message.pic.o -lmicoccm$(VERSION) -lmicocoss$(VERSION) \
-lmico$(VERSION) $(LDLIBS)
clean:
$(RM) channel.$(SOEXT) consumer.$(SOEXT) producer.$(SOEXT) client
$(RM) channel_ccm.cc channel_ccm.h channel.cc channel.h
$(RM) consumer_ccm.cc consumer_ccm.h consumer.cc consumer.h
$(RM) producer_ccm.cc producer_ccm.h producer.cc producer.h
$(RM) message.cc message.h
$(RM) *.o *.$(SOEXT) *~ core *.ior
channel_impl.pic.o: channel_impl.cc channel.h message_impl.h message.h
consumer_impl.pic.o: consumer_impl.cc consumer.h message_impl.h message.h
producer_impl.pic.o: producer_impl.cc producer.h message_impl.h message.h
message_impl.pic.o: message_impl.cc message_impl.h message.h
consumer_ccm.pic.o: consumer_ccm.cc
producer_ccm.pic.o: producer_ccm.cc
consumer.pic.o: consumer.cc
producer.pic.o: producer.cc
message.pic.o: message.cc
client.o: client.cc
channel_ccm.cc channel_ccm.h: channel.idl
$(CCMGEN) $^
consumer_ccm.cc consumer_ccm.h: consumer.idl
$(CCMGEN) $^
producer_ccm.cc producer_ccm.h: producer.idl
$(CCMGEN) $^
channel.cc channel.h: channel.idl
$(IDL) $^
consumer.cc consumer.h: consumer.idl
$(IDL) $^
producer.cc producer.h: producer.idl
$(IDL) $^
message.cc message.h: message.idl
$(IDL) $^
--- NEW FILE: README ---
This is an example that demonstrates usage of publishes and consumes
event ports.
The EventChannel component (channel.idl) implements a very simple
event channel similar to the Event Service. The component simply sends
out all events that are sent to the "incoming" port to all components
that are subscribed to its "outgoing" port, and voilà, you have a
oneway, n-to-n event channel. You could even create multiple event
channels and connect them.
Also included here are a Consumer component (consumer.idl) and a
Producer component (producer.idl).
The eventtype that is sent is defined in message.idl.
The client starts one event channel, a couple of producers and
consumers, and interconnects them. It then causes each producer to
send some events. Since all three consumers are launched in the same
console, you will see each event thrice.
The Producer and the EventChannel consumers both implement the
SessionComponent interface to gain access to their SessionContext,
which they need to push events. Otherwise, the components don't have
very much to do.
Note the create_* entry points, which must register the Valuetype
factory for the Message type. For this reason, entry points receive a
pointer to the ORB, upon which they can call register_value_factory.
--- NEW FILE: channel.idl ---
#include <mico/CCM.idl>
#include "message.idl"
component EventChannel {
consumes Message incoming;
publishes Message outgoing;
};
local interface MyEventChannel :
Components::SessionComponent,
CCM_EventChannel
{
};
home EventChannelHome manages EventChannel
{
};
--- NEW FILE: channel_impl.cc ---
#include <iostream.h>
#include "channel.h"
#include "message_impl.h"
class MyEventChannel_impl : virtual public MyEventChannel
{
private:
CCM_EventChannel_Context_var _ctx;
bool active;
public:
MyEventChannel_impl ()
{
active = false;
}
void push_incoming (Message * msg)
{
if (active) {
_ctx->push_outgoing (msg);
}
}
void set_session_context (Components::SessionContext_ptr ctx)
{
_ctx = CCM_EventChannel_Context::_narrow (ctx);
}
void ccm_activate ()
{
cout << "Event Channel is active." << endl;
active = true;
}
void ccm_passivate ()
{
cout << "Event Channel is passive." << endl;
active = false;
}
void ccm_remove ()
{
cout << "Event Channel is being removed." << endl;
}
};
class MyEventChannelHome_impl : virtual public CCM_EventChannelHome {
public:
Components::EnterpriseComponent_ptr create ()
{
return new MyEventChannel_impl;
}
};
extern "C" {
Components::HomeExecutorBase_ptr
create_EventChannelHome (CORBA::ORB_ptr orb)
{
CORBA::ValueFactoryBase_var f = new MessageFactory;
orb->register_value_factory ("IDL:Message:1.0", f);
return new MyEventChannelHome_impl;
}
}
--- NEW FILE: client.cc ---
#include <mico/CosNaming.h>
#include <mico/CCMContainer.h>
#include "channel.h"
#include "producer.h"
#include "consumer.h"
#include "message_impl.h"
int
main (int argc, char *argv[])
{
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
CORBA::Object_var obj = orb->resolve_initial_references ("NameService");
CosNaming::NamingContextExt_var nc =
CosNaming::NamingContextExt::_narrow (obj);
MICO::CCM::register_all_factories (orb);
CORBA::ValueFactoryBase_var f = new MessageFactory;
orb->register_value_factory ("IDL:Message:1.0", f);
EventChannel_var channel;
Consumer_var consumers[3];
Producer_var producers[4];
MessageConsumer_var mc;
CORBA::ULong i;
/*
* ---
*/
cout << "creating Event Channel ... " << flush;
obj = nc->resolve_str ("EventChannelHome");
EventChannelHome_var channel_home = EventChannelHome::_narrow (obj);
channel = channel_home->create ();
cout << "done." << endl;
/*
* ---
*/
cout << "creating Consumers ... " << flush;
obj = nc->resolve_str ("ConsumerHome");
ConsumerHome_var consumer_home = ConsumerHome::_narrow (obj);
for (i=0; i<3; i++) {
cout << i << " " << flush;
consumers[i] = consumer_home->create ();
}
cout << "done." << endl;
/*
* ---
*/
cout << "subscribing Consumers ... " << flush;
for (i=0; i<3; i++) {
cout << i << " " << flush;
mc = consumers[i]->get_consumer_msg ();
channel->subscribe_outgoing (mc);
}
cout << "done." << endl;
/*
* ---
*/
cout << "creating Producers ... " << flush;
obj = nc->resolve_str ("ProducerHome");
ProducerHome_var producer_home = ProducerHome::_narrow (obj);
for (i=0; i<4; i++) {
cout << i << " " << flush;
producers[i] = producer_home->create ();
}
cout << "done." << endl;
/*
* ---
*/
cout << "configuring Message ... " << flush;
Message_var msg = new Message_impl;
for (i=0; i<4; i++) {
cout << i << " " << flush;
char temp[256];
sprintf (temp, "Producer %d", i);
msg->text ((const char *) temp);
producers[i]->myMessage (msg);
}
cout << "done." << endl;
/*
* ---
*/
cout << "connecting Producers ... " << flush;
mc = channel->get_consumer_incoming ();
for (i=0; i<4; i++) {
cout << i << " " << flush;
producers[i]->subscribe_msg (mc);
}
cout << "done." << endl;
/*
* ---
*/
cout << "Activating ... " << flush;
channel->configuration_complete ();
for (i=0; i<3; i++) {
consumers[i]->configuration_complete ();
}
for (i=0; i<4; i++) {
producers[i]->configuration_complete ();
}
cout << "done." << endl;
/*
* ---
*/
cout << "Send some Events ... " << flush;
for (i=0; i<4; i++) {
producers[i]->run (i+1);
}
cout << "done." << endl;
return 0;
}
--- NEW FILE: consumer.idl ---
#include "message.idl"
component Consumer {
consumes Message msg;
};
home ConsumerHome manages Consumer {};
--- NEW FILE: consumer_impl.cc ---
#include "consumer.h"
#include "message_impl.h"
class MyConsumer_impl : virtual public CCM_Consumer
{
public:
void push_msg (Message * msg)
{
cout << "Consumer: got message `" << msg->text() << "'" << endl;
}
};
class MyConsumerHome_impl : virtual public CCM_ConsumerHome {
public:
Components::EnterpriseComponent_ptr create ()
{
return new MyConsumer_impl;
}
};
extern "C" {
Components::HomeExecutorBase_ptr
create_ConsumerHome (CORBA::ORB_ptr orb)
{
CORBA::ValueFactoryBase_var f = new MessageFactory;
orb->register_value_factory ("IDL:Message:1.0", f);
return new MyConsumerHome_impl;
}
}
--- NEW FILE: events ---
#!/bin/sh
MICORC=/dev/null
export MICORC
# run Naming Service
echo "Starting Naming Service ..."
rm -f nsd.ior
nsd --ior nsd.ior &
nsd_pid=$!
trap "kill $nsd_pid > /dev/null 2> /dev/null" 0
# wait for Naming Service to start
for i in 0 1 2 3 4 5 6 7 8 9 ; do
if test -r nsd.ior ; then break ; else sleep 1 ; fi
done
# start Server Activator
echo "Starting Server Activator ..."
rm -f ccmd.ior
mico-ccmd --ior ccmd.ior &
server_pid=$!
trap "kill $nsd_pid $server_pid > /dev/null 2> /dev/null" 0
# wait for Server Activator to start
for i in 0 1 2 3 4 5 6 7 8 9 ; do
if test -r ccmd.ior ; then break ; else sleep 1 ; fi
done
# start EventChannel
echo "Loading Event Channel component ..."
ccmload -ORBInitRef NameService=file://`pwd`/nsd.ior --sa file://`pwd`/ccmd.ior -v --ns EventChannelHome EventChannelHome ./channel.so
echo "Loading Consumer component ..."
ccmload -ORBInitRef NameService=file://`pwd`/nsd.ior --sa file://`pwd`/ccmd.ior -v --ns ConsumerHome ConsumerHome ./consumer.so
echo "Loading Producer component ..."
ccmload -ORBInitRef NameService=file://`pwd`/nsd.ior --sa file://`pwd`/ccmd.ior -v --ns ProducerHome ProducerHome ./producer.so
# run Client
echo "Running Client ..."
./client -ORBInitRef NameService=file://`pwd`/nsd.ior
echo "Terminating ..."
sleep 3
--- NEW FILE: message.idl ---
#ifndef __MESSAGE__
#define __MESSAGE__
eventtype Message {
public string text;
};
#endif
--- NEW FILE: message_impl.cc ---
#include "message_impl.h"
Message_impl::Message_impl ()
{
text ((const char *) "");
}
CORBA::ValueBase *
MessageFactory::create_for_unmarshal ()
{
return new Message_impl;
}
--- NEW FILE: message_impl.h ---
#ifndef __EVENT_IMPL_H__
#define __EVENT_IMPL_H__
#include "message.h"
class Message_impl :
virtual public OBV_Message,
virtual public CORBA::DefaultValueRefCountBase
{
public:
Message_impl ();
};
class MessageFactory : public CORBA::ValueFactoryBase
{
public:
CORBA::ValueBase * create_for_unmarshal ();
};
#endif
--- NEW FILE: producer.idl ---
#include <mico/CCM.idl>
#include "message.idl"
interface ProducerAdmin {
attribute Message myMessage;
void run (in unsigned long count);
};
component Producer supports ProducerAdmin {
publishes Message msg;
};
home ProducerHome manages Producer {};
local interface MyProducer :
CCM_Producer,
Components::SessionComponent
{
};
--- NEW FILE: producer_impl.cc ---
#include "producer.h"
#include "message_impl.h"
class MyProducer_impl : virtual public MyProducer
{
private:
CCM_Producer_Context_var _ctx;
Message_var _mymsg;
bool active;
public:
MyProducer_impl ()
{
_mymsg = new Message_impl;
_mymsg->text ((const char*) "Hello World!");
active = false;
}
void myMessage (Message * newmsg)
{
CORBA::add_ref (newmsg);
_mymsg = newmsg;
}
Message * myMessage ()
{
CORBA::add_ref (_mymsg);
return _mymsg;
}
void run (CORBA::ULong count)
{
if (active) {
for (CORBA::ULong i=0; i<count; i++) {
_ctx->push_msg (_mymsg);
}
}
}
void set_session_context (Components::SessionContext_ptr ctx)
{
_ctx = CCM_Producer_Context::_narrow (ctx);
}
void ccm_activate ()
{
if (!active) {
active = true;
run (1);
}
}
void ccm_passivate ()
{
active = false;
}
void ccm_remove ()
{
}
};
class MyProducerHome_impl : virtual public CCM_ProducerHome {
public:
Components::EnterpriseComponent_ptr create ()
{
return new MyProducer_impl;
}
};
extern "C" {
Components::HomeExecutorBase_ptr
create_ProducerHome (CORBA::ORB_ptr orb)
{
CORBA::ValueFactoryBase_var f = new MessageFactory;
orb->register_value_factory ("IDL:Message:1.0", f);
return new MyProducerHome_impl;
}
}
|
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:16
|
Update of /cvsroot/micomt/mico/demo/ccm/hello2
In directory usw-pr-cvs1:/tmp/cvs-serv31844/demo/ccm/hello2
Added Files:
Makefile README client.cc hello hello.idl hello_impl.cc
Log Message:
- merged with MICO 2.3.7
--- NEW FILE: Makefile ---
all: all_target
DIR_PREFIX=../
include ../../MakeVars
INSTALL_DIR = ccm/hello2
INSTALL_SRCS = README Makefile client.cc hello.idl hello_impl.cc
INSTALL_SCRIPTS = hello
all_target: .depend client hello.$(SOEXT)
client: client.o hello.pic.o $(DEPS)
$(LD) $(CXXFLAGS) $(LDFLAGS) -o $@ client.o hello.pic.o -lmicoccm$(VERSION) -lmicocoss$(VERSION) $(LDLIBS)
hello.$(SOEXT): hello_impl.pic.o hello_ccm.pic.o hello.pic.o $(DEPS)
$(RM) $@
$(LDSO) $(CXXFLAGS) $(LDFLAGS) -o hello hello_impl.pic.o hello_ccm.pic.o hello.pic.o -lmicoccm$(VERSION) $(LDLIBS)
clean:
$(RM) client hello.$(SOEXT)
$(RM) hello_ccm.cc hello_ccm.h
$(RM) hello.cc hello.h
$(RM) *.o *.$(SOEXT) *~ core *.ior .depend
client.o: client.cc hello.h
hello.pic.o: hello.cc
hello_impl.pic.o: hello_impl.cc hello_ccm.h hello.h
hello_ccm.pic.o: hello_ccm.cc
hello_ccm.cc hello_ccm.h: hello.idl
$(CCMGEN) $^
hello.cc hello.h: hello.idl
$(IDL) $^
--- NEW FILE: README ---
This is the same example as ../hello, but compiles the component into
a loadable shared library.
--- NEW FILE: client.cc ---
#include <CORBA.h>
#include <mico/CosNaming.h>
#include "hello.h"
int
main (int argc, char *argv[])
{
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
CORBA::Object_var obj = orb->resolve_initial_references ("NameService");
CosNaming::NamingContextExt_var nc =
CosNaming::NamingContextExt::_narrow (obj);
assert (!CORBA::is_nil (nc));
obj = nc->resolve_str ("HelloHome");
assert (!CORBA::is_nil (obj));
HelloHome_var hh = HelloHome::_narrow (obj);
HelloWorld_var hw = hh->create ();
hw->message ("Hello World");
hw->sayHello ();
hw->remove ();
return 0;
}
--- NEW FILE: hello ---
#!/bin/sh
MICORC=/dev/null
export MICORC
# run Naming Service
echo "Starting Naming Service ..."
rm -f nsd.ior
nsd --ior nsd.ior &
nsd_pid=$!
trap "kill $nsd_pid > /dev/null 2> /dev/null" 0
# wait for Naming Service to start
for i in 0 1 2 3 4 5 6 7 8 9 ; do
if test -r nsd.ior ; then break ; else sleep 1 ; fi
done
# start Server Activator
echo "Starting Server Activator ..."
rm -f ccmd.ior
mico-ccmd --ior ccmd.ior &
server_pid=$!
trap "kill $nsd_pid $server_pid > /dev/null 2> /dev/null" 0
# wait for Server Activator to start
for i in 0 1 2 3 4 5 6 7 8 9 ; do
if test -r ccmd.ior ; then break ; else sleep 1 ; fi
done
echo "Loading HelloWorld component ..."
ccmload -ORBInitRef NameService=file://`pwd`/nsd.ior --sa file://`pwd`/ccmd.ior --ns HelloHome -v HelloHome ./hello.so
# run Client
echo "Running Client ..."
./client -ORBInitRef NameService=file://`pwd`/nsd.ior
--- NEW FILE: hello.idl ---
interface Hello {
void sayHello ();
};
component HelloWorld supports Hello {
attribute string message;
};
home HelloHome manages HelloWorld {
};
--- NEW FILE: hello_impl.cc ---
#include "hello.h"
class HelloWorld_impl : virtual public CCM_HelloWorld {
private:
CORBA::String_var _msg;
public:
void sayHello ()
{
cout << _msg << endl;
}
char * message ()
{
return CORBA::string_dup (_msg);
}
void message (const char * msg)
{
_msg = CORBA::string_dup (msg);
}
};
class HelloHome_impl : virtual public CCM_HelloHome {
public:
Components::EnterpriseComponent_ptr create ()
{
return new HelloWorld_impl;
}
};
extern "C" {
Components::HomeExecutorBase_ptr create_HelloHome ()
{
return new HelloHome_impl;
}
}
|
|
From: Karel G. <kg...@us...> - 2002-03-23 19:54:36
|
Update of /cvsroot/micomt/mico/demo/ccm/hello2 In directory usw-pr-cvs1:/tmp/cvs-serv26975/hello2 Log Message: Directory /cvsroot/micomt/mico/demo/ccm/hello2 added to the repository |
