diff options
author | bala <balanatarajan@users.noreply.github.com> | 2003-12-13 01:29:38 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2003-12-13 01:29:38 +0000 |
commit | 395cacf21095841234c6b9288e3cded98e726eea (patch) | |
tree | ed630d93e370ffb2c906111588adc98253c69a3c | |
parent | 1d3349fae042a7086e2ed55482aab8820087b601 (diff) | |
download | ATCD-395cacf21095841234c6b9288e3cded98e726eea.tar.gz |
ChangeLogTag:Fri Dec 12 19:27:11 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r-- | TAO/ChangeLog | 12 | ||||
-rw-r--r-- | TAO/tests/OBV/Makefile | 1 | ||||
-rwxr-xr-x | TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl | 2 | ||||
-rw-r--r-- | TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile | 58 | ||||
-rw-r--r-- | TAO/tests/Portable_Interceptors/Makefile | 2 |
5 files changed, 62 insertions, 13 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 04be3565f78..ef31775ef17 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Fri Dec 12 19:27:11 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tests/OBV/Makefile: + * tests/Portable_Interceptors/Makefile: + * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile: + + Added missing directories to the build. + + * tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl: + + Changed the executable name for the test. + Fri Dec 12 19:10:53 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tests/OBV/Collocated/Forward/Makefile: diff --git a/TAO/tests/OBV/Makefile b/TAO/tests/OBV/Makefile index 36a5c1b59de..8da1c3d328f 100644 --- a/TAO/tests/OBV/Makefile +++ b/TAO/tests/OBV/Makefile @@ -13,6 +13,7 @@ DIRS = Any \ Factory \ Forward \ + Collocated \ TC_Alignment diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl index 7543b6e9454..f4b4ecb0f99 100755 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl @@ -13,7 +13,7 @@ $file = PerlACE::LocalFile ("test.ior"); unlink $file; -$SV = new PerlACE::Process ("collocated", "-ORBobjrefstyle url"); +$SV = new PerlACE::Process ("Collocated_Test", "-ORBobjrefstyle url"); print STDERR "\n\n==== Running interceptor Dynamic test\n"; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile index 2326a90c595..9cb6ca27001 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile @@ -1,13 +1,16 @@ #---------------------------------------------------------------------------- # GNU Makefile # -# @file Makefile +# @file Makefile.Portable_Interceptors_Service_Context_Manipulation_Collocated # # $Id$ # +# This file was automatically generated by MPC. Any changes made directly to +# this file will be lost the next time it is generated. +# #---------------------------------------------------------------------------- -MAKEFILE = Makefile -BIN_UNCHECKED = collocated +MAKEFILE = Makefile +BIN_UNCHECKED = collocated ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO @@ -16,7 +19,7 @@ ifndef CIAO_ROOT CIAO_ROOT = $(TAO_ROOT)/CIAO endif -TAO_IDL = $TAO_ROOT/TAO_IDL/tao_idl +TAO_IDL = ../../../../../bin/tao_idl IDL_FILES = test IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext))) @@ -33,12 +36,31 @@ FILES = \ #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- -LDLIBS = -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO -lACE +LDLIBS = -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_ObjRefTemplate -lTAO_Valuetype -lTAO -lACE include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU ## We don't need the ACELIB setting from wrapper_macros.GNU ACELIB = include $(TAO_ROOT)/rules.tao.GNU +# To build multiple executables in the same directory on AIX, it works +# best to have a template directory per project. +# The compiler/linker isn't too smart about instantiating templates... +ifdef TEMPINCDIR +TEMPINCDIR := $(TEMPINCDIR)/Portable_Interceptors_Service_Context_Manipulation_Collocated + +all: $(TEMPINCDIR) + +$(TEMPINCDIR): + @-test -d $(TEMPINCDIR) || mkdir -p $(TEMPINCDIR) $(ACE_NUL_STDERR) + +endif +OUTPUT_DIRECTORY = . +all: $(OUTPUT_DIRECTORY) + +$(OUTPUT_DIRECTORY): + -@mkdir -p "$(OUTPUT_DIRECTORY)" + + ifeq ($(interceptors),1) BIN = $(BIN_UNCHECKED) else @@ -47,10 +69,17 @@ endif OBJS = $(addsuffix .o, $(notdir $(FILES))) SRC = $(addsuffix .cpp, $(FILES)) +ifneq (,$(RC)) + FILES += $(RESOURCES) +endif + ifneq ($(BIN),) all: idl_stubs -testC.cpp testS.cpp test_i.cpp Collocated_ORBInitializer.cpp interceptors.cpp Client_Task.cpp Server_Task.cpp Collocated_Test.cpp: idl_stubs + +# This rule forces make to run the idl_stubs +# target before building any of the source files. +FORCED_IDL_STUBS = testC.cpp testS.cpp test_i.cpp Collocated_ORBInitializer.cpp interceptors.cpp Client_Task.cpp Server_Task.cpp Collocated_Test.cpp endif include $(ACE_ROOT)/include/makeinclude/macros.GNU @@ -60,7 +89,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk -CPPFLAGS += -I$(ACE_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT) +CPPFLAGS += -I../../../.. -I../../../../tao -I../../../../.. ifeq ($(static_libs),1) ifneq ($(LIB),) CPPFLAGS += -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS @@ -70,7 +99,7 @@ endif LDFLAGS += -L../../../../../ace,../../../../tao,../../../../tao/PortableServer,../../../../tao/Valuetype,../../../../tao/ObjRefTemplate,../../../../tao/IORInterceptor -L../../../../../lib -TAO_IDLFLAGS += -Gv -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h +TAO_IDLFLAGS += -Gv -I../../../.. -I../../../../tao -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- @@ -78,21 +107,26 @@ require_warning: @echo This project will not be built due to one of the following missing features: @echo interceptors -../../../../../lib: - -@mkdir -p "../../../../../lib" - -ADDITIONAL_IDL_TARGETS = # IDL File Directory: . ifneq ($(ADDITIONAL_IDL_TARGETS),) idl_stubs: $(ADDITIONAL_IDL_TARGETS) endif +ifneq ($(FORCED_IDL_STUBS),) +$(FORCED_IDL_STUBS): idl_stubs +endif + .PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) +ifndef kylix $(BIN): $(addprefix $(VDIR), $(OBJS)) $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) +else +$(BIN): $(addprefix $(VDIR), $(OBJS)) + $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $(VLDLIBS) $(BORINITEXEOBJ) $(POSTLINK) $^, $@,, +endif realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) diff --git a/TAO/tests/Portable_Interceptors/Makefile b/TAO/tests/Portable_Interceptors/Makefile index 2fb46435abe..4c3b2a644c1 100644 --- a/TAO/tests/Portable_Interceptors/Makefile +++ b/TAO/tests/Portable_Interceptors/Makefile @@ -18,6 +18,8 @@ DIRS = \ ForwardRequest \ Request_Interceptor_Flow \ PICurrent \ + Bug_1559 \ + Collocated \ AMI ifndef TAO_ROOT |