Script updates

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

diff --git a/distrib/msw/cw.rsp b/distrib/msw/cw.rsp
index 7e03749e3e5b8aae2cae2d9ca5c9108f694e5979..b522b5f76d8f19f4bc5cc71fab5ebc4ec3e9cacc 100644 (file)
--- a/distrib/msw/cw.rsp
+++ b/distrib/msw/cw.rsp
@@ -63,6 +63,7 @@ samples/oleauto/*W7.xml
 samples/opengl/*W7.xml
 samples/ownerdrw/*W7.xml
 samples/png/*W7.xml
 samples/opengl/*W7.xml
 samples/ownerdrw/*W7.xml
 samples/png/*W7.xml

+samples/popup/*W7.xml

 samples/printing/*W7.xml
 samples/regtest/*W7.xml
 samples/rotate/*W7.xml
 samples/printing/*W7.xml
 samples/regtest/*W7.xml
 samples/rotate/*W7.xml

diff --git a/distrib/msw/cw_mac.rsp b/distrib/msw/cw_mac.rsp
index e54a0981b89c0a61d9c6a1aacde584a75b12f58b..ac511e34308869b24f624751aea194c222fbf23b 100644 (file)
--- a/distrib/msw/cw_mac.rsp
+++ b/distrib/msw/cw_mac.rsp
@@ -123,6 +123,8 @@ samples/opengl/*.mcp
 samples/ownerdrw/*M?.xml
 samples/ownerdrw/*.mcp
 samples/png/*M?.xml
 samples/ownerdrw/*M?.xml
 samples/ownerdrw/*.mcp
 samples/png/*M?.xml

+samples/popup/*M?.xml
+samples/popup/*.mcp

 samples/png/*.mcp
 samples/printing/*M?.xml
 samples/printing/*.mcp
 samples/png/*.mcp
 samples/printing/*M?.xml
 samples/printing/*.mcp

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 771818f82141aaa635fa85c8fd36babcf0d66a14..f41f5eaab63c3a894d80ae248ad659a164515723 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -24,6 +24,13 @@ build/bakefiles/formats/*.bkl
 build/bakefiles/formats/*.empy
 build/bakefiles/formats/README
 build/bakefiles/formats/*.bkmanifest
 build/bakefiles/formats/*.empy
 build/bakefiles/formats/README
 build/bakefiles/formats/*.bkmanifest

+build/bakefiles/wxpresets/*.bkl
+build/bakefiles/wxpresets/presets
+build/bakefiles/wxpresets/sample/*.bkl
+build/bakefiles/wxpresets/sample/*.in
+build/bakefiles/wxpresets/sample/*.cpp
+build/bakefiles/wxpresets/*.bkl
+build/update-setup-h

 
 distrib/msw/*.rsp
 distrib/msw/*.bat
 
 distrib/msw/*.rsp
 distrib/msw/*.bat


@@ -1005,6 +1012,19 @@ samples/png/*.png
 samples/png/*.pro
 samples/png/*.bkl
 
 samples/png/*.pro
 samples/png/*.bkl
 

+samples/popup/*.cpp
+samples/popup/*.h
+samples/popup/makefile*
+samples/popup/*.rc
+samples/popup/*.def
+samples/popup/*.bmp
+samples/popup/*.xpm
+samples/popup/*.ico
+samples/popup/*.txt
+samples/popup/*.png
+samples/popup/*.pro
+samples/popup/*.bkl
+

 samples/printing/*.cpp
 samples/printing/*.h
 samples/printing/*.def
 samples/printing/*.cpp
 samples/printing/*.h
 samples/printing/*.def


@@ -1424,14 +1444,13 @@ demos/dbbrowse/*.bkl
 
 tests/*.bkl
 tests/makefile*.*
 
 tests/*.bkl
 tests/makefile*.*

-tests/*.dsp
-tests/*.dsw

 tests/*.cpp
 tests/*.fc
 
 tests/archive/*.cpp
 tests/arrays/*.cpp
 tests/datetime/*.cpp
 tests/*.cpp
 tests/*.fc
 
 tests/archive/*.cpp
 tests/arrays/*.cpp
 tests/datetime/*.cpp

+tests/fileconf/*.cpp

 tests/filename/*.cpp
 tests/filesys/*.cpp
 tests/fontmap/*.cpp
 tests/filename/*.cpp
 tests/filesys/*.cpp
 tests/fontmap/*.cpp

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index 40e1bf9b1b402978e4a1468f20eba35c39d7c08b..fee30eddb46b2e79229599a0fbf9ac5fd2af486f 100644 (file)
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -56,6 +56,7 @@ samples/mobile/styles/Makefile.in
 samples/multimon/Makefile.in
 samples/notebook/Makefile.in
 samples/png/Makefile.in
 samples/multimon/Makefile.in
 samples/notebook/Makefile.in
 samples/png/Makefile.in

+samples/popup/Makefile.in

 samples/printing/Makefile.in
 samples/propsize/Makefile.in
 samples/render/Makefile.in
 samples/printing/Makefile.in
 samples/propsize/Makefile.in
 samples/render/Makefile.in


@@ -187,6 +188,8 @@ src/x11/descrip.mms
 src/png/scripts/descrip.mms
 src/unix/descrip.mms
 src/zlib/descrip.mms
 src/png/scripts/descrip.mms
 src/unix/descrip.mms
 src/zlib/descrip.mms

+src/xml/descrip.mms
+src/xrc/descrip.mms

 src/regex/descrip.mms
 utils/helpview/src/descrip.mms
 utils/tex2rtf/src/descrip.mms
 src/regex/descrip.mms
 utils/helpview/src/descrip.mms
 utils/tex2rtf/src/descrip.mms

diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index 9e043118e1e692ae2035adf4645be16c95199119..4f8b2dc028c1e9721d90c806420d8f3a5845d07e 100644 (file)
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -25,7 +25,7 @@ PROGNAME=$0
 SCRIPTDIR=$WXWIN/distrib/msw
 WEBFILES=c:/wx2dev/wxWebSite
 # Set this to the required version
 SCRIPTDIR=$WXWIN/distrib/msw
 WEBFILES=c:/wx2dev/wxWebSite
 # Set this to the required version

-VERSION=2.5.3
+VERSION=2.5.4

 
 . $SCRIPTDIR/setup.var
 
 
 . $SCRIPTDIR/setup.var
 

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 9a0cc3c0065a73a0436bc67097182d6fc670cb56..57ed25ed6f57d0a41e22cb4546f5e7c7aab3ce84 100644 (file)
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -192,6 +192,9 @@ samples/ownerdrw/ownerdrw.dsw
 samples/png/png.dsp
 samples/png/png.dsw
 
 samples/png/png.dsp
 samples/png/png.dsw
 

+samples/popup/popup.dsp
+samples/popup/popup.dsw
+

 samples/printing/printing.dsp
 samples/printing/printing.dsw
 
 samples/printing/printing.dsp
 samples/printing/printing.dsw
 


@@ -395,3 +398,6 @@ utils/configtool/src/configtool.dsw
 utils/hhp2cached/hhp2cached.dsp
 utils/hhp2cached/hhp2cached.dsw
 
 utils/hhp2cached/hhp2cached.dsp
 utils/hhp2cached/hhp2cached.dsw
 

+tests/*.dsp
+tests/*.dsw
+

diff --git a/distrib/msw/wince.rsp b/distrib/msw/wince.rsp
index 7d048af8722bffc00fda804522248dfd3334544c..894e34eec9c3141e05b804c97b9fb23550f6d2e3 100644 (file)
--- a/distrib/msw/wince.rsp
+++ b/distrib/msw/wince.rsp
@@ -168,6 +168,9 @@ samples/ownerdrw/ownerdrw.vcw
 samples/png/png.vcp
 samples/png/png.vcw
 
 samples/png/png.vcp
 samples/png/png.vcw
 

+samples/popup/popup.vcp
+samples/popup/popup.vcw
+

 samples/printing/printing.vcp
 samples/printing/printing.vcw
 
 samples/printing/printing.vcp
 samples/printing/printing.vcw
 


@@ -385,3 +388,6 @@ contrib/samples/svg/svgtest.vcw
 utils/configtool/src/configtool.vcp
 utils/configtool/src/configtool.vcw
 
 utils/configtool/src/configtool.vcp
 utils/configtool/src/configtool.vcw
 

+tests/*.vcp
+tests/*.vcw
+