ChangeLogTag:Wed Mar 8 01:33:21 2000 Christopher Kohlhoff <chris@kohlhoff.com>

11 files changed, 92 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 365dca3790e..b8b96ea1b8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed Mar  8 01:33:21 2000  Christopher Kohlhoff <chris@kohlhoff.com> 
+
+	* tests/Makefile.bor: Added new test Process_Manager_Test.
+  
+        * include/makeinclude/compiler.bor, make_flags.bor: Added support
+	  for BCB's codeguard memory checking tool.
+
+        * include/makeinclude/outputdir.bor: Allow a different directory
+	  creation tool to be substituted for "mkdir" on Win9x.
+	
 Tue Mar 07 18:37:26 2000  Tom Ziomek <tomz@cc701.comm.mot.com>
 
         * ace/Singleton.h: added comment to ACE_Unmanaged_Singleton
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 365dca3790e..b8b96ea1b8c 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Wed Mar  8 01:33:21 2000  Christopher Kohlhoff <chris@kohlhoff.com> 
+
+	* tests/Makefile.bor: Added new test Process_Manager_Test.
+  
+        * include/makeinclude/compiler.bor, make_flags.bor: Added support
+	  for BCB's codeguard memory checking tool.
+
+        * include/makeinclude/outputdir.bor: Allow a different directory
+	  creation tool to be substituted for "mkdir" on Win9x.
+	
 Tue Mar 07 18:37:26 2000  Tom Ziomek <tomz@cc701.comm.mot.com>
 
         * ace/Singleton.h: added comment to ACE_Unmanaged_Singleton
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 365dca3790e..b8b96ea1b8c 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Wed Mar  8 01:33:21 2000  Christopher Kohlhoff <chris@kohlhoff.com> 
+
+	* tests/Makefile.bor: Added new test Process_Manager_Test.
+  
+        * include/makeinclude/compiler.bor, make_flags.bor: Added support
+	  for BCB's codeguard memory checking tool.
+
+        * include/makeinclude/outputdir.bor: Allow a different directory
+	  creation tool to be substituted for "mkdir" on Win9x.
+	
 Tue Mar 07 18:37:26 2000  Tom Ziomek <tomz@cc701.comm.mot.com>
 
         * ace/Singleton.h: added comment to ACE_Unmanaged_Singleton
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index ffe30ef1730..6a452112425 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Wed Mar  8 01:33:21 2000  Christopher Kohlhoff <chris@kohlhoff.com> 
+
+        * TAO/Makefile.bor: Added support for 3 different "levels" of
+	  build: minimal, typical and all.
+
+	* TAO/orbsvcs/orbsvcs/Makefile.bor: Added new files.
+
 Tue Mar 07 15:42:41 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* docs/interceptors.html: Fixed some html tag problems.  Thanks to
diff --git a/TAO/Makefile.bor b/TAO/Makefile.bor
index 6d170cd475c..4bb0fec8c9a 100644
--- a/TAO/Makefile.bor
+++ b/TAO/Makefile.bor
@@ -2,20 +2,31 @@
 # Makefile for building ACE and TAO 
 #
 
-!ifndef BUILDALL
+!ifndef BUILD
+BUILD = typical
+!endif
+
+!if $(BUILD) == minimal
+
+DIRS = \
+	..\ace \
+	..\apps\gperf\src \
+	tao \
+	TAO_IDL \
+	orbsvcs
+
+!elif $(BUILD) == typical
 
-# By default we build a smaller set of libraries and executables.
 DIRS = \
 	..\ace \
 	..\apps\gperf\src \
 	tao \
-	tao_idl \
+	TAO_IDL \
 	orbsvcs \
 	utils
 
-!else
+!elif $(BUILD) == all
 
-# When BUILDALL is defined we will make everything that can be built.
 DIRS = \
 	..\ace \
 	..\apps \
@@ -28,6 +39,8 @@ DIRS = \
 	tests \
 	utils
 
+!else
+!error Please set your BUILD variable to one of "minimal", "typical" or "all".
 !endif
 	
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/THANKS b/THANKS
index 3f6d4517106..2c5f15038b7 100644
--- a/THANKS
+++ b/THANKS
@@ -352,7 +352,7 @@ Brad Walton <brad.walton@transnexus.com>
 Paul Motuzenko <p_motuzenko@hotmail.com>
 Kurt Sussman <kls@best.com>
 Rob Thornton <ret1@cec.wustl.edu>
-Chanaka Liyanaarachchi <chanakal@ittc.ukans.edu>
+Chanaka Liyanaarachchi <chanaka@ociweb.com>
 Saneyasu <sane@sail.t.u-tokyo.ac.jp>
 Steve Kay <slk1@icore.ih.lucent.com>
 Greg White <gwhite@northlink.com>
@@ -914,6 +914,7 @@ David O'Farrell <eeidofl@eei.ericsson.se>
 Bob Bouterse <BBouterse@escient.com>
 Malcolm Spence <spence_m@ociweb.com>
 Dong-Yueh Liu <dyliu@ms1.hinet.net>
+Craig Ball <Craig.Ball@megasys.com> 
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson.  Paul devised the recursive Makefile scheme that
diff --git a/ace/Token.h b/ace/Token.h
index 08711a59358..f88d53fee7b 100644
--- a/ace/Token.h
+++ b/ace/Token.h
@@ -36,7 +36,7 @@ class ACE_Export ACE_Token
   // = TITLE
   //    Class that acquires, renews, and releases a synchronization
   //    token that is serviced in strict FIFO ordering and that also
