ChangeLogTag:Tue Mar 2 23:57:29 UTC 2004 Don Hinton <dhinton@dre.vanderbilt.edu>

19 files changed, 102 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index b72e95cd3bc..a37403b8775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+Tue Mar  2 23:57:29 UTC 2004  Don Hinton  <dhinton@dre.vanderbilt.edu>
+
+        * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm:
+          Added a check for "ciao" that mimics the behavior of
+          already in place for tao.  This will enable us to know
+          if it's a ciao project so we can include a ciao specific
+          rules file.
+
+        * bin/MakeProjectCreator/modules/Parser.pm:
+          Output the name of the file that can't be opened
+          instead of just saying unable to read.
+
+        * bin/MakeProjectCreator/modules/ProjectCreator.pm:
+          Don't always tack on a file extension.  This was
+          vexing when trying to pass a different template file.
+          This way, you can let your shell complete the file name
+          that you find without having to hit the delete key 5 times.
+
+          Allow calls to pass the absolute path--just easier for
+          scripts to handle.
+
+        * include/makeinclude/wrapper_macros.GNU:
+          Removed $(CCFLAGS) $(CPPFLAGS) from the link step.  Thanks
+          to Boris Kolpackov <boris@dre.vanderbilt.edu> for pointing
+          this out.
+
+        * include/makeinclude/rules.local.GNU:
+          Make sure assignments to CLEANUP_OBJS is always additive.
+
+        * include/makeinclude/platform_chorus.GNU:
+        * include/makeinclude/platform_chorus4.x_g++.GNU:
+        * include/makeinclude/platform_freebsd.GNU:
+        * include/makeinclude/platform_linux.GNU:
+        * include/makeinclude/platform_lynxos.GNU:
+        * include/makeinclude/platform_macosx.GNU:
+        * include/makeinclude/platform_macosx_panther.GNU:
+        * include/makeinclude/platform_openbsd.GNU:
+        * include/makeinclude/platform_psosim_g++.GNU:
+        * include/makeinclude/platform_qnx_neutrino.GNU:
+        * include/makeinclude/platform_qnx_rtp_gcc.GNU:
+        * include/makeinclude/platform_sunos5_g++.GNU:
+        * include/makeinclude/platform_unixware_g++.GNU:
+          Don't always include -pipe in CFLAGS, let users
+          control it with the pipes option.
+
 Tue Mar  2 18:46:11 2004  Steve Huston  <shuston@riverace.com>
 
 	* tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp:
diff --git a/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
index 8c83810d958..83a1b6b08d4 100644
--- a/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
@@ -87,6 +87,12 @@ sub fill_value {
     $value = ((defined $incs && $incs =~ /tao/i) ||
               (defined $libs && $libs =~ /tao/i));
   }
+  elsif ($name eq 'ciao') {
+      my($incs) = $self->get_assignment('includes');
+      my($libs) = $self->get_assignment('libpaths');
+    $value = ((defined $incs && $incs =~ /ciao/i) ||
+              (defined $libs && $libs =~ /ciao/i));
+  }
 
   return $value;
 }
diff --git a/bin/MakeProjectCreator/modules/Parser.pm b/bin/MakeProjectCreator/modules/Parser.pm
index 99c3e16bc79..c0fdec93b1c 100644
--- a/bin/MakeProjectCreator/modules/Parser.pm
+++ b/bin/MakeProjectCreator/modules/Parser.pm
@@ -135,7 +135,7 @@ sub read_file {
     close($ih);
   }
   else {
-    $errorString = 'Unable to open for reading';
+    $errorString = "Unable to open \"$input\" for reading";
     $status = 0;
   }
 
diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm
index 222e608dcf8..f9879de8503 100644
--- a/bin/MakeProjectCreator/modules/ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm
@@ -2173,9 +2173,17 @@ sub write_output_file {
   my($status)   = 0;
   my($error)    = undef;
   my($tover)    = $self->get_template_override();
-  my($template) = (defined $tover ? $tover : $self->get_template()) .
-                  ".$TemplateExtension";
-  my($tfile)    = $self->search_include_path($template);
+  my($template) = (defined $tover ? $tover : $self->get_template());
+
+  if (! ($template =~ /$TemplateExtension/)) {
+    $template = $template . ".$TemplateExtension";
+  }
+  my($tfile) = "";
+  if ($template =~ /^\//) {
+    $tfile = $template;
+  } else { 
+    $tfile = $self->search_include_path($template);
+  }
 
   if (defined $tfile) {
     ## Read in the template values for the
diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU
index 3ba9c080b13..b9f905e8f85 100644
--- a/include/makeinclude/platform_chorus.GNU
+++ b/include/makeinclude/platform_chorus.GNU
@@ -52,7 +52,6 @@ CCFLAGS         += $(CFLAGS) -fno-implicit-templates    \
                    -fconserve-space                     \
                    -fcheck-new                          \
                    -nostdinc                            \
-                   -pipe                                \
                    -fno-rtti                            \
                    -fwritable-strings                   \
                    -fsigned-char                        \
@@ -61,6 +60,8 @@ CCFLAGS         += $(CFLAGS) -fno-implicit-templates    \
                    -D_POSIX_THREAD_SAFE_FUNCTIONS	\
                    "-DNO_FPU_SUPPORT"
 
+pipes ?= 1
+
 ifeq ($(CPU),powerpc)
 CCFLAGS         += -mstrict-align                       \
                    -mno-sdata
diff --git a/include/makeinclude/platform_chorus4.x_g++.GNU b/include/makeinclude/platform_chorus4.x_g++.GNU
index 089e473607b..4b78cf134ec 100644
--- a/include/makeinclude/platform_chorus4.x_g++.GNU
+++ b/include/makeinclude/platform_chorus4.x_g++.GNU
@@ -113,7 +113,6 @@ CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) \
            -fconserve-space                     \
            -fcheck-new                          \
            -nostdinc                            \
-           -pipe                                \
            -fno-rtti                            \
            -fwritable-strings                   \
            -fsigned-char                        \
@@ -123,6 +122,8 @@ CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) \
            -D_POSIX_THREAD_SAFE_FUNCTIONS	\
            "-DNO_FPU_SUPPORT"
 
+pipes ?= 1
+
 ifeq ($(CPU),powerpc)
 CCFLAGS += -mstrict-align                       \
            -mno-sdata
diff --git a/include/makeinclude/platform_freebsd.GNU b/include/makeinclude/platform_freebsd.GNU
index d373f518449..ac207879e8b 100644
--- a/include/makeinclude/platform_freebsd.GNU
+++ b/include/makeinclude/platform_freebsd.GNU
@@ -30,10 +30,12 @@ ifeq (,$(optimize))
   optimize = 1
 endif
 
+pipes ?= 1
+
 CC              = gcc
 CXX             = g++
 
-CFLAGS          += -W -Wall -Wpointer-arith -pipe
+CFLAGS          += -W -Wall -Wpointer-arith
 DCFLAGS         += -g
 RET = $(shell test $(OSVERSION) -ge 300000 && printf 1)
 ifneq ($(RET),1)
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index a3b0ce566ad..c8dd8c8c201 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -72,7 +72,10 @@ else
   CXX = g++
 endif
 
-CFLAGS  += -W -Wall -Wpointer-arith -pipe
+# fix this
+pipes ?= 1
+
+CFLAGS  += -W -Wall -Wpointer-arith
 ifeq ($(threads),1)
     CPPFLAGS  += -D_REENTRANT $(PLATFORM_AIO_SUPPORT)
 endif # threads
diff --git a/include/makeinclude/platform_lynxos.GNU b/include/makeinclude/platform_lynxos.GNU
index 537a9375f79..fd709dbeec1 100644
--- a/include/makeinclude/platform_lynxos.GNU
+++ b/include/makeinclude/platform_lynxos.GNU
@@ -97,9 +97,11 @@ else
   ACE_HAS_GNUG_PRE_2_8 = 0
 endif # VERSION
 
