Changed the scripts so that the environment tests for makedocs only check

things really needed by makedocs.  Things needed by makerel are now in their
own check.  Also switched to unix2dos instead of unsing flip since unix2dos is
more common.

--HG--
rename : docs/testenv => docs/testenv_rel

docs/README.txt

@@ -32,13 +32,14 @@ hack something together :)
 
 There are four scripts in the docs folder.  
 
- - testenv:  This script tests your environment for all the needed utilities.
+ - testenv_rel: This script tests your environment for all the needed utilities.
 		Run it and it should tell you what else you need to install.
 		Note that the htmlify utility is something I wrote and is in
-	     dlib's repository in the tools/htmlify folder.  You should build 
-	     and install it.  (go into that folder, make a subfolder called 
-	     build, then cd into build and say:  "cmake ..; make; sudo make install".  
-	     You will need to install cmake if you don't have it already)
+		dlib's repository in the tools/htmlify folder.  You should
+		build and install it.  (go into that folder, make a subfolder
+		called build, then cd into build and say:  "cmake ..; make;
+		sudo make install".  You will need to install cmake if you
+		don't have it already)
 
  - makedocs: This remakes all the HTML documentation by pulling files out
  	     of the dlib repository.  If you want to use this stuff for your

docs/makerel

@@ -10,7 +10,7 @@ report_failure ()
 }
 
 
-./testenv || report_failure
+./testenv_rel || report_failure
 
 
 
@@ -67,7 +67,8 @@ cd .. || report_failure
 
 tar -cf $SOURCE_TAR $RELDIR  || report_failure
 # flip everything to MS-DOS line endings 
-find $RELDIR -name "*.cpp" -or -name "*.h" -or -name "*.txt" -or -name "*.html" | xargs flip -m
+#find $RELDIR -name "*.cpp" -or -name "*.h" -or -name "*.txt" -or -name "*.html" | xargs flip -m
+find $RELDIR -name "*.cpp" -or -name "*.h" -or -name "*.txt" -or -name "*.html" | xargs unix2dos &> /dev/null 
 
 zip -r9 $SOURCE_ZIP $RELDIR > /dev/null || report_failure
 tar -C ../docs -cf $WEBPAGE web || report_failure

docs/testenv

@@ -13,7 +13,6 @@ return_error()
 echo Testing environment for needed utilities
 
 bc -h 		> /dev/null || return_error "bc";
-flip -h 		> /dev/null || return_error "flip";
 echo nothing | awk '{}' > /dev/null || return_error "awk";
 echo | sed -e "s/s/r/"  > /dev/null || return_error "sed";
 htmlify 		> /dev/null || return_error "htmlify";
@@ -23,7 +22,6 @@ xsltproc -V 		> /dev/null || return_error "xsltproc";
 tar --help 		> /dev/null || return_error "tar";
 zip -h 			> /dev/null || return_error "zip";
 bzip2 -h 	       &> /dev/null || return_error "bzip2";
-wine --help 	       &> /dev/null || return_error "wine";
 
 
 echo All needed utilities found 

docs/testenv_rel

+#/bin/sh
+#
+#This script checks to make sure all the commands we need are 
+#present
+
+return_error()
+{
+   echo "Error, can't run the $1 command"
+   exit 1
+}
+
+./testenv
+
+echo Testing environment for needed release building utilities
+
+
+#flip -h 		> /dev/null || return_error "flip";
+unix2dos -h 		&> /dev/null || return_error "unix2dos";
+wine --help 	       &> /dev/null || return_error "wine";
+
+
+echo All needed utilities found 
+exit 0
+