-  //    supports readers/writer semantics.
+  //    supports (1) recursion and (2) readers/writer semantics.
   //
   // = DESCRIPTION
   //    This class is a more general-purpose synchronization mechanism
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
index 51b2357fecb..69e064e4c3d 100644
--- a/include/makeinclude/compiler.bor
+++ b/include/makeinclude/compiler.bor
@@ -59,15 +59,23 @@ STATIC_CFLAGS = -tWR
 STATIC_LFLAGS =
 !endif
 
+!ifdef CODEGUARD
+CODEGUARD_CFLAGS = -vG
+!else
+# CFLAGS compatibility with a default application generated by
+# the BCB IDE, however these flags do not work with codeguard.
+CODEGUARD_CFLAGS = -b- -Ve -Vx
+!endif
+
 THREAD_CFLAGS = -D_MT -tWM
 WARNINGS_CFLAGS = -w-rvl -w-rch -w-par -w-ccc -w-obs -w-aus -w-pia
 DEFINES_CFLAGS = -DWIN32;_NO_VCL
 QUIET_CFLAGS = -q
-MISC_CFLAGS = -a8 -b- -Ve -Vx
+ALIGN_CFLAGS = -a8
 
 COMMON_CFLAGS = $(QUIET_CFLAGS) $(DEBUG_CFLAGS) $(THREAD_CFLAGS) \
 	$(STATIC_CFLAGS) $(WARNINGS_CFLAGS) $(DEFINES_CFLAGS) \
-	$(MISC_CFLAGS)
+	$(ALIGN_CFLAGS) $(CODEGUARD_CFLAGS)
 
 COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn
 
@@ -120,16 +128,20 @@ VCLVER = 40
 # Libraries to be linked
 #
 
+!ifdef CODEGUARD
+CODEGUARD_LIB = cg32.lib
+!endif
+
 !ifdef STATIC
 !ifdef PASCAL
-COMMON_LIBS = import32.lib vcl$(VCLVER).lib vcle$(VCLVER).lib cp32mt.lib ws2_32.lib
+COMMON_LIBS = $(CODEGUARD_LIB) import32.lib vcl$(VCLVER).lib vcle$(VCLVER).lib cp32mt.lib ws2_32.lib
 !else
-COMMON_LIBS = import32.lib cw32mt.lib ws2_32.lib
+COMMON_LIBS = $(CODEGUARD_LIB) import32.lib cw32mt.lib ws2_32.lib
 !endif
 !else
 !ifdef PASCAL
-COMMON_LIBS = import32.lib vcl$(VCLVER).bpi vcle$(VCLVER).lib cp32mti.lib ws2_32.lib
+COMMON_LIBS = $(CODEGUARD_LIB) import32.lib vcl$(VCLVER).bpi vcle$(VCLVER).lib cp32mti.lib ws2_32.lib
 !else
-COMMON_LIBS = import32.lib cw32mti.lib ws2_32.lib
+COMMON_LIBS = $(CODEGUARD_LIB) import32.lib cw32mti.lib ws2_32.lib
 !endif
 !endif
diff --git a/include/makeinclude/make_flags.bor b/include/makeinclude/make_flags.bor
index e6fe899eb9e..75827afb063 100644
--- a/include/makeinclude/make_flags.bor
+++ b/include/makeinclude/make_flags.bor
@@ -14,4 +14,8 @@ STATIC_FLAG = -DSTATIC
 PASCAL_FLAG = -DPASCAL
 !endif
 
-MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG)
+!ifdef CODEGUARD
+CODEGUARD_FLAG = -DCODEGUARD
+!endif
+
+MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) $(CODEGUARD_FLAG)
diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor
index 719e2721a1b..5bf73ab3ebf 100644
--- a/include/makeinclude/outputdir.bor
+++ b/include/makeinclude/outputdir.bor
@@ -51,10 +51,20 @@ BINDIR=$(BASE_BINDIR)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)
 CORE_BINDIR=$(ACE_ROOT)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)
 !endif
 
+!ifdef MKDIR
+MAKE_BINDIR=$(MKDIR) "$(BINDIR)"
+!else
+# Use default mkdir provided by command shell. May not work on Win9x.
 MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)"
+!endif
 
 !ifndef OBJDIR
 OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(STATIC_DIR)\$(DEBUG_DIR)
 !endif
 
+!ifdef MKDIR
+MAKE_OBJDIR=$(MKDIR) "$(OBJDIR)"
+!else
+# Use default mkdir provided by command shell. May not work on Win9x.
 MAKE_OBJDIR=if not exist "$(OBJDIR)" mkdir "$(OBJDIR)"
+!endif
diff --git a/tests/Makefile.bor b/tests/Makefile.bor
index cdaa9546c89..d2d4efb35ea 100644
--- a/tests/Makefile.bor
+++ b/tests/Makefile.bor
@@ -51,6 +51,7 @@ TESTS = \
 	Priority_Buffer_Test \
 	Priority_Reactor_Test \
 	Priority_Task_Test \
+	Process_Manager_Test \
 	Process_Mutex_Test \
 	Process_Strategy_Test \
 	RB_Tree_Test \