more consistent naming

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

diff --git a/wxPython/distrib/all/build-windows b/wxPython/distrib/all/build-windows
index 0b8ea638b1018623e692edc78d529476ddb75be1..cd40bdb2bffc44868022898b4eaca6012251be50 100755 (executable)
--- a/wxPython/distrib/all/build-windows
+++ b/wxPython/distrib/all/build-windows
@@ -30,22 +30,45 @@ VERSION=$4
 shift;shift;shift;shift
 PYVER=$@
 
+
 # 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
 
-# change to the right spot and copy our build scripts
+# # 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
+
+
+# untar the source 
+echo "Unarchiving wxPython-src-$VERSION.tar.gz"
+cd $DESTDIR
+tar xzf wxPython-src-$VERSION.tar.gz 
+rm wxPython-src-$VERSION.tar.gz
+
+
+# Fix line endings
+echo "Converting wxPython line endings to CRLF..."
+cd $WXDIR
+names=`find wxPython -name "*.py" -o -name "*.txt" -o -name "*.htm*" -o -name "*.css" -o -name "*.xml" `
+unix2dos -D $names
+
+
+# change to the right spot in the source tree and copy our build scripts
+echo "Setting up for the build..."
 cd $WXDIR/build/msw
 cp $WXDIR/wxPython/distrib/msw/.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/wxDIALOG_UNIT_COMPATIBILITY *1/wxDIALOG_UNIT_COMPATIBILITY 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
@@ -62,39 +85,44 @@ echo "Building the wx DLLs..."
 .make hybrid
 .make hybrid-uni
 
-echo "Building the wx tools..."
-.make_tools
+
+#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
 
 for ver in $PYVER; do
     echo $ver
     b $ver d USE_SWIG=0
-    b $ver h 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
+    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
 
 
 echo "Copying installers to $DESTDIR..."
-mv dist/wxPythonWIN32* $DESTDIR
+mv dist/wxPython* $DESTDIR
 cd $DESTDIR
 
 
 if [ $SKIPCLEAN != yes ]; then 
     echo "Cleaning up..."
-    rm -r $WXDIR
+    rm -r $WXDIR || true
 fi
 
 echo "-=-=-=-  Goodbye!  -=-=-=-"