From bf158fe6c6e0e8c4879c6ac45ba47e8eaacce128 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 2 Jun 2006 03:43:46 +0000 Subject: [PATCH] Switch to bzip2 for compression git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/distrib/README.1st.txt | 4 ++-- wxPython/distrib/all/build-docs | 6 +++--- wxPython/distrib/all/build-osx | 6 +++--- wxPython/distrib/all/build-windows | 2 +- wxPython/distrib/all/do-build-osx | 10 ++++----- wxPython/distrib/all/do-build-rpm | 4 ++-- wxPython/distrib/all/do-build-windows | 6 +++--- wxPython/distrib/mac/wxPythonOSX/build | 20 +++++++++--------- wxPython/distrib/makedemo | 2 +- wxPython/distrib/makedev.bat | 2 +- wxPython/distrib/makedocs | 4 ++-- wxPython/distrib/makepreview.bat | 2 +- wxPython/distrib/makerpm | 29 +++++++++++--------------- wxPython/distrib/wxPythonFull.spec.in | 2 +- 14 files changed, 47 insertions(+), 52 deletions(-) diff --git a/wxPython/distrib/README.1st.txt b/wxPython/distrib/README.1st.txt index a4699bf910..d3ca71b860 100644 --- 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 3c982706d8..d7ae7b67eb 100755 --- 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 f799c1d63e..1e667e335c 100755 --- 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 a64d1a1356..252928627b 100755 --- 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 b4a82a0223..826c7f896e 100755 --- 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 6a0bf692de..15a89e1f78 100755 --- 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 871ec7696f..c97ff0650d 100755 --- 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 0563285f0a..9f5473bf0a 100755 --- 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" < "$DMGAPPS/Samples/Build ERROR.txt" < /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 a05cd0b4d7..9473e27f74 100644 --- 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 -- 2.45.2