Qhull 2011.1 2011/05/14 6.2.0.1383 (exe/dll files unchanged)

 - PointCoordinates.cpp: Add #include <iterator> [R. Richter, S. Pasko]
 - Remove deprecated libqhull/qhull.h
   Use libqhull/libqhull.h instead.  It avoids confusion with libqhullcpp/Qhull.h
 - Makefile: Add LIBDIR, INCDIR, and DESTDIR to install [L.H. de Mello]
     Separate MAN install from DOC install
     Create install directories
     Installs headers to include/libqhull, include/libqhullcpp, include/road
 - CMakeLists.txt: Add MAN_INSTALL_DIR for qhull.1 and rbox.1 man pages
     Add RoadTest.h to include/road for Qt users (road_HEADERS)
 - Renamed md5sum files to avoid two extensions
 - qh-get.htm: Add Readme links and 2009.1 note.
 - qh-optf.htm: Fix link
 - index.htm: Updated Google Scholar link
 - qhull-zip.sh: Improved error message.

Author: cbbarber

.gitignore

@@ -17,25 +17,20 @@ r?
 *.rej
 
 # Build products
-bin/*
-lib/*
 tmp/*
-build/*
+project/Makefile*
+project/*/Makefile*
+project/*/object_script*
+project/*/Release/*
+project/*/Debug/*
+project/*/release/*
+project/*/debug/*
 *.a
 *.dll
 *.lib
 *.exe
 *.o
 *.md5sum
-.Makefile*
-src/road/RoadTest.h.cpp
-
-# Out-of-date directories
-config/*
-project/*
-working/*
-working/*/*
-
 
 # Qt files
 *.pro.user
