Script updates

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

diff --git a/distrib/msw/contrib.rsp b/distrib/msw/contrib.rsp
index f76aa9c01eafb0f45494955541ee0455bffc0dc3..5388519960f58b76c0296a101884d8286bbf9318 100644 (file)
--- a/distrib/msw/contrib.rsp
+++ b/distrib/msw/contrib.rsp
@@ -13,6 +13,11 @@ 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
@@ -48,13 +53,6 @@ contrib/build/svg/*.dsw
 contrib/build/svg/*.dsp
 contrib/build/svg/makefile*
 
-contrib/build/xrc/*.bkl
-contrib/build/xrc/*.dsw
-contrib/build/xrc/*.dsp
-contrib/build/xrc/makefile*
-
-
-
 contrib/configure.in
 contrib/configure
 
@@ -302,3 +300,20 @@ contrib/samples/svg/svgtest.dsw
 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/msw/cw.rsp b/distrib/msw/cw.rsp
index 8af32324b60eea2c7ba53fe90d58156f6c1b24ea..3528390530ec7e506c5f0947bb6ec05687f36ccf 100644 (file)
--- a/distrib/msw/cw.rsp
+++ b/distrib/msw/cw.rsp
@@ -33,6 +33,7 @@ samples/docview/*W7.xml
 samples/docvwmdi/*W7.xml
 samples/dragimag/*W7.xml
 samples/drawing/*W7.xml
+samples/drawer/*W7.xml
 samples/dynamic/*W7.xml
 samples/erase/*W7.xml
 samples/event/*W7.xml
@@ -94,18 +95,22 @@ demos/forty/*W7.xml
 demos/fractal/*W7.xml
 demos/life/*W7.xml
 
+src/xrc/*W7.xml
+samples/xrc/*W7.xml
+utils/wxrc/*W7.xml
+utils/convertrc/*W7.xml
+utils/wxrcedit/*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/xrc/*W7.xml
-contrib/samples/xrc/*W7.xml
 contrib/src/mmedia/*W7.xml
 contrib/samples/mmedia/*W7.xml
 contrib/src/stc/*W7.xml
 contrib/samples/stc/*W7.xml
-contrib/utils/wxrc/*W7.xml
-contrib/utils/convertrc/*W7.xml
-contrib/utils/wxrcedit/*W7.xml
 contrib/src/canvas/*W7.xml
 contrib/samples/canvas/simple/*W7.xml
 contrib/samples/canvas/test/*W7.xml

diff --git a/distrib/msw/cw_mac.rsp b/distrib/msw/cw_mac.rsp
index b23acc19ba5c0f72a2bc00f604744c591277bcaf..8c26fe30515c5c520d8b21b5a628563e7f6e6439 100644 (file)
--- a/distrib/msw/cw_mac.rsp
+++ b/distrib/msw/cw_mac.rsp
@@ -25,6 +25,17 @@ src/png/*.mcp
 src/regex/*M?.xml
 src/regex/*.mcp
 
+src/xrc/*M?.xml
+src/xrc/*.mcp
+samples/xrc/*M?.xml
+samples/xrc/*.mcp
+utils/wxrc/*M?.xml
+utils/wxrc/*.mcp
+contrib/utils/convertrc/*M?.xml
+contrib/utils/convertrc/*.mcp
+contrib/utils/wxrcedit/*M?.xml
+contrib/utils/wxrcedit/*.mcp
+
 samples/artprov/*M?.xml
 samples/artprov/*.mcp
 samples/calendar/*M?.xml
@@ -52,6 +63,7 @@ samples/docvwmdi/*.mcp
 samples/dragimag/*M?.xml
 samples/dragimag/*.mcp
 samples/drawing/*M?.xml
+samples/drawer/*M?.xml
 samples/drawing/*.mcp
 samples/dynamic/*M?.xml
 samples/dynamic/*.mcp
@@ -187,12 +199,6 @@ contrib/samples/ogl/ogledit/*.mcp
 contrib/samples/ogl/studio/*M?.xml
 contrib/samples/ogl/studio/*.mcp
 
-contrib/src/xrc/*M?.xml
-contrib/src/xrc/*.mcp
-
-contrib/samples/xrc/*M?.xml
-contrib/samples/xrc/*.mcp
-
 contrib/src/mmedia/*M?.xml
 contrib/src/mmedia/*.mcp
 
@@ -205,21 +211,12 @@ contrib/src/stc/*.mcp
 contrib/samples/stc/*M?.xml
 contrib/samples/stc/*.mcp
 
-contrib/utils/wxrc/*M?.xml
-contrib/utils/wxrc/*.mcp
-
-contrib/utils/convertrc/*M?.xml
-contrib/utils/convertrc/*.mcp
-
-contrib/utils/wxrcedit/*M?.xml
-contrib/utils/wxrcedit/*.mcp
-
-contrib/src/canvas/*M?.xml
-contrib/src/canvas/*.mcp
-contrib/samples/canvas/simple/*M?.xml
-contrib/samples/canvas/simple/*.mcp
-contrib/samples/canvas/test/*M?.xml
-contrib/samples/canvas/test/*.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

diff --git a/distrib/msw/dmc.rsp b/distrib/msw/dmc.rsp
index 831b198b196e2afb7f564584538fb2661da47476..15286c3d3b1d0c1108b81ce6d667fce88ac6d41b 100644 (file)
--- a/distrib/msw/dmc.rsp
+++ b/distrib/msw/dmc.rsp
@@ -10,7 +10,6 @@ contrib/build/ogl/makefile.dmc
 contrib/build/plot/makefile.dmc
 contrib/build/stc/makefile.dmc
 contrib/build/svg/makefile.dmc
-contrib/build/xrc/makefile.dmc
 contrib/samples/animate/makefile.dmc
 contrib/samples/deprecated/proplist/makefile.dmc
 contrib/samples/deprecated/resource/makefile.dmc
@@ -28,10 +27,11 @@ contrib/samples/ogl/studio/makefile.dmc
 contrib/samples/plot/makefile.dmc
 contrib/samples/stc/makefile.dmc
 contrib/samples/svg/makefile.dmc
-contrib/samples/xrc/makefile.dmc
 contrib/utils/convertrc/makefile.dmc
-contrib/utils/wxrc/makefile.dmc
 contrib/utils/wxrcedit/makefile.dmc
+contrib/src/foldbar/makefile.dmc
+contrib/samples/foldbar/extended/makefile.dmc
+contrib/samples/foldbar/foldpanelbar/makefile.dmc
 demos/bombs/makefile.dmc
 demos/dbbrowse/makefile.dmc
 demos/forty/makefile.dmc
@@ -128,6 +128,7 @@ samples/treectrl/makefile.dmc
 samples/typetest/makefile.dmc
 samples/validate/makefile.dmc
 samples/vscroll/makefile.dmc
+samples/xrc/makefile.dmc
 samples/widgets/makefile.dmc
 samples/wizard/makefile.dmc
 tests/makefile.dmc
@@ -138,3 +139,5 @@ utils/helpview/src/makefile.dmc
 utils/hhp2cached/makefile.dmc
 utils/makefile.dmc
 utils/tex2rtf/src/makefile.dmc
+utils/wxrc/makefile.dmc
+

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index b9ce63e7bea1676387e0be08232bf7767bf5b3af..0703eb1052a3f46df83dc8dd02cec3ac0e786c1e 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -10,6 +10,7 @@ setup.h.in
 install-sh
 mkinstalldirs
 wx-config.in
+wx-config-inplace.in
 version-script.in
 setup.h_vms
 regen
@@ -464,12 +465,6 @@ samples/event/*.bmp
 samples/event/*.pro
 samples/event/*.bkl
 
-samples/except/*.cpp
-samples/except/*.rc
-samples/except/makefile*
-samples/except/*.xpm
-samples/except/*.bkl
-
 samples/except/*.cpp
 samples/except/*.h
 samples/except/makefile*
@@ -741,6 +736,8 @@ samples/internat/ja/*.mo
 samples/internat/ja/*.po
 samples/internat/ka/*.mo
 samples/internat/ka/*.po
+samples/internat/pl/*.mo
+samples/internat/pl/*.po
 samples/internat/*.bkl
 
 samples/ipc/*.cpp
@@ -1337,6 +1334,7 @@ demos/forty/*.txt
 demos/forty/*.pro
 demos/forty/*.bkl
 demos/forty/*.r
+demos/forty/*.htm
 
 demos/fractal/*.cpp
 demos/fractal/*.h
@@ -1422,8 +1420,12 @@ tests/*.cpp
 tests/*.fc
 
 tests/arrays/*.cpp
+tests/datetime/*.cpp
+tests/filename/*.cpp
 tests/filesys/*.cpp
+tests/fontmap/*.cpp
 tests/formatconverter/*.cpp
+tests/hashes/*.cpp
 tests/longlong/*.cpp
 tests/mbconv/*.cpp
 

diff --git a/distrib/msw/mac.rsp b/distrib/msw/mac.rsp
index b722c0d61fdd12ede16bac2efb46f222f0da1f84..8c485d4c42bd6781bf8afd7afc77adc31f391074 100644 (file)
--- a/distrib/msw/mac.rsp
+++ b/distrib/msw/mac.rsp
@@ -19,6 +19,11 @@ samples/html/htmlctrl/makefile.wat
 samples/html/htmlctrl/makefile.bcc
 samples/html/htmlctrl/*.bkl
 
+samples/drawer/*.cpp
+samples/drawer/*.h
+samples/drawer/makefile*
+samples/drawer/*.bkl
+
 src/wxWindows.pbproj/project.pbxproj
 src/wxWindows.xcode/project.pbxproj
 

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index c6050c8516f6904274d018371ae93ca9bb590c1d..73bc2192bae6c03749cc232aee1920edf637c3c0 100644 (file)
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -17,6 +17,7 @@ samples/dnd/Makefile.in
 samples/docview/Makefile.in
 samples/docvwmdi/Makefile.in
 samples/dragimag/Makefile.in
+samples/drawer/Makefile.in
 samples/drawing/Makefile.in
 samples/dynamic/Makefile.in
 samples/erase/Makefile.in
@@ -111,6 +112,7 @@ contrib/Makefile.in
 contrib/src/Makefile.in
 contrib/src/applet/Makefile.in
 contrib/src/canvas/Makefile.in
+contrib/src/foldbar/Makefile.in
 contrib/src/ogl/Makefile.in
 contrib/src/mmedia/Makefile.in
 contrib/src/stc/Makefile.in
@@ -121,9 +123,9 @@ contrib/src/fl/Makefile.in
 contrib/src/net/Makefile.in
 
 contrib/samples/Makefile.in
-contrib/samples/canvas/test/Makefile.in
-contrib/samples/canvas/simple/Makefile.in
-contrib/samples/canvas/Makefile.in
+contrib/samples/foldbar/Makefile.in
+contrib/samples/foldbar/extended/Makefile.in
+contrib/samples/foldbar/foldpanelbar/Makefile.in
 contrib/samples/gizmos/Makefile.in
 contrib/samples/gizmos/multicell/Makefile.in
 contrib/samples/gizmos/splittree/Makefile.in

diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index ea5bd526ccc2e71e29106aa0581408716645575a..c28b47987e1520b1ba1b4d58871c4e4894f8a625 100644 (file)
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -2,7 +2,7 @@
 
 # Make a distribution of an application on MSW.
 # Example:
-# ../distrib/msw/makesetup.sh --wxmsw --verbose &> | cat > log
+# ../distrib/msw/makesetup.sh --wxmsw --verbose &> log
 
 # If your zip accepts Cygwin-style paths, then
 # use cygpath, else substitute echo
@@ -16,6 +16,7 @@ SPINOS2=0
 SPINDOCS=1
 SPINALL=1
 SPINWXALL=1
+GETMAKEFILES=0
 VERBOSE=0
 ZIPFLAGS=
 
@@ -23,7 +24,7 @@ PROGNAME=$0
 SCRIPTDIR=$WXWIN/distrib/msw
 WEBFILES=c:/wx2dev/wxWebSite
 # Set this to the required version
-VERSION=2.5.2
+VERSION=2.5.3
 
 . $SCRIPTDIR/setup.var
 
@@ -256,38 +257,38 @@ dospinwxall()
 {
     cd $APPDIR
 
-    # Create wxWidgets-$VERSION-win.zip which is used to create wxMSW
+    # Create wxWidgets-$VERSION-all.zip which is used to create wxMSW
     echo Zipping individual components
-    rm -f $DESTDIR/wxWidgets-$VERSION-win.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/generic.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/makefile.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/msw.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/ogl.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/mmedia.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/stc.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/tex2rtf.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/jpeg.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/tiff.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/xml.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/contrib.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/deprecated.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utils.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/wince.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/dmc.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/cw.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/cw_mac.rsp
-
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/x11.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/cocoa.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/motif.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/mac.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/wince.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/mgl.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/os2.rsp
-
-#    rearchive wxWidgets-$VERSION-win.zip wxWidgets-$VERSION $DESTDIR
+    rm -f $DESTDIR/wxWidgets-$VERSION-all.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/generic.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/makefile.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/msw.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/ogl.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/mmedia.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/stc.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/tex2rtf.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/jpeg.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/tiff.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/xml.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/contrib.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/deprecated.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/utils.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/utilmake.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/univ.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/wince.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/dmc.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/cw.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/cw_mac.rsp
+
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/x11.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/cocoa.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/motif.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/mac.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/wince.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/mgl.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/os2.rsp
+
+#    rearchive wxWidgets-$VERSION-all.zip wxWidgets-$VERSION $DESTDIR
 
     if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
         rm -f -r $DESTDIR/wxWidgets-$VERSION
@@ -295,7 +296,7 @@ dospinwxall()
 
     mkdir $DESTDIR/wxWidgets-$VERSION
     cd $DESTDIR/wxWidgets-$VERSION
-    unzip $ZIPFLAGS ../wxWidgets-$VERSION-win.zip
+    unzip $ZIPFLAGS ../wxWidgets-$VERSION-all.zip
 
     echo Copying readme files...
     cp $APPDIR/docs/licence.txt LICENCE.txt
@@ -305,7 +306,7 @@ dospinwxall()
 
     cd $DESTDIR
 
-    rm -f $DESTDIR/wxWidgets-$VERSION-win.zip
+    rm -f $DESTDIR/wxWidgets-$VERSION-all.zip
     zip $ZIPFLAGS -r wxAll-$VERSION.zip wxWidgets-$VERSION/*
 }
 
@@ -676,6 +677,21 @@ makesetup()
     fi
 }
 
+# Get the makefiles that aren't in CVS and unarchive them
+getmakefiles()
+{
+    echo Getting eVC++ project files...
+    curl http://biolpc22.york.ac.uk/pub/CVS_Makefiles/wx-mk-evcprj.zip --output /c/transit/wx-mk-evcprj.zip
+    echo Getting Digital Mars makefiles...
+    curl http://biolpc22.york.ac.uk/pub/CVS_Makefiles/wx-mk-dmars.zip --output /c/transit/wx-mk-dmars.zip
+
+    cd $APPDIR
+    echo Unarchiving makefiles and project files...
+    unzip -o -a /c/transit/wx-mk-evcprj.zip
+    unzip -o -a /c/transit/wx-mk-dmars.zip
+    echo Done getting makefiles and project files.
+}
+
 # We can't use e.g. this:
 # ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
@@ -713,6 +729,7 @@ usage()
     echo "    --wxall           Build wxAll zip distribution"
     echo "    --docs            Build docs archives"
     echo "    --all             Build all distributions (the default)"
+    echo "    --getmakefiles    Get out-of-CVS makefiles and unarchive into the wxWidgets source tree"
     echo "    --verbose         Verbose zip operation"
     echo.
     echo Note that options only override settings in $SCRIPTDIR/setup.var.
@@ -728,9 +745,10 @@ for i in "$@"; do
        --upx) UPX=1 ;;
        --no-upx) UPX=0 ;;
        --wxmac) SPINMAC=1; SPINALL=0 ;;
-       --wxmsw) SPINMSW=1; SPINALL=0 ;;
+       --wxmsw) SPINMSW=1; SPINALL=0; SPINWXALL=0 ;;
        --wxos2) SPINOS2=1; SPINALL=0 ;;
        --wxall) SPINWXALL=1; SPINALL=0 ;;
+       --getmakefiles) GETMAKEFILES=1; SPINALL=0 ;;
        --docs) SPINDOCS=1; SPINALL=0 ;;
        --all) SPINALL=1 ;;
        --verbose) VERBOSE=1 ;;
@@ -741,8 +759,14 @@ for i in "$@"; do
     esac
 done
 
+
 doinit
 
+if [ "$GETMAKEFILES" = "1" ]; then
+    getmakefiles
+    exit
+fi
+
 # findversion
 makesetup
 

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index c360dd199e9438f27d4868d4625933137c5bcd2e..de87912e66683856dd10cbe8ec69aa43edadb799 100644 (file)
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -73,6 +73,9 @@ samples/docvwmdi/docvwmdi.dsw
 samples/dragimag/dragimag.dsp
 samples/dragimag/dragimag.dsw
 
+samples/drawer/drawer.dsp
+samples/drawer/drawer.dsw
+
 samples/drawing/drawing.dsp
 samples/drawing/drawing.dsw
 
@@ -88,9 +91,6 @@ samples/event/event.dsw
 samples/except/except.dsp
 samples/except/except.dsw
 
-samples/except/except.dsp
-samples/except/except.dsw
-
 samples/exec/exec.dsp
 samples/exec/exec.dsw
 
@@ -291,6 +291,9 @@ demos/life/life.dsw
 demos/poem/poem.dsp
 demos/poem/poem.dsw
 
+utils/wxrc/wxrc.dsp
+utils/wxrc/wxrc.dsw
+
 utils/tex2rtf/src/tex2rtf_tex2rtf.dsp
 utils/tex2rtf/src/tex2rtf_tex2rtf_gui.dsp
 
@@ -310,11 +313,8 @@ contrib/samples/ogl/ogledit/ogledit.dsw
 contrib/samples/ogl/studio/studio.dsp
 contrib/samples/ogl/studio/studio.dsw
 
-contrib/build/xrc/xrc.dsp
-contrib/build/xrc/xrc.dsw
-
-contrib/samples/xrc/xrcdemo.dsp
-contrib/samples/xrc/xrcdemo.dsw
+samples/xrc/xrcdemo.dsp
+samples/xrc/xrcdemo.dsw
 
 contrib/build/mmedia/mmedia.dsp
 contrib/build/mmedia/mmedia.dsw
@@ -328,9 +328,6 @@ contrib/build/stc/stc.dsw
 contrib/samples/stc/stctest.dsp
 contrib/samples/stc/stctest.dsw
 
-contrib/utils/wxrc/wxrc.dsp
-contrib/utils/wxrc/wxrc.dsw
-
 contrib/utils/convertrc/convertrc.dsp
 contrib/utils/convertrc/convertrc.dsw
 
@@ -382,4 +379,7 @@ contrib/samples/deprecated/resource/resource.dsw
 contrib/samples/deprecated/treelay/treelay.dsp
 contrib/samples/deprecated/treelay/treelay.dsw
 
+contrib/src/foldbar/foldbar.dsp
+contrib/samples/foldbar/extended/extended.dsp
+contrib/samples/foldbar/foldpanelbar/foldpanelbar.dsp
 

diff --git a/distrib/msw/wince.rsp b/distrib/msw/wince.rsp
index f9f92dd7d148020423a5ed0f04107b43de3f0947..6eddcde29721a152b240b8af3866ee3f25c28395 100644 (file)
--- a/distrib/msw/wince.rsp
+++ b/distrib/msw/wince.rsp
@@ -57,6 +57,9 @@ samples/docview/docview.vcw
 samples/docvwmdi/docvwmdi.vcp
 samples/docvwmdi/docvwmdi.vcw
 
+samples/drawer/drawer.vcp
+samples/drawer/drawer.vcw
+
 samples/drawing/drawing.vcp
 samples/drawing/drawing.vcw
 
@@ -264,69 +267,62 @@ demos/life/life.vcw
 demos/poem/poem.vcp
 demos/poem/poem.vcw
 
-utils/tex2rtf/src/Tex2RTF.vcp
-utils/tex2rtf/src/Tex2RTF.vcw
+utils/tex2rtf/src/tex2rtf.vcp
+utils/tex2rtf/src/tex2rtf.vcw
 
 utils/hhp2cached/hhp2cached.vcp
 utils/hhp2cached/hhp2cached.vcw
 
-utils/helpgen/src/HelpGen.vcp
-utils/helpgen/src/HelpGen.vcw
+utils/helpgen/src/helpgen.vcp
+utils/helpgen/src/helpgen.vcw
 
 utils/helpview/src/helpview.vcp
 utils/helpview/src/helpview.vcw
 utils/helpview/src/client.vcp
 utils/helpview/src/client.vcw
 
-contrib/src/ogl/Ogl.vcp
-contrib/src/ogl/Ogl.vcw
+contrib/src/ogl/ogl.vcp
+contrib/src/ogl/ogl.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/ogl/ogledit/ogledit.vcp
+contrib/samples/ogl/ogledit/ogledit.vcw
+contrib/samples/ogl/studio/studio.vcp
+contrib/samples/ogl/studio/studio.vcw
 
-contrib/src/xrc/Xrc.vcp
-contrib/src/xrc/Xrc.vcw
+src/xrc/xrc.vcp
+src/xrc/xrc.vcw
 
-contrib/samples/xrc/XrcDemo.vcp
-contrib/samples/xrc/XrcDemo.vcw
+samples/xrc/xrcdemo.vcp
+samples/xrc/xrcdemo.vcw
 
-contrib/src/mmedia/Mmedia.vcp
-contrib/src/mmedia/MMedia.vcw
+contrib/src/mmedia/mmedia.vcp
+contrib/src/mmedia/mmedia.vcw
 
-contrib/samples/mmedia/Mmboard.vcp
-contrib/samples/mmedia/Mmboard.vcw
+contrib/samples/mmedia/mmboard.vcp
+contrib/samples/mmedia/mmboard.vcw
 
-contrib/src/stc/Stc.vcp
-contrib/src/stc/Stc.vcw
+contrib/src/stc/stc.vcp
+contrib/src/stc/stc.vcw
 
-contrib/samples/stc/StcTest.vcp
-contrib/samples/stc/StcTest.vcw
+contrib/samples/stc/stctest.vcp
+contrib/samples/stc/stctest.vcw
 
 contrib/utils/wxrc/wxrc.vcp
 contrib/utils/wxrc/wxrc.vcw
 
-contrib/utils/convertrc/Convert.vcp
-contrib/utils/convertrc/Convert.vcw
-
-contrib/utils/wxrcedit/wxRcEdit.vcp
-contrib/utils/wxrcedit/wxRcEdit.vcw
+contrib/utils/convertrc/convert.vcp
+contrib/utils/convertrc/convert.vcw
 
-contrib/src/canvas/Canvas.vcp
-contrib/src/canvas/Canvas.vcw
-contrib/samples/canvas/simple/Simple.vcp
-contrib/samples/canvas/simple/Simple.vcw
-contrib/samples/canvas/test/Test.vcp
-contrib/samples/canvas/test/Test.vcw
+contrib/utils/wxrcedit/wxrcedit.vcp
+contrib/utils/wxrcedit/wxrcedit.vcw
 
-contrib/src/plot/Plot.vcp
-contrib/src/plot/Plot.vcw
-contrib/samples/plot/Plot.vcp
-contrib/samples/plot/Plot.vcw
+contrib/src/plot/plot.vcp
+contrib/src/plot/plot.vcw
+contrib/samples/plot/plot.vcp
+contrib/samples/plot/plot.vcw
 
-contrib/src/gizmos/Gizmos.vcp
-contrib/src/gizmos/Gizmos.vcw
+contrib/src/gizmos/gizmos.vcp
+contrib/src/gizmos/gizmos.vcw
 contrib/samples/gizmos/dynsash/dynsash.vcp
 contrib/samples/gizmos/dynsash/dynsash.vcw
 contrib/samples/gizmos/dynsash_switch/dynsash_switch.vcp
@@ -335,13 +331,13 @@ contrib/samples/gizmos/editlbox/editlbox.vcp
 contrib/samples/gizmos/editlbox/editlbox.vcw
 contrib/samples/gizmos/multicell/multicell.vcp
 contrib/samples/gizmos/multicell/multicell.vcw
-contrib/samples/gizmos/splittree/Tree.vcp
-contrib/samples/gizmos/splittree/Tree.vcw
+contrib/samples/gizmos/splittree/splittree.vcp
+contrib/samples/gizmos/splittree/splittree.vcw
 
-contrib/src/animate/Animate.vcp
-contrib/src/animate/Animate.vcw
-contrib/samples/animate/AniTest.vcp
-contrib/samples/animate/AniTest.vcw
+contrib/src/animate/animate.vcp
+contrib/src/animate/animate.vcw
+contrib/samples/animate/anitest.vcp
+contrib/samples/animate/anitest.vcw
 
 contrib/src/fl/fl.vcp
 contrib/src/fl/fl.vcw
@@ -356,8 +352,8 @@ contrib/samples/fl/fl_sample2/fl_demo.vcw
 contrib/samples/fl/fl_sample3/fl_demo.vcp
 contrib/samples/fl/fl_sample3/fl_demo.vcw
 
-contrib/src/net/Net.vcp
-contrib/src/net/Net.vcw
+contrib/src/net/net.vcp
+contrib/src/net/net.vcw
 
 contrib/src/deprecated/deprecated.vcp
 
@@ -370,4 +366,10 @@ contrib/samples/deprecated/resource/resource.vcw
 contrib/samples/deprecated/treelay/treelay.vcp
 contrib/samples/deprecated/treelay/treelay.vcw
 
+contrib/src/foldbar/foldbar.vcp
+contrib/src/foldbar/foldbar.vcw
+contrib/samples/foldbar/extended/extended.vcp
+contrib/samples/foldbar/extended/extended.vcw
+contrib/samples/foldbar/foldpanelbar/foldpanelbar.vcp
+contrib/samples/foldbar/foldpanelbar/foldpanelbar.vcw
 

diff --git a/distrib/msw/xml.rsp b/distrib/msw/xml.rsp
index 366867f6ba45722de2451ed0ec640e003a34e42b..b2572b6b64f6528d866cd494fadb6819e95c7a0c 100644 (file)
--- a/distrib/msw/xml.rsp
+++ b/distrib/msw/xml.rsp
@@ -42,74 +42,55 @@ src/expat/xmlwf/*.cxx
 src/xml/xml.cpp
 include/wx/xml/*.h
 
-contrib/docs/html/xrc/*.htm
-contrib/docs/html/xrc/*.gif
-contrib/docs/html/xrc/*.png
-contrib/docs/winhelp/xrc.hlp
-contrib/docs/winhelp/xrc.cnt
-contrib/docs/pdf/xrc.pdf
+src/xrc/*.cpp
+src/xrc/*.h
+src/xrc/*.rc
+src/xrc/*.def
+src/xrc/*.xbm
+src/xrc/*.xpm
+src/xrc/makefile.vc
+src/xrc/makefile.bcc
+src/xrc/makefile.b32
+src/xrc/makefile.wat
+src/xrc/makefile.g95
+src/xrc/makefile.unx
+src/xrc/makefile.dos
+src/xrc/makefile.vms
+src/xrc/Makefile.in
+src/xrc/*.txt
+src/xrc/*.ico
+src/xrc/*.bmp
+src/xrc/README
+src/xrc/README.EXPAT
 
-contrib/docs/latex/xrc/*.tex
-contrib/docs/latex/xrc/*.sty
-contrib/docs/latex/xrc/*.bib
-contrib/docs/latex/xrc/*.hpj
-contrib/docs/latex/xrc/*.ini
-contrib/docs/latex/xrc/*.txt
-contrib/docs/latex/xrc/*.cnt
-contrib/docs/latex/xrc/*.eps
-contrib/docs/latex/xrc/*.bmp
-contrib/docs/latex/xrc/*.gif
-contrib/docs/latex/xrc/*.wmf
+include/wx/xrc/*.h
 
-contrib/src/xrc/*.cpp
-contrib/src/xrc/*.h
-contrib/src/xrc/*.rc
-contrib/src/xrc/*.def
-contrib/src/xrc/*.xbm
-contrib/src/xrc/*.xpm
-contrib/src/xrc/makefile.vc
-contrib/src/xrc/makefile.bcc
-contrib/src/xrc/makefile.b32
-contrib/src/xrc/makefile.wat
-contrib/src/xrc/makefile.g95
-contrib/src/xrc/makefile.unx
-contrib/src/xrc/makefile.dos
-contrib/src/xrc/makefile.vms
-contrib/src/xrc/Makefile.in
-contrib/src/xrc/*.txt
-contrib/src/xrc/*.ico
-contrib/src/xrc/*.bmp
-contrib/src/xrc/README
-contrib/src/xrc/README.EXPAT
-
-contrib/include/wx/xrc/*.h
-
-contrib/samples/xrc/*.cpp
-contrib/samples/xrc/*.h
-contrib/samples/xrc/*.rc
-contrib/samples/xrc/*.def
-contrib/samples/xrc/*.xbm
-contrib/samples/xrc/makefile.vc
-contrib/samples/xrc/makefile.bcc
-contrib/samples/xrc/makefile.b32
-contrib/samples/xrc/makefile.wat
-contrib/samples/xrc/makefile.g95
-contrib/samples/xrc/makefile.unx
-contrib/samples/xrc/makefile.dos
-contrib/samples/xrc/makefile.vms
-contrib/samples/xrc/Makefile.in
-contrib/samples/xrc/*.txt
-contrib/samples/xrc/*.ico
-contrib/samples/xrc/*.bmp
-contrib/samples/xrc/*.xpm
-contrib/samples/xrc/xrcdemo.dsp
-contrib/samples/xrc/xrcdemo.dsw
-contrib/samples/xrc/xrcdemo.bkl
-contrib/samples/xrc/rc/*.bmp
-contrib/samples/xrc/rc/*.gif
-contrib/samples/xrc/rc/*.ico
-contrib/samples/xrc/rc/*.xpm
-contrib/samples/xrc/rc/*.xrc
+samples/xrc/*.cpp
+samples/xrc/*.h
+samples/xrc/*.rc
+samples/xrc/*.def
+samples/xrc/*.xbm
+samples/xrc/makefile.vc
+samples/xrc/makefile.bcc
+samples/xrc/makefile.b32
+samples/xrc/makefile.wat
+samples/xrc/makefile.g95
+samples/xrc/makefile.unx
+samples/xrc/makefile.dos
+samples/xrc/makefile.vms
+samples/xrc/Makefile.in
+samples/xrc/*.txt
+samples/xrc/*.ico
+samples/xrc/*.bmp
+samples/xrc/*.xpm
+samples/xrc/xrcdemo.dsp
+samples/xrc/xrcdemo.dsw
+samples/xrc/xrcdemo.bkl
+samples/xrc/rc/*.bmp
+samples/xrc/rc/*.gif
+samples/xrc/rc/*.ico
+samples/xrc/rc/*.xpm
+samples/xrc/rc/*.xrc
 
 contrib/utils/convertrc/*.cpp
 contrib/utils/convertrc/*.h
@@ -132,27 +113,27 @@ contrib/utils/convertrc/*.xpm
 contrib/utils/convertrc/ConvertVC.dsp
 contrib/utils/convertrc/ConvertVC.dsw
 
-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.dos
-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
-contrib/utils/wxrc/wxrc.dsp
-contrib/utils/wxrc/wxrc.dsw
-contrib/utils/wxrc/*.bkl
+utils/wxrc/*.cpp
+utils/wxrc/*.h
+utils/wxrc/*.rc
+utils/wxrc/*.def
+utils/wxrc/*.xbm
+utils/wxrc/makefile.vc
+utils/wxrc/makefile.bcc
+utils/wxrc/makefile.b32
+utils/wxrc/makefile.wat
+utils/wxrc/makefile.g95
+utils/wxrc/makefile.unx
+utils/wxrc/makefile.dos
+utils/wxrc/makefile.vms
+utils/wxrc/Makefile.in
+utils/wxrc/*.txt
+utils/wxrc/*.ico
+utils/wxrc/*.bmp
+utils/wxrc/*.xpm
+utils/wxrc/wxrc.dsp
+utils/wxrc/wxrc.dsw
+utils/wxrc/*.bkl
 
 contrib/utils/wxrcedit/*.cpp
 contrib/utils/wxrcedit/*.h