- Removed cgal_test and makefile from CVS, rely on defaults.

- Updated Polyhedron_incremental_builder_3 doc.
This commit is contained in:
Lutz Kettner 2002-04-15 12:39:16 +00:00
parent 22aea08c90
commit d674b2ed9d
8 changed files with 12 additions and 382 deletions

View File

@ -1,6 +1,11 @@
Polyhedron Package: Release changes:
---------------------------------------------------------------------
3.28 (15 Apr 2002)
- Removed cgal_test and makefile from CVS, rely on defaults.
- Updated Polyhedron_incremental_builder_3 doc.
3.27 (11 Apr 2002)
- resubmission.

View File

@ -132,7 +132,9 @@ vertices when creating new facets.
\ccMethod{bool error() const;}{returns error status of the builder.}
\ccGlue
\ccMethod{void rollback();}{undoes all changes made to the halfedge
data structure since the last \ccc{begin_surface()}.}
data structure since the last \ccc{begin_surface()} in relative
indexing, and deletes the whole surface in absolute indexing.
It needs a new call to \ccc{begin_surface()} to start inserting again.}
\ccMethod{bool check_unconnected_vertices();}{returns
\ccc{true} if unconnected vertices are detected. If \ccc{verbose} was set to

View File

@ -132,7 +132,9 @@ vertices when creating new facets.
\ccMethod{bool error() const;}{returns error status of the builder.}
\ccGlue
\ccMethod{void rollback();}{undoes all changes made to the halfedge
data structure since the last \ccc{begin_surface()}.}
data structure since the last \ccc{begin_surface()} in relative
indexing, and deletes the whole surface in absolute indexing.
It needs a new call to \ccc{begin_surface()} to start inserting again.}
\ccMethod{bool check_unconnected_vertices();}{returns
\ccc{true} if unconnected vertices are detected. If \ccc{verbose} was set to

View File

@ -1,90 +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 <target>
#---------------------------------------------------------------------#
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 polyhedron_prog_color
compile_and_run polyhedron_prog_cube
compile_and_run polyhedron_prog_incr_builder
compile_and_run polyhedron_prog_incr_builder_old
compile_and_run polyhedron_prog_normals
compile_and_run polyhedron_prog_normals_old
compile_and_run polyhedron_prog_off
compile_and_run polyhedron_prog_off_old
compile_and_run polyhedron_prog_planes
compile_and_run polyhedron_prog_point_iterator_old
compile_and_run polyhedron_prog_simple
compile_and_run polyhedron_prog_simple_old
compile_and_run polyhedron_prog_subdiv
compile_and_run polyhedron_prog_subdiv_with_boundary
compile_and_run polyhedron_prog_tetra
compile_and_run polyhedron_prog_tetra_old
compile_and_run polyhedron_prog_traits
compile_and_run polyhedron_prog_vector
fi

View File

@ -1,152 +0,0 @@
# Created by the script create_makefile
# This is the makefile for compiling a CGAL application.
#---------------------------------------------------------------------#
# include platform specific settings
#---------------------------------------------------------------------#
# Choose the right include file from the <cgalroot>/make directory.
# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE
include $(CGAL_MAKEFILE)
#---------------------------------------------------------------------#
# compiler flags
#---------------------------------------------------------------------#
CXXFLAGS = \
$(CGAL_CXXFLAGS) \
$(DEBUG_OPT)
#---------------------------------------------------------------------#
# linker flags
#---------------------------------------------------------------------#
LIBPATH = \
$(CGAL_LIBPATH)
LDFLAGS = \
$(CGAL_LDFLAGS)
#---------------------------------------------------------------------#
# target entries
#---------------------------------------------------------------------#
all: \
polyhedron_prog_color \
polyhedron_prog_cube \
polyhedron_prog_cut_cube \
polyhedron_prog_incr_builder \
polyhedron_prog_incr_builder_old \
polyhedron_prog_normals \
polyhedron_prog_normals_old \
polyhedron_prog_off \
polyhedron_prog_off_old \
polyhedron_prog_planes \
polyhedron_prog_point_iterator_old \
polyhedron_prog_simple \
polyhedron_prog_simple_old \
polyhedron_prog_subdiv \
polyhedron_prog_subdiv_with_boundary \
polyhedron_prog_tetra \
polyhedron_prog_tetra_old \
polyhedron_prog_traits \
polyhedron_prog_vector \
polyhedron_prog_vertex_color \
polyhedron_prog_vertex_normal
polyhedron_prog_color$(EXE_EXT): polyhedron_prog_color$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_color polyhedron_prog_color$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_cube$(EXE_EXT): polyhedron_prog_cube$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_cube polyhedron_prog_cube$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_cut_cube$(EXE_EXT): polyhedron_prog_cut_cube$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_cut_cube polyhedron_prog_cut_cube$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_incr_builder$(EXE_EXT): polyhedron_prog_incr_builder$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_incr_builder polyhedron_prog_incr_builder$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_incr_builder_old$(EXE_EXT): polyhedron_prog_incr_builder_old$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_incr_builder_old polyhedron_prog_incr_builder_old$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_normals$(EXE_EXT): polyhedron_prog_normals$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_normals polyhedron_prog_normals$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_normals_old$(EXE_EXT): polyhedron_prog_normals_old$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_normals_old polyhedron_prog_normals_old$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_off$(EXE_EXT): polyhedron_prog_off$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_off polyhedron_prog_off$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_off_old$(EXE_EXT): polyhedron_prog_off_old$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_off_old polyhedron_prog_off_old$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_planes$(EXE_EXT): polyhedron_prog_planes$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_planes polyhedron_prog_planes$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_point_iterator_old$(EXE_EXT): polyhedron_prog_point_iterator_old$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_point_iterator_old polyhedron_prog_point_iterator_old$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_simple$(EXE_EXT): polyhedron_prog_simple$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_simple polyhedron_prog_simple$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_simple_old$(EXE_EXT): polyhedron_prog_simple_old$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_simple_old polyhedron_prog_simple_old$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_subdiv$(EXE_EXT): polyhedron_prog_subdiv$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_subdiv polyhedron_prog_subdiv$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_subdiv_with_boundary$(EXE_EXT): polyhedron_prog_subdiv_with_boundary$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_subdiv_with_boundary polyhedron_prog_subdiv_with_boundary$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_tetra$(EXE_EXT): polyhedron_prog_tetra$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_tetra polyhedron_prog_tetra$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_tetra_old$(EXE_EXT): polyhedron_prog_tetra_old$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_tetra_old polyhedron_prog_tetra_old$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_traits$(EXE_EXT): polyhedron_prog_traits$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_traits polyhedron_prog_traits$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_vector$(EXE_EXT): polyhedron_prog_vector$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_vector polyhedron_prog_vector$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_vertex_color$(EXE_EXT): polyhedron_prog_vertex_color$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_vertex_color polyhedron_prog_vertex_color$(OBJ_EXT) $(LDFLAGS)
polyhedron_prog_vertex_normal$(EXE_EXT): polyhedron_prog_vertex_normal$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)polyhedron_prog_vertex_normal polyhedron_prog_vertex_normal$(OBJ_EXT) $(LDFLAGS)
clean: \
polyhedron_prog_color.clean \
polyhedron_prog_cube.clean \
polyhedron_prog_cut_cube.clean \
polyhedron_prog_incr_builder.clean \
polyhedron_prog_incr_builder_old.clean \
polyhedron_prog_normals.clean \
polyhedron_prog_normals_old.clean \
polyhedron_prog_off.clean \
polyhedron_prog_off_old.clean \
polyhedron_prog_planes.clean \
polyhedron_prog_point_iterator_old.clean \
polyhedron_prog_simple.clean \
polyhedron_prog_simple_old.clean \
polyhedron_prog_subdiv.clean \
polyhedron_prog_subdiv_with_boundary.clean \
polyhedron_prog_tetra.clean \
polyhedron_prog_tetra_old.clean \
polyhedron_prog_traits.clean \
polyhedron_prog_vector.clean \
polyhedron_prog_vertex_color.clean \
polyhedron_prog_vertex_normal.clean
#---------------------------------------------------------------------#
# suffix rules
#---------------------------------------------------------------------#
.C$(OBJ_EXT):
$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
.cpp$(OBJ_EXT):
$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<