@@ -47,8 +42,6 @@ working/*/*
 *.suo
 *.user
 *.ilk
-!build/*.sln
-!build/*.vcproj
 
 # CVS files
 CVS/*
@@ -57,3 +50,6 @@ CVS/*
 */*/*/CVS/*
 *.cvsignore
 
+# Other files
+working/
+

Announce.txt

@@ -1,5 +1,5 @@
 
- Qhull 2011.1  2011/04/17
+ Qhull 2011.1  2011/05/14
 
         http://www.qhull.org
         git@gitorious.org:qhull/qhull.git

CMakeLists.txt

@@ -7,15 +7,17 @@
 #   cd build && cmake -G "MSYS Makefiles" .. && cmake ..
 #   make
 #
-# $Id: //main/2011/qhull/CMakeLists.txt#9 $$Change: 1373 $
-# $DateTime: 2011/04/17 22:20:48 $$Author: bbarber $
+# For qhulltest, use Qt build (src/qhull-all.pro)
+#
+# $Id: //main/2011/qhull/CMakeLists.txt#11 $$Change: 1383 $
+# $DateTime: 2011/05/14 13:04:47 $$Author: bbarber $
 
 project(qhull)
 cmake_minimum_required(VERSION 2.6)
 
 # Define qhull_VERSION in CMakeLists.txt, Makefile, qhull-exports.def, and qhull-warn.pri
 string(REGEX REPLACE ".* ([0-9]+) .*"
-    "6.2.0.\\1"  qhull_VERSION "$Change: 1373 $")
+    "6.2.0.\\1"  qhull_VERSION "$Change: 1383 $")
 set(qhull_VERSION2 "2011.1 2011/04/17")
 
 if(INCLUDE_INSTALL_DIR)
@@ -30,6 +32,10 @@ if(BIN_INSTALL_DIR)
 else()
 set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
 endif()
+if(MAN_INSTALL_DIR)
+else()
+set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/man/man1)
+endif()
 if(DOC_INSTALL_DIR)
 else()
     if(WIN32)
@@ -38,7 +44,6 @@ else()
         set(DOC_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/packages/qhull)
     endif()
 endif()
-
 message(STATUS)
 message(STATUS "========== qhull Build Information ==========")
 message(STATUS "Build Version: 				   ${qhull_VERSION}")
@@ -47,8 +52,9 @@ message(STATUS "Binary Directory (BIN_INSTALL_DIR):        ${BIN_INSTALL_DIR}")
 message(STATUS "Library Directory (LIB_INSTALL_DIR):       ${LIB_INSTALL_DIR}")
 message(STATUS "Include Directory (INCLUDE_INSTALL_DIR):   ${INCLUDE_INSTALL_DIR}")
 message(STATUS "Documentation Directory (DOC_INSTALL_DIR): ${DOC_INSTALL_DIR}")
+message(STATUS "Man Pages Directory (MAN_INSTALL_DIR):     ${MAN_INSTALL_DIR}")
 message(STATUS "Build Type (CMAKE_BUILD_TYPE):             ${CMAKE_BUILD_TYPE}")
-message(STATUS "To override these options, add -D{OPTION_NAME}=... to the commandline")
+message(STATUS "To override these options, add -D{OPTION_NAME}=... to the cmake command")
 message(STATUS)
 message(STATUS "To build and install qhull, enter \"make\" and \"make install\"")
 message(STATUS)
@@ -127,6 +133,7 @@ set(
     road_HEADERS
         src/road/RoadError.h
         src/road/RoadLogEvent.h
+        src/road/RoadTest.h
 )
 
 set(
@@ -318,5 +325,6 @@ install(TARGETS ${qhull_TARGETS}
 install(FILES ${libqhull_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull)
 install(FILES ${libqhullcpp_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhullcpp)
 install(FILES ${road_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/road)
-
+install(FILES html/qhull.man DESTINATION ${MAN_INSTALL_DIR} RENAME qhull.1)
+install(FILES html/rbox.man DESTINATION ${MAN_INSTALL_DIR} RENAME rbox.1)
 install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR})

Makefile

@@ -1,7 +1,7 @@
 # Unix Makefile for qhull and rbox (default gcc/g++)
 #
 #       see README.txt  
-#       Qt project file at src/qhull-all.pro
+#       For qhulltest, use Qt project file at src/qhull-all.pro
 #       
 # Results
 #	qhull 		 Computes convex hulls and related structures (libqhullstatic)
@@ -30,6 +30,10 @@
 #       make cleanall    Remove generated files
 #
 #       BINDIR           directory where to copy executables
+#       DESTDIR          destination directory
+#       DOCDIR           directory where to copy html documentation
+#       INCDIR           directory where to copy headers
+#       LIBDIR           directory where to copy libraries
 #       MANDIR           directory where to copy manual pages
 #       PRINTMAN         command for printing manual pages
 #       PRINTC           command for printing C files
@@ -60,8 +64,12 @@
 # You may build the qhull programs without using a library
 # make qhullx
 
-BINDIR	= /usr/local/bin
-MANDIR	= /usr/local/man/man1
+DESTDIR = /usr/local
+BINDIR	= $(DESTDIR)/bin
+DOCDIR	= $(DESTDIR)/share/doc/packages/qhull
+INCDIR	= $(DESTDIR)/include
+LIBDIR	= $(DESTDIR)/lib
+MANDIR	= $(DESTDIR)/man/man1
 
 # if you do not have enscript, try a2ps or just use lpr.  The files are text.
 PRINTMAN = enscript -2rl
@@ -139,15 +147,27 @@ cleanall: clean
 doc: 
 	$(PRINTMAN) $(TXTFILES) $(DOCFILES)
 
-install:  
-	cp bin/qconvex $(BINDIR)/qconvex
-	cp bin/qdelaunay $(BINDIR)/qdelaunay
-	cp bin/qhalf $(BINDIR)/qhalf
-	cp bin/qhull $(BINDIR)/qhull
-	cp bin/qvoronoi $(BINDIR)/qvoronoi
-	cp bin/rbox $(BINDIR)/rbox
+install:
+	mkdir -p $(BINDIR)
+	mkdir -p $(DOCDIR)
+	mkdir -p $(INCDIR)/libqhull
+	mkdir -p $(INCDIR)/libqhullcpp
+	mkdir -p $(INCDIR)/road
+	mkdir -p $(LIBDIR)
+	mkdir -p $(MANDIR)
+	cp bin/qconvex $(BINDIR)
+	cp bin/qdelaunay $(BINDIR)
+	cp bin/qhalf $(BINDIR)
+	cp bin/qhull $(BINDIR)
+	cp bin/qvoronoi $(BINDIR)
+	cp bin/rbox $(BINDIR)
 	cp html/qhull.man $(MANDIR)/qhull.1
 	cp html/rbox.man $(MANDIR)/rbox.1
+	cp html/* $(DOCDIR)
+	cp -P lib/* $(LIBDIR)
+	cp src/libqhull/*.h $(INCDIR)/libqhull
+	cp src/libqhullcpp/*.h $(INCDIR)/libqhullcpp
+	cp src/road/*.h $(INCDIR)/road
 
 new:	cleanall all
 
@@ -254,8 +274,9 @@ TESTFILES= $(TCPP)/qhulltest.cpp $(TCPP)/Coordinates_test.cpp $(TCPP)/Point_test
 TXTFILES= Announce.txt REGISTER.txt COPYING.txt README.txt src/Changes.txt
 DOCFILES= html/rbox.txt html/qhull.txt
 FILES=	Makefile src/rbox/rbox.c src/user_eg/user_eg.c src/user_eg2/user_eg2.c eg/q_test eg/q_egtest eg/q_eg
-HTMFILES= html/qhull.man html/rbox.man $(L)/qh-code.htm $(L)/qh-optg.htm $(L)/qh-optt.htm \
-	html/index.htm html/qh-quick.htm html/qh-impre.htm html/qh-eg.htm \
+MANFILES= html/qhull.man html/rbox.man 
+# Source code is documented by src/libqhull/*.htm
+HTMFILES= html/index.htm html/qh-quick.htm html/qh-impre.htm html/qh-eg.htm \
 	html/qh-optc.htm html/qh-opto.htm html/qh-optf.htm  html/qh-optp.htm html/qh-optq.htm \
 	html/qh-c.htm html/qh-faq.htm html/qhull.htm html/qconvex.htm html/qdelaun.htm \
 	html/qh-geom.htm html/qh-globa.htm html/qh-io.htm html/qh-mem.htm html/qh-merge.htm \

eg/qhull-zip.sh

@@ -127,7 +127,7 @@ log_step $LINENO "Clean distribution directories"
 #############################
 
 if [[ -f qhull/src/Make-config.sh || -d qhull/src/debian ]]; then
-    exit_err $LINENO "Remove debian build from src/"
+    exit_err $LINENO "Before continuing, remove debian build from src/"
 fi    
 p4 sync -f qhull/build/...
 exit_if_err $LINENO "Can not 'p4 sync -f qhull.sln *.vcproj'"

html/qh-get.htm

@@ -29,24 +29,24 @@ <h1><a
 
         <p>Visit <a href="http://www.qhull.org/news">Qhull News</a>
         for news, bug reports, change history, and users.
-        If you use Qhull 2003.1. please upgrade to 2011.1 or apply
+        If you use Qhull 2003.1 or 2009.1, please upgrade to 2011.1 or apply
         <a href="http://www.qhull.org/download/poly.c-qh_gethash.patch">poly.c-qh_gethash.patch</a>.</p>
         </li>
     <li><a
         href="http://www.qhull.org/download/qhull-2011.1.zip">Download:
         Qhull 2011.1 for Windows</a> (2.1 Mbytes,
+        <a href="http://www.qhull.org/README.txt">readme</a>,
         <a href="http://www.qhull.org/download/qhull-2011.1.md5sum">md5sum</a>,
-        <a href="http://www.qhull.org/download/qhull-2011.1-zip.md5sum">contents</a>,
-        <a href="http://www.qhull.org/README.txt">readme</a>)
+        <a href="http://www.qhull.org/download/qhull-2011.1-zip.md5sum">contents</a>)
         <p>Type: console programs for
         Windows</p>
         <p>Includes executables, documentation, and sources files. It runs in a
         command window.</p>
     </li>
         <li><a href="http://www.qhull.org/download/qhull-2011.1-src.tgz">Download: Qhull 2011.1 for Unix</a> (670K,
+        <a href="http://www.qhull.org/README.txt">readme</a>,
         <a href="http://www.qhull.org/download/qhull-2011.1.md5sum">md5sum</a>,
-        <a href="http://www.qhull.org/download/qhull-2011.1-src-tgz.md5sum">contents</a>,
-        <a href="http://www.qhull.org/README.txt">readme</a>)
+        <a href="http://www.qhull.org/download/qhull-2011.1-src-tgz.md5sum">contents</a>)
         <p>Type: C/C++ source code for 32-bit and 64-bit architectures</p>
         <p>Includes documentation, source files, a gcc Makefile, CMakeLists.txt, DevStudio projects, and Qt projects.
             Includes preliminary C++ support.</p>

html/qh-optf.htm

@@ -375,7 +375,7 @@ <h3><A href="#format">&#187;</a><a name="Fn">Fn - print neighboring
 
 <p>For simplicial facets, each neighbor is opposite
 the corresponding vertex (option '<A href="#Fv">Fv</a>').
-Do not compare to option '<A href="qh_opto.htm#i">i</a>'.  Option 'i'
+Do not compare to option '<A href="qh-opto.htm#i">i</a>'.  Option 'i'
 orients facets by reversing the order of two vertices.  For non-simplicial facets,
 the neighbors are unordered.
 

index.htm

@@ -53,7 +53,7 @@ <h1>Qhull</h1>
 <ul>
     <li><a href="http://www.qhull.org/news">News</a> and
         <a href="http://www.qhull.org/news/qhull-news.html#bugs">Bugs</a>
-        about Qhull 2011.1 2011/04/17</li>
+        about Qhull 2011.1 2011/05/14</li>
     <li><a href="http://www.qhull.org/download">Download</a> Qhull</li>
     <li><a
         href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/welcome.html">Examples
@@ -65,7 +65,7 @@ <h1>Qhull</h1>
                 www.qhull.org
         <p>
     <li><a href="http://www.qhull.org/news/qhull-news.html#users">How</a> is Qhull used?</li>
-        <li><a href="http://scholar.google.com/scholar?cites=6731193060570243661&hl=en&as_sdt=40000000">Google Scholar</a>
+        <li><a href="http://scholar.google.com/scholar?cites=13151392091060773178&as_sdt=40000005">Google Scholar</a>
         and <a href="http://citeseerx.ist.psu.edu/showciting?doi=10.1.1.117.405&sort=cite">CiteSeer</a>
         references to Qhull
 </p>

src/Changes.txt

@@ -24,7 +24,24 @@ To do
  - Locate mirror site for Qhull
 
 ------------
-Qhull 2011.1  2010/04/17 6.2.0.1373
+Qhull 2011.1  2011/05/14 6.2.0.1383 (exe/dll files unchanged)
+ - PointCoordinates.cpp: Add #include <iterator> [R. Richter, S. Pasko]
+ - Remove deprecated libqhull/qhull.h
+   Use libqhull/libqhull.h instead.  It avoids confusion with libqhullcpp/Qhull.h
+ - Makefile: Add LIBDIR, INCDIR, and DESTDIR to install [L.H. de Mello]
+     Separate MAN install from DOC install
+     Create install directories
+     Installs headers to include/libqhull, include/libqhullcpp, include/road
+ - CMakeLists.txt: Add MAN_INSTALL_DIR for qhull.1 and rbox.1 man pages
+     Add RoadTest.h to include/road for Qt users (road_HEADERS)
+ - Renamed md5sum files to avoid two extensions
+ - qh-get.htm: Add Readme links and 2009.1 note.
+ - qh-optf.htm: Fix link
+ - index.htm: Updated Google Scholar link
+ - qhull-zip.sh: Improved error message.
+
+------------
+Qhull 2011.1  2011/04/17 6.2.0.1373
 
 Changes to deliverables
  - qvoronoi: Deprecated 'Qt' and 'QJn'. Removed from documentation and prompts.