From 789f8e6ad40488d2dd5f5f4d87e195d0f1e23422 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 27 Aug 2003 20:22:13 +0000 Subject: [PATCH] Do archive name case conversion for wxMac and wxMotif git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/makerpm | 141 ++++++++++++++++++++++++++++++++++++++- distrib/msw/maketarballs | 35 +++++++++- 2 files changed, 172 insertions(+), 4 deletions(-) diff --git a/distrib/msw/makerpm b/distrib/msw/makerpm index 0f222f246e..c3b4a30cb4 100755 --- a/distrib/msw/makerpm +++ b/distrib/msw/makerpm @@ -27,7 +27,7 @@ dospinwxgtk() make allmo cd $WXDEST/wxgtk/release echo Configuring... - $WXSRC/configure --no-recursion + $WXSRC/configure --with-gtk --no-recursion echo Making... make -j1 dist bzip-dist-only @@ -54,7 +54,7 @@ dospinwxgtk() cd $RPM_ROOT rpmbuild -ba SPECS/wxGTK.spec 2>&1 | tee wxGTK.out - echo Finished wxBase RPM build, in $RPM_ROOT. + echo Finished wxGTK RPM build, in $RPM_ROOT. echo "SRPMS:" ls SRPMS echo "RPMS/i386:" @@ -65,6 +65,127 @@ dospinwxgtk() cp $WXDEST/wxgtk/release/*.tar.gz $WXDEST cp $WXDEST/wxgtk/release/*.tar.bz2 $WXDEST + rm -f -r $WXDEST/wxgtk + + echo Now try the RPMs with rpm -i. +} + +dospinwxmotif() +{ + echo Making wxMotif RPMs... + RPM_ROOT=$WXDEST/wxmotif/rpm-root + + if [ ! -d $WXDEST ]; then + mkdir $WXDEST + fi + + rm -f -r $WXDEST/wxmotif + mkdir $WXDEST/wxmotif + mkdir $WXDEST/wxmotif/release + mkdir $RPM_ROOT + + cd $WXSRC + cd locale + make allmo + cd $WXDEST/wxmotif/release + echo Configuring... + $WXSRC/configure --with-motif --no-recursion + echo Making... + make -j1 dist bzip-dist-only + + echo Setting up RPM build dir $RPM_ROOT... + rm -f -r $RPM_ROOT + mkdir $RPM_ROOT + mkdir $RPM_ROOT/BUILD + mkdir $RPM_ROOT/RPMS + mkdir $RPM_ROOT/RPMS/i386 + mkdir $RPM_ROOT/RPMS/i686 + mkdir $RPM_ROOT/RPMS/noarch + mkdir $RPM_ROOT/SOURCES + mkdir $RPM_ROOT/SPECS + mkdir $RPM_ROOT/SRPMS + + echo %_topdir $RPM_ROOT > ~/.rpmmacros + + echo Copying wxMOTIF-$WXVER.tar.bz2 to $RPM_ROOT/SOURCES... + cp wxMOTIF-$WXVER.tar.bz2 $RPM_ROOT/SOURCES + echo Copying wxMotif.spec to $RPM_ROOT/SPECS... + cp $WXSRC/wxMotif.spec $RPM_ROOT/SPECS + + echo Starting wxMotif RPM build... + cd $RPM_ROOT + rpmbuild -ba SPECS/wxMotif.spec 2>&1 | tee wxGTK.out + + echo Finished wxMotif RPM build, in $RPM_ROOT. + echo "SRPMS:" + ls SRPMS + echo "RPMS/i386:" + ls RPMS/i386 + + cp $RPM_ROOT/SRPMS/*.rpm $WXDEST + cp $RPM_ROOT/RPMS/*.rpm $WXDEST + cp $WXDEST/wxmotif/release/*.tar.gz $WXDEST + cp $WXDEST/wxmotif/release/*.tar.bz2 $WXDEST + + echo Rearchiving wxMotif tarballs to change wxMOTIF to wxMotif... + cd $WXDEST + mkdir wxMotif.tmp + cd wxMotif.tmp + rm -f -r * + tar xfz ../wxMOTIF-$WXVER.tar.gz + mv wxMOTIF-$WXVER wxMotif-$WXVER + rm -f ../wxMOTIF-$WXVER.tar.gz + rm -f ../wxMOTIF-$WXVER.tar.bz2 + tar cf ../wxMotif-$WXVER.tar * + gzip -c ../wxMotif-$WXVER.tar > ../wxMotif-$WXVER.tar.gz + bzip2 -f9 ../wxMotif-$WXVER.tar + cd .. + rm -f -r wxMotif.tmp + rm -f -r $WXDEST/wxmotif + + echo Now try the RPMs with rpm -i. +} + +dospinwxmac() +{ + echo Making wxMac tarballs... + echo Note that this must be done on a Mac. + if [ ! -d $WXDEST ]; then + mkdir $WXDEST + fi + + rm -f -r $WXDEST/wxmac + mkdir $WXDEST/wxmac + mkdir $WXDEST/wxmac/release + + cd $WXSRC + cd locale + make allmo + cd $WXDEST/wxmac/release + echo Configuring... + $WXSRC/configure --with-mac --no-recursion + echo Making... + make -j1 dist bzip-dist-only + + cp $WXDEST/wxmac/release/*.tar.gz $WXDEST + cp $WXDEST/wxmac/release/*.tar.bz2 $WXDEST + + echo Rearchiving wxMac tarballs to change wxMAC to wxMAC... + cd $WXDEST + mkdir wxMac.tmp + cd wxMac.tmp + rm -f -r * + tar xfz ../wxMac-$WXVER.tar.gz + mv wxMAC-$WXVER wxMac-$WXVER + rm -f ../wxMAC-$WXVER.tar.gz + rm -f ../wxMAC-$WXVER.tar.bz2 + tar cf ../wxMac-$WXVER.tar * + gzip -c ../wxMac-$WXVER.tar > ../wxMac-$WXVER.tar.gz + bzip2 -f9 ../wxMac-$WXVER.tar + cd .. + rm -f -r wxMac.tmp + + rm -f -r $WXDEST/wxmac echo Now try the RPMs with rpm -i. } @@ -125,6 +246,7 @@ dospinwxbase() cp $WXDEST/wxbase/release/*.tar.gz $WXDEST cp $WXDEST/wxbase/release/*.tar.bz2 $WXDEST + rm -f -r $WXDEST/wxbase echo Now try the RPMs with rpm -i. } @@ -185,6 +307,7 @@ dospinwxx11() cp $WXDEST/wxx11/release/*.tar.gz $WXDEST cp $WXDEST/wxx11/release/*.tar.bz2 $WXDEST + rm -f -r $WXDEST/wxx11 echo Now try the RPMs with rpm -i. } @@ -195,6 +318,8 @@ WXVER=$3 SPINWXX11=0 SPINWXGTK=0 +SPINWXMAC=0 +SPINWXMOTIF=0 SPINWXBASE=0 SPINEVERYTHING=0 UPDATECVS=0 @@ -207,6 +332,8 @@ usage() echo " --wxgtk Spin wxGTK RPMs" echo " --wxbase Spin wxBase RPMs" echo " --wxx11 Spin wxX11 RPMs" + echo " --wxmotif Spin wxMotif RPMs" + echo " --wxmac Make wxMac tarball" echo " --all Spin EVERYTHING" echo " --updatecvs Update from CVS" @@ -238,6 +365,8 @@ for i in "$@"; do case "$i" in --wxx11) SPINWXX11=1 ;; --wxgtk) SPINWXGTK=1 ;; + --wxmotif) SPINWXMOTIF=1 ;; + --wxmac) SPINWXMAC=1 ;; --wxbase) SPINWXBASE=1 ;; --all) SPINEVERYTHING=1 ;; --updatecvs) UPDATECVS=1 ;; @@ -271,3 +400,11 @@ if [ "$SPINWXBASE" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then dospinwxbase fi +if [ "$SPINWXMOTIF" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then + dospinwxmotif +fi + +if [ "$SPINWXMAC" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then + dospinwxmac +fi + diff --git a/distrib/msw/maketarballs b/distrib/msw/maketarballs index ea147d94b7..0c273f4cd8 100755 --- a/distrib/msw/maketarballs +++ b/distrib/msw/maketarballs @@ -79,7 +79,22 @@ dospinwxmotif() cp $WXDEST/wxmotif/release/*.tar.gz $WXDEST cp $WXDEST/wxmotif/release/*.tar.bz2 $WXDEST - mv $WXDEST/wxMOTIF-$WXVER.tar.gz $WXDEST/wxMotif-$WXVER.tar.gz + + echo Rearchiving wxMotif tarballs to change wxMOTIF to wxMotif... + cd $WXDEST + mkdir wxMotif.tmp + cd wxMotif.tmp + rm -f -r * + tar xfz ../wxMOTIF-$WXVER.tar.gz + mv wxMOTIF-$WXVER wxMotif-$WXVER + rm -f ../wxMOTIF-$WXVER.tar.gz + rm -f ../wxMOTIF-$WXVER.tar.bz2 + tar cf ../wxMotif-$WXVER.tar * + gzip -c ../wxMotif-$WXVER.tar > ../wxMotif-$WXVER.tar.gz + bzip2 -f9 ../wxMotif-$WXVER.tar + cd .. + rm -f -r wxMotif.tmp + rm -f -r $WXDEST/wxmotif } dospinwxmac() @@ -105,7 +120,23 @@ dospinwxmac() cp $WXDEST/wxmac/release/*.tar.gz $WXDEST cp $WXDEST/wxmac/release/*.tar.bz2 $WXDEST - mv $WXDEST/wxMAC-$WXVER.tar.gz $WXDEST/wxMac-$WXVER.tar.gz + + echo Rearchiving wxMac tarballs to change wxMAC to wxMAC... + cd $WXDEST + mkdir wxMac.tmp + cd wxMac.tmp + rm -f -r * + tar xfz ../wxMac-$WXVER.tar.gz + mv wxMAC-$WXVER wxMac-$WXVER + rm -f ../wxMAC-$WXVER.tar.gz + rm -f ../wxMAC-$WXVER.tar.bz2 + tar cf ../wxMac-$WXVER.tar * + gzip -c ../wxMac-$WXVER.tar > ../wxMac-$WXVER.tar.gz + bzip2 -f9 ../wxMac-$WXVER.tar + cd .. + rm -f -r wxMac.tmp + + rm -f -r $WXDEST/wxmac } docopydocs()