View File

@ -1,74 +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 <target>
#---------------------------------------------------------------------#
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 test_polyhedron
compile_and_run test_polyhedron_old
fi

View File

@ -1,63 +0,0 @@
# Created by the script create_makefile
# This is the makefile for compiling a CGAL application.
#---------------------------------------------------------------------#
# include platform specific settings
#---------------------------------------------------------------------#
# Choose the right include file from the <cgalroot>/make directory.
# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE
include $(CGAL_MAKEFILE)
#---------------------------------------------------------------------#
# compiler flags
#---------------------------------------------------------------------#
CXXFLAGS = \
$(TESTSUITE_CXXFLAGS) \
$(EXTRA_FLAGS) \
$(CGAL_CXXFLAGS) \
$(LONG_NAME_PROBLEM_CXXFLAGS) \
$(DEBUG_OPT)
#---------------------------------------------------------------------#
# linker flags
#---------------------------------------------------------------------#
LIBPATH = \
$(TESTSUITE_LIBPATH) \
$(CGAL_LIBPATH)
LDFLAGS = \
$(TESTSUITE_LDFLAGS) \
$(LONG_NAME_PROBLEM_LDFLAGS) \
$(CGAL_LDFLAGS)
#---------------------------------------------------------------------#
# target entries
#---------------------------------------------------------------------#
all: \
test_polyhedron \
test_polyhedron_old
test_polyhedron$(EXE_EXT): test_polyhedron$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_polyhedron test_polyhedron$(OBJ_EXT) $(LDFLAGS)
test_polyhedron_old$(EXE_EXT): test_polyhedron_old$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_polyhedron_old test_polyhedron_old$(OBJ_EXT) $(LDFLAGS)
clean: \
test_polyhedron.clean \
test_polyhedron_old.clean
#---------------------------------------------------------------------#
# suffix rules
#---------------------------------------------------------------------#
.C$(OBJ_EXT):
$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
.cpp$(OBJ_EXT):
$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<

View File

@ -1 +1 @@
3.27 (11 Apr 2002)
3.28 (15 Apr 2002)