X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec..7447d53c35249d42128d6243c90998f03882859a:/docs/doxygen/regen.sh

diff --git a/docs/doxygen/regen.sh b/docs/doxygen/regen.sh
index 8089bc1e58..64daea529b 100755
--- a/docs/doxygen/regen.sh
+++ b/docs/doxygen/regen.sh
@@ -20,11 +20,20 @@ me=$(basename $0)
 path=${0%%/$me}        # path from which the script has been launched
 current=$(pwd)
 cd $path
-export WXWIDGETS=`cd ../.. && pwd`
+if [ "$WXWIDGETS" = "" ]; then
+    export WXWIDGETS=`cd ../.. && pwd`
+    if [ "$OSTYPE" = "cygwin" ]; then
+        export WXWIDGETS=`cygpath -w $WXWIDGETS`
+    fi
+fi
+
+if [ "$DOXYGEN" = "" ]; then
+    DOXYGEN=doxygen
+fi
 
 # prepare folders for the cp commands below
 mkdir -p out/html       # we need to copy files in this folder below
-mkdir -p out/html/wxmsw out/html/wxgtk out/html/wxmac
+mkdir -p out/html/generic out/html/wxmsw out/html/wxgtk out/html/wxmac
 
 # These are not automatically copied by Doxygen because they're not
 # used in doxygen documentation, only in our html footer and by our
@@ -35,13 +44,9 @@ cp images/tab_*.gif out/html
 cp images/wxmsw/*png out/html/wxmsw
 cp images/wxmac/*png out/html/wxmac
 cp images/wxgtk/*png out/html/wxgtk
+cp images/generic/*png out/html/generic
 cp wxwidgets.js out/html
 
-# these CSS are not automatically copied by Doxygen because they're
-# included by our custom html header...
-cp wxwidgets.css out/html
-cp wxtabs.css out/html
-
 # which configuration should we use?
 if [[ -z "$1" ]]; then
     cfgfile="Doxyfile_all"
@@ -56,7 +61,7 @@ fi
 #     otherwise when generating the CHM file with Doxygen, those files are
 #     not included!
 #
-doxygen $cfgfile
+$DOXYGEN $cfgfile
 
 if [[ "$1" = "qch" ]]; then
     # we need to add missing files to the .qhp
@@ -145,10 +150,8 @@ fi
 # more readable
 currpath=`pwd`/
 interfacepath=`cd ../../interface && pwd`/
-cat doxygen.log | sed -e "s|$currpath||g" -e "s|$interfacepath||g" >temp
-
-# Doxygen warnings are not completely sorted for filename; enforce correct sorting:
-cat temp | sort >doxygen.log
+cat doxygen.log | sed -e "s|$currpath||g" -e "s|$interfacepath||g" > temp
+cat temp > doxygen.log
 rm temp
 
 # return to the original folder from which this script was launched