diff options
Diffstat (limited to 'TAO/orbsvcs/tests/ImplRepo')
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc | 23 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am | 106 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc | 13 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/Makefile.am | 23 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am | 4 | ||||
-rwxr-xr-x | TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl | 2 | ||||
-rwxr-xr-x | TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl | 2 | ||||
-rwxr-xr-x | TAO/orbsvcs/tests/ImplRepo/run_test.pl | 12 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am | 11 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc | 4 |
12 files changed, 42 insertions, 164 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc index c42ffc5651c..049f561a5fc 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc @@ -1,36 +1,19 @@ // $Id$ -project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*Server): taoserver, minimum_corba, imr_client { idlflags += -Sa -St - - IDL_Files { - Messenger.idl - } - - custom_only = 1 -} - - -project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, imr_client { - after += *idl exename = MessengerServer Source_Files { Messenger_i.cpp MessengerServer.cpp - MessengerS.cpp - MessengerC.cpp - } - IDL_Files { } } -project(*Client): taoexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): taoexe, minimum_corba { + idlflags += -Sa -St exename = MessengerClient Source_Files { MessengerC.cpp MessengerClient.cpp } - IDL_Files { - } } diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am deleted file mode 100644 index 95ef8567a2b..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2604_Idl.am - -BUILT_SOURCES = \ - MessengerC.cpp \ - MessengerC.h \ - MessengerC.inl \ - MessengerS.cpp \ - MessengerS.h \ - MessengerS.inl - -CLEANFILES = \ - Messenger-stamp \ - MessengerC.cpp \ - MessengerC.h \ - MessengerC.inl \ - MessengerS.cpp \ - MessengerS.h \ - MessengerS.inl - -MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp - -Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Messenger.idl - @touch $@ - -noinst_HEADERS = \ - Messenger.idl - -## Makefile.Bug_2604_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += MessengerClient - -MessengerClient_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -MessengerClient_SOURCES = \ - MessengerC.cpp \ - MessengerClient.cpp \ - Messenger_i.h - -MessengerClient_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2604_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += MessengerServer - -MessengerServer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -MessengerServer_SOURCES = \ - MessengerC.cpp \ - MessengerS.cpp \ - MessengerServer.cpp \ - Messenger_i.cpp \ - Messenger_i.h - -MessengerServer_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp index 41195ba4376..ebb2309b7f7 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp @@ -73,10 +73,6 @@ main (int argc, char *argv[]) orb->run (); - // the following 1 second of sleep is needed to help - // Windows with "server shutdown too quickly so the - // client cannot get the reply" issue. - ACE_OS::sleep(1); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Messenger server shutting " "down.\n"))); root_poa->destroy (1, 1); diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc index 12ce27f4286..848b239d9ee 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc @@ -9,8 +9,8 @@ project(airplane_idl) : taoidldefaults { } -project(airplane server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client, avoids_corba_e_micro { - after += airplane_idl +project(airplane server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { + after += airplane_idl IDL_Files { } @@ -24,8 +24,8 @@ project(airplane server) : portableserver, orbsvcsexe, avoids_minimum_corba, ior } } -project(airplane client) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable { - after += airplane_idl +project(airplane client) : portableserver, orbsvcsexe, minimum_corba, iortable { + after += airplane_idl IDL_Files { } @@ -46,7 +46,8 @@ project(nestea_idl): taoidldefaults { custom_only = 1 } -project(nestea server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client, avoids_corba_e_micro, avoids_ace_for_tao { +project(nestea server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { + avoids += ace_for_tao after += nestea_idl IDL_Files { @@ -67,7 +68,7 @@ project(nestea server) : portableserver, orbsvcsexe, avoids_minimum_corba, iorta } } -project(nestea client) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable { +project(nestea client) : portableserver, orbsvcsexe, minimum_corba, iortable { after += nestea_idl IDL_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Makefile.am index d2dd49722b9..15e3b659ff7 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/Makefile.am @@ -13,12 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) SUBDIRS = \ . \ - Bug_2604_Regression \ NameService \ scale @@ -49,12 +48,13 @@ Airplane-stamp: $(srcdir)/Airplane.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Airplane.idl @touch $@ + noinst_HEADERS = \ Airplane.idl ## Makefile.airplane_client.am -if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += airplane_client @@ -78,11 +78,11 @@ airplane_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif BUILD_EXCEPTIONS +endif !BUILD_MINIMUM_CORBA ## Makefile.airplane_server.am -if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += airplane_server @@ -109,7 +109,7 @@ airplane_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif BUILD_EXCEPTIONS +endif !BUILD_MINIMUM_CORBA ## Makefile.nestea_idl.am @@ -136,12 +136,13 @@ Nestea-stamp: $(srcdir)/Nestea.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Nestea.idl @touch $@ + noinst_HEADERS += \ Nestea.idl ## Makefile.nestea_client.am -if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += nestea_client @@ -165,11 +166,12 @@ nestea_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif BUILD_EXCEPTIONS +endif !BUILD_MINIMUM_CORBA ## Makefile.nestea_server.am -if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += nestea_server @@ -196,7 +198,8 @@ nestea_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif BUILD_EXCEPTIONS +endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc index c5a71e0cbca..fe939b060c5 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project: namingexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project: namingexe, minimum_corba { } diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am index 8ced4a626dc..038d3a8f254 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.ImplRepo_NameService.am -if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = test @@ -37,7 +37,7 @@ test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif BUILD_EXCEPTIONS +endif !BUILD_MINIMUM_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl index b9b1ec65089..827a33cd317 100755 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl @@ -18,7 +18,7 @@ $activator_ior = PerlACE::LocalFile("activator.ior"); $IMR = new PerlACE::Process ("../../../ImplRepo_Service/ImplRepo_Service"); $ACTIVATOR = new PerlACE::Process("../../../ImplRepo_Service/ImR_Activator"); $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service"); -$TAO_IMR = new PerlACE::Process ("$ENV{ACE_ROOT}/bin/tao_imr"); +$TAO_IMR = new PerlACE::Process ("../../../../../bin/tao_imr"); # We want the tao_imr executable to be found exactly in the path # given, without being modified by the value of -ExeSubDir. diff --git a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl index 629083b74d9..a2f9847b70a 100755 --- a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl @@ -15,7 +15,7 @@ $imr_locator_ior = PerlACE::LocalFile ("imr_locator.ior"); $pfile = PerlACE::LocalFile ("persistence.dat"); $IMR_LOCATOR = new PerlACE::Process ("../../../ImplRepo_Service/ImplRepo_Service"); -$TAO_IMR = new PerlACE::Process ("$ENV{ACE_ROOT}/bin/tao_imr"); +$TAO_IMR = new PerlACE::Process ("../../../../../bin/tao_imr"); # We want the tao_imr executable to be found exactly in the path # given, without being modified by the value of -ExeSubDir. diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl index 532f878adbe..21fcf064c49 100755 --- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl @@ -45,7 +45,7 @@ my $endpoint = "-ORBEndpoint " . "$protocol" . "://:" . $port; my $IMR_LOCATOR = new PerlACE::Process ("../../ImplRepo_Service/ImplRepo_Service"); my $IMR_ACTIVATOR = new PerlACE::Process ("../../ImplRepo_Service/ImR_Activator"); -my $TAO_IMR = new PerlACE::Process("$ENV{ACE_ROOT}/bin/tao_imr"); +my $TAO_IMR = new PerlACE::Process("../../../../bin/tao_imr"); # We want the tao_imr executable to be found exactly in the path # given, without being modified by the value of -ExeSubDir. @@ -272,7 +272,7 @@ sub airplane_ir_test my $imr_initref = "-ORBInitRef ImplRepoService=file://$imr_locator_ior"; - $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior $refstyle"); + $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior"); $IMR_LOCATOR->Spawn (); if (PerlACE::waitforfile_timed ($imr_locator_ior, 5) == -1) { @@ -372,7 +372,7 @@ sub nestea_ir_test my $imr_initref = "-orbobjrefstyle URL -ORBInitRef ImplRepoService=file://$imr_locator_ior"; - $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior $refstyle"); + $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior"); $IMR_LOCATOR->Spawn (); if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) { @@ -510,7 +510,7 @@ sub perclient my $imr_initref = "-orbobjrefstyle URL -ORBInitRef ImplRepoService=file://$imr_locator_ior"; # specify an endpoint so that we can use corbaloc url for the client. - $IMR_LOCATOR->Arguments ("-d 2 -orbendpoint iiop://:8888 -o $imr_locator_ior $refstyle"); + $IMR_LOCATOR->Arguments ("-d 2 -orbendpoint iiop://:8888 -o $imr_locator_ior"); $IMR_LOCATOR->Spawn (); if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) { @@ -605,7 +605,7 @@ sub shutdown_repo # Specify an endpoint so that we can restart on the same port. # Specify persistence so that we can test that shutdown-repo -a works after reconnect - $IMR_LOCATOR->Arguments ("-p test.repo -d 1 -orbendpoint iiop://:8888 -o $imr_locator_ior $refstyle"); + $IMR_LOCATOR->Arguments ("-p test.repo -d 1 -orbendpoint iiop://:8888 -o $imr_locator_ior"); unlink $imr_locator_ior; $IMR_LOCATOR->Spawn (); @@ -685,7 +685,7 @@ sub persistent_ir_test unlink $imr_locator_ior; ## Be sure to start the ImR on a consistent endpoint, so that any created IORs ## remain valid even if the ImR restarts. - $IMR_LOCATOR->Arguments ("-orbendpoint iiop://:8888 -x $backing_store -d 2 -o $imr_locator_ior $refstyle"); + $IMR_LOCATOR->Arguments ("-orbendpoint iiop://:8888 -x $backing_store -d 2 -o $imr_locator_ior"); $IMR_LOCATOR->Spawn (); if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) { print STDERR "ERROR: cannot find $imr_locator_ior\n"; diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am index 8d985b8e508..7b336b7db96 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am @@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = @@ -43,12 +43,13 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ + noinst_HEADERS = \ test.idl ## Makefile.scaletest_client.am -if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -71,11 +72,11 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif BUILD_EXCEPTIONS +endif !BUILD_MINIMUM_CORBA ## Makefile.scaletest_server.am -if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -100,7 +101,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif BUILD_EXCEPTIONS +endif !BUILD_MINIMUM_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc index 1c256087109..5e8640bf068 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc @@ -7,7 +7,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client, avoids_corba_e_micro { +project(*server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { after += *idl IDL_Files { @@ -21,7 +21,7 @@ project(*server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, i } } -project(*client) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable { +project(*client) : portableserver, orbsvcsexe, minimum_corba, iortable { after += *idl IDL_Files { |