Switch to bzip2 for compression

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/distrib/README.1st.txt b/wxPython/distrib/README.1st.txt
index a4699bf9107d0116babf021fe1a08f37bd750b50..d3ca71b86022149daa6705a416f6531657661d06 100644 (file)
--- a/wxPython/distrib/README.1st.txt
+++ b/wxPython/distrib/README.1st.txt
@@ -1,5 +1,5 @@
-README for wxPython-src-2.6.*.tar.gz
-====================================
+README for wxPython-src-2.6.*.tar.bz2
+=====================================
 
 
 This archive contains the source code and other files for both

diff --git a/wxPython/distrib/all/build-docs b/wxPython/distrib/all/build-docs
index 3c982706d8d9e5627653f75a018376bbdf43938b..d7ae7b67eb89bb94e4fb03664ede5ef4f8699d5a 100755 (executable)
--- a/wxPython/distrib/all/build-docs
+++ b/wxPython/distrib/all/build-docs
@@ -24,14 +24,14 @@ if [ $skipdocs != yes ]; then
     # build the doc and demo tarballs
     distrib/makedemo
     distrib/makedocs
-    mv dist/wxPython-docs-$VERSION.tar.gz $STAGING_DIR
-    mv dist/wxPython-demo-$VERSION.tar.gz $STAGING_DIR
+    mv dist/wxPython-docs-$VERSION.tar.bz2 $STAGING_DIR
+    mv dist/wxPython-demo-$VERSION.tar.bz2 $STAGING_DIR
 
 
     # build the new docs too
     if [ $skipnewdocs != yes ]; then
        docs/bin/everything
-       mv dist/wxPython-newdocs-$VERSION.tar.gz $STAGING_DIR
+       mv dist/wxPython-newdocs-$VERSION.tar.bz2 $STAGING_DIR
     fi
 fi
 

diff --git a/wxPython/distrib/all/build-osx b/wxPython/distrib/all/build-osx
index f799c1d63e4c04d6236411d530fab562e8b3a883..1e667e335c15ff516a15fd93cc6c0cd4e32c951d 100755 (executable)
--- a/wxPython/distrib/all/build-osx
+++ b/wxPython/distrib/all/build-osx
@@ -23,9 +23,9 @@ if [ $skiposx != yes ]; then
     echo "Copying source files and build script..."
     ssh root@$host "mkdir -p $OSX_BUILD && rm -rf $OSX_BUILD/* || true"
     
-    scp $STAGING_DIR/wxPython-src-$VERSION.tar.gz \
-       $STAGING_DIR/wxPython-docs-$VERSION.tar.gz \
-       $STAGING_DIR/wxPython-demo-$VERSION.tar.gz \
+    scp $STAGING_DIR/wxPython-src-$VERSION.tar.bz2 \
+       $STAGING_DIR/wxPython-docs-$VERSION.tar.bz2 \
+       $STAGING_DIR/wxPython-demo-$VERSION.tar.bz2 \
        distrib/all/do-build-osx \
        root@$host:$OSX_BUILD
 

diff --git a/wxPython/distrib/all/build-windows b/wxPython/distrib/all/build-windows
index a64d1a13561588d503773ced972dc73ea4d05bd0..252928627bea5702680458c8876f91771c438445 100755 (executable)
--- a/wxPython/distrib/all/build-windows
+++ b/wxPython/distrib/all/build-windows
@@ -18,7 +18,7 @@ if [ $skipwin != yes ]; then
     fi
 
     echo "Copying source file and build script..."
-    scp $STAGING_DIR/wxPython-src-$VERSION.tar.gz \
+    scp $STAGING_DIR/wxPython-src-$VERSION.tar.bz2 \
        distrib/all/do-build-windows \
        $WIN_HOST:$WIN_BUILD
     

diff --git a/wxPython/distrib/all/do-build-osx b/wxPython/distrib/all/do-build-osx
index b4a82a022348bcb3e58392e5dabf143cb1763fdc..826c7f896e74d0a965bbf86b79ab51549cf6b34e 100755 (executable)
--- a/wxPython/distrib/all/do-build-osx
+++ b/wxPython/distrib/all/do-build-osx
@@ -39,10 +39,10 @@ echo "which gcc = " `which gcc`
 #exit 0
 
 # 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
 
 
 echo "Invoking wxPythonOSX build script..."