+pipes ?= 1
+
 CC              = gcc
 CXX             = g++
-CFLAGS          += -mthreads -pipe -ansi -Wpointer-arith
+CFLAGS          += -mthreads -ansi -Wpointer-arith
 #### -Winline complains a lot with -O2.
 #### CFLAGS          += -Winline
 #### LynxOS 3.0.0's g++ has a lot of warnings about non-virtual base class
diff --git a/include/makeinclude/platform_macosx.GNU b/include/makeinclude/platform_macosx.GNU
index 4d46b9f49a4..254fd153418 100644
--- a/include/makeinclude/platform_macosx.GNU
+++ b/include/makeinclude/platform_macosx.GNU
@@ -16,9 +16,11 @@ ifeq (,$(versioned_so))
 endif
 with_ld = macosx
 
+pipes ?= 1
+
 CC              = gcc
 CXX             = g++
-CFLAGS          += -Wall -Wpointer-arith -Wno-long-double -pipe -I/sw/include
+CFLAGS          += -Wall -Wpointer-arith -Wno-long-double -I/sw/include
 
 DCFLAGS         += -g
 DLD             = libtool
diff --git a/include/makeinclude/platform_macosx_panther.GNU b/include/makeinclude/platform_macosx_panther.GNU
index 15cd216a8d9..8e531e27a54 100644
--- a/include/makeinclude/platform_macosx_panther.GNU
+++ b/include/makeinclude/platform_macosx_panther.GNU
@@ -16,9 +16,11 @@ ifeq (,$(versioned_so))
 endif
 with_ld = macosx
 
+pipes ?= 1
+
 CC              = gcc
 CXX             = g++
-CFLAGS          += -Wall -Wpointer-arith -Wno-long-double -pipe  
+CFLAGS          += -Wall -Wpointer-arith -Wno-long-double  
 
 DCFLAGS         += -g
 DLD             = libtool
diff --git a/include/makeinclude/platform_openbsd.GNU b/include/makeinclude/platform_openbsd.GNU
index 9117f113744..102739ae3c3 100644
--- a/include/makeinclude/platform_openbsd.GNU
+++ b/include/makeinclude/platform_openbsd.GNU
@@ -20,10 +20,12 @@ ifeq (,$(threads))
   threads = 1
 endif
 
+pipes ?= 1
+
 CC              = gcc
 CXX		= g++
 
-CFLAGS          += -W -Wall -Wpointer-arith -pipe
+CFLAGS          += -W -Wall -Wpointer-arith
 DCFLAGS         += -g
 LDFLAGS		+= -Wl,-rpath $(ACE_ROOT)/ace
 DLD             = $(CXX)
diff --git a/include/makeinclude/platform_psosim_g++.GNU b/include/makeinclude/platform_psosim_g++.GNU
index 308c1a82039..86491598ac5 100644
--- a/include/makeinclude/platform_psosim_g++.GNU
+++ b/include/makeinclude/platform_psosim_g++.GNU
@@ -24,10 +24,11 @@ PSS_BSP_LIB     = $(PSS_BSP)/bsp.a
 
 debug = 1
 optimize = 1
+pipes ?=1
 
 CC              = gcc
 CXX             = g++
-CFLAGS          += -W -Wall -Wpointer-arith -pipe #### -Winline
+CFLAGS          += -W -Wall -Wpointer-arith #### -Winline
 
 
 # -w suppresses warnings
diff --git a/include/makeinclude/platform_qnx_neutrino.GNU b/include/makeinclude/platform_qnx_neutrino.GNU
index 71101f45304..80c0eb57bbe 100644
--- a/include/makeinclude/platform_qnx_neutrino.GNU
+++ b/include/makeinclude/platform_qnx_neutrino.GNU
@@ -15,10 +15,12 @@ ifeq (,$(repo))
   repo = 1
 endif # ! repo
 
