removed contrib files from the scripts

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

diff --git a/distrib/scripts/create_archives.sh b/distrib/scripts/create_archives.sh
index 64a8f852bcbd5ab342c0890d6cd08f89c4aa8283..3eade8a52fa0434fbe7df8cdcba856b1a9633832 100755 (executable)
--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -39,16 +39,15 @@ getfilelist(){
   outfile=$2
 
   filelist="base.rsp"
-  contribfiles="stc.rsp contrib.rsp ogl.rsp"
   utilsfiles="tex2rtf.rsp utils.rsp utilmake.rsp"
-  commonfiles="generic.rsp generic_samples.rsp jpeg.rsp tiff.rsp xml.rsp deprecated.rsp makefile.rsp $utilsfiles $contribfiles"
+  commonfiles="generic.rsp generic_samples.rsp jpeg.rsp tiff.rsp xml.rsp makefile.rsp $utilsfiles"
 
   if [ ! $port = "base" ]; then
     filelist="$filelist $commonfiles"
   fi
 
   if [ $port = "msw" ] || [ $port = "all" ]; then
-    filelist="$filelist msw.rsp univ.rsp vc.rsp mmedia.rsp wince.rsp dmc.rsp"
+    filelist="$filelist msw.rsp univ.rsp vc.rsp wince.rsp dmc.rsp"
   fi
 
   if [ $port = "os2" ] || [ $port = "all" ]; then
@@ -62,11 +61,11 @@ getfilelist(){
   if [ $port = "mgl" ] || [ $port = "all" ]; then
     filelist="$filelist mgl.rsp"
   fi
-  
+
   if [ $port = "dfb" ] || [ $port = "all" ]; then
-    filelist="$filelist univ.rsp dfb.rsp" 
+    filelist="$filelist univ.rsp dfb.rsp"
   fi
-  
+
   if [ $port = "gtk" ] || [ $port = "all" ]; then
     filelist="$filelist gtk.rsp"
   fi
@@ -190,7 +189,7 @@ prepareforrelease()
 
     cp $APPDIR/docs/mgl/readme.txt $APPDIR/readme-mgl.txt
     cp $APPDIR/docs/mgl/install.txt $APPDIR/install-mgl.txt
-    
+
     cp $APPDIR/docs/dfb/install.txt $APPDIR/install-dfb.txt
 
     cp $APPDIR/docs/x11/readme.txt $APPDIR/readme-x11.txt
@@ -212,7 +211,6 @@ prepareforrelease()
     rm -f BuildCVS.txt descrip.mms
     rm -f setup.h_vms
     rm -f docs/html/wxbook.htm docs/html/roadmap.htm
-    rm -f -r contrib/docs/latex/ogl
     rm -f src/mingegcs.bat
 #    rm -f *.spec
     rm -f src/gtk/descrip.mms src/motif/descrip.mms

diff --git a/distrib/scripts/includes/configure_build.inc b/distrib/scripts/includes/configure_build.inc
index 18739204db02f44acc6cff1194eb7c2457049dff..5323f17c0b67f0d3141ecc7e36ba04f76bb86180 100644 (file)
--- a/distrib/scripts/includes/configure_build.inc
+++ b/distrib/scripts/includes/configure_build.inc
@@ -4,10 +4,10 @@ if [ "$INSTALLDIR" = "" ]; then
   mkdir -p $INSTALLDIR
 fi
 
-# wxPython needs this option so that it can build extensions that store the 
+# wxPython needs this option so that it can build extensions that store the
 # right install_name (e.g. /usr/local/lib) even if the files aren't actually
 # in /usr/local/lib at the time they're being linked against
-# we do this by setting the "official" prefix at build time, and later 
+# we do this by setting the "official" prefix at build time, and later
 if [ "$BUILDPREFIX" = "" ]; then
   BUILDPREFIX=$INSTALLDIR
 fi
@@ -28,37 +28,30 @@ WXPYTHON_OPTS="--enable-monolithic \
        --enable-debug_flag \
        --enable-optimise \
        --disable-debugreport "
-       
-       
+
+
 do_build(){
     OPTS=""
     if [ "$WXPYTHON" == "1" ]; then
       OPTS="$WXPYTHON_OPTS"
     fi
-    
+
     if [ "$DEBUG" == "1" ]; then
       OPTS="$OPTS $DEBUG_OPTS "
     fi
-    
+
     if [ "$UNICODE" == "1" ]; then
       OPTS="$OPTS $UNICODE_OPTS "
     fi
-    
-    
-    
+
+
+
     if [ "$STATIC" == "1" ]; then
       OPTS="$OPTS --enable-static"
     fi
-    
+
     OPTS="$OPTS $OTHER_OPTS"
-    
+
     $WXROOT/configure --prefix=$BUILDPREFIX $OPTS
     make
-    
-    # build the libs wxPython needs
-    if [ "$WXPYTHON" == "1" ]; then
-      make -C contrib/src/animate
-      make -C contrib/src/gizmos
-      make -C contrib/src/stc
-    fi
-}
\ No newline at end of file
+}

diff --git a/distrib/scripts/mac/macbuild b/distrib/scripts/mac/macbuild
index 2dc554d4a88349b389ebf47e9ef1bfe7e8e57d57..0f9e0d41c4686dfb1aca53ab11c7025609f0a235 100755 (executable)
--- a/distrib/scripts/mac/macbuild
+++ b/distrib/scripts/mac/macbuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# you need to change this if you run from outside this dir. 
+# you need to change this if you run from outside this dir.
 if [ "$WXROOT" = "" ]; then
   WXROOT=../../..
 fi
@@ -20,9 +20,4 @@ do_build
 
 make prefix=$INSTALLDIR install
 
-if [ "$WXPYTHON" == "1" ]; then
-  make -C contrib/src/gizmos prefix=$INSTALLDIR install
-  make -C contrib/src/stc prefix=$INSTALLDIR install
-fi
-
-cd $OLDDIR
\ No newline at end of file
+cd $OLDDIR

diff --git a/distrib/scripts/mac/macbuild-lipo b/distrib/scripts/mac/macbuild-lipo
index ab48db42bdf3a5cf6a743c4b32f2e84cae2fc408..00e9dd30260bb79f5b2a129e12abf249f376714a 100755 (executable)
--- a/distrib/scripts/mac/macbuild-lipo
+++ b/distrib/scripts/mac/macbuild-lipo
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# you need to change this if you run from outside this dir. 
+# you need to change this if you run from outside this dir.
 if [ "$WXROOT" = "" ]; then
   WXROOT=../../..
 fi
@@ -28,30 +28,30 @@ cd $DIR
 do_build
 cd ..
 
-# Copy over everything, then remove files we need to replace with lipo'd versions  
+# Copy over everything, then remove files we need to replace with lipo'd versions
 mkdir -p bld
 cp -R bld-i386/* bld
 cp -R bld-i386/.pch bld/.pch
 rm bld/lib/*.dylib
 
-# lipo the files, but make sure not to run it on symbolic links  
+# lipo the files, but make sure not to run it on symbolic links
 for item in `cd bld-i386/lib; ls *.dylib`
 do
   if [ -f bld-i386/lib/$item -a ! -L bld-i386/lib/$item ]; then
       lipo -create bld-i386/lib/$item bld-ppc/lib/$item -output bld/lib/$item
   else
       cp -R bld-i386/lib/$item bld/lib
-  fi    
+  fi
 done
-  
+
 # make install hacks - the copy operations mess up the timestamps and thus
 # cause make to erroneously think that the libraries need rebuilt
 touch bld/.pch/wxprec_monodll/wx/*.gch
 touch bld/.pch/wxprec_gldll/wx/*.gch
 touch bld/*.o
 touch bld/lib/*
-    
-# one more hack - inplace wx-config has a hardcoded path in it - we need to 
+
+# one more hack - inplace wx-config has a hardcoded path in it - we need to
 # change that path from bld-i386 to just bld in case someone wants to build things
 # in tree. (wxPython does this, for example)
 python -c "import os; fname = os.path.abspath('bld/wx-config'); data = open(fname).read(); data = data.replace('bld-i386', 'bld'); open(fname, 'w').write(data)"
@@ -59,8 +59,3 @@ python -c "import os; fname = os.path.abspath('bld/wx-config'); data = open(fnam
 cd bld
 make prefix=$INSTALLDIR install
 
-if [ "$WXPYTHON" == "1" ]; then
-  make -C contrib/src/animate prefix=$INSTALLDIR install
-  make -C contrib/src/gizmos prefix=$INSTALLDIR install
-  make -C contrib/src/stc prefix=$INSTALLDIR install
-fi
\ No newline at end of file

diff --git a/distrib/scripts/mac/tardist b/distrib/scripts/mac/tardist
index 9cabbbc85ce127dea7bb54351ef01a2fa2d3e777..c4c2aac3eccea44b7c5c4e8ea777c742513a9e8e 100644 (file)
--- a/distrib/scripts/mac/tardist
+++ b/distrib/scripts/mac/tardist
@@ -71,11 +71,7 @@ cat $SCRIPTDIR/manifests/mac.rsp  \
     $SCRIPTDIR/manifests/cw_mac.rsp  \
     $SCRIPTDIR/manifests/tex2rtf.rsp  \
     $SCRIPTDIR/manifests/utils.rsp  \
-    $SCRIPTDIR/manifests/ogl.rsp  \
-    $SCRIPTDIR/manifests/stc.rsp  \
     $SCRIPTDIR/manifests/xml.rsp  \
-    $SCRIPTDIR/manifests/contrib.rsp  \
-    $SCRIPTDIR/manifests/deprecated.rsp  \
     $SCRIPTDIR/manifests/makefile.rsp  \
     $SCRIPTDIR/manifests/tiff.rsp  \
     $SCRIPTDIR/manifests/jpeg.rsp \
@@ -91,7 +87,6 @@ mkdir wxMac-${WXVER}
 cd wxMac-${WXVER}
 
 $TAR xf ../wxMac-${WXVER}.tar
-rm -f -r contrib/src/mmedia contrib/samples/mmedia
 echo Copying readme files...
 cp $WXSRC/docs/mac/readme.txt README-MAC.txt
 cp $WXSRC/docs/mac/install.txt INSTALL-MAC.txt
@@ -144,15 +139,10 @@ cat $SCRIPTDIR/manifests/generic.rsp \
     $SCRIPTDIR/manifests/univ.rsp  \
     $SCRIPTDIR/manifests/mgl.rsp  \
     $SCRIPTDIR/manifests/dfb.rsp  \
-    $SCRIPTDIR/manifests/contrib.rsp  \
-    $SCRIPTDIR/manifests/deprecated.rsp  \
     $SCRIPTDIR/manifests/utilmake.rsp  \
     $SCRIPTDIR/manifests/utils.rsp  \
-    $SCRIPTDIR/manifests/mmedia.rsp  \
     $SCRIPTDIR/manifests/tex2rtf.rsp  \
-    $SCRIPTDIR/manifests/stc.rsp  \
     $SCRIPTDIR/manifests/xml.rsp  \
-    $SCRIPTDIR/manifests/ogl.rsp  \
     $SCRIPTDIR/manifests/makefile.rsp  \
     $SCRIPTDIR/manifests/tiff.rsp  \
     $SCRIPTDIR/manifests/jpeg.rsp  \

diff --git a/distrib/scripts/manifests/contrib.rsp b/distrib/scripts/manifests/contrib.rsp
deleted file mode 100644 (file)
index 0b4b7a8..0000000
--- a/distrib/scripts/manifests/contrib.rsp
+++ /dev/null
@@ -1,293 +0,0 @@
-contrib/build/animate/*.bkl
-contrib/build/animate/*.dsw
-contrib/build/animate/*.dsp
-contrib/build/animate/makefile*
-
-contrib/build/deprecated/*.bkl
-contrib/build/deprecated/*.dsw
-contrib/build/deprecated/*.dsp
-contrib/build/deprecated/makefile*
-
-contrib/build/fl/*.bkl
-contrib/build/fl/*.dsw
-contrib/build/fl/*.dsp
-contrib/build/fl/makefile*
-
-contrib/build/foldbar/*.bkl
-contrib/build/foldbar/*.dsw
-contrib/build/foldbar/*.dsp
-contrib/build/foldbar/makefile*
-
-contrib/build/gizmos/*.bkl
-contrib/build/gizmos/*.dsw
-contrib/build/gizmos/*.dsp
-contrib/build/gizmos/makefile*
-
-contrib/build/mmedia/*.bkl
-contrib/build/mmedia/*.dsw
-contrib/build/mmedia/*.dsp
-contrib/build/mmedia/makefile*
-
-contrib/build/net/*.bkl
-contrib/build/net/*.dsw
-contrib/build/net/*.dsp
-contrib/build/net/makefile*
-
-contrib/build/ogl/*.bkl
-contrib/build/ogl/*.dsw
-contrib/build/ogl/*.dsp
-contrib/build/ogl/makefile*
-
-contrib/build/plot/*.bkl
-contrib/build/plot/*.dsw
-contrib/build/plot/*.dsp
-contrib/build/plot/makefile*
-
-contrib/build/stc/*.bkl
-contrib/build/stc/*.dsw
-contrib/build/stc/*.dsp
-contrib/build/stc/makefile*
-
-contrib/build/svg/*.bkl
-contrib/build/svg/*.dsw
-contrib/build/svg/*.dsp
-contrib/build/svg/makefile*
-
-contrib/configure.in
-contrib/configure
-
-contrib/src/animate/*.cpp
-contrib/src/animate/*.h
-contrib/src/animate/readme.txt
-contrib/include/wx/animate/*.h
-
-contrib/samples/animate/*.cpp
-contrib/samples/animate/*.h
-contrib/samples/animate/makefile*
-contrib/samples/animate/*.xbm
-contrib/samples/animate/*.xpm
-contrib/samples/animate/*.txt
-contrib/samples/animate/*.ico
-contrib/samples/animate/*.bmp
-contrib/samples/animate/*.rc
-contrib/samples/animate/*.gif
-contrib/samples/animate/anitest.dsp
-contrib/samples/animate/*.bkl
-
-contrib/src/applet/*.cpp
-contrib/src/applet/*.h
-contrib/src/applet/make*
-contrib/include/wx/applet/*.h
-contrib/include/wx/applet/*.xpm
-contrib/include/wx/applet/*.bmp
-contrib/include/wx/applet/*.rc
-
-contrib/samples/applet/*.cpp
-contrib/samples/applet/*.h
-contrib/samples/applet/makefile*
-contrib/samples/applet/*.xbm
-contrib/samples/applet/*.xpm
-contrib/samples/applet/*.txt
-contrib/samples/applet/*.html
-contrib/samples/applet/*.ico
-contrib/samples/applet/*.bmp
-contrib/samples/applet/*.rc
-contrib/samples/applet/*.wdr
-
-contrib/src/deprecated/*.cpp
-contrib/src/deprecated/*.h
-contrib/src/deprecated/*.l
-contrib/src/deprecated/*.c
-contrib/src/deprecated/readme.txt
-contrib/include/wx/deprecated/*.h
-
-contrib/samples/deprecated/proplist/*.cpp
-contrib/samples/deprecated/proplist/*.h
-contrib/samples/deprecated/proplist/makefile*
-contrib/samples/deprecated/proplist/*.xbm
-contrib/samples/deprecated/proplist/*.xpm
-contrib/samples/deprecated/proplist/*.txt
-contrib/samples/deprecated/proplist/*.ico
-contrib/samples/deprecated/proplist/*.bmp
-contrib/samples/deprecated/proplist/*.rc
-contrib/samples/deprecated/proplist/*.gif
-contrib/samples/deprecated/proplist/proplist.dsp
-contrib/samples/deprecated/proplist/*.bkl
-
-contrib/samples/deprecated/resource/*.cpp
-contrib/samples/deprecated/resource/*.h
-contrib/samples/deprecated/resource/makefile*
-contrib/samples/deprecated/resource/*.xbm
-contrib/samples/deprecated/resource/*.xpm
-contrib/samples/deprecated/resource/*.txt
-contrib/samples/deprecated/resource/*.ico
-contrib/samples/deprecated/resource/*.bmp
-contrib/samples/deprecated/resource/*.rc
-contrib/samples/deprecated/resource/*.gif
-contrib/samples/deprecated/resource/resource.dsp
-contrib/samples/deprecated/resource/*.bkl
-
-contrib/samples/deprecated/treelay/*.cpp
-contrib/samples/deprecated/treelay/*.h
-contrib/samples/deprecated/treelay/makefile*
-contrib/samples/deprecated/treelay/*.xbm
-contrib/samples/deprecated/treelay/*.xpm
-contrib/samples/deprecated/treelay/*.txt
-contrib/samples/deprecated/treelay/*.ico
-contrib/samples/deprecated/treelay/*.bmp
-contrib/samples/deprecated/treelay/*.rc
-contrib/samples/deprecated/treelay/*.gif
-contrib/samples/deprecated/treelay/treelay.dsp
-contrib/samples/deprecated/treelay/*.bkl
-
-contrib/src/fl/*.cpp
-contrib/src/fl/*.h
-contrib/src/fl/files.lst
-contrib/include/wx/fl/*.h
-
-contrib/samples/fl/makefile*
-contrib/samples/fl/bitmaps/*.bmp
-contrib/samples/fl/bitmaps/*.xpm
-contrib/samples/fl/*.cpp
-contrib/samples/fl/*.h
-contrib/samples/fl/*.xbm
-contrib/samples/fl/*.xpm
-contrib/samples/fl/*.txt
-contrib/samples/fl/*.ico
-contrib/samples/fl/*.bmp
-contrib/samples/fl/*.rc
-contrib/samples/fl/*.dsp
-contrib/samples/fl/*.bkl
-
-contrib/src/gizmos/*.cpp
-contrib/src/gizmos/*.h
-contrib/src/gizmos/*.xpm
-contrib/src/gizmos/*.bmp
-contrib/include/wx/gizmos/*.h
-
-contrib/samples/gizmos/dynsash/*.cpp
-contrib/samples/gizmos/dynsash/*.h
-contrib/samples/gizmos/dynsash/makefile*
-contrib/samples/gizmos/dynsash/*.xbm
-contrib/samples/gizmos/dynsash/*.xpm
-contrib/samples/gizmos/dynsash/*.txt
-contrib/samples/gizmos/dynsash/*.ico
-contrib/samples/gizmos/dynsash/*.bmp
-contrib/samples/gizmos/dynsash/*.rc
-contrib/samples/gizmos/dynsash/dynsash.dsp
-contrib/samples/gizmos/dynsash/*.bkl
-
-contrib/samples/gizmos/dynsash_switch/*.cpp
-contrib/samples/gizmos/dynsash_switch/*.h
-contrib/samples/gizmos/dynsash_switch/makefile*
-contrib/samples/gizmos/dynsash_switch/*.xbm
-contrib/samples/gizmos/dynsash_switch/*.xpm
-contrib/samples/gizmos/dynsash_switch/*.txt
-contrib/samples/gizmos/dynsash_switch/*.ico
-contrib/samples/gizmos/dynsash_switch/*.bmp
-contrib/samples/gizmos/dynsash_switch/*.rc
-contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
-contrib/samples/gizmos/dynsash_switch/*.bkl
-
-contrib/samples/gizmos/editlbox/*.cpp
-contrib/samples/gizmos/editlbox/*.h
-contrib/samples/gizmos/editlbox/makefile*
-contrib/samples/gizmos/editlbox/*.xbm
-contrib/samples/gizmos/editlbox/*.xpm
-contrib/samples/gizmos/editlbox/*.txt
-contrib/samples/gizmos/editlbox/*.ico
-contrib/samples/gizmos/editlbox/*.bmp
-contrib/samples/gizmos/editlbox/*.rc
-contrib/samples/gizmos/editlbox/editlbox.dsp
-contrib/samples/gizmos/editlbox/*.bkl
-
-contrib/samples/gizmos/led/*.cpp
-contrib/samples/gizmos/led/*.h
-contrib/samples/gizmos/led/makefile*
-contrib/samples/gizmos/led/*.xbm
-contrib/samples/gizmos/led/*.xpm
-contrib/samples/gizmos/led/*.txt
-contrib/samples/gizmos/led/*.ico
-contrib/samples/gizmos/led/*.bmp
-contrib/samples/gizmos/led/*.rc
-contrib/samples/gizmos/led/led.dsp
-contrib/samples/gizmos/led/*.bkl
-
-contrib/samples/gizmos/multicell/*.cpp
-contrib/samples/gizmos/multicell/*.h
-contrib/samples/gizmos/multicell/makefile*
-contrib/samples/gizmos/multicell/*.xbm
-contrib/samples/gizmos/multicell/*.xpm
-contrib/samples/gizmos/multicell/*.txt
-contrib/samples/gizmos/multicell/*.ico
-contrib/samples/gizmos/multicell/*.bmp
-contrib/samples/gizmos/multicell/*.rc
-contrib/samples/gizmos/multicell/multicell.dsp
-contrib/samples/gizmos/multicell/*.bkl
-
-contrib/samples/gizmos/splittree/*.cpp
-contrib/samples/gizmos/splittree/*.h
-contrib/samples/gizmos/splittree/makefile*
-contrib/samples/gizmos/splittree/*.xbm
-contrib/samples/gizmos/splittree/*.xpm
-contrib/samples/gizmos/splittree/*.txt
-contrib/samples/gizmos/splittree/*.ico
-contrib/samples/gizmos/splittree/*.bmp
-contrib/samples/gizmos/splittree/*.rc
-contrib/samples/gizmos/splittree/splittree.dsp
-contrib/samples/gizmos/splittree/*.bkl
-
-contrib/src/plot/*.cpp
-contrib/src/plot/*.h
-contrib/include/wx/plot/*.h
-contrib/include/wx/plot/*.xpm
-contrib/include/wx/plot/*.bmp
-contrib/include/wx/plot/*.rc
-
-contrib/samples/plot/*.cpp
-contrib/samples/plot/*.h
-contrib/samples/plot/makefile*
-contrib/samples/plot/*.xbm
-contrib/samples/plot/*.xpm
-contrib/samples/plot/*.txt
-contrib/samples/plot/*.ico
-contrib/samples/plot/*.bmp
-contrib/samples/plot/*.rc
-contrib/samples/plot/plot.dsp
-contrib/samples/plot/*.bkl
-
-contrib/src/net/*.cpp
-contrib/src/net/*.h
-contrib/include/wx/net/*.h
-
-contrib/src/svg/*.cpp
-contrib/src/svg/README.TXT
-contrib/include/wx/svg/*.h
-contrib/samples/svg/make*
-contrib/samples/svg/*.cpp
-contrib/samples/svg/*.h
-contrib/samples/svg/*.ico
-contrib/samples/svg/*.xpm
-contrib/samples/svg/*.bmp
-contrib/samples/svg/*.rc
-contrib/samples/svg/svgtest.dsp
-contrib/samples/svg/*.bkl
-contrib/samples/svg/bitmaps/*.xpm
-
-contrib/src/foldbar/*.cpp
-contrib/src/foldbar/*.ico
-contrib/src/foldbar/*.xpm
-contrib/include/wx/foldbar/*.h
-contrib/samples/foldbar/extended/*.cpp
-contrib/samples/foldbar/extended/*.h
-contrib/samples/foldbar/extended/*.xpm
-contrib/samples/foldbar/extended/*.ico
-contrib/samples/foldbar/extended/*.rc
-contrib/samples/foldbar/extended/make*
-contrib/samples/foldbar/foldpanelbar/*.cpp
-contrib/samples/foldbar/foldpanelbar/*.h
-contrib/samples/foldbar/foldpanelbar/*.xpm
-contrib/samples/foldbar/foldpanelbar/*.ico
-contrib/samples/foldbar/foldpanelbar/*.rc
-contrib/samples/foldbar/foldpanelbar/make*
-

diff --git a/distrib/scripts/manifests/cw.rsp b/distrib/scripts/manifests/cw.rsp
index 611001de8c66b918f8f29a08afe104ac54a6827c..a12d81ce64250817d8918a1096f6a16554f8bba2 100644 (file)
--- a/distrib/scripts/manifests/cw.rsp
+++ b/distrib/scripts/manifests/cw.rsp
@@ -101,41 +101,3 @@ src/xrc/*W7.xml
 samples/xrc/*W7.xml
 utils/wxrc/*W7.xml
 utils/convertrc/*W7.xml
-
-contrib/src/foldbar/*W7.xml
-contrib/samples/foldbar/extended/*W7.xml
-contrib/samples/foldbar/foldpanelbar/*W7.xml
-contrib/src/ogl/*W7.xml
-contrib/samples/ogl/ogledit/*W7.xml
-contrib/samples/ogl/studio/*W7.xml
-contrib/src/mmedia/*W7.xml
-contrib/samples/mmedia/*W7.xml
-contrib/src/stc/*W7.xml
-contrib/samples/stc/*W7.xml
-contrib/src/canvas/*W7.xml
-contrib/samples/canvas/simple/*W7.xml
-contrib/samples/canvas/test/*W7.xml
-contrib/src/plot/*W7.xml
-contrib/samples/plot/*M?.xml
-contrib/samples/plot/*W7.xml
-contrib/src/gizmos/*W7.xml
-contrib/samples/gizmos/dynsash/*W7.xml
-contrib/samples/gizmos/dynsash_switch/*W7.xml
-contrib/samples/gizmos/editlbox/*W7.xml
-contrib/samples/gizmos/multicell/*W7.xml
-contrib/samples/gizmos/splittree/*W7.xml
-contrib/src/animate/*W7.xml
-contrib/samples/animate/*W7.xml
-contrib/src/fl/*W7.xml
-contrib/samples/fl/fl_demo1/*W7.xml
-contrib/samples/fl/fl_demo2/*W7.xml
-contrib/samples/fl/fl_sample1/*W7.xml
-contrib/samples/fl/fl_sample2/*W7.xml
-contrib/samples/fl/fl_sample3/*W7.xml
-contrib/src/net/*W7.xml
-
-contrib/src/deprecated/*W7.xml
-contrib/samples/deprecated/resource/*W7.xml
-contrib/samples/deprecated/proplist/*W7.xml
-contrib/samples/deprecated/treelay/*W7.xml
-

diff --git a/distrib/scripts/manifests/cw_mac.rsp b/distrib/scripts/manifests/cw_mac.rsp
index 83d00cb04d0935cde90c9f5a2a3f7516d75a03eb..ec655ba026890005b15a409b81719e577ffefec2 100644 (file)
--- a/distrib/scripts/manifests/cw_mac.rsp
+++ b/distrib/scripts/manifests/cw_mac.rsp
@@ -31,8 +31,6 @@ samples/xrc/*M?.xml
 samples/xrc/*.mcp
 utils/wxrc/*M?.xml
 utils/wxrc/*.mcp
-contrib/utils/convertrc/*M?.xml
-contrib/utils/convertrc/*.mcp
 
 samples/artprov/*M?.xml
 samples/artprov/*.mcp
@@ -194,79 +192,3 @@ demos/fractal/*.mcp
 demos/life/*M?.xml
 demos/life/*.mcp
 
-contrib/src/ogl/*M?.xml
-contrib/src/ogl/*.mcp
-
-contrib/samples/ogl/ogledit/*M?.xml
-contrib/samples/ogl/ogledit/*.mcp
-contrib/samples/ogl/studio/*M?.xml
-contrib/samples/ogl/studio/*.mcp
-
-contrib/src/mmedia/*M?.xml
-contrib/src/mmedia/*.mcp
-
-contrib/samples/mmedia/*M?.xml
-contrib/samples/mmedia/*.mcp
-
-contrib/src/stc/*M?.xml
-contrib/src/stc/*.mcp
-
-contrib/samples/stc/*M?.xml
-contrib/samples/stc/*.mcp
-
-contrib/src/foldbar/*M?.xml
-contrib/src/foldbar/*.mcp
-contrib/samples/foldbar/extended/*M?.xml
-contrib/samples/foldbar/extended/*.mcp
-contrib/samples/foldbar/foldpanelbar/*M?.xml
-contrib/samples/foldbar/foldpanelbar/*.mcp
-
-contrib/src/plot/*M?.xml
-contrib/src/plot/*.mcp
-contrib/samples/plot/*M?.xml
-contrib/samples/plot/*.mcp
-
-contrib/src/gizmos/*M?.xml
-contrib/src/gizmos/*.mcp
-contrib/samples/gizmos/dynsash/*M?.xml
-contrib/samples/gizmos/dynsash/*.mcp
-contrib/samples/gizmos/dynsash_switch/*M?.xml
-contrib/samples/gizmos/dynsash_switch/*.mcp
-contrib/samples/gizmos/editlbox/*M?.xml
-contrib/samples/gizmos/editlbox/*.mcp
-contrib/samples/gizmos/multicell/*M?.xml
-contrib/samples/gizmos/multicell/*.mcp
-contrib/samples/gizmos/splittree/*M?.xml
-contrib/samples/gizmos/splittree/*.mcp
-
-contrib/src/animate/*M?.xml
-contrib/src/animate/*.mcp
-contrib/samples/animate/*M?.xml
-contrib/samples/animate/*.mcp
-
-contrib/src/fl/*M?.xml
-contrib/src/fl/*.mcp
-contrib/samples/fl/fl_demo1/*M?.xml
-contrib/samples/fl/fl_demo1/*.mcp
-contrib/samples/fl/fl_demo2/*M?.xml
-contrib/samples/fl/fl_demo2/*.mcp
-contrib/samples/fl/fl_sample1/*M?.xml
-contrib/samples/fl/fl_sample1/*.mcp
-contrib/samples/fl/fl_sample2/*M?.xml
-contrib/samples/fl/fl_sample2/*.mcp
-contrib/samples/fl/fl_sample3/*M?.xml
-contrib/samples/fl/fl_sample3/*.mcp
-
-contrib/src/net/*M?.xml
-contrib/src/net/*.mcp
-
-contrib/src/deprecated/*M?.xml
-contrib/src/deprecated/*.mcp
-
-contrib/samples/deprecated/proplist/*M?.xml
-contrib/samples/deprecated/proplist/*.mcp
-contrib/samples/deprecated/resource/*M?.xml
-contrib/samples/deprecated/resource/*.mcp
-contrib/samples/deprecated/treelay/*M?.xml
-contrib/samples/deprecated/treelay/*.mcp
-

diff --git a/distrib/scripts/manifests/deprecated.rsp b/distrib/scripts/manifests/deprecated.rsp
deleted file mode 100644 (file)
index 0a5424d..0000000
--- a/distrib/scripts/manifests/deprecated.rsp
+++ /dev/null
@@ -1,42 +0,0 @@
-contrib/src/deprecated/*.cpp
-contrib/src/deprecated/dosyacc.c
-contrib/src/deprecated/doslex.c
-contrib/src/deprecated/cwlex_yy.c
-contrib/src/deprecated/cwy_tab.c
-contrib/include/wx/deprecated/*.h
-
-contrib/samples/deprecated/proplist/*.cpp
-contrib/samples/deprecated/proplist/*.h
-contrib/samples/deprecated/proplist/*.def
-contrib/samples/deprecated/proplist/makefile*
-contrib/samples/deprecated/proplist/*.xbm
-contrib/samples/deprecated/proplist/*.xpm
-contrib/samples/deprecated/proplist/*.ico
-contrib/samples/deprecated/proplist/*.bmp
-contrib/samples/deprecated/proplist/*.rc
-contrib/samples/deprecated/proplist/*.pro
-
-contrib/samples/deprecated/resource/*.cpp
-contrib/samples/deprecated/resource/*.h
-contrib/samples/deprecated/resource/*.def
-contrib/samples/deprecated/resource/*.rc
-contrib/samples/deprecated/resource/*.txt
-contrib/samples/deprecated/resource/*.wxr
-contrib/samples/deprecated/resource/makefile*
-contrib/samples/deprecated/resource/*.xbm
-contrib/samples/deprecated/resource/*.xpm
-contrib/samples/deprecated/resource/*.ico
-contrib/samples/deprecated/resource/*.pro
-
-contrib/samples/deprecated/treelay/*.cpp
-contrib/samples/deprecated/treelay/*.h
-contrib/samples/deprecated/treelay/makefile*
-contrib/samples/deprecated/treelay/*.rc
-contrib/samples/deprecated/treelay/*.def
-contrib/samples/deprecated/treelay/*.ico
-contrib/samples/deprecated/treelay/*.xpm
-contrib/samples/deprecated/treelay/*.txt
-contrib/samples/deprecated/treelay/*.bmp
-contrib/samples/deprecated/treelay/*.pro
-
-

diff --git a/distrib/scripts/manifests/dmc.rsp b/distrib/scripts/manifests/dmc.rsp
index 960bbbfc9eeacf0404d9066038e0ef14ef95cea0..c8da4bd272898e6b99f057c3c98d8b79e2dcbf26 100644 (file)
--- a/distrib/scripts/manifests/dmc.rsp
+++ b/distrib/scripts/manifests/dmc.rsp
@@ -2,64 +2,6 @@ build/msw/config.dmc
 build/msw/config.dms
 build/msw/makefile.dmc
 build/msw/makefile.dms
-contrib/build/deprecated/makefile.dmc
-contrib/build/deprecated/makefile.dms
-contrib/build/fl/makefile.dmc
-contrib/build/fl/makefile.dms
-contrib/build/foldbar/makefile.dmc
-contrib/build/foldbar/makefile.dms
-contrib/build/gizmos/makefile.dmc
-contrib/build/gizmos/makefile.dms
-contrib/build/mmedia/makefile.dmc
-contrib/build/mmedia/makefile.dms
-contrib/build/net/makefile.dmc
-contrib/build/net/makefile.dms
-contrib/build/ogl/makefile.dmc
-contrib/build/ogl/makefile.dms
-contrib/build/plot/makefile.dmc
-contrib/build/plot/makefile.dms
-contrib/build/stc/makefile.dmc
-contrib/build/stc/makefile.dms
-contrib/build/svg/makefile.dmc
-contrib/build/svg/makefile.dms
-contrib/samples/deprecated/proplist/makefile.dmc
-contrib/samples/deprecated/proplist/makefile.dms
-contrib/samples/deprecated/resource/makefile.dmc
-contrib/samples/deprecated/resource/makefile.dms
-contrib/samples/deprecated/treelay/makefile.dmc
-contrib/samples/deprecated/treelay/makefile.dms
-contrib/samples/fl/makefile.dmc
-contrib/samples/fl/makefile.dms
-contrib/samples/foldbar/extended/makefile.dmc
-contrib/samples/foldbar/extended/makefile.dms
-contrib/samples/foldbar/foldpanelbar/makefile.dmc
-contrib/samples/foldbar/foldpanelbar/makefile.dms
-contrib/samples/gizmos/dynsash/makefile.dmc
-contrib/samples/gizmos/dynsash/makefile.dms
-contrib/samples/gizmos/dynsash_switch/makefile.dmc
-contrib/samples/gizmos/dynsash_switch/makefile.dms
-contrib/samples/gizmos/editlbox/makefile.dmc
-contrib/samples/gizmos/editlbox/makefile.dms
-contrib/samples/gizmos/led/makefile.dmc
-contrib/samples/gizmos/led/makefile.dms
-contrib/samples/gizmos/multicell/makefile.dmc
-contrib/samples/gizmos/multicell/makefile.dms
-contrib/samples/gizmos/splittree/makefile.dmc
-contrib/samples/gizmos/splittree/makefile.dms
-contrib/samples/mmedia/makefile.dmc
-contrib/samples/mmedia/makefile.dms
-contrib/samples/ogl/ogledit/makefile.dmc
-contrib/samples/ogl/ogledit/makefile.dms
-contrib/samples/ogl/studio/makefile.dmc
-contrib/samples/ogl/studio/makefile.dms
-contrib/samples/plot/makefile.dmc
-contrib/samples/plot/makefile.dms
-contrib/samples/stc/makefile.dmc
-contrib/samples/stc/makefile.dms
-contrib/samples/svg/makefile.dmc
-contrib/samples/svg/makefile.dms
-contrib/utils/convertrc/makefile.dmc
-contrib/utils/convertrc/makefile.dms
 demos/bombs/makefile.dmc
 demos/bombs/makefile.dms
 demos/dbbrowse/makefile.dmc

diff --git a/distrib/scripts/manifests/docsrc.rsp b/distrib/scripts/manifests/docsrc.rsp
index 5ba69f2c2acb42289d2f5814ddcedbbc3ddf47ec..ff017df2d0496fa2660faa22a75b1bc005af486f 100644 (file)
--- a/distrib/scripts/manifests/docsrc.rsp
+++ b/distrib/scripts/manifests/docsrc.rsp
@@ -20,9 +20,3 @@ utils/tex2rtf/docs/*.bmp
 utils/tex2rtf/docs/*.shg
 utils/tex2rtf/docs/*.wmf
 utils/tex2rtf/docs/*.gif
-
-contrib/docs/latex/svg/*.gif
-contrib/docs/latex/svg/*.tex
-contrib/docs/latex/svg/*.ini
-contrib/docs/latex/svg/*.sty
-

diff --git a/distrib/scripts/manifests/generic.rsp b/distrib/scripts/manifests/generic.rsp
index 4c0ffa3c0553fae2b1030f72938967e613272f7a..11b68c5e5b6611f9ff7a846bd931efa1b0917634 100644 (file)
--- a/distrib/scripts/manifests/generic.rsp
+++ b/distrib/scripts/manifests/generic.rsp
@@ -132,8 +132,6 @@ utils/hhp2cached/*.xbm
 utils/hhp2cached/*.xpm
 utils/hhp2cached/*.txt
 
-contrib/lib/dummy
-
 demos/demos.bkl
 demos/makefile*
 

diff --git a/distrib/scripts/manifests/makefile.rsp b/distrib/scripts/manifests/makefile.rsp
index b007dbac09a3f1b4613a862ee6d247abca073589..78ac785b8ac28264afa78865a03346997e1b5b18 100644 (file)
--- a/distrib/scripts/manifests/makefile.rsp
+++ b/distrib/scripts/manifests/makefile.rsp
@@ -1,33 +1,4 @@
 autoconf_inc.m4
-contrib/samples/deprecated/proplist/Makefile.in
-contrib/samples/deprecated/resource/Makefile.in
-contrib/samples/deprecated/treelay/Makefile.in
-contrib/samples/fl/Makefile.in
-contrib/samples/foldbar/extended/Makefile.in
-contrib/samples/foldbar/foldpanelbar/Makefile.in
-contrib/samples/gizmos/dynsash/Makefile.in
-contrib/samples/gizmos/dynsash_switch/Makefile.in
-contrib/samples/gizmos/editlbox/Makefile.in
-contrib/samples/gizmos/led/Makefile.in
-contrib/samples/gizmos/multicell/Makefile.in
-contrib/samples/gizmos/splittree/Makefile.in
-contrib/samples/mmedia/Makefile.in
-contrib/samples/ogl/ogledit/Makefile.in
-contrib/samples/ogl/studio/Makefile.in
-contrib/samples/plot/Makefile.in
-contrib/samples/stc/Makefile.in
-contrib/samples/svg/Makefile.in
-contrib/src/deprecated/Makefile.in
-contrib/src/fl/Makefile.in
-contrib/src/foldbar/Makefile.in
-contrib/src/gizmos/Makefile.in
-contrib/src/mmedia/Makefile.in
-contrib/src/net/Makefile.in
-contrib/src/ogl/Makefile.in
-contrib/src/plot/Makefile.in
-contrib/src/stc/Makefile.in
-contrib/src/svg/Makefile.in
-contrib/utils/convertrc/Makefile.in
 demos/bombs/Makefile.in
 demos/dbbrowse/Makefile.in
 demos/forty/Makefile.in
@@ -160,9 +131,6 @@ libs/vms_gtk.opt
 ./src/motif/descrip.mms
 ./src/common/descrip.mms
 ./src/generic/descrip.mms
-./contrib/src/deprecated/descrip.mms
-./contrib/samples/mmedia/descrip.mms
-./contrib/samples/deprecated/resource/descrip.mms
 ./demos/bombs/descrip.mms
 ./samples/db/descrip.mms
 ./samples/aui/descrip.mms

diff --git a/distrib/scripts/manifests/mmedia.rsp b/distrib/scripts/manifests/mmedia.rsp
deleted file mode 100644 (file)
index 3949e61..0000000
--- a/distrib/scripts/manifests/mmedia.rsp
+++ /dev/null
@@ -1,37 +0,0 @@
-contrib/docs/html/mmedia/*.htm
-contrib/docs/html/mmedia/*.gif
-contrib/docs/html/mmedia/*.png
-contrib/docs/winhelp/mmedia.hlp
-contrib/docs/winhelp/mmedia.cnt
-contrib/docs/pdf/mmedia.pdf
-
-contrib/docs/latex/mmedia/*.tex
-contrib/docs/latex/mmedia/*.sty
-contrib/docs/latex/mmedia/*.bib
-contrib/docs/latex/mmedia/*.hpj
-contrib/docs/latex/mmedia/*.ini
-contrib/docs/latex/mmedia/*.txt
-contrib/docs/latex/mmedia/*.cnt
-contrib/docs/latex/mmedia/*.eps
-contrib/docs/latex/mmedia/*.bmp
-contrib/docs/latex/mmedia/*.gif
-contrib/docs/latex/mmedia/*.wmf
-
-contrib/include/wx/mmedia/*.h
-contrib/include/wx/mmedia/internal/*.h
-contrib/build/mmedia/makefile*
-contrib/src/mmedia/README
-contrib/src/mmedia/*.h
-contrib/src/mmedia/*.cpp
-contrib/samples/mmedia/*.h
-contrib/samples/mmedia/*.cpp
-contrib/samples/mmedia/makefile*
-contrib/samples/mmedia/*.xbm
-contrib/samples/mmedia/*.xpm
-contrib/samples/mmedia/*.ico
-contrib/samples/mmedia/*.txt
-contrib/samples/mmedia/*.rc
-contrib/samples/mmedia/*.def
-contrib/samples/mmedia/mmboard.dsp
-contrib/samples/mmedia/*.bkl
-

diff --git a/distrib/scripts/manifests/ogl.rsp b/distrib/scripts/manifests/ogl.rsp
deleted file mode 100644 (file)
index a59851f..0000000
--- a/distrib/scripts/manifests/ogl.rsp
+++ /dev/null
@@ -1,96 +0,0 @@
-contrib/docs/html/ogl/*.htm
-contrib/docs/html/ogl/*.gif
-contrib/docs/html/ogl/*.png
-contrib/docs/winhelp/ogl.hlp
-contrib/docs/winhelp/ogl.cnt
-contrib/docs/pdf/ogl.pdf
-
-contrib/docs/latex/ogl/*.tex
-contrib/docs/latex/ogl/*.sty
-contrib/docs/latex/ogl/*.bib
-contrib/docs/latex/ogl/*.hpj
-contrib/docs/latex/ogl/*.ini
-contrib/docs/latex/ogl/*.txt
-contrib/docs/latex/ogl/*.cnt
-contrib/docs/latex/ogl/*.eps
-contrib/docs/latex/ogl/*.bmp
-contrib/docs/latex/ogl/*.gif
-contrib/docs/latex/ogl/*.wmf
-
-contrib/src/ogl/*.cpp
-contrib/src/ogl/*.h
-contrib/src/ogl/*.rc
-contrib/src/ogl/*.def
-contrib/src/ogl/*.xbm
-contrib/src/ogl/*.xpm
-contrib/src/ogl/makefile.vc
-contrib/src/ogl/makefile.bcc
-contrib/src/ogl/makefile.b32
-contrib/src/ogl/makefile.wat
-contrib/src/ogl/makefile.g95
-contrib/src/ogl/makefile.unx
-contrib/src/ogl/makefile.vms
-contrib/src/ogl/Makefile.in
-contrib/src/ogl/*.txt
-contrib/src/ogl/*.ico
-contrib/src/ogl/*.bmp
-
-contrib/include/wx/ogl/*.h
-
-contrib/samples/ogl/ogledit/*.cpp
-contrib/samples/ogl/ogledit/*.h
-contrib/samples/ogl/ogledit/*.rc
-contrib/samples/ogl/ogledit/*.def
-contrib/samples/ogl/ogledit/*.xbm
-contrib/samples/ogl/ogledit/makefile.vc
-contrib/samples/ogl/ogledit/makefile.bcc
-contrib/samples/ogl/ogledit/makefile.b32
-contrib/samples/ogl/ogledit/makefile.wat
-contrib/samples/ogl/ogledit/makefile.g95
-contrib/samples/ogl/ogledit/makefile.unx
-contrib/samples/ogl/ogledit/makefile.vms
-contrib/samples/ogl/ogledit/Makefile.in
-contrib/samples/ogl/ogledit/*.txt
-contrib/samples/ogl/ogledit/*.ico
-contrib/samples/ogl/ogledit/*.bmp
-contrib/samples/ogl/ogledit/*.xpm
-contrib/samples/ogl/ogledit/ogledit.dsp
-contrib/samples/ogl/ogledit/bitmaps/*.bmp
-contrib/samples/ogl/ogledit/bitmaps/*.gif
-contrib/samples/ogl/ogledit/bitmaps/*.xbm
-contrib/samples/ogl/ogledit/bitmaps/*.xpm
-
-contrib/samples/ogl/studio/*.cpp
-contrib/samples/ogl/studio/*.h
-contrib/samples/ogl/studio/*.rc
-contrib/samples/ogl/studio/*.def
-contrib/samples/ogl/studio/*.xbm
-contrib/samples/ogl/studio/makefile.vc
-contrib/samples/ogl/studio/makefile.bcc
-contrib/samples/ogl/studio/makefile.b32
-contrib/samples/ogl/studio/makefile.wat
-contrib/samples/ogl/studio/makefile.g95
-contrib/samples/ogl/studio/makefile.unx
-contrib/samples/ogl/studio/makefile.vms
-contrib/samples/ogl/studio/Makefile.in
-contrib/samples/ogl/studio/*.txt
-contrib/samples/ogl/studio/*.ico
-contrib/samples/ogl/studio/*.bmp
-contrib/samples/ogl/studio/*.xpm
-contrib/samples/ogl/studio/*.wxr
-contrib/samples/ogl/studio/studio.dsp
-contrib/samples/ogl/studio/bitmaps/*.bmp
-contrib/samples/ogl/studio/bitmaps/*.gif
-contrib/samples/ogl/studio/bitmaps/*.xbm
-contrib/samples/ogl/studio/bitmaps/*.xpm
-contrib/samples/ogl/studio/bitmaps/*.ico
-contrib/samples/ogl/studio/manual/*.tex
-contrib/samples/ogl/studio/manual/*.ini
-contrib/samples/ogl/studio/manual/*.gif
-contrib/samples/ogl/studio/manual/*.bmp
-contrib/samples/ogl/studio/manual/*.htm
-contrib/samples/ogl/studio/manual/*.hlp
-contrib/samples/ogl/studio/manual/*.cnt
-contrib/samples/ogl/studio/manual/Makefile
-
-

diff --git a/distrib/scripts/manifests/stc.rsp b/distrib/scripts/manifests/stc.rsp
deleted file mode 100644 (file)
index ee963f7..0000000
--- a/distrib/scripts/manifests/stc.rsp
+++ /dev/null
@@ -1,52 +0,0 @@
-contrib/docs/html/stc/*.htm
-contrib/docs/html/stc/*.gif
-contrib/docs/html/stc/*.png
-contrib/docs/winhelp/stc.hlp
-contrib/docs/winhelp/stc.cnt
-contrib/docs/pdf/stc.pdf
-
-contrib/docs/latex/stc/*.tex
-contrib/docs/latex/stc/*.sty
-contrib/docs/latex/stc/*.bib
-contrib/docs/latex/stc/*.hpj
-contrib/docs/latex/stc/*.ini
-contrib/docs/latex/stc/*.txt
-contrib/docs/latex/stc/*.cnt
-contrib/docs/latex/stc/*.eps
-contrib/docs/latex/stc/*.bmp
-contrib/docs/latex/stc/*.gif
-contrib/docs/latex/stc/*.wmf
-
-contrib/src/stc/*.cpp
-contrib/src/stc/*.h
-contrib/src/stc/*.rc
-contrib/src/stc/*.def
-contrib/src/stc/*.xbm
-contrib/src/stc/*.xpm
-contrib/src/stc/make*.*
-contrib/src/stc/*.ico
-contrib/src/stc/*.bmp
-contrib/src/stc/README.txt
-
-contrib/src/stc/scintilla/README.txt
-contrib/src/stc/scintilla/include/*.h
-contrib/src/stc/scintilla/src/*.cpp
-contrib/src/stc/scintilla/src/*.cxx
-contrib/src/stc/scintilla/src/*.h
-contrib/include/wx/stc/*.h
-
-contrib/samples/stc/*.cpp
-contrib/samples/stc/*.h
-contrib/samples/stc/*.rc
-contrib/samples/stc/*.def
-contrib/samples/stc/*.xbm
-contrib/samples/stc/make*.*
-contrib/samples/stc/Makefile
-contrib/samples/stc/*.txt
-contrib/samples/stc/*.ico
-contrib/samples/stc/*.bmp
-contrib/samples/stc/*.xpm
-contrib/samples/stc/*.wxr
-contrib/samples/stc/stctest.dsp
-contrib/samples/stc/*.bkl
-

diff --git a/distrib/scripts/manifests/vc.rsp b/distrib/scripts/manifests/vc.rsp
index 842b852ae56a8dd9aa1083fcf36f5183c36f5877..dd17c204508ff569bd1ecad40bbac88a7d8ddaba 100644 (file)
--- a/distrib/scripts/manifests/vc.rsp
+++ b/distrib/scripts/manifests/vc.rsp
@@ -19,69 +19,6 @@ build/msw/wx_wxtiff.dsp
 build/msw/wx_wxzlib.dsp
 build/msw/wx_xml.dsp
 build/msw/wx_xrc.dsp
-contrib/build/deprecated/deprecated.dsp
-contrib/build/deprecated/deprecated.dsw
-contrib/build/fl/fl.dsp
-contrib/build/fl/fl.dsw
-contrib/build/foldbar/foldbar.dsp
-contrib/build/foldbar/foldbar.dsw
-contrib/build/gizmos/gizmos.dsw
-contrib/build/gizmos/gizmos_gizmos.dsp
-contrib/build/gizmos/gizmos_gizmos_xrc.dsp
-contrib/build/mmedia/mmedia.dsp
-contrib/build/mmedia/mmedia.dsw
-contrib/build/net/net.dsp
-contrib/build/net/net.dsw
-contrib/build/ogl/ogl.dsp
-contrib/build/ogl/ogl.dsw
-contrib/build/plot/plot.dsp
-contrib/build/plot/plot.dsw
-contrib/build/stc/stc.dsp
-contrib/build/stc/stc.dsw
-contrib/build/svg/svg.dsp
-contrib/build/svg/svg.dsw
-contrib/samples/deprecated/proplist/proplist.dsp
-contrib/samples/deprecated/proplist/proplist.dsw
-contrib/samples/deprecated/resource/resource.dsp
-contrib/samples/deprecated/resource/resource.dsw
-contrib/samples/deprecated/treelay/treelay.dsp
-contrib/samples/deprecated/treelay/treelay.dsw
-contrib/samples/fl/fl.dsw
-contrib/samples/fl/fl_fl_demo1.dsp
-contrib/samples/fl/fl_fl_demo2.dsp
-contrib/samples/fl/fl_fl_sample1.dsp
-contrib/samples/fl/fl_fl_sample2.dsp
-contrib/samples/fl/fl_fl_sample3.dsp
-contrib/samples/foldbar/extended/extended.dsp
-contrib/samples/foldbar/extended/extended.dsw
-contrib/samples/foldbar/foldpanelbar/foldtest.dsp
-contrib/samples/foldbar/foldpanelbar/foldtest.dsw
-contrib/samples/gizmos/dynsash/dynsash.dsp
-contrib/samples/gizmos/dynsash/dynsash.dsw
-contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
-contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw
-contrib/samples/gizmos/editlbox/editlbox.dsp
-contrib/samples/gizmos/editlbox/editlbox.dsw
-contrib/samples/gizmos/led/led.dsp
-contrib/samples/gizmos/led/led.dsw
-contrib/samples/gizmos/multicell/multicell.dsp
-contrib/samples/gizmos/multicell/multicell.dsw
-contrib/samples/gizmos/splittree/splittree.dsp
-contrib/samples/gizmos/splittree/splittree.dsw
-contrib/samples/mmedia/mmboard.dsp
-contrib/samples/mmedia/mmboard.dsw
-contrib/samples/ogl/ogledit/ogledit.dsp
-contrib/samples/ogl/ogledit/ogledit.dsw
-contrib/samples/ogl/studio/studio.dsp
-contrib/samples/ogl/studio/studio.dsw
-contrib/samples/plot/plot.dsp
-contrib/samples/plot/plot.dsw
-contrib/samples/stc/stctest.dsp
-contrib/samples/stc/stctest.dsw
-contrib/samples/svg/svgtest.dsp
-contrib/samples/svg/svgtest.dsw
-contrib/utils/convertrc/convertrc.dsp
-contrib/utils/convertrc/convertrc.dsw
 demos/bombs/bombs.dsp
 demos/bombs/bombs.dsw
 demos/dbbrowse/dbbrowse.dsp

diff --git a/distrib/scripts/manifests/wince.rsp b/distrib/scripts/manifests/wince.rsp
index 95bcbfae99b967c651ab2f6ea8fd12977bdf5628..b214ec6057e46f7e90de0e0afdc5e59c7614c48b 100644 (file)
--- a/distrib/scripts/manifests/wince.rsp
+++ b/distrib/scripts/manifests/wince.rsp
@@ -5,69 +5,6 @@ build/wince/wx_wxexpat.vcp
 build/wince/wx_wxjpeg.vcp
 build/wince/wx_wxpng.vcp
 build/wince/wx_wxzlib.vcp
-contrib/build/deprecated/deprecated.vcp
-contrib/build/deprecated/deprecated.vcw
-contrib/build/fl/fl.vcp
-contrib/build/fl/fl.vcw
-contrib/build/foldbar/foldbar.vcp
-contrib/build/foldbar/foldbar.vcw
-contrib/build/gizmos/gizmos_gizmos.vcp
-contrib/build/gizmos/gizmos_gizmos_xrc.vcp
-contrib/build/gizmos/gizmos.vcw
-contrib/build/mmedia/mmedia.vcp
-contrib/build/mmedia/mmedia.vcw
-contrib/build/net/net.vcp
-contrib/build/net/net.vcw
-contrib/build/ogl/ogl.vcp
-contrib/build/ogl/ogl.vcw
-contrib/build/plot/plot.vcp
-contrib/build/plot/plot.vcw
-contrib/build/stc/stc.vcp
-contrib/build/stc/stc.vcw
-contrib/build/svg/svg.vcp
-contrib/build/svg/svg.vcw
-contrib/samples/deprecated/proplist/proplist.vcp
-contrib/samples/deprecated/proplist/proplist.vcw
-contrib/samples/deprecated/resource/resource.vcp
-contrib/samples/deprecated/resource/resource.vcw
-contrib/samples/deprecated/treelay/treelay.vcp
-contrib/samples/deprecated/treelay/treelay.vcw
-contrib/samples/fl/fl_fl_demo1.vcp
-contrib/samples/fl/fl_fl_demo2.vcp
-contrib/samples/fl/fl_fl_sample1.vcp
-contrib/samples/fl/fl_fl_sample2.vcp
-contrib/samples/fl/fl_fl_sample3.vcp
-contrib/samples/fl/fl.vcw
-contrib/samples/foldbar/extended/extended.vcp
-contrib/samples/foldbar/extended/extended.vcw
-contrib/samples/foldbar/foldpanelbar/foldtest.vcp
-contrib/samples/foldbar/foldpanelbar/foldtest.vcw
-contrib/samples/gizmos/dynsash/dynsash.vcp
-contrib/samples/gizmos/dynsash/dynsash.vcw
-contrib/samples/gizmos/dynsash_switch/dynsash_switch.vcp
-contrib/samples/gizmos/dynsash_switch/dynsash_switch.vcw
-contrib/samples/gizmos/editlbox/editlbox.vcp
-contrib/samples/gizmos/editlbox/editlbox.vcw
-contrib/samples/gizmos/led/led.vcp
-contrib/samples/gizmos/led/led.vcw
-contrib/samples/gizmos/multicell/multicell.vcp
-contrib/samples/gizmos/multicell/multicell.vcw
-contrib/samples/gizmos/splittree/splittree.vcp
-contrib/samples/gizmos/splittree/splittree.vcw
-contrib/samples/mmedia/mmboard.vcp
-contrib/samples/mmedia/mmboard.vcw
-contrib/samples/ogl/ogledit/ogledit.vcp
-contrib/samples/ogl/ogledit/ogledit.vcw
-contrib/samples/ogl/studio/studio.vcp
-contrib/samples/ogl/studio/studio.vcw
-contrib/samples/plot/plot.vcp
-contrib/samples/plot/plot.vcw
-contrib/samples/stc/stctest.vcp
-contrib/samples/stc/stctest.vcw
-contrib/samples/svg/svgtest.vcp
-contrib/samples/svg/svgtest.vcw
-contrib/utils/convertrc/convertrc.vcp
-contrib/utils/convertrc/convertrc.vcw
 demos/bombs/bombs.vcp
 demos/bombs/bombs.vcw
 demos/dbbrowse/dbbrowse.vcp

diff --git a/distrib/scripts/manifests/wx_hlp.rsp b/distrib/scripts/manifests/wx_hlp.rsp
index 4e95f6559ce8f5f8892219b889a8a3a980ec9472..1a72b4735b0e3a381d1b2872ffec71bf9c996970 100644 (file)
--- a/distrib/scripts/manifests/wx_hlp.rsp
+++ b/distrib/scripts/manifests/wx_hlp.rsp
@@ -1,4 +1,2 @@
 docs/winhelp/*.hlp
 docs/winhelp/*.cnt
-contrib/docs/winhelp/*.hlp
-contrib/docs/winhelp/*.cnt

diff --git a/distrib/scripts/manifests/wx_html.rsp b/distrib/scripts/manifests/wx_html.rsp
index 5d2c7aa963ab76e745b3dd7e381bab4cd9af3d14..449f12c62ac11dbcb4a3a8f832897347e43393ab 100644 (file)
--- a/distrib/scripts/manifests/wx_html.rsp
+++ b/distrib/scripts/manifests/wx_html.rsp
@@ -11,8 +11,3 @@ docs/html/tex2rtf/*.gif
 docs/html/odbc/*.htm
 
 docs/html/gettext/*.html
-
-contrib/docs/html/ogl/*.htm
-contrib/docs/html/ogl/*.html
-contrib/docs/html/ogl/*.gif
-

diff --git a/distrib/scripts/manifests/wx_pdf.rsp b/distrib/scripts/manifests/wx_pdf.rsp
index 710dc9de2bae7df4a4a7efe475e46b50892357de..6a979c3678b40ec4538dee1de6ce3f6fd21582bd 100644 (file)
--- a/distrib/scripts/manifests/wx_pdf.rsp
+++ b/distrib/scripts/manifests/wx_pdf.rsp
@@ -1,2 +1 @@
 docs/pdf/*.pdf
-contrib/docs/pdf/*.pdf

diff --git a/distrib/scripts/manifests/wxrc.rsp b/distrib/scripts/manifests/wxrc.rsp
deleted file mode 100644 (file)
index b0b4bb3..0000000
--- a/distrib/scripts/manifests/wxrc.rsp
+++ /dev/null
@@ -1,57 +0,0 @@
-contrib/docs/html/xml/*.htm
-contrib/docs/html/xml/*.gif
-contrib/docs/html/xml/*.png
-contrib/docs/winhelp/xml.hlp
-contrib/docs/winhelp/xml.cnt
-contrib/docs/pdf/xml.pdf
-
-contrib/docs/latex/xml/*.tex
-contrib/docs/latex/xml/*.sty
-contrib/docs/latex/xml/*.bib
-contrib/docs/latex/xml/*.hpj
-contrib/docs/latex/xml/*.ini
-contrib/docs/latex/xml/*.txt
-contrib/docs/latex/xml/*.cnt
-contrib/docs/latex/xml/*.eps
-contrib/docs/latex/xml/*.bmp
-contrib/docs/latex/xml/*.gif
-contrib/docs/latex/xml/*.wmf
-
-contrib/src/xml/*.cpp
-contrib/src/xml/*.h
-contrib/src/xml/*.rc
-contrib/src/xml/*.def
-contrib/src/xml/*.xbm
-contrib/src/xml/*.xpm
-contrib/src/xml/makefile.vc
-contrib/src/xml/makefile.bcc
-contrib/src/xml/makefile.b32
-contrib/src/xml/makefile.wat
-contrib/src/xml/makefile.g95
-contrib/src/xml/makefile.unx
-contrib/src/xml/makefile.vms
-contrib/src/xml/Makefile.in
-contrib/src/xml/*.txt
-contrib/src/xml/*.ico
-contrib/src/xml/*.bmp
-
-contrib/include/wx/xml/*.h
-
-contrib/utils/wxrc/*.cpp
-contrib/utils/wxrc/*.h
-contrib/utils/wxrc/*.rc
-contrib/utils/wxrc/*.def
-contrib/utils/wxrc/*.xbm
-contrib/utils/wxrc/makefile.vc
-contrib/utils/wxrc/makefile.bcc
-contrib/utils/wxrc/makefile.b32
-contrib/utils/wxrc/makefile.wat
-contrib/utils/wxrc/makefile.g95
-contrib/utils/wxrc/makefile.unx
-contrib/utils/wxrc/makefile.vms
-contrib/utils/wxrc/Makefile.in
-contrib/utils/wxrc/*.txt
-contrib/utils/wxrc/*.ico
-contrib/utils/wxrc/*.bmp
-contrib/utils/wxrc/*.xpm
-

diff --git a/distrib/scripts/manifests/xml.rsp b/distrib/scripts/manifests/xml.rsp
index 68af101a17faa03e66adb26182f66a78a17c99d7..414c24d7d60f50ed2fa3a00a8fb9d0734a6f39bd 100644 (file)
--- a/distrib/scripts/manifests/xml.rsp
+++ b/distrib/scripts/manifests/xml.rsp
@@ -82,25 +82,6 @@ samples/xrc/rc/*.ico
 samples/xrc/rc/*.xpm
 samples/xrc/rc/*.xrc
 
-contrib/utils/convertrc/*.cpp
-contrib/utils/convertrc/*.h
-contrib/utils/convertrc/*.rc
-contrib/utils/convertrc/*.def
-contrib/utils/convertrc/*.xbm
-contrib/utils/convertrc/makefile.vc
-contrib/utils/convertrc/makefile.bcc
-contrib/utils/convertrc/makefile.b32
-contrib/utils/convertrc/makefile.wat
-contrib/utils/convertrc/makefile.g95
-contrib/utils/convertrc/makefile.unx
-contrib/utils/convertrc/makefile.vms
-contrib/utils/convertrc/Makefile.in
-contrib/utils/convertrc/*.txt
-contrib/utils/convertrc/*.ico
-contrib/utils/convertrc/*.bmp
-contrib/utils/convertrc/*.xpm
-contrib/utils/convertrc/convertrc.dsp
-
 utils/wxrc/*.cpp
 utils/wxrc/*.h
 utils/wxrc/*.rc

diff --git a/distrib/scripts/msw/makesetup.sh b/distrib/scripts/msw/makesetup.sh
index 82797a016613a60642cf6f41ac61fe7959fa4c19..cb3fe8d2c4b4248e298d029bfbcece5360a9d378 100755 (executable)
--- a/distrib/scripts/msw/makesetup.sh
+++ b/distrib/scripts/msw/makesetup.sh
@@ -39,64 +39,63 @@ fi
 getfilelist(){
   port=$1
   outfile=$2
-  
+
   filelist="base.rsp"
-  contribfiles="stc.rsp contrib.rsp ogl.rsp"
   utilsfiles="tex2rtf.rsp utils.rsp utilmake.rsp"
-  commonfiles="generic.rsp generic_samples.rsp jpeg.rsp tiff.rsp xml.rsp deprecated.rsp makefile.rsp $utilsfiles $contribfiles"
-  
+  commonfiles="generic.rsp generic_samples.rsp jpeg.rsp tiff.rsp xml.rsp makefile.rsp $utilsfiles"
+
   if [ ! $port = "base" ]; then
-    filelist="$filelist $commonfiles" 
-  fi 
-  
+    filelist="$filelist $commonfiles"
+  fi
+
   if [ $port = "msw" ] || [ $port = "all" ]; then
     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"
   fi
-  
+
   if [ $port = "x11" ] || [ $port = "all" ]; then
     filelist="$filelist x11.rsp"
   fi
-  
+
   if [ $port = "mgl" ] || [ $port = "all" ]; then
-    filelist="$filelist mgl.rsp" 
+    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 palmos.rsp"
   fi
-  
+
   tempfile="/tmp/wx$port.files.in"
-  rm -f $tempfile 
+  rm -f $tempfile
   rm -f $outfile
-  
+
   olddir=$PWD
   cd $MANIFESTDIR
-  
+
   cat $filelist > $tempfile
-  
+
   cd $APPDIR
   expandlines $tempfile $outfile
-  
+
   cd $olddir
 }
 
@@ -166,11 +165,11 @@ ziptotar()
     pushd $changeto
 
     unzip $ZIPFLAGS $archive
-    
+
     tar cfz $archive.tar.gz $dirname
 
     tar -cvf $dirname | bzip2 -9 > $archive.tar.bz2
-    
+
     rm -rf $dirname
 
     popd
@@ -218,7 +217,7 @@ dospinos2()
 
     cd $APPDIR
     getfilelist "os2" /tmp/os2files
-    
+
     # Zip up the complete wxOS2-xxx.zip file
     zip $ZIPFLAGS -@ $DESTDIR/wxOS2-$VERSION.zip < /tmp/os2files
 
@@ -243,7 +242,7 @@ dospinos2()
 dospinmsw()
 {
     echo Zipping wxMSW...
-    
+
     cd $APPDIR
 
     # now expand the wildcards to actual file names
@@ -263,12 +262,12 @@ dospinwxall()
     echo Zipping individual components
     rm -f $DESTDIR/wxWidgets-$VERSION-all.zip
 
-    # Save adding all the wxMSW files again    
+    # Save adding all the wxMSW files again
     if [ ! -f $DESTDIR/wxWidgets-$VERSION-win.zip ]; then
         dospinmsw
     fi
     cp $DESTDIR/wxWidgets-$VERSION-win.zip $DESTDIR/wxWidgets-$VERSION-all.zip
-    
+
     cat $MANIFESTDIR/cw_mac.rsp $MANIFESTDIR/vc.rsp $MANIFESTDIR/x11.rsp $MANIFESTDIR/gtk.rsp $MANIFESTDIR/cocoa.rsp $MANIFESTDIR/motif.rsp $MANIFESTDIR/mac.rsp $MANIFESTDIR/mgl.rsp $MANIFESTDIR/os2.rsp $MANIFESTDIR/palmos.rsp | sort | uniq > /tmp/all.txt
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < /tmp/all.txt
 
@@ -318,7 +317,7 @@ dospindocs()
 
     echo Creating $DESTDIR/wxWidgets-$VERSION-DocSource.zip
     expandlines $MANIFESTDIR/docsrc.rsp /tmp/docsources
-    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-DocSource.zip < /tmp/docsources 
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-DocSource.zip < /tmp/docsources
     rearchive wxWidgets-$VERSION-DocSource.zip wxWidgets-$VERSION $DESTDIR
 
     echo Creating $DESTDIR/wxWidgets-$VERSION-WinHelp.zip
@@ -347,16 +346,16 @@ dospindocs()
 
     echo Creating $DESTDIR/wxWidgets-$VERSION-HTMLHelp.zip
     expandlines $MANIFESTDIR/wx_chm.rsp /tmp/chmdocs
-    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-HTMLHelp.zip < /tmp/chmdocs 
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-HTMLHelp.zip < /tmp/chmdocs
     rearchive wxWidgets-$VERSION-HTMLHelp.zip wxWidgets-$VERSION $DESTDIR
 
     # Add Linuxy docs to a separate archive to be transported to Linux for the
     # Linux-based releases
     echo Creating $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip
-    
+
     cat $MANIFESTDIR/wx_html.rsp $MANIFESTDIR/wx_pdf.rsp $MANIFESTDIR/wx_htb.rsp > /tmp/linuxdocs.in
     expandlines /tmp/linuxdocs.in /tmp/linuxdocs
-    
+
     zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip < /tmp/linuxdocs
 
     # PDF/HTML docs that should go into the Windows setup because
@@ -370,30 +369,30 @@ dospindocs()
 
 dospinport(){
     port=$1
-    
+
     if [ $port != "all" ]; then
-        portname="`echo $port|tr '[a-z]' '[A-Z]'`"    
+        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$portname-$VERSION.zip < $portfiles 
+    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$portname-$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$portname-$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$portname-$VERSION.zip wxWidgets-$VERSION $DESTDIR
 }
@@ -421,7 +420,6 @@ dospininstaller()
     rm -f BuildCVS.txt descrip.mms
     rm -f setup.h_vms
     rm -f docs/html/wxbook.htm docs/html/roadmap.htm
-    rm -f -r contrib/docs/latex/ogl
     rm -f src/mingegcs.bat
     rm -f -r distrib
     rm -f *.spec
@@ -432,7 +430,7 @@ dospininstaller()
     if [ ! -d bin ]; then
         mkdir bin
     fi
-    
+
     #cp $APPDIR/bin/tex2rtf.exe bin
     #cp $APPDIR/bin/tex2rtf.chm bin
     #cp $APPDIR/bin/widgets.exe bin
@@ -453,74 +451,74 @@ dospininstaller()
     if [ "$INNO" != "0" ]; then
         echo Generating $SETUPSCRIPTNAME
         rm -f $SETUPSCRIPTNAME
-    
+
         sh $SCRIPTDIR/msw/makeinno.sh $SETUPIMAGEDIR $INNOTOP $INNOBOTTOM $SETUPSCRIPTNAME
-    
+
         if [ ! -f $SETUPSCRIPTNAME ]; then
             echo "*** Error - something went wrong with the script file generation."
             exit 1
         fi
-    
+
         # Now replace %VERSION% with the real application version, and other
         # variables
         echo Replacing variables in the setup script
         doreplace $SETUPSCRIPTNAME "s/%VERSION%/$VERSION/g"
         doreplace $SETUPSCRIPTNAME "s/%COPYRIGHTHOLDER%/$AUTHOR/g"
         doreplace $SETUPSCRIPTNAME "s/%VENDOR%/$VENDOR/g"
-    
+
         unix2dosname $READMEFILE
         doreplace $SETUPSCRIPTNAME "s;%READMEFILE%;$RETVALUE;g"
-    
+
         unix2dosname $READMEAFTERFILE
         doreplace $SETUPSCRIPTNAME "s;%READMEAFTERFILE%;$RETVALUE;g"
-    
+
         unix2dosname $LICENSEFILE
         doreplace $SETUPSCRIPTNAME "s;%LICENSEFILE%;$RETVALUE;g"
-    
+
         doreplace $SETUPSCRIPTNAME "s/%APPNAME%/$APPNAME/g"
         doreplace $SETUPSCRIPTNAME "s/%APPTITLE%/$APPTITLE/g"
-    
+
         unix2dosname $SETUPIMAGEDIR
         doreplace $SETUPSCRIPTNAME "s;%SOURCEDIR%;$RETVALUE;g"
-    
+
         unix2dosname $DESTDIR
         doreplace $SETUPSCRIPTNAME "s;%OUTPUTDIR%;$RETVALUE;g"
-    
+
         doreplace $SETUPSCRIPTNAME "s/%APPEXTENSION%/$APPEXTENSION/g"
-    
+
         # FIXME: how do we get the first name in the list?
         if [ "$MANUALFILES" != "" ]; then
             HELPFILE=`basename $MANUALFILES`
             unix2dosname $HELPFILE
             doreplace $SETUPSCRIPTNAME "s;%HELPFILE%;$RETVALUE;g"
         fi
-    
+
         rm -f $DESTDIR/setup*.* $DESTDIR/wxMSW-$VERSION-Setup.exe
-    
+
         # Inno Setup complains if this step is not done
         unix2dos --unix2dos $SETUPSCRIPTNAME
-        
+
         # Now invoke INNO compiler on the new ISS file
         # First, make a DOS filename or Inno Setup will get confused.
-    
+
         unix2dosname2 $SETUPSCRIPTNAME
         DOSFILENAME=$RETVALUE
-    
+
         # Note: the double slash is Mingw32/MSYS convention for
         # denoting a switch, that must not be converted into
         # a path (otherwise /c = c:/)
-    
+
         cd `dirname $SETUPSCRIPTNAME`
         BASESCRIPTNAME=`basename $SETUPSCRIPTNAME`
         echo Invoking Inno Setup compiler on $BASESCRIPTNAME
-    
+
         "$SETUPCOMPILER" //cc $BASESCRIPTNAME
-    
+
         if [ ! -f $DESTDIR/setup.exe ]; then
             echo "*** Error - the setup.exe was not generated."
             exit
         fi
-    
+
         cd $DESTDIR
         mv setup.exe wxMSW-$VERSION-Setup.exe
 
@@ -571,9 +569,7 @@ makesetup()
     rm -f $DESTDIR/wx*.zip
     rm -f $DESTDIR/*.htb
     rm -f $DESTDIR/ogl3*.zip
-    rm -f $DESTDIR/contrib*.zip
     rm -f $DESTDIR/tex2rtf2*.zip
-    rm -f $DESTDIR/mmedia*.zip
     rm -f $DESTDIR/jpeg*.zip
     rm -f $DESTDIR/tiff*.zip
     rm -f $DESTDIR/utils*.zip
@@ -605,7 +601,7 @@ makesetup()
     cp $WEBFILES/site/faq*.htm $APPDIR/docs/html
     cp $WEBFILES/site/platform.htm $APPDIR/docs/html
     cp $WEBFILES/site/i18n.htm $APPDIR/docs/html
-    
+
     echo Copying readme files...
     cp $APPDIR/docs/msw/readme.txt README-MSW.txt
     cp $APPDIR/docs/msw/install.txt INSTALL-MSW.txt
@@ -614,7 +610,7 @@ makesetup()
     cp $APPDIR/docs/lgpl.txt COPYING.LIB
     cp $APPDIR/docs/changes.txt CHANGES.txt
     cp $APPDIR/docs/readme.txt README.txt
-    
+
     # Copy setup0.h files to setup.h
     # OS/2 always built with configure now
     # cp $APPDIR/include/wx/os2/setup0.h $APPDIR/include/wx/os2/setup.h
@@ -658,7 +654,7 @@ makesetup()
     fi
 
     docopydocs $APPDIR $DESTDIR
-    
+
     # Time to regenerate the Inno Install script
     dospininstaller
 }