ignore warning 4535 for VC8 too as it still seems to be harmless

[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 7e3a6ec2cd0f7b3aa39016c07dbb6665556998af..050b6e30512be791aed0df137fcb95e6a09d6826 100755 (executable)
--- a/wxPython/distrib/all/do-build-windows
+++ b/wxPython/distrib/all/do-build-windows
@@ -18,8 +18,8 @@ set -o errexit
 
 echo "-=-=-=-  Hello from $HOSTNAME  -=-=-=-"
 
-if [ $# -lt 5 ]; then
-    echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION PYVER..."
+if [ $# -lt 6 ]; then
+    echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION PYVER CHARTYPE"
     exit 1
 fi
 
@@ -28,22 +28,15 @@ DESTDIR=$2
 SKIPCLEAN=$3
 VERSION=$4
 PYVER=$5
-
+CHARTYPE=$6
 
 # WXDIR is the cygwin path, WXWIN is the DOS path
-WXWIN_OLD=$WXWIN
 WXWIN=`cygpath -w $WXDIR`
 export WXWIN
+export WXDIR
+export TOOLS=/cygdrive/c/TOOLS
 
 
-# # 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
-
 # setup the compiler
 if [ $PYVER = 2.3 ]; then
     echo "Using MSVC ver 6"
@@ -57,10 +50,10 @@ 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
@@ -89,44 +82,79 @@ 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_DEBUGREPORRT 0/g
+s/wxUSE_DEBUGREPORT *1/wxUSE_DEBUGREPORT 0/g
+s/wxUSE_GRAPHICS_CONTEXT *0/wxUSE_GRAPHICS_CONTEXT 1/g
 EOF
 cat $WXDIR/include/wx/msw/setup0.h | sed -f .my.sedexpr > $WXDIR/include/wx/msw/setup.h
 rm .my.sedexpr
 
 
 echo "Building the wx DLLs..."
-.make hybrid
-.make hybrid-uni
+if [ $CHARTYPE = both -o $CHARTYPE = ansi ]; then
+    .make hybrid USE_GDIPLUS=1
+fi
+if [ $CHARTYPE = both -o $CHARTYPE = unicode ]; then
+    .make hybrid-uni USE_GDIPLUS=1
+fi
+
+
+# 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 "Translating docs to html..."
+# 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
+
+
+# echo "Extracting html docs..."
+# mkdir -p $WXDIR/docs/html/wx
+# cd $WXDIR/docs/html/wx
+# rm -rf *
+# tar xjf $DESTDIR/wxPython-docs-$VERSION.tar.bz2
+# rm $DESTDIR/wxPython-docs-$VERSION.tar.bz2
+# unzip wxPython-$VERSION/docs/wx.zip
+
+
+echo "Building the HTMLHelp file..."
+cd $WXDIR/docs/html/wx
+##cp $DOCDIR/latex/wx/wx.css .
+$TOOLS/HTMLHelpWorkshop/hhc.exe wx.hhp || true
+mkdir -p ../../htmlhelp
+mv wx.chm ../../htmlhelp
 
 
-#echo "Building the wx tools..."
-#.make_tools
 
-# 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..."
 cd $WXDIR/wxPython
 mkdir -p dist
+if [ $CHARTYPE = both -o $CHARTYPE = ansi ]; then
+    b $PYVER d UNICODE=0 USE_SWIG=0
+    b $PYVER h UNICODE=0 USE_SWIG=0 EP_ADD_OPTS=1
+    b $PYVER r UNICODE=0 USE_SWIG=0
+fi
+if [ $CHARTYPE = both -o $CHARTYPE = unicode ]; then
+    b $PYVER d UNICODE=1 USE_SWIG=0
+    b $PYVER h UNICODE=1 USE_SWIG=0 EP_ADD_OPTS=1
+    b $PYVER r UNICODE=1 USE_SWIG=0
+fi
 
-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=1 USE_SWIG=0
-    b $ver h UNICODE=1 USE_SWIG=0 EP_ADD_OPTS=1
-    b $ver r UNICODE=1 USE_SWIG=0
-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..."