Tue Dec 9 16:32:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 24 insertions, 156 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 5602a051c5d..cdb440d9780 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,22 @@
+Tue Dec  9 16:32:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/split-cpp:
+        * bin/split-cpp.pl:
+          Renamed to have pl extension
+
+        * debianbuild/patches/00list:
+          Updated
+
+        * debianbuild/patches/03-g++-new-throws.dpatch:
+        * debianbuild/patches/08-fix-perl-shebang.dpatch:
+        * debianbuild/patches/90-patch-mpc-basedir.dpatch:
+        * debianbuild/patches/91-patch-dg-basedir.dpatch:
+          Not needed anymore, this issues are fixed on svn head
+
+        * examples/IPC_SAP/SOCK_SAP/summarize.pl:
+        * examples/IPC_SAP/SSL_SAP/summarize.pl:
+          Added missing shebang
+
 Tue Dec  9 16:19:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * debianbuild/*:
diff --git a/ACE/bin/split-cpp b/ACE/bin/split-cpp.pl
index 513c52a946c..400208ba22a 100755
--- a/ACE/bin/split-cpp
+++ b/ACE/bin/split-cpp.pl
@@ -1,3 +1,4 @@
+#! /usr/bin/perl
 eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
     & eval 'exec perl -w -S $0 $argv:q'
     if 0;
diff --git a/ACE/debianbuild/patches/00list b/ACE/debianbuild/patches/00list
index ed20e77bbbf..58876f97286 100644
--- a/ACE/debianbuild/patches/00list
+++ b/ACE/debianbuild/patches/00list
@@ -6,6 +6,4 @@
 15-fix-fltk-include
 34-bts386713
 50-prepatch-dummy-mark
-90-patch-mpc-basedir
-91-patch-dg-basedir
 92-default-ACE_ROOT
diff --git a/ACE/debianbuild/patches/03-g++-new-throws.dpatch b/ACE/debianbuild/patches/03-g++-new-throws.dpatch
deleted file mode 100644
index 54f3b631ae9..00000000000
--- a/ACE/debianbuild/patches/03-g++-new-throws.dpatch
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03-g++-new-throws.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: don't test if new() throws std::bad_alloc
-
-@DPATCH@
---- orig/configure.ac
-+++ mod/configure.ac
-@@ -5224,57 +5224,7 @@
-   ACE_CACHE_CHECK([if new throws std::bad_alloc exception on failure],
-     [ace_cv_new_throws_bad_alloc_exception],
-     [
--     AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#if defined (ACE_HAS_NEW_NO_H)
--# include <new>
--#elif defined (ACE_HAS_NEW_H)
--# include <new.h>
--#endif
--
--#if defined (ACE_HAS_STDEXCEPT_NO_H)
--# include <stdexcept>
--#elif defined (ACE_HAS_EXCEPTION_H)
--# include <exception.h>
--#endif
--
--/* We already checked for ACE_LACKS_NUMERIC_LIMITS */
--#if !defined ACE_LACKS_NUMERIC_LIMITS
--#include <limits>
--#endif
--
--        int main(int, char *[]) {
--#if defined ACE_LACKS_NUMERIC_LIMITS
--          const size_t ALLOC_SIZE = 2 * 1024 * 1024 * 1024;
--#else
--          const size_t ALLOC_SIZE = std::numeric_limits<size_t>::max () / 2;
--#endif
--          while (1) {
--            try {
--              char *a = new char[ALLOC_SIZE];
--              if (a == 0) {
--                return 1; /* new() does NOT throw exceptions */
--              }
--            }
--
--#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
--            catch (std::bad_alloc)
--#else
--            catch (bad_alloc)
--#endif  /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
--            {
--             return 0; /* new() does throw exceptions */
--            }
--         };
--
--         return 1;  /* ERROR: We shouldn't get this far! */
--        }
--       ]])],[
--        ace_cv_new_throws_bad_alloc_exception=yes
--       ],[
--        ace_cv_new_throws_bad_alloc_exception=no
--       ],[
--        ace_cv_new_throws_bad_alloc_exception=no
--       ])
-+     ace_cv_new_throws_bad_alloc_exception=yes
-     ], [AC_DEFINE([ACE_NEW_THROWS_EXCEPTIONS])],)
- 
-   if test "$ace_cv_new_throws_bad_alloc_exception" != yes; then
diff --git a/ACE/debianbuild/patches/08-fix-perl-shebang.dpatch b/ACE/debianbuild/patches/08-fix-perl-shebang.dpatch
deleted file mode 100644
index f3c389145ca..00000000000
--- a/ACE/debianbuild/patches/08-fix-perl-shebang.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08-fix-perl-shebang.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add missing Perl shebangs in examples.
-
-@DPATCH@
---- ACE_wrappers.orig/examples/IPC_SAP/SOCK_SAP/summarize
-+++ ACE_wrappers/examples/IPC_SAP/SOCK_SAP/summarize
-@@ -1,3 +1,4 @@
-+#!/usr/bin/perl
- eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
-     & eval 'exec perl -w -S $0 $argv:q'
-     if 0;
---- ACE_wrappers.orig/examples/IPC_SAP/SSL_SAP/summarize
-+++ ACE_wrappers/examples/IPC_SAP/SSL_SAP/summarize
-@@ -1,3 +1,4 @@
-+#!/usr/bin/perl
- eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
-     & eval 'exec perl -w -S $0 $argv:q'
-     if 0;
---- ACE_wrappers.orig/bin/split-cpp
-+++ ACE_wrappers/bin/split-cpp
-@@ -1,6 +1,4 @@
--eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
--    & eval 'exec perl -w -S $0 $argv:q'
--    if 0;
-+#!/usr/bin/perl
- 
- # Splits C++ source files into one file per function or data item.
- #
diff --git a/ACE/debianbuild/patches/90-patch-mpc-basedir.dpatch b/ACE/debianbuild/patches/90-patch-mpc-basedir.dpatch
deleted file mode 100644
index 622f5def4a8..00000000000
--- a/ACE/debianbuild/patches/90-patch-mpc-basedir.dpatch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90-patch-mpc-basedir.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description
-
-@DPATCH@
---- ACE_wrappers.orig/bin/mwc.pl
-+++ ACE_wrappers/bin/mwc.pl
-@@ -27,7 +27,7 @@
-   $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
-   $basePath = VMS::Filespec::unixify($basePath);
- }
--$basePath .= '/MakeProjectCreator';
-+$basePath = '/usr/share/ace/bin/MakeProjectCreator';
- 
- my($mpcroot) = $ENV{MPC_ROOT};
- my($mpcpath) = (defined $mpcroot ? $mpcroot :
---- ACE_wrappers.orig/bin/mpc.pl
-+++ ACE_wrappers/bin/mpc.pl
-@@ -27,7 +27,7 @@
-   $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
-   $basePath = VMS::Filespec::unixify($basePath);
- }
--$basePath .= '/MakeProjectCreator';
-+$basePath = '/usr/share/ace/bin/MakeProjectCreator';
- 
- my($mpcroot) = $ENV{MPC_ROOT};
- my($mpcpath) = (defined $mpcroot ? $mpcroot :
diff --git a/ACE/debianbuild/patches/91-patch-dg-basedir.dpatch b/ACE/debianbuild/patches/91-patch-dg-basedir.dpatch
deleted file mode 100644
index 62ff87af78f..00000000000
--- a/ACE/debianbuild/patches/91-patch-dg-basedir.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 91-patch-dg-basedir.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix path to DependencyGenerator.
-
-@DPATCH@
---- ACE_wrappers.orig/bin/depgen.pl
-+++ ACE_wrappers/bin/depgen.pl
-@@ -19,12 +19,8 @@
- use File::Spec;
- use File::Basename;
- 
--my($basePath) = $FindBin::Bin;
--if ($^O eq 'VMS') {
--  $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
--  $basePath = VMS::Filespec::unixify($basePath);
--}
--unshift(@INC, $basePath . '/DependencyGenerator');
-+my($basePath) = '/usr/share/ace/bin/DependencyGenerator';
-+unshift(@INC, $basePath);
- 
- require DependencyEditor;
- 
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/summarize.pl b/ACE/examples/IPC_SAP/SOCK_SAP/summarize.pl
index ee8ffd2df25..6411faa2f88 100755
--- a/ACE/examples/IPC_SAP/SOCK_SAP/summarize.pl
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/summarize.pl
@@ -1,3 +1,4 @@
+#! /usr/bin/perl
 eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
     & eval 'exec perl -w -S $0 $argv:q'
     if 0;
@@ -32,7 +33,7 @@ foreach $total_threads (sort {$a <=> $b} @total_threads) {
   open (FILE, "client-${total_threads}.log")  ||
     die "$0: unable to open \"client-${total_threads}.log\"\n";
   while ($line = <FILE>) {
-    if ($line =~ /.*usec-per-message = ([\d\.]+)/) 
+    if ($line =~ /.*usec-per-message = ([\d\.]+)/)
     {
         $high_latency  += $1 ;
 	$number++;
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/summarize.pl b/ACE/examples/IPC_SAP/SSL_SAP/summarize.pl
index ee8ffd2df25..6411faa2f88 100755
--- a/ACE/examples/IPC_SAP/SSL_SAP/summarize.pl
+++ b/ACE/examples/IPC_SAP/SSL_SAP/summarize.pl
@@ -1,3 +1,4 @@
+#! /usr/bin/perl
 eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
     & eval 'exec perl -w -S $0 $argv:q'
     if 0;
@@ -32,7 +33,7 @@ foreach $total_threads (sort {$a <=> $b} @total_threads) {
   open (FILE, "client-${total_threads}.log")  ||
     die "$0: unable to open \"client-${total_threads}.log\"\n";
   while ($line = <FILE>) {
-    if ($line =~ /.*usec-per-message = ([\d\.]+)/) 
+    if ($line =~ /.*usec-per-message = ([\d\.]+)/)
     {
         $high_latency  += $1 ;
 	$number++;