Build and distrib tweaks ported over from the 2.6 branch

[wxWidgets.git] / wxPython / distrib / all / do-build-windows

diff --git a/wxPython/distrib/all/do-build-windows b/wxPython/distrib/all/do-build-windows
index cd40bdb2bffc44868022898b4eaca6012251be50..4fe7658a461c6227e402cab743593ae1aaa04ce3 100755 (executable)
--- a/wxPython/distrib/all/do-build-windows
+++ b/wxPython/distrib/all/do-build-windows
@@ -27,30 +27,33 @@ WXDIR=$1
 DESTDIR=$2
 SKIPCLEAN=$3
 VERSION=$4
-shift;shift;shift;shift
-PYVER=$@
+PYVER=$5
 
 
 # WXDIR is the cygwin path, WXWIN is the DOS path
-WXWIN_OLD=$WXWIN
 WXWIN=`cygpath -w $WXDIR`
 export WXWIN
-
-
-# # Fix the PATH.  (Why is this needed??)
-# PATH=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/home/robind/bin:.:$WXDIR/lib/vc_dll:$PATH
-# export PATH
-# echo "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
-# echo $PATH
-# echo "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
-# exit 0
+export WXDIR
+export TOOLS=/cygdrive/c/TOOLS
+
+
+# setup the compiler
+if [ $PYVER = 2.3 ]; then
+    echo "Using MSVC ver 6"
+    . msvcset local 6
+    echo `which cl.exe`
+else
+    echo "Using MSVC ver 7"
+    . msvcset local 7
+    echo `which cl.exe`
+fi
 
 
 # untar the source 
-echo "Unarchiving wxPython-src-$VERSION.tar.gz"
+echo "Unarchiving wxPython-src-$VERSION.tar.bz2"
 cd $DESTDIR
-tar xzf wxPython-src-$VERSION.tar.gz 
-rm wxPython-src-$VERSION.tar.gz
+tar xjf wxPython-src-$VERSION.tar.bz2
+rm wxPython-src-$VERSION.tar.bz2
 
 
 # Fix line endings
@@ -64,11 +67,13 @@ unix2dos -D $names
 echo "Setting up for the build..."
 cd $WXDIR/build/msw
 cp $WXDIR/wxPython/distrib/msw/.m* .
+chmod +x .m*
 
 
 # replace some settings in setup0.h and write to setup.h
 cat > .my.sedexpr  <<EOF
 s/wxDIALOG_UNIT_COMPATIBILITY *1/wxDIALOG_UNIT_COMPATIBILITY 0/g
+s/wxUSE_EXCEPTIONS *1/wxUSE_EXCEPTIONS 0/g
 s/wxUSE_DEBUG_CONTEXT *0/wxUSE_DEBUG_CONTEXT 1/g
 s/wxUSE_MEMORY_TRACING *0/wxUSE_MEMORY_TRACING 1/g
 s/wxUSE_DIALUP_MANAGER *1/wxUSE_DIALUP_MANAGER 0/g
@@ -76,6 +81,8 @@ s/wxUSE_GLCANVAS *0/wxUSE_GLCANVAS 1/g
 s/wxUSE_POSTSCRIPT *0/wxUSE_POSTSCRIPT 1/g
 s/wxUSE_AFM_FOR_POSTSCRIPT *1/wxUSE_AFM_FOR_POSTSCRIPT 0/g
 s/wxUSE_DISPLAY *0/wxUSE_DISPLAY 1/g
+s/wxUSE_DIB_FOR_BITMAP *0/wxUSE_DIB_FOR_BITMAP 1/g
+s/wxUSE_DEBUGREPORT *1/wxUSE_DEBUGREPORT 0/g
 EOF
 cat $WXDIR/include/wx/msw/setup0.h | sed -f .my.sedexpr > $WXDIR/include/wx/msw/setup.h
 rm .my.sedexpr
@@ -86,13 +93,35 @@ echo "Building the wx DLLs..."
 .make hybrid-uni
 
 
-#echo "Building the wx tools..."
-#.make_tools
+echo "Building tex2rtf..."
+cd $WXDIR/utils/tex2rtf/src
+$WXDIR/build/msw/.mymake hybrid 
+cp vc_mswhdll/tex2rtf.exe $WXDIR/lib/vc_dll/tex2rtf.exe
+
+echo "Building the HTMLHelp file..."
+DOCDIR=$WXDIR/docs
+cd $DOCDIR/latex/wx
+mkdir -p $DOCDIR/html/wx
+cp *.gif $DOCDIR/html/wx
+cp *.css $DOCDIR/html/wx
+DOCSRC=`cygpath -w $DOCDIR/latex/wx/manual.tex`
+DOCDEST=`cygpath -w $DOCDIR/html/wx/wx.htm` 
+DOCINI=`cygpath -w $DOCDIR/latex/wx/tex2rtf_css.ini`
+
+$WXDIR/lib/vc_dll/tex2rtf.exe $DOCSRC $DOCDEST -twice -html -macros $DOCINI
+
+cd $DOCDIR/html/wx
+cp $DOCDIR/latex/wx/wx.css .
+$TOOLS/HTMLHelpWorkshop/hhc.exe wx.hhp || true
+mkdir -p ../../htmlhelp
+mv wx.chm ../../htmlhelp
+
+# rm -f $DOCDIR/html/wx/*.con
+# rm -f $DOCDIR/html/wx/*.ref
+# rm -f $DOCDIR/latex/wx/*.con
+# rm -f $DOCDIR/latex/wx/*.ref
+
 
-# cheat and just copy the .CHM files from the regular project dir
-# TODO:  Copy over the wxPython-docs fle and run hhc on the contents of that.
-mkdir -p $WXDIR/docs/htmlhelp
-cp `cygpath $WXWIN_OLD/docs/htmlhelp`/*.chm $WXDIR/docs/htmlhelp
 
 
 echo "Building wxPython and installers..."
@@ -101,9 +130,9 @@ mkdir -p dist
 
 for ver in $PYVER; do
     echo $ver
-    b $ver d USE_SWIG=0
-    b $ver h USE_SWIG=0 EP_ADD_OPTS=1
-    b $ver r USE_SWIG=0
+    b $ver d UNICODE=0 USE_SWIG=0
+    b $ver h UNICODE=0 USE_SWIG=0 EP_ADD_OPTS=1
+    b $ver r UNICODE=0 USE_SWIG=0
     b $ver d UNICODE=1 USE_SWIG=0
     b $ver h UNICODE=1 USE_SWIG=0 EP_ADD_OPTS=1
     b $ver r UNICODE=1 USE_SWIG=0
@@ -112,7 +141,7 @@ done
 echo "Building the developer package..."
 WXWIN=`cygpath -w $WXDIR`
 export WXWIN
-4nt /c distrib/makedev.bat $VERSION
+$TOOLS/4dos/4nt /c distrib/makedev.bat $VERSION
 
 
 echo "Copying installers to $DESTDIR..."