merge from next

Scripts/developer_scripts/cgal_header_clean_up.py

@@ -0,0 +1,63 @@
+#!/usr/bin/python
+#this dirty scripts tries to put one copyright holder per line
+#so that it is easy to get them out from a file
+#WARNING: this is an experimental script that is not guarantee to work
+# in all cases
+#usage: cgal_header_clean_up.py cpp_file
+
+
+from sys import argv
+from sys import exit
+from sys import stderr
+import re
+import curses.ascii
+
+f=file(argv[1])
+
+line=f.readline();
+
+
+if re.search("// Copyright \(c\) ",line):
+  index=16
+  
+  while (not curses.ascii.isalpha(line[index]) and line[index]!='\n' ):
+    index=index+1
+  print line[0:index]
+  print "// "+line[index:len(line)-1]
+ 
+  regexp = re.compile("//\s*$")
+
+  line=f.readline()
+  buf=""
+  while 1:
+    if regexp.match(line):
+      break
+    #look for a comma
+    index=3
+    last=3
+    
+    while 1:
+      while (line[index]!=',' and line[index]!='\n'):
+        index=index+1
+      if line[index]=='\n':
+        if last!=index:
+          buf=line[last:index]+" "
+        else:
+          buf=""
+        break
+      print "// "+buf+line[last:index+1]
+      buf=""
+      last=index+1
+      while line[last]==" ":
+        last=last+1
+      index=last
+    line=f.readline()
+  print "// "+buf
+  while line:
+    print line,
+    line=f.readline()
+  
+    
+else:
+  stderr.write(argv[1]+" error no copyright in the first place\n")  
+  exit()

Scripts/developer_scripts/check_licenses

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 # Copyright (c) 2005,2006  Utrecht University (The Netherlands),
-# ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany),
-# INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg
-# (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria),
+# ETH Zurich (Switzerland),
+# INRIA Sophia-Antipolis (France),
+# Max-Planck-Institute Saarbruecken (Germany),
 # and Tel-Aviv University (Israel).  All rights reserved.
 #
 # This file is part of CGAL (www.cgal.org); you can redistribute it and/or

Scripts/developer_scripts/clean_up_branch.sh

