diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-15 04:31:35 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-15 04:31:35 +0000 |
| commit | b0b7dced450c53eaca173efa49e450b304d31006 (patch) | |
| tree | 63df93ff2aca9708b43434116c91a7dc666fb2f5 | |
| parent | adaab8fc46791299983cdc7c942a7cb3411c7069 (diff) | |
| download | ATCD-b0b7dced450c53eaca173efa49e450b304d31006.tar.gz | |
ChangeLogTag:Fri Mar 14 22:26:56 2003 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/ciao_client.mpb | 8 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/ciao_component.mpb | 7 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/ciao_server.mpb | 4 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/modules/Driver.pm | 8 |
5 files changed, 40 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 2b430febc64..3f7164b5f0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Fri Mar 14 22:26:56 2003 Nanbor Wang <nanbor@cs.wustl.edu> + + * bin/MakeProjectCreator/config/ciao_client.mpb: + * bin/MakeProjectCreator/config/ciao_component.mpb: + * bin/MakeProjectCreator/config/ciao_server.mpb: + * bin/MakeProjectCreator/modules/Driver.pm: Merged in CIAO + specific rules and default environment settings. These changes + help me take advantage of Chad's and other's work without + complicating my workspace. Most of other CIAO stuff are rather + localized. + + These changes have no effect on others whatsoever. + Fri Mar 14 11:49:27 2003 Steve Huston <shuston@riverace.com> * tests/Cached_Allocator_Test.cpp: Fix access out-of-bounds error. diff --git a/bin/MakeProjectCreator/config/ciao_client.mpb b/bin/MakeProjectCreator/config/ciao_client.mpb new file mode 100644 index 00000000000..8d55d257771 --- /dev/null +++ b/bin/MakeProjectCreator/config/ciao_client.mpb @@ -0,0 +1,8 @@ +project : taolib_with_idl { + depends += CIAO_Client + idlflags += -I $(CIAO_ROOT) -I $(TAO_ROOT) -I $(TAO_ROOT)/orbsvcs/orbsvcs + idlflags += -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" + libs += TAO TAO_IFR_Client CIAO_Client + libpaths += $(TAO_ROOT)/tao/IFR_Client $(CIAO_ROOT)/ciao + includes += $(CIAO_ROOT) $(CIAO_ROOT)/ciao +} diff --git a/bin/MakeProjectCreator/config/ciao_component.mpb b/bin/MakeProjectCreator/config/ciao_component.mpb new file mode 100644 index 00000000000..682c976e2d6 --- /dev/null +++ b/bin/MakeProjectCreator/config/ciao_component.mpb @@ -0,0 +1,7 @@ +project : ciao_client { + depends += CIAO_Container + libs += TAO_PortableServer TAO_Security CIAO_Container + libpaths += $(TAO_ROOT)/tao/PortableServer $(TAO_ROOT)/orbsvcs/orbsvcs + includes += $(TAO_ROOT)/orbsvcs/orbsvcs + idlflags += -I$(TAO_ROOT) -I$(TAO_ROOT)/CIAO/ciao +} diff --git a/bin/MakeProjectCreator/config/ciao_server.mpb b/bin/MakeProjectCreator/config/ciao_server.mpb new file mode 100644 index 00000000000..a4a584e5742 --- /dev/null +++ b/bin/MakeProjectCreator/config/ciao_server.mpb @@ -0,0 +1,4 @@ +project : ciao_component { + depends += CIAO_Server + libs += CIAO_Server +} diff --git a/bin/MakeProjectCreator/modules/Driver.pm b/bin/MakeProjectCreator/modules/Driver.pm index a5be9e65179..14ad94bab88 100644 --- a/bin/MakeProjectCreator/modules/Driver.pm +++ b/bin/MakeProjectCreator/modules/Driver.pm @@ -409,6 +409,14 @@ sub run { $relative{'TAO_ROOT'} = "$relative{ACE_ROOT}/TAO"; } } + if (!defined $relative{'CIAO_ROOT'}) { + if (defined $ENV{CIAO_ROOT}) { + $relative{'CIAO_ROOT'} = $ENV{CIAO_ROOT}; + } + else { + $relative{'CIAO_ROOT'} = "$relative{ACE_ROOT}/TAO/CIAO"; + } + } } ## Set up un-buffered output for the progress callback |