diff options
| -rw-r--r-- | TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/tests/BiDirectional/BiDirectional.mpc | 3 | ||||
| -rw-r--r-- | TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc | 3 | ||||
| -rw-r--r-- | TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc | 3 | ||||
| -rw-r--r-- | TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc | 2 | ||||
| -rw-r--r-- | TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc | 3 | ||||
| -rw-r--r-- | TAO/tests/MT_BiDir/MT_BiDir.mpc | 3 | ||||
| -rw-r--r-- | TAO/tests/NestedUpcall/Triangle_Test/TT.mpc | 4 |
8 files changed, 20 insertions, 14 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index cf4b7ac3aa0..de583be5b2e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Wed Dec 20 09:36:00 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/BiDirectional/BiDirectional.mpc: + * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc: + * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc: + * tests/Bug_2417_Regression/Bug_2417_Regression.mpc: + * tests/Bug_2560_Regression/Bug_2560_Regression.mpc: + * tests/MT_BiDir/MT_BiDir.mpc: + * tests/NestedUpcall/Triangle_Test/TT.mpc: + Disabled some projects that can't compile when CORBA/e + micro has been enabled. Also removed some after usage because + there is now a seperate idl project + Wed Dec 20 09:31:00 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * examples/Callback_Quoter/Callback_Quoter.mpc: diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc index ac0132aacd9..bb389945946 100644 --- a/TAO/tests/BiDirectional/BiDirectional.mpc +++ b/TAO/tests/BiDirectional/BiDirectional.mpc @@ -20,10 +20,9 @@ project(*Server): taoserver, anytypecode, avoids_minimum_corba, bidir_giop, avoi } } -project(*Client): taoserver, anytypecode, avoids_minimum_corba, bidir_giop { +project(*Client): taoserver, anytypecode, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { exename = client after += *idl - after += *Server Source_Files { test_i.cpp client.cpp diff --git a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc index 7805f4ad4cb..a76649bfc17 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc +++ b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc @@ -20,9 +20,8 @@ project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_mi } } -project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop { +project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { after += *idl - after += *Server Source_Files { test_i.cpp client.cpp diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc index 590d8704769..7d7848bccd9 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc +++ b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc @@ -20,9 +20,8 @@ project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_mi } } -project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop { +project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { after += *idl - after += *Server Source_Files { test_i.cpp client.cpp diff --git a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc index fee0918158e..e2bd6d206cd 100644 --- a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc +++ b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc @@ -24,7 +24,7 @@ project(*Server): taoserver, messaging, threads { project(*Client): taoserver, threads { exename = client - after += *Server + after += *idl Source_Files { subscriber_impl.cpp subscriberS.cpp diff --git a/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc b/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc index 029187f3e03..31a88d65d5e 100644 --- a/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc +++ b/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc @@ -10,7 +10,6 @@ project(*idl): taoidldefaults { project(*client) : taoclient { after += *idl - after += *Server exename = client source_files { client.cpp @@ -22,7 +21,7 @@ project(*client) : taoclient { } } -project(*server) : taoserver { +project(*server) : taoserver, avoids_corba_e_micro { after += *idl source_files { server.cpp diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc index 8df1d19f40f..f04bbed84ce 100644 --- a/TAO/tests/MT_BiDir/MT_BiDir.mpc +++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc @@ -25,9 +25,8 @@ project(*Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoi } } -project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop { +project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { after += *idl - after += *Server Source_Files { Client_Task.cpp Receiver_i.cpp diff --git a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc index be1ef3d3052..4009beffab7 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc +++ b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc @@ -22,9 +22,8 @@ project(*Nested_Upcall_Server_A): taoexe, utils, portableserver, avoids_corba_e_ } } -project(*Nested_Upcall_Server_B): taoexe, utils, portableserver { +project(*Nested_Upcall_Server_B): taoexe, utils, portableserver, avoids_corba_e_micro { after += *Nested_Upcall_Server_Idl - after += *Nested_Upcall_Server_A Source_Files { Object_B_i.cpp server_B.cpp @@ -39,7 +38,6 @@ project(*Nested_Upcall_Server_B): taoexe, utils, portableserver { project(*Nested_Upcall_Initiator): taoexe, utils, portableserver { after += *Nested_Upcall_Server_Idl - after += *Nested_Upcall_Server_B Source_Files { Initiator_i.cpp initiator.cpp |