@@ -63,8 +63,8 @@ cd $DESTDIR
 if [ $SKIPCLEAN != yes ]; then 
     echo "Cleaning up..."
     rm -r $WXDIR || true
-    rm wxPython-docs-$VERSION.tar.gz
-    rm wxPython-demo-$VERSION.tar.gz
+    rm wxPython-docs-$VERSION.tar.bz2
+    rm wxPython-demo-$VERSION.tar.bz2
 fi
 
 echo "-=-=-=-  Goodbye!  -=-=-=-"

diff --git a/wxPython/distrib/all/do-build-rpm b/wxPython/distrib/all/do-build-rpm
index 6a0bf692de5f8e4701b416ba904c920fff5d006a..15a89e1f786d56b8a76bcbc657267db0c9616777 100755 (executable)
--- a/wxPython/distrib/all/do-build-rpm
+++ b/wxPython/distrib/all/do-build-rpm
@@ -69,7 +69,7 @@ for dir in SPECS BUILD RPMS SOURCES SRPMS tmp; do
     fi
 done
 
-cp wxPython-src-$VERSION.tar.gz $rpmtop/SOURCES
+cp wxPython-src-$VERSION.tar.bz2 $rpmtop/SOURCES
 
 echo "******************** PYVER = " $PYVER
 for ver in $PYVER; do 
@@ -93,7 +93,7 @@ if [ $SKIPCLEAN != yes ]; then
     rm -rf $rpmtop
 
     echo "Cleaning up..."
-    rm *.spec *.tar.gz
+    rm *.spec *.tar.bz2
 fi
 
 echo "-=-=-=-  Goodbye!  -=-=-=-"

diff --git a/wxPython/distrib/all/do-build-windows b/wxPython/distrib/all/do-build-windows
index 871ec7696ff604198bbe235c770e2771fc9c8932..c97ff0650d847cb4729864cee3cc03975b0ccdac 100755 (executable)
--- a/wxPython/distrib/all/do-build-windows
+++ b/wxPython/distrib/all/do-build-windows
@@ -50,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

diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build
index 0563285f0a055de43000a176f2487358d275bfec..9f5473bf0ab0fb555395a346d82257684a72e73d 100755 (executable)
--- a/wxPython/distrib/mac/wxPythonOSX/build
+++ b/wxPython/distrib/mac/wxPythonOSX/build
@@ -134,21 +134,21 @@ if [ -z "$TARBALLDIR" ]; then
     # TARBALLDIR before invoking this script...
     TARBALLDIR=/stuff/Development/wxPython/dist/$VERSION
 fi
-TARBALL=$TARBALLDIR/wxPython-src-$VERSION.tar.gz
+TARBALL=$TARBALLDIR/wxPython-src-$VERSION.tar.bz2
 
-if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.gz ]; then 
+if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.bz2 ]; then 
     echo "-------------------------------------------------------"
     echo " WARNING:  Demo tarball not found, will skip building "
     echo "           the Demo app bundle and etc."
-    echo " $TARBALLDIR/wxPython-demo-$VERSION.tar.gz"
+    echo " $TARBALLDIR/wxPython-demo-$VERSION.tar.bz2"
     echo "-------------------------------------------------------"
 fi
 
-if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.gz ]; then
+if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.bz2 ]; then
     echo "-------------------------------------------------------"
     echo " WARNING:  Docs tarball not found, will skip building "
     echo "           the the wxDocsViewer app bundle and etc."
-    echo " $TARBALLDIR/wxPython-docs-$VERSION.tar.gz"
+    echo " $TARBALLDIR/wxPython-docs-$VERSION.tar.bz2"
     echo "-------------------------------------------------------"
 fi
 
@@ -201,7 +201,7 @@ pushd $BUILDROOT
 
 if [ $skiptar != yes ]; then
     echo Unarchiving tarball...
-    tar xzf $TARBALL
+    tar xjf $TARBALL
 fi
 
 if [ $inplace = no ]; then
@@ -543,7 +543,7 @@ EOF
 
 
     # wxDocs
-    if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.gz ]; then
+    if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.bz2 ]; then
        cat > "$DMGAPPS/Docs/Build ERROR.txt" <<EOF
 
 The wxPython-docs tarball was not found when building this disk image!