+pipes ?= 1
+ 
 CC      = i386-nto-gcc
 CXX     = i386-nto-g++
 
-CFLAGS  += -pipe -W -Wall -Wpointer-arith
+CFLAGS  += -W -Wall -Wpointer-arith
 DCFLAGS += -g
 DLD     = $(CXX)
 LD      = $(CXX)
diff --git a/include/makeinclude/platform_qnx_rtp_gcc.GNU b/include/makeinclude/platform_qnx_rtp_gcc.GNU
index 28b1e21ef54..21790d9d6ec 100644
--- a/include/makeinclude/platform_qnx_rtp_gcc.GNU
+++ b/include/makeinclude/platform_qnx_rtp_gcc.GNU
@@ -16,12 +16,14 @@ else
   LDLAGS += -fno-exceptions
 endif # ! exceptions
 
+pipes ?= 1
+
 CC      = gcc
 CXX     = g++
 
 DCFLAGS += -gstabs
 
-CFLAGS  += -pipe -W -Wall -Wpointer-arith
+CFLAGS  += -W -Wall -Wpointer-arith
 
 DLD     = $(CXX)
 LD      = $(CXX)
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
index 5942377b48c..9e19f643a0b 100644
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ b/include/makeinclude/platform_sunos5_g++.GNU
@@ -39,9 +39,11 @@ else  # ! i86pc
   DCFLAGS         += -g
 endif # ! i86pc
 
+pipes ?= 1
+
 CC              = gcc
 CXX             = g++
-CFLAGS          += -W -Wall -Wpointer-arith -pipe #### -Winline
+CFLAGS          += -W -Wall -Wpointer-arith #### -Winline
 
 ifeq ($(threads),1)
   CPPFLAGS      += -D_REENTRANT
diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU
index 97a89621c81..3f23e7dfddf 100644
--- a/include/makeinclude/platform_unixware_g++.GNU
+++ b/include/makeinclude/platform_unixware_g++.GNU
@@ -48,5 +48,6 @@ PRELIB          = @true
 #
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
 
-CFLAGS          += -W -Wall -Wpointer-arith -pipe #### -Winline
+pipes ?= 1
+CFLAGS          += -W -Wall -Wpointer-arith #### -Winline
 CCFLAGS         += $(CFLAGS) $(TEMPLATES_FLAG)
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index ad5ea3bb423..79667844917 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -309,7 +309,7 @@ endif # shared_libs
 CLEANUP_OBJS += $(addsuffix .o, $(addprefix $(VDIR),$(CLEANUP_BIN)))
 
 ifdef SRC
-  CLEANUP_OBJS = $(addsuffix .$(OBJEXT),$(addprefix $(VDIR),$(basename $(SRC))))
+  CLEANUP_OBJS += $(addsuffix .$(OBJEXT),$(addprefix $(VDIR),$(basename $(SRC))))
 endif # SRC
 ifneq ($(CLEANUP_BIN),)
   CLEANUP_OBJS += $(addsuffix .$(OBJEXT),$(addprefix $(VDIR),$(basename $(CLEANUP_BIN))))
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 3829f97fd74..db6fc93a1b6 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -813,14 +813,14 @@ COMPILEESO.cc   = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS)
 ifeq ($(LINK.c),override)
   LINK.c  = $(LINK.c.override)
 else
-  LINK.c  = $(PURELINK) $(PRELINK) $(LD) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \
+  LINK.c  = $(PURELINK) $(PRELINK) $(LD) $(LDFLAGS) \
             $(LDLIBS) $(LIBS)
 endif # LINK.c.override
 
 ifeq ($(LINK.cc),override)
   LINK.cc = $(LINK.cc.override)
 else
-  LINK.cc = $(PURELINK) $(PRELINK) $(LD) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS)
+  LINK.cc = $(PURELINK) $(PRELINK) $(LD) $(PTDIRS)
 endif # LINK.cc.override
 
 SOLINK.cc = $(PRELINK) $(DLD) $(SOFLAGS)