From f47874fd500fa10ea687861d6fdb7ed764557ea7 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Sat, 27 Jan 2007 17:05:27 +0000 Subject: [PATCH] These cgal_test/makefile do not seem to bring anything compared to the default generated. --- .gitattributes | 1 - Circulator/examples/Circulator/cgal_test | 75 ------------------------ Circulator/examples/Circulator/makefile | 63 -------------------- 3 files changed, 139 deletions(-) delete mode 100755 Circulator/examples/Circulator/cgal_test delete mode 100644 Circulator/examples/Circulator/makefile diff --git a/.gitattributes b/.gitattributes index e6ce09d8127..ba116314cc5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -425,7 +425,6 @@ Circular_kernel_3/demo/Circular_kernel_3/images/button_wire.gif -text svneol=uns Circular_kernel_3/demo/Circular_kernel_3/images/d_solid_b.gif -text svneol=unset#image/gif Circular_kernel_3/demo/Circular_kernel_3/images/d_wire_b.gif -text svneol=unset#image/gif Circular_kernel_3/examples/Circular_kernel_3/example_Circular_kernel_3 -text -Circulator/examples/Circulator/cgal_test eol=lf Convex_hull_2/demo/Convex_hull_2/convex_hull_2.vcproj eol=crlf Convex_hull_2/demo/Convex_hull_2/help/index.html svneol=native#text/html Convex_hull_2/doc_tex/Convex_hull_2/saarhull.eps -text svneol=unset#application/postscript diff --git a/Circulator/examples/Circulator/cgal_test b/Circulator/examples/Circulator/cgal_test deleted file mode 100755 index a41c834a1e4..00000000000 --- a/Circulator/examples/Circulator/cgal_test +++ /dev/null @@ -1,75 +0,0 @@ -#! /bin/sh - -# This is a script for the CGAL test suite. Such a script must obey -# the following rules: -# -# - the name of the script is cgal_test -# - for every target two one line messages are written to the file 'error.txt' -# the first one indicates if the compilation was successful -# the second one indicates if the execution was successful -# if one of the two was not successful, the line should start with 'ERROR:' -# - running the script should not require any user interaction -# - the script should clean up object files and executables - -ERRORFILE=error.txt - -#---------------------------------------------------------------------# -# compile_and_run -#---------------------------------------------------------------------# - -compile_and_run() -{ - echo "Compiling $1 ... " - if eval 'make CGAL_MAKEFILE=$CGAL_MAKEFILE \ - TESTSUITE_CXXFLAGS="$TESTSUITE_CXXFLAGS" \ - TESTSUITE_LDFLAGS="$TESTSUITE_LDFLAGS" $1' ; then - echo " compilation of $1 succeeded" >> $ERRORFILE - else - echo " ERROR: compilation of $1 failed" >> $ERRORFILE - fi - - if [ -f $1 ] ; then - OUTPUTFILE=ProgramOutput.$1.$PLATFORM - rm -f $OUTPUTFILE - COMMAND="./$1" - if [ -f $1.cmd ] ; then - COMMAND="$COMMAND `cat $1.cmd`" - fi - if [ -f $1.cin ] ; then - COMMAND="cat $1.cin | $COMMAND" - fi - echo "Executing $1 ... " - echo - if eval 2>&1 $COMMAND > $OUTPUTFILE ; then - echo " execution of $1 succeeded" >> $ERRORFILE - else - echo " ERROR: execution of $1 failed" >> $ERRORFILE - fi - else - echo " ERROR: could not execute $1" >> $ERRORFILE - fi - - eval "2>&1 make CGAL_MAKEFILE=$CGAL_MAKEFILE clean > /dev/null " -} - -#---------------------------------------------------------------------# -# remove the previous error file -#---------------------------------------------------------------------# - -rm -f $ERRORFILE -touch $ERRORFILE - -#---------------------------------------------------------------------# -# compile and run the tests -#---------------------------------------------------------------------# - -if [ $# -ne 0 ] ; then - for file in $* ; do - compile_and_run $file - done -else - compile_and_run circulator_prog1 - compile_and_run circulator_prog2 - compile_and_run circulator_prog3 -fi - diff --git a/Circulator/examples/Circulator/makefile b/Circulator/examples/Circulator/makefile deleted file mode 100644 index 58f9b10bc19..00000000000 --- a/Circulator/examples/Circulator/makefile +++ /dev/null @@ -1,63 +0,0 @@ -# Created by the script cgal_create_makefile -# This is the makefile for compiling a CGAL application. - -#---------------------------------------------------------------------# -# include platform specific settings -#---------------------------------------------------------------------# -# Choose the right include file from the /make directory. - -# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE -include $(CGAL_MAKEFILE) - -#---------------------------------------------------------------------# -# compiler flags -#---------------------------------------------------------------------# - -CXXFLAGS = \ - $(TESTSUITE_CXXFLAGS) \ - $(EXTRA_FLAGS) \ - $(CGAL_CXXFLAGS) \ - $(DEBUG_OPT) - -#---------------------------------------------------------------------# -# linker flags -#---------------------------------------------------------------------# - -LIBPATH = \ - $(TESTSUITE_LIBPATH) \ - $(CGAL_LIBPATH) - -LDFLAGS = \ - $(TESTSUITE_LDFLAGS) \ - $(CGAL_LDFLAGS) - -#---------------------------------------------------------------------# -# target entries -#---------------------------------------------------------------------# - -all: \ - circulator_prog1 \ - circulator_prog2 \ - circulator_prog3 - -circulator_prog1$(EXE_EXT): circulator_prog1$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)circulator_prog1 circulator_prog1$(OBJ_EXT) $(LDFLAGS) - -circulator_prog2$(EXE_EXT): circulator_prog2$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)circulator_prog2 circulator_prog2$(OBJ_EXT) $(LDFLAGS) - -circulator_prog3$(EXE_EXT): circulator_prog3$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)circulator_prog3 circulator_prog3$(OBJ_EXT) $(LDFLAGS) - -clean: \ - circulator_prog1.clean \ - circulator_prog2.clean \ - circulator_prog3.clean - -#---------------------------------------------------------------------# -# suffix rules -#---------------------------------------------------------------------# - -.cpp$(OBJ_EXT): - $(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $< -