@@ -0,0 +1,85 @@
+#!/bin/bash
+#
+# usage: bash clean_up_branch.sh directory [rm]
+#
+#       lists all files that should be removed from a branch. 
+#       directory is the path to the repository.
+#       If additional rm option is passed, files will be deleted.
+#
+
+REPO_DIR=.
+DELETE=0
+
+if [ $# -gt 0 ] ; then 
+  REPO_DIR=$1 
+fi
+
+if [ ! -e $REPO_DIR/.svn/entries ]; then
+  echo "$REPO_DIR is not a working copy"
+  exit 1
+fi;
+
+if [ $# -gt 1 ]; then
+  if [ "$2" == "rm" ]; then
+    DELETE=1
+  else
+  echo "Unknown option $2"
+  exit 1     
+  fi
+fi;
+
+echo Cleaning $REPO_DIR
+
+#define regular expression to match generated files
+REGEXP='ProgramOutput\.|CMakeFiles|CMakeLists.txt|\.moc$|CMakeCache\.txt|error\.txt|cmake_install\.cmake|Makefile|doc_html|doc_pdf|\.pdflg$|\.ilg$|\.cgallog$|\.blg$|\.bak$|\.hax$|\.aux$|\.maf$|\.hlg$|\.out$|demo.*\/qrc_.*\.cxx|demo.*\/ui_.*\.h'
+
+
+INITIAL=`svn status --no-ignore $1| awk '{if ($1 =="?" || $1=="I" ) print $2 }'`
+
+
+#first get executable files
+EXECS=''
+DIRS=''
+KNOWN=''
+OTHER=''
+
+for i in $INITIAL; do 
+  if [ -x $REPO_DIR/$i  -a  ! -d $REPO_DIR/$i ]; then 
+    EXECS="$EXECS $i"
+  elif [[ "$i" =~ $REGEXP ]]; then
+    KNOWN="$KNOWN $i"
+  else
+    OTHER="$OTHER $i"
+  fi;
+done
+
+if [ "$EXECS" ]; then
+  echo "#Cleaning executables"
+  echo rm -rf $EXECS
+fi
+
+if [ "$KNOWN" ]; then
+  echo "#Cleaning known generated files"
+  echo rm -rf $KNOWN
+fi
+
+if [ "$OTHER" ]; then
+echo "#No predefined behavior"
+echo "# $OTHER"
+fi
+
+
+if [ $DELETE -eq 1 ]; then
+  if [ "$EXECS" -o "$KNOWN" ]; then
+    echo "Are you sure you want to execute the printed commands? [YES/NO]"
+    read ANSWER
+    if [ "$ANSWER" == "YES" ]; then
+      for i in $EXECS $KNOWN; do
+        rm -rf $REPO_DIR/$i
+      done
+    fi
+  else
+    echo "Nothing to do"
+  fi
+fi
+

Scripts/developer_scripts/create_assertions.sh

@@ -1,395 +0,0 @@
-# Copyright (c) 1999, 2001, 2003 Utrecht University (The Netherlands),
-# ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany),
-# INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg
-# (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria),
-# and Tel-Aviv University (Israel).  All rights reserved.
-#
-# This file is part of CGAL (www.cgal.org); you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; version 2.1 of the License.
-# See the file LICENSE.LGPL distributed with CGAL.
-#
-# Licensees holding a valid commercial license may use this file in
-# accordance with the commercial license agreement provided with the software.
-#
-# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# $URL$
-# $Id$
-# 
-#
-# Author(s)     : Geert-Jan Giezeman, Sven Schönherr
-
-if test $# -ne 1
-then
-echo "usage:" >&2
-echo "$0 name" >&2
-exit 1
-fi
-
-nameUC=`echo $1 | tr "[a-z]" "[A-Z]" `
-nameLC=`echo $1 | tr "[A-Z]" "[a-z]" `
-
-if test -n "${nameUC}"
-then
-#append underscore to name
-nameUC="${nameUC}_"
-nameLC="${nameLC}_"
-fi
-
-sed -e "s/XXX_/${nameUC}/g" -e "s/xxx_/${nameLC}/g" <<"EOF" \
-        > "${nameLC}assertions.h"
-// Replace this remark by a proper copyright notice.
-//
-// $URL$
-// $Id$
-// 
-//
-// Author(s)     : Geert-Jan Giezeman, Sven Schoenherr
-//
-// Generated from script create_assertions.sh
-
-
-// Note that this header file is intentionnaly not protected with a
-// macro (as <cassert>). Calling it a second time with another value
-// for NDEBUG for example must make a difference.
-
-#include <CGAL/assertions.h>
-
-// macro definitions
-// =================
-// assertions
-// ----------
-
-#undef CGAL_xxx_assertion
-#undef CGAL_xxx_assertion_msg
-#undef CGAL_xxx_assertion_code
-
-#if defined(CGAL_XXX_NO_ASSERTIONS) || defined(CGAL_NO_ASSERTIONS) \
-  || defined(NDEBUG)
-#  define CGAL_xxx_assertion(EX) (static_cast<void>(0))
-#  define CGAL_xxx_assertion_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_assertion_code(CODE)
-#else
-#  define CGAL_xxx_assertion(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_assertion_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_assertion_code(CODE) CODE
-#  define CGAL_xxx_assertions 1
-#endif // CGAL_XXX_NO_ASSERTIONS
-
-
-#undef CGAL_xxx_exactness_assertion
-#undef CGAL_xxx_exactness_assertion_msg
-#undef CGAL_xxx_exactness_assertion_code
-
-#if defined(CGAL_XXX_NO_ASSERTIONS) || defined(CGAL_NO_ASSERTIONS) \
-  || (!defined(CGAL_XXX_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS))\
-  || defined(NDEBUG)
-#  define CGAL_xxx_exactness_assertion(EX) (static_cast<void>(0))
-#  define CGAL_xxx_exactness_assertion_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_exactness_assertion_code(CODE)
-#else
-#  define CGAL_xxx_exactness_assertion(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_exactness_assertion_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_exactness_assertion_code(CODE) CODE
-#  define CGAL_xxx_exactness_assertions 1
-#endif // CGAL_XXX_NO_ASSERTIONS
-
-
-#undef CGAL_xxx_expensive_assertion
-#undef CGAL_xxx_expensive_assertion_msg
-#undef CGAL_xxx_expensive_assertion_code
-
-#if defined(CGAL_XXX_NO_ASSERTIONS) \
-  || defined(CGAL_NO_ASSERTIONS) \
-  || (!defined(CGAL_XXX_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) \
-  || defined(NDEBUG)
-#  define CGAL_xxx_expensive_assertion(EX) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_assertion_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_assertion_code(CODE)
-#else
-#  define CGAL_xxx_expensive_assertion(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_expensive_assertion_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_expensive_assertion_code(CODE) CODE
-#  define CGAL_xxx_expensive_assertions 1
-#endif // CGAL_XXX_NO_ASSERTIONS
-
-
-#undef CGAL_xxx_expensive_exactness_assertion
-#undef CGAL_xxx_expensive_exactness_assertion_msg
-#undef CGAL_xxx_expensive_exactness_assertion_code
-
-#if defined(CGAL_XXX_NO_ASSERTIONS) || defined(CGAL_NO_ASSERTIONS) \
-  || (!defined(CGAL_XXX_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS))\
-  || (!defined(CGAL_XXX_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) \
-  || defined(NDEBUG)
-#  define CGAL_xxx_expensive_exactness_assertion(EX) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_exactness_assertion_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_exactness_assertion_code(CODE)
-#else
-#  define CGAL_xxx_expensive_exactness_assertion(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_expensive_exactness_assertion_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_expensive_exactness_assertion_code(CODE) CODE
-#  define CGAL_xxx_expensive_exactness_assertions 1
-#endif // CGAL_XXX_NO_ASSERTIONS
-
-
-// preconditions
-// -------------
-
-#undef CGAL_xxx_precondition
-#undef CGAL_xxx_precondition_msg
-#undef CGAL_xxx_precondition_code
-
-#if defined(CGAL_XXX_NO_PRECONDITIONS) || defined(CGAL_NO_PRECONDITIONS) \
-  || defined(NDEBUG)
-#  define CGAL_xxx_precondition(EX) (static_cast<void>(0))
-#  define CGAL_xxx_precondition_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_precondition_code(CODE)
-#else
-#  define CGAL_xxx_precondition(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_precondition_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_precondition_code(CODE) CODE
-#  define CGAL_xxx_preconditions 1
-#endif // CGAL_XXX_NO_PRECONDITIONS
-
-
-#undef CGAL_xxx_exactness_precondition
-#undef CGAL_xxx_exactness_precondition_msg
-#undef CGAL_xxx_exactness_precondition_code
-
-#if defined(CGAL_XXX_NO_PRECONDITIONS) || defined(CGAL_NO_PRECONDITIONS) \
-  || (!defined(CGAL_XXX_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS))\
-  || defined(NDEBUG)
-#  define CGAL_xxx_exactness_precondition(EX) (static_cast<void>(0))
-#  define CGAL_xxx_exactness_precondition_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_exactness_precondition_code(CODE)
-#else
-#  define CGAL_xxx_exactness_precondition(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_exactness_precondition_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_exactness_precondition_code(CODE) CODE
-#  define CGAL_xxx_exactness_preconditions 1
-#endif // CGAL_XXX_NO_PRECONDITIONS
-
-
-#undef CGAL_xxx_expensive_precondition
-#undef CGAL_xxx_expensive_precondition_msg
-#undef CGAL_xxx_expensive_precondition_code
-
-#if defined(CGAL_XXX_NO_PRECONDITIONS) || defined(CGAL_NO_PRECONDITIONS) \
-  || (!defined(CGAL_XXX_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) \
-  || defined(NDEBUG)
-#  define CGAL_xxx_expensive_precondition(EX) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_precondition_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_precondition_code(CODE)
-#else
-#  define CGAL_xxx_expensive_precondition(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_expensive_precondition_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_expensive_precondition_code(CODE) CODE
-#  define CGAL_xxx_expensive_preconditions 1
-#endif // CGAL_XXX_NO_PRECONDITIONS
-
-
-#undef CGAL_xxx_expensive_exactness_precondition
-#undef CGAL_xxx_expensive_exactness_precondition_msg
-#undef CGAL_xxx_expensive_exactness_precondition_code
-
-#if defined(CGAL_XXX_NO_PRECONDITIONS) || defined(CGAL_NO_PRECONDITIONS) \
-  || (!defined(CGAL_XXX_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS))\
-  || (!defined(CGAL_XXX_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) \
-  || defined(NDEBUG)
-#  define CGAL_xxx_expensive_exactness_precondition(EX) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_exactness_precondition_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_exactness_precondition_code(CODE)
-#else
-#  define CGAL_xxx_expensive_exactness_precondition(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_expensive_exactness_precondition_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_expensive_exactness_precondition_code(CODE) CODE
-#  define CGAL_xxx_expensive_exactness_preconditions 1
-#endif // CGAL_XXX_NO_PRECONDITIONS
-
-
-// postconditions
-// --------------
-
-#undef CGAL_xxx_postcondition
-#undef CGAL_xxx_postcondition_msg
-#undef CGAL_xxx_postcondition_code
-
-#if defined(CGAL_XXX_NO_POSTCONDITIONS) || defined(CGAL_NO_POSTCONDITIONS) \
-  || defined(NDEBUG)
-#  define CGAL_xxx_postcondition(EX) (static_cast<void>(0))
-#  define CGAL_xxx_postcondition_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_postcondition_code(CODE)
-#else
-#  define CGAL_xxx_postcondition(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_postcondition_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_postcondition_code(CODE) CODE
-#  define CGAL_xxx_postconditions 1
-#endif // CGAL_XXX_NO_POSTCONDITIONS
-
-
-#undef CGAL_xxx_exactness_postcondition
-#undef CGAL_xxx_exactness_postcondition_msg
-#undef CGAL_xxx_exactness_postcondition_code
-
-#if defined(CGAL_XXX_NO_POSTCONDITIONS) || defined(CGAL_NO_POSTCONDITIONS) \
-  || (!defined(CGAL_XXX_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS))\
-  || defined(NDEBUG)
-#  define CGAL_xxx_exactness_postcondition(EX) (static_cast<void>(0))
-#  define CGAL_xxx_exactness_postcondition_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_exactness_postcondition_code(CODE)
-#else
-#  define CGAL_xxx_exactness_postcondition(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_exactness_postcondition_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_exactness_postcondition_code(CODE) CODE
-#  define CGAL_xxx_exactness_postconditions 1
-#endif // CGAL_XXX_NO_POSTCONDITIONS
-
-
-#undef CGAL_xxx_expensive_postcondition
-#undef CGAL_xxx_expensive_postcondition_msg
-#undef CGAL_xxx_expensive_postcondition_code
-
-#if defined(CGAL_XXX_NO_POSTCONDITIONS) || defined(CGAL_NO_POSTCONDITIONS) \
-  || (!defined(CGAL_XXX_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) \
-  || defined(NDEBUG)
-#  define CGAL_xxx_expensive_postcondition(EX) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_postcondition_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_postcondition_code(CODE)
-#else
-#  define CGAL_xxx_expensive_postcondition(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_expensive_postcondition_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_expensive_postcondition_code(CODE) CODE
-#  define CGAL_xxx_expensive_postconditions 1
-#endif // CGAL_XXX_NO_POSTCONDITIONS
-
-
-#undef CGAL_xxx_expensive_exactness_postcondition
-#undef CGAL_xxx_expensive_exactness_postcondition_msg
-#undef CGAL_xxx_expensive_exactness_postcondition_code
-
-#if defined(CGAL_XXX_NO_POSTCONDITIONS) || defined(CGAL_NO_POSTCONDITIONS) \
-  || (!defined(CGAL_XXX_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS))\
-  || (!defined(CGAL_XXX_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) \
-  || defined(NDEBUG)
-#  define CGAL_xxx_expensive_exactness_postcondition(EX) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_exactness_postcondition_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_exactness_postcondition_code(CODE)
-#else
-#  define CGAL_xxx_expensive_exactness_postcondition(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_expensive_exactness_postcondition_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_expensive_exactness_postcondition_code(CODE) CODE
-#  define CGAL_xxx_expensive_exactness_postconditions 1
-#endif // CGAL_XXX_NO_POSTCONDITIONS
-
-
-// warnings
-// --------
-
-#undef CGAL_xxx_warning
-#undef CGAL_xxx_warning_msg
-#undef CGAL_xxx_warning_code
-
-#if defined(CGAL_XXX_NO_WARNINGS) || defined(CGAL_NO_WARNINGS) \
-  || defined(NDEBUG)
-#  define CGAL_xxx_warning(EX) (static_cast<void>(0))
-#  define CGAL_xxx_warning_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_warning_code(CODE)
-#else
-#  define CGAL_xxx_warning(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_warning_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_warning_code(CODE) CODE
-#  define CGAL_xxx_warnings 1
-#endif // CGAL_XXX_NO_WARNINGS
-
-
-#undef CGAL_xxx_exactness_warning
-#undef CGAL_xxx_exactness_warning_msg
-#undef CGAL_xxx_exactness_warning_code
-
-#if defined(CGAL_XXX_NO_WARNINGS) || defined(CGAL_NO_WARNINGS) \
-  || (!defined(CGAL_XXX_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS))\
-  || defined(NDEBUG)
-#  define CGAL_xxx_exactness_warning(EX) (static_cast<void>(0))
-#  define CGAL_xxx_exactness_warning_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_exactness_warning_code(CODE)
-#else
-#  define CGAL_xxx_exactness_warning(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_exactness_warning_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_exactness_warning_code(CODE) CODE
-#  define CGAL_xxx_exactness_warnings 1
-#endif // CGAL_XXX_NO_WARNINGS
-
-
-#undef CGAL_xxx_expensive_warning
-#undef CGAL_xxx_expensive_warning_msg
-#undef CGAL_xxx_expensive_warning_code
-
-#if defined(CGAL_XXX_NO_WARNINGS) || defined(CGAL_NO_WARNINGS) \
-  || (!defined(CGAL_XXX_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) \
-  || defined(NDEBUG)
-#  define CGAL_xxx_expensive_warning(EX) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_warning_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_warning_code(CODE)
-#else
-#  define CGAL_xxx_expensive_warning(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_expensive_warning_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_expensive_warning_code(CODE) CODE
-#  define CGAL_xxx_expensive_warnings 1
-#endif // CGAL_XXX_NO_WARNINGS
-
-
-#undef CGAL_xxx_expensive_exactness_warning
-#undef CGAL_xxx_expensive_exactness_warning_msg
-#undef CGAL_xxx_expensive_exactness_warning_code
-
-#if defined(CGAL_XXX_NO_WARNINGS) || defined(CGAL_NO_WARNINGS) \
-  || (!defined(CGAL_XXX_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS))\
-  || (!defined(CGAL_XXX_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) \
-  || defined(NDEBUG)
-#  define CGAL_xxx_expensive_exactness_warning(EX) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_exactness_warning_msg(EX,MSG) (static_cast<void>(0))
-#  define CGAL_xxx_expensive_exactness_warning_code(CODE)
-#else
-#  define CGAL_xxx_expensive_exactness_warning(EX) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__))
-#  define CGAL_xxx_expensive_exactness_warning_msg(EX,MSG) \
-   (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__, MSG))
-#  define CGAL_xxx_expensive_exactness_warning_code(CODE) CODE
-#  define CGAL_xxx_expensive_exactness_warnings 1
-#endif // CGAL_XXX_NO_WARNINGS
-
-
-EOF

Scripts/developer_scripts/create_internal_release

@@ -242,9 +242,9 @@ sub create_version_file()
 
     print TEMPFILE << 'EOF';
 // Copyright (c) 2006  Utrecht University (The Netherlands),
-// ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany),
-// INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg
-// (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria),
+// ETH Zurich (Switzerland),
+// INRIA Sophia-Antipolis (France),
+// Max-Planck-Institute Saarbruecken (Germany),
 // and Tel-Aviv University (Israel).  All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or

Scripts/developer_scripts/list_cgal_includes

@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # Copyright (c) 2003,2005,2006  Utrecht University (The Netherlands),
-# ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany),
-# INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg
-# (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria),
+# ETH Zurich (Switzerland),
+# INRIA Sophia-Antipolis (France),
+# Max-Planck-Institute Saarbruecken (Germany),
 # and Tel-Aviv University (Israel).  All rights reserved.
 #
 # This file is part of CGAL (www.cgal.org); you can redistribute it and/or