From 06839aadca844a404485dcf89498f32043ad1f89 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Tue, 20 Jun 2006 00:36:19 +0000 Subject: [PATCH] Updating manifests and attempting to use manifests to generate all ports. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/scripts/manifests/base.rsp | 18 ------- distrib/scripts/manifests/generic.rsp | 60 +---------------------- distrib/scripts/manifests/wince.rsp | 2 + distrib/scripts/msw/makesetup.sh | 92 +++++++++++++++++++++++++++++------ 4 files changed, 79 insertions(+), 93 deletions(-) diff --git a/distrib/scripts/manifests/base.rsp b/distrib/scripts/manifests/base.rsp index 4ca24c8..40c3bcc 100644 --- a/distrib/scripts/manifests/base.rsp +++ b/distrib/scripts/manifests/base.rsp @@ -20,43 +20,29 @@ build/msw/makefile.* src/common/*.cpp src/common/extended.c -src/common/unzip.c -src/common/unzip.h src/common/*.inc src/common/base.rc src/msdos/*.cpp src/msw/*.cpp -src/msw/*.h src/msw/makefile.* src/msw/makebase.b32 -src/msw/makeuniv.b32 -src/msw/*.lst -src/msw/*.def -src/msw/*.inc src/msw/winestub.c -src/msw/gsocket.c -src/msw/gsockmsw.c src/msw/version.rc src/msw/ole/*.cpp -src/msw/*.prj src/msw/wince/*.cpp -src/msw/wince/*.c src/unix/*.cpp -src/unix/*.c src/zlib/*.c src/zlib/*.h src/zlib/INDEX src/zlib/README src/zlib/ChangeLog -src/zlib/configure src/zlib/*.txt -src/zlib/makefile* src/zlib/*.com src/zlib/*.3 @@ -77,7 +63,6 @@ include/wx/*.inl include/wx/*.cpp include/wx/protocol/*.h include/wx/wx_setup.vms -include/wx/common/*.h include/wx/unix/*.h lib/dummy @@ -99,11 +84,8 @@ samples/console/*.h samples/console/makefile* samples/console/*.rc samples/console/*.def -samples/console/*.bmp samples/console/*.xpm samples/console/*.xbm -samples/console/*.png -samples/console/*.ico samples/console/*.txt samples/console/*.pro samples/console/*.bkl diff --git a/distrib/scripts/manifests/generic.rsp b/distrib/scripts/manifests/generic.rsp index ab45de4..5a265af 100644 --- a/distrib/scripts/manifests/generic.rsp +++ b/distrib/scripts/manifests/generic.rsp @@ -18,7 +18,7 @@ regen build/bakefiles/*.bkl build/bakefiles/Bakefiles.bkgen build/bakefiles/README -build/bakefiles/*.py* +build/bakefiles/*.py build/bakefiles/*.mk build/bakefiles/formats/*.bkl build/bakefiles/formats/*.empy @@ -33,30 +33,10 @@ build/update-setup-h build/aclocal/*.m4 -build/script/*.sh -build/script/*.txt -build/script/*.bat -build/script/*.vc -build/script/*.iss - misc/scripts/makegtktags misc/scripts/*.sh misc/scripts/*.bat -distrib/msw/*.rsp -distrib/msw/*.bat -distrib/msw/*.cpp -distrib/msw/*.txt -distrib/msw/tardist -distrib/msw/tarwxmotif -distrib/msw/tmake/*.t -distrib/msw/tmake/Makefile -distrib/msw/tmake/filelist.txt -distrib/msw/tmake/makeall.bat -distrib/msw/tmake/makeall.sh -distrib/msw/tmake/wxwin.pro -distrib/msw/tmake/tmake.conf - locale/*.po locale/msw/*.po locale/Makefile @@ -85,8 +65,6 @@ docs/tech/*.htm src/common/*.cpp src/common/extended.c -src/common/unzip.c -src/common/unzip.h src/common/*.inc src/common/base.rc @@ -102,9 +80,6 @@ src/richtext/*.cpp src/aui/*.cpp -src/unix/*.cpp -src/unix/*.c - src/png/*.c src/png/*.h src/png/makefile* @@ -121,29 +96,6 @@ src/png/scripts/makefile* src/png/scripts/*.com src/png/scripts/*.def -src/zlib/*.c -src/zlib/*.h -src/zlib/INDEX -src/zlib/README -src/zlib/ChangeLog -src/zlib/configure -src/zlib/*.txt -src/zlib/makefile* -src/zlib/*.com -src/zlib/*.3 - -src/regex/COPYRIGHT -src/regex/makefile* -src/regex/README -src/regex/WHATSNEW -src/regex/mkh -src/regex/*.h -src/regex/*.ih -src/regex/*.c -src/regex/tests -src/regex/regex.3 -src/regex/regex.7 - src/iodbc/AUTHORS src/iodbc/COPYING src/iodbc/autoconfig @@ -157,19 +109,11 @@ src/iodbc/*.h src/iodbc/*.ci src/iodbc/*.exp -include/wx/*.h -include/wx/*.inl -include/wx/*.cpp -include/wx/protocol/*.h include/wx/wx_setup.vms include/wx/common/*.h include/wx/generic/*.h include/wx/generic/*.xpm -include/wx/unix/*.h include/wx/html/*.h -include/wx/html/msw/*.bmp -include/wx/html/msw/*.ico -include/wx/html/msw/*.rc include/wx/richtext/*.h include/wx/aui/*.h lib/dummy @@ -201,7 +145,6 @@ samples/*.xpm samples/access/*.cpp samples/access/*.h samples/access/makefile* -samples/access/*.xbm samples/access/*.xpm samples/access/*.ico samples/access/*.rc @@ -211,7 +154,6 @@ samples/access/*.bkl samples/artprov/*.cpp samples/artprov/*.h samples/artprov/makefile* -samples/artprov/*.xbm samples/artprov/*.xpm samples/artprov/*.txt samples/artprov/*.ico diff --git a/distrib/scripts/manifests/wince.rsp b/distrib/scripts/manifests/wince.rsp index 33a98e1..cfaf387 100644 --- a/distrib/scripts/manifests/wince.rsp +++ b/distrib/scripts/manifests/wince.rsp @@ -1,6 +1,8 @@ build/wince/wx.vcw build/wince/wx_*.vcp +build/wince/missing + samples/access/access.vcp samples/access/access.vcw diff --git a/distrib/scripts/msw/makesetup.sh b/distrib/scripts/msw/makesetup.sh index 4209f7c..5a9d4f5 100755 --- a/distrib/scripts/msw/makesetup.sh +++ b/distrib/scripts/msw/makesetup.sh @@ -50,15 +50,39 @@ getfilelist(){ fi if [ $port = "msw" ] || [ $port = "all" ]; then - filelist="$filelist msw.rsp univ.rsp vc.rsp mmedia.rsp wince.rsp palmos.rsp dmc.rsp" + filelist="$filelist msw.rsp univ.rsp vc.rsp mmedia.rsp wince.rsp dmc.rsp" fi if [ $port = "os2" ] || [ $port = "all" ]; then - filelist="$filelist os2.rsp" + filelist="$filelist os2.rsp" + fi + + if [ $port = "x11" ] || [ $port = "all" ]; then + filelist="$filelist x11.rsp" + fi + + if [ $port = "mgl" ] || [ $port = "all" ]; then + filelist="$filelist mgl.rsp" + fi + + if [ $port = "gtk" ] || [ $port = "all" ]; then + filelist="$filelist gtk.rsp" + fi + + if [ $port = "cocoa" ] || [ $port = "all" ]; then + filelist="$filelist cocoa.rsp" + fi + + if [ $port = "motif" ] || [ $port = "all" ]; then + filelist="$filelist motif.rsp" + fi + + if [ $port = "mac" ] || [ $port = "all" ]; then + filelist="$filelist mac.rsp" fi if [ $port = "all" ]; then - filelist="$filelist x11.rsp gtk.rsp cocoa.rsp motif.rsp mac.rsp mgl.rsp" + filelist="$filelist palmos.rsp" fi tempfile="/tmp/wx$port.files.in" @@ -133,6 +157,26 @@ rearchive() popd } +ziptotar() +{ + archive=$1 + dirname=$2 + changeto=$3 + + pushd $changeto + + unzip $ZIPFLAGS $archive + + tar cfz $archive.tar.gz $dirname + + tar -cvf $dirname | bzip2 -9 > $archive.tar.bz2 + + rm -rf $dirname + + popd +} + + rearchivetar() { archive=$1 @@ -327,26 +371,31 @@ dospindocs() dospinport(){ port=$1 - upperport="`echo $port|tr '[a-z]' '[A-Z]'`" - echo "Zipping wx$upperport..." + if [ $port != "all" ]; then + portname="`echo $port|tr '[a-z]' '[A-Z]'`" + else + portname="wxWidgets" + fi + + echo "Zipping wx$portname..." cd $APPDIR portfiles="/tmp/wx$port.files" getfilelist "$port" "$portfiles" - zip $ZIPFLAGS -@ $DESTDIR/wx$upperport-$VERSION.zip < $portfiles - zip $ZIPFLAGS -g $DESTDIR/wx$upperport-$VERSION.zip LICENSE.txt COPYING.LIB CHANGES.txt README.txt + zip $ZIPFLAGS -@ $DESTDIR/wx$portname-$VERSION.zip < $portfiles + zip $ZIPFLAGS -g $DESTDIR/wx$portname-$VERSION.zip LICENSE.txt COPYING.LIB CHANGES.txt README.txt if [ $port = "msw" ] || [ $port = "all" ]; then - zip $ZIPFLAGS -g $DESTDIR/wx$upperport-$VERSION.zip README-MSW.txt INSTALL-MSW.txt + zip $ZIPFLAGS -g $DESTDIR/wx$portname-$VERSION.zip README-MSW.txt INSTALL-MSW.txt fi if [ $port = "os2" ] || [ $port = "all" ]; then - zip $ZIPFLAGS -g $DESTDIR/wx$upperport-$VERSION.zip INSTALL-OS2.txt + zip $ZIPFLAGS -g $DESTDIR/wx$portname-$VERSION.zip INSTALL-OS2.txt fi # put all files in a wxWidgets-$VERSION subdir in the zip archive - rearchive wx$upperport-$VERSION.zip wxWidgets-$VERSION $DESTDIR + rearchive wx$portname-$VERSION.zip wxWidgets-$VERSION $DESTDIR } dospininstaller() @@ -384,12 +433,12 @@ dospininstaller() mkdir bin fi - cp $APPDIR/bin/tex2rtf.exe bin - cp $APPDIR/bin/tex2rtf.chm bin - cp $APPDIR/bin/widgets.exe bin - cp $APPDIR/bin/life.exe bin - cp $APPDIR/demos/life/breeder.lif bin - cp $APPDIR/docs/htmlhelp/tex2rtf.chm bin + #cp $APPDIR/bin/tex2rtf.exe bin + #cp $APPDIR/bin/tex2rtf.chm bin + #cp $APPDIR/bin/widgets.exe bin + #cp $APPDIR/bin/life.exe bin + #cp $APPDIR/demos/life/breeder.lif bin + #cp $APPDIR/docs/htmlhelp/tex2rtf.chm bin if [ ! -d docs/pdf ]; then mkdir docs/pdf @@ -592,6 +641,17 @@ makesetup() dospinport "all" #dospinwxall fi + if [ "$SPINALL" = "1" ]; then + dospinport "mgl" + dospinport "gtk" + dospinport "x11" + dospinport "motif" + dospinport "mac" + dospinport "cocoa" + #dospinwxall + fi + + # Do docs spin if [ "$SPINDOCS" = "1" ] || [ "$SPINALL" = "1" ]; then dospindocs -- 2.7.4