@@ -552,7 +552,7 @@ EOF
 
     else
        pushd $BUILDROOT
-       tar xzvf $TARBALLDIR/wxPython-docs-$VERSION.tar.gz
+       tar xjvf $TARBALLDIR/wxPython-docs-$VERSION.tar.bz2
        popd
 
         # Make an app to launch viewdocs.py
@@ -585,7 +585,7 @@ EOF
     popd
 
 
-    if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.gz ]; then
+    if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.bz2 ]; then
        cat > "$DMGAPPS/Samples/Build ERROR.txt" <<EOF
 
 The wxPython-$VERSION-demo tarball was not found when building this disk image!
@@ -597,7 +597,7 @@ EOF
 
         # Copy the demo and samples to the disk image from the tarball
        pushd $DMGAPPS/Samples
-       tar xzvf $TARBALLDIR/wxPython-demo-$VERSION.tar.gz
+       tar xjvf $TARBALLDIR/wxPython-demo-$VERSION.tar.bz2
        mv wxPython-$VERSION/* .
        rm -rf wxPython-$VERSION
        rm demo/b demo/.setup.sh

diff --git a/wxPython/distrib/makedemo b/wxPython/distrib/makedemo
index a5c42a978b89cf5d700315e9640d17aee8f02b61..e94a2e1f59f35e90086767656ba276a5975c13e0 100755 (executable)
--- a/wxPython/distrib/makedemo
+++ b/wxPython/distrib/makedemo
@@ -29,7 +29,7 @@ rm -f `find  _distrib_tgz/wxPython-$VERSION -name ".#*"`
 cd _distrib_tgz
 
 tar cvf ../dist/wxPython-demo-$VERSION.tar wxPython-$VERSION
-gzip -9 -f ../dist/wxPython-demo-$VERSION.tar
+bzip2 -9 -f ../dist/wxPython-demo-$VERSION.tar
 
 cd ..
 rm -r _distrib_tgz

diff --git a/wxPython/distrib/makedev.bat b/wxPython/distrib/makedev.bat
index 31df78063b5a29e4b708d5eda8981c2f14616b03..d48f9159491a01b6e6ae2126f68bb199d56dc805 100755 (executable)
--- a/wxPython/distrib/makedev.bat
+++ b/wxPython/distrib/makedev.bat
@@ -69,7 +69,7 @@ rm del-dirs
 
 rem *** bundle it all up  TODO: don't hard-code the 2.6
 tar cvf ../dist/wxPython2.6-win32-devel-%1.tar wxPython-%1
-gzip -9 ../dist/wxPython2.6-win32-devel-%1.tar
+bzip2 -9 ../dist/wxPython2.6-win32-devel-%1.tar
 
 rem *** cleanup
 cd ..

diff --git a/wxPython/distrib/makedocs b/wxPython/distrib/makedocs
index 9cfaeea489c4e99c89443b4e131357886b17964a..c530a6d868f82d12e1114de60623be21d00f3bb8 100755 (executable)
--- a/wxPython/distrib/makedocs
+++ b/wxPython/distrib/makedocs
@@ -62,9 +62,9 @@ cp ../distrib/viewdocs.py $DEST
 cp ../distrib/README.viewdocs.txt $DEST/README.txt
 ##cp ../docs/xml/wxPython-metadata.xml $DEST
 
-rm -f ../dist/wxPython-docs-$VERSION.tar.gz
+rm -f ../dist/wxPython-docs-$VERSION.tar.bz2
 tar cvf ../dist/wxPython-docs-$VERSION.tar wxPython-$VERSION
-gzip -9 ../dist/wxPython-docs-$VERSION.tar
+bzip2 -9 ../dist/wxPython-docs-$VERSION.tar
 
 
 # **** Cleanup

diff --git a/wxPython/distrib/makepreview.bat b/wxPython/distrib/makepreview.bat
index dbd4f610f2f58b229e245dffa02144408cfe5028..20736851dd9ce96c8d9fbd2af8e322d81870f803 100755 (executable)
--- a/wxPython/distrib/makepreview.bat
+++ b/wxPython/distrib/makepreview.bat
@@ -41,7 +41,7 @@ cd ..
 rem *** bundle it all up
 cd _distrib_zip
 tar cvf ../dist/wxPythonWIN32-preview-%1.tar wxPython-%1
-gzip -9 ../dist/wxPythonWIN32-preview-%1.tar
+bzip2 -9 ../dist/wxPythonWIN32-preview-%1.tar
 mv ../dist/wxPythonWIN32-preview-%1.tar.gz ../dist/wxPythonWIN32-preview-%1.tgz
 
 rem *** cleanup

diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index 5a989b6db1e3bf2ea10443bafb57bb92b34dd50c..b39243ea19f1e2a623630370fd2eac43660d5656 100755 (executable)
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -134,21 +134,14 @@ if [ -z "${skipcopy}" ]; then
     # copy root dir contents
     cp -pf --link ${wxdir}/* ${tarver} > /dev/null 2>&1
 
-    # copy all top dirs except CVS, build, demos, samples, utils, and wxPython
-    for d in art build contrib debian distrib docs include lib locale misc patches src; do
+    # copy all top dirs except CVS, demos, samples, and wxPython
+    for d in art build contrib debian docs include lib locale patches samples src utils; do
        if [ -e ${wxdir}/$d ]; then
            cp -Rpf --link ${wxdir}/$d ${tarver} #> /dev/null 2>&1
        fi
     done
 
-#     # and tex2rtf too
-#     mkdir ${tarver}/utils
-#     cp -Rpf --link ${wxdir}/utils/tex2rtf ${tarver}/utils
-#     # tex2rtf needs these files
-#     mkdir ${tarver}/samples
-#     cp -Rpf --link ${wxdir}/samples/sample.* ${tarver}/samples
-
-    # now do the same thing for wxPython, skipping it's build dirs and such
+    # now do the same thing for wxPython, but use the DIRLIST to select dirs to copy
     for dir in `grep -v '#' ${wxdir}/wxPython/distrib/DIRLIST`; do
        mkdir ${tarver}/${dir}
        ##echo "cp -pf --link ${wxdir}/${dir}/* ${tarver}/${dir}"
@@ -172,9 +165,9 @@ if [ -z "${skipcopy}" ]; then
     rm *.spec
     rm -rf distrib/msw/tmake
     rm -rf docs/html
-    rm -rf docs/latex
-    rm -rf contrib/docs
-    rm -rf contrib/samples
+    #rm -rf docs/latex
+    #rm -rf contrib/docs
+    #rm -rf contrib/samples
     rm locale/*.mo
     cleanup ".#*"
     cleanup "#*#"
@@ -191,6 +184,8 @@ if [ -z "${skipcopy}" ]; then
     cleanup motif
     cleanup os2
     cleanup x11
+    cleanup univ
+    cleanup wine
 
     rm -f wxPython/wx/*  > /dev/null 2>&1
 
@@ -224,10 +219,10 @@ if [ -z "${skiptar}" ]; then
     tar cvf ${distdir}/${tarver}.tar ${tarver} > /dev/null
 
     echo "*** Compressing..."
-    if [ -e ${distdir}/${tarver}.tar.gz ]; then
-       rm ${distdir}/${tarver}.tar.gz
+    if [ -e ${distdir}/${tarver}.tar.bz2 ]; then
+       rm ${distdir}/${tarver}.tar.bz2
     fi
-    gzip --best ${distdir}/${tarver}.tar
+    bzip2 --best ${distdir}/${tarver}.tar
     popd > /dev/null
 fi
 
@@ -237,7 +232,7 @@ fi
 
 if [ -z "${skiprpm}" ]; then
     echo "*** Building RPMs..."
-    cp ${distdir}/${tarver}.tar.gz ${rpmtop}/SOURCES
+    cp ${distdir}/${tarver}.tar.bz2 ${rpmtop}/SOURCES
 
     if [ "${srpmonly}" = "1" ]; then
        rpmbuild -bs \

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index a05cd0b4d75f2bac10c345b4dfe5f3b3ae841606..9473e27f74b43e505977b7aea91f13333d1a83af 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -111,7 +111,7 @@ Name:      %{pkgname}%{ver2}
 Summary:   Cross platform GUI toolkit for Python
 Version:   %{version}
 Release:   %{release}
-Source0:   %{tarname}-%{version}.tar.gz
+Source0:   %{tarname}-%{version}.tar.bz2
 License:   wx Library Licence, Version 3
 URL:       http://wxPython.org/
 Packager:  Robin Dunn <robin@alldunn.com>