]> git.saurik.com Git - wxWidgets.git/commitdiff
Removed some obsolete distribution files
authorJulian Smart <julian@anthemion.co.uk>
Tue, 12 Aug 2003 15:33:14 +0000 (15:33 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Tue, 12 Aug 2003 15:33:14 +0000 (15:33 +0000)
Updated listing files
Added new shell scripts for spinning wxMSW

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

21 files changed:
distrib/msw/contrib.rsp
distrib/msw/docsrc.rsp
distrib/msw/generic.rsp
distrib/msw/innobott.txt
distrib/msw/innotop.txt
distrib/msw/mac.rsp
distrib/msw/makefile.rsp
distrib/msw/makeinno.sh [new file with mode: 0644]
distrib/msw/makesetup.sh [new file with mode: 0644]
distrib/msw/mmedia.rsp
distrib/msw/msw.rsp
distrib/msw/namedown
distrib/msw/setup.var [new file with mode: 0644]
distrib/msw/stc.rsp
distrib/msw/vc.rsp
distrib/msw/xml.rsp
distrib/msw/zipdist.bat [deleted file]
distrib/msw/zipdistinno.bat [deleted file]
distrib/msw/zipmac.bat [deleted file]
distrib/msw/zipwxmac.bat [deleted file]
distrib/msw/zipwxos2.bat [deleted file]

index 1a9cee95b4b20d81919b37edc2fbb6d299d754f8..91326c6619312cd7554487b959fa1347ecbce1ab 100644 (file)
@@ -1,18 +1,91 @@
+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/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/build/xrc/*.bkl
+contrib/build/xrc/*.dsw
+contrib/build/xrc/*.dsp
+contrib/build/xrc/makefile*
+
+
+
 contrib/configure.in
 contrib/configure
 
-contrib/samples/plot/*.cpp
-contrib/samples/plot/*.h
-contrib/samples/plot/*.def
-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/PlotVC.dsp
-contrib/samples/plot/PlotVC.dsw
+contrib/src/animate/*.cpp
+contrib/src/animate/*.h
+contrib/src/animate/make*
+contrib/src/animate/readme.txt
+contrib/include/wx/animate/*.h
+
+contrib/samples/animate/*.cpp
+contrib/samples/animate/*.h
+contrib/samples/animate/*.def
+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/anitest.dsw
+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
@@ -26,47 +99,89 @@ contrib/samples/applet/*.ico
 contrib/samples/applet/*.bmp
 contrib/samples/applet/*.rc
 contrib/samples/applet/*.wdr
-contrib/samples/applet/AppletVC.dsp
-contrib/samples/applet/AppletVC.dsw
 
-contrib/samples/gizmos/multicell/*.cpp
-contrib/samples/gizmos/multicell/*.h
-contrib/samples/gizmos/multicell/*.def
-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/multicell.dsw
+contrib/src/deprecated/*.cpp
+contrib/src/deprecated/*.h
+contrib/src/deprecated/*.l
+contrib/src/deprecated/*.c
+contrib/src/deprecated/make*
+contrib/src/deprecated/readme.txt
+contrib/include/wx/deprecated/*.h
 
-contrib/samples/gizmos/splittree/*.cpp
-contrib/samples/gizmos/splittree/*.h
-contrib/samples/gizmos/splittree/*.def
-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/TreeVC.dsp
-contrib/samples/gizmos/splittree/TreeVC.dsw
+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/*.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/proplist.dsw
+contrib/samples/deprecated/proplist/*.bkl
 
-contrib/samples/gizmos/editlbox/*.cpp
-contrib/samples/gizmos/editlbox/*.h
-contrib/samples/gizmos/editlbox/*.def
-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/editlbox.dsw
+contrib/samples/deprecated/resource/*.cpp
+contrib/samples/deprecated/resource/*.h
+contrib/samples/deprecated/resource/*.def
+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/resource.dsw
+contrib/samples/deprecated/resource/*.bkl
+
+contrib/samples/deprecated/treelay/*.cpp
+contrib/samples/deprecated/treelay/*.h
+contrib/samples/deprecated/treelay/*.def
+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/treelay.dsw
+contrib/samples/deprecated/treelay/*.bkl
+
+contrib/src/fl/*.cpp
+contrib/src/fl/*.h
+contrib/src/fl/files.lst
+contrib/src/fl/make*
+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/*.def
+contrib/samples/fl/makefile*
+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/*.dsw
+contrib/samples/fl/*.bkl
+
+contrib/src/gizmos/*.cpp
+contrib/src/gizmos/*.h
+contrib/src/gizmos/make*
+contrib/src/gizmos/*.xpm
+contrib/src/gizmos/*.bmp
+contrib/include/wx/gizmos/*.h
 
 contrib/samples/gizmos/dynsash/*.cpp
 contrib/samples/gizmos/dynsash/*.h
@@ -80,6 +195,7 @@ contrib/samples/gizmos/dynsash/*.bmp
 contrib/samples/gizmos/dynsash/*.rc
 contrib/samples/gizmos/dynsash/dynsash.dsp
 contrib/samples/gizmos/dynsash/dynsash.dsw
+contrib/samples/gizmos/dynsash/*.bkl
 
 contrib/samples/gizmos/dynsash_switch/*.cpp
 contrib/samples/gizmos/dynsash_switch/*.h
@@ -93,6 +209,21 @@ 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/dynsash_switch.dsw
+contrib/samples/gizmos/dynsash_switch/*.bkl
+
+contrib/samples/gizmos/editlbox/*.cpp
+contrib/samples/gizmos/editlbox/*.h
+contrib/samples/gizmos/editlbox/*.def
+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/editlbox.dsw
+contrib/samples/gizmos/editlbox/*.bkl
 
 contrib/samples/gizmos/led/*.cpp
 contrib/samples/gizmos/led/*.h
@@ -106,141 +237,65 @@ contrib/samples/gizmos/led/*.bmp
 contrib/samples/gizmos/led/*.rc
 contrib/samples/gizmos/led/led.dsp
 contrib/samples/gizmos/led/led.dsw
+contrib/samples/gizmos/led/*.bkl
 
-contrib/samples/animate/*.cpp
-contrib/samples/animate/*.h
-contrib/samples/animate/*.def
-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/AniTestVC.dsp
-contrib/samples/animate/AniTestVC.dsw
+contrib/samples/gizmos/multicell/*.cpp
+contrib/samples/gizmos/multicell/*.h
+contrib/samples/gizmos/multicell/*.def
+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/multicell.dsw
+contrib/samples/gizmos/multicell/*.bkl
 
-contrib/samples/fl/makefile*
-contrib/samples/fl/bitmaps/*.bmp
-contrib/samples/fl/bitmaps/*.xpm
-contrib/samples/fl/fl_demo1/*.cpp
-contrib/samples/fl/fl_demo1/*.h
-contrib/samples/fl/fl_demo1/*.def
-contrib/samples/fl/fl_demo1/makefile*
-contrib/samples/fl/fl_demo1/*.xbm
-contrib/samples/fl/fl_demo1/*.xpm
-contrib/samples/fl/fl_demo1/*.txt
-contrib/samples/fl/fl_demo1/*.ico
-contrib/samples/fl/fl_demo1/*.bmp
-contrib/samples/fl/fl_demo1/*.rc
-contrib/samples/fl/fl_demo1/fl_demo.dsp
-contrib/samples/fl/fl_demo1/fl_demo.dsw
-contrib/samples/fl/fl_demo2/*.cpp
-contrib/samples/fl/fl_demo2/*.h
-contrib/samples/fl/fl_demo2/*.def
-contrib/samples/fl/fl_demo2/makefile*
-contrib/samples/fl/fl_demo2/*.xbm
-contrib/samples/fl/fl_demo2/*.xpm
-contrib/samples/fl/fl_demo2/*.txt
-contrib/samples/fl/fl_demo2/*.ico
-contrib/samples/fl/fl_demo2/*.bmp
-contrib/samples/fl/fl_demo2/*.rc
-contrib/samples/fl/fl_demo2/fl_demo.dsp
-contrib/samples/fl/fl_demo2/fl_demo.dsw
-contrib/samples/fl/fl_sample1/*.cpp
-contrib/samples/fl/fl_sample1/*.h
-contrib/samples/fl/fl_sample1/*.def
-contrib/samples/fl/fl_sample1/makefile*
-contrib/samples/fl/fl_sample1/*.xbm
-contrib/samples/fl/fl_sample1/*.xpm
-contrib/samples/fl/fl_sample1/*.txt
-contrib/samples/fl/fl_sample1/*.ico
-contrib/samples/fl/fl_sample1/*.bmp
-contrib/samples/fl/fl_sample1/*.rc
-contrib/samples/fl/fl_sample1/fl_demo.dsp
-contrib/samples/fl/fl_sample1/fl_demo.dsw
-contrib/samples/fl/fl_sample2/*.cpp
-contrib/samples/fl/fl_sample2/*.h
-contrib/samples/fl/fl_sample2/*.def
-contrib/samples/fl/fl_sample2/makefile*
-contrib/samples/fl/fl_sample2/*.xbm
-contrib/samples/fl/fl_sample2/*.xpm
-contrib/samples/fl/fl_sample2/*.txt
-contrib/samples/fl/fl_sample2/*.ico
-contrib/samples/fl/fl_sample2/*.bmp
-contrib/samples/fl/fl_sample2/*.rc
-contrib/samples/fl/fl_sample2/fl_demo.dsp
-contrib/samples/fl/fl_sample2/fl_demo.dsw
-contrib/samples/fl/fl_sample3/*.cpp
-contrib/samples/fl/fl_sample3/*.h
-contrib/samples/fl/fl_sample3/*.def
-contrib/samples/fl/fl_sample3/makefile*
-contrib/samples/fl/fl_sample3/*.xbm
-contrib/samples/fl/fl_sample3/*.xpm
-contrib/samples/fl/fl_sample3/*.txt
-contrib/samples/fl/fl_sample3/*.ico
-contrib/samples/fl/fl_sample3/*.bmp
-contrib/samples/fl/fl_sample3/*.rc
-contrib/samples/fl/fl_sample3/fl_demo.dsp
-contrib/samples/fl/fl_sample3/fl_demo.dsw
+contrib/samples/gizmos/splittree/*.cpp
+contrib/samples/gizmos/splittree/*.h
+contrib/samples/gizmos/splittree/*.def
+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/splittree.dsw
+contrib/samples/gizmos/splittree/*.bkl
 
 contrib/src/plot/*.cpp
 contrib/src/plot/*.h
 contrib/src/plot/make*
-contrib/src/plot/PlotVC.dsp
-contrib/src/plot/PlotVC.dsw
 contrib/include/wx/plot/*.h
 contrib/include/wx/plot/*.xpm
 contrib/include/wx/plot/*.bmp
 contrib/include/wx/plot/*.rc
 
-contrib/src/gizmos/*.cpp
-contrib/src/gizmos/*.h
-contrib/src/gizmos/make*
-contrib/src/gizmos/*.xpm
-contrib/src/gizmos/*.bmp
-contrib/src/gizmos/GizmosVC.dsp
-contrib/src/gizmos/GizmosVC.dsw
-contrib/include/wx/gizmos/*.h
-
-contrib/src/applet/*.cpp
-contrib/src/applet/*.h
-contrib/src/applet/make*
-contrib/src/applet/AppletVC.dsp
-contrib/src/applet/AppletVC.dsw
-contrib/include/wx/applet/*.h
-contrib/include/wx/applet/*.xpm
-contrib/include/wx/applet/*.bmp
-contrib/include/wx/applet/*.rc
-
-contrib/src/animate/*.cpp
-contrib/src/animate/*.h
-contrib/src/animate/make*
-contrib/src/animate/readme.txt
-contrib/src/animate/AnimateVC.dsp
-contrib/src/animate/AnimateVC.dsw
-contrib/include/wx/animate/*.h
-
-contrib/src/fl/*.cpp
-contrib/src/fl/*.h
-contrib/src/fl/files.lst
-contrib/src/fl/make*
-contrib/src/fl/flVC.dsp
-contrib/src/fl/flVC.dsw
-contrib/include/wx/fl/*.h
+contrib/samples/plot/*.cpp
+contrib/samples/plot/*.h
+contrib/samples/plot/*.def
+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/plot.dsw
+contrib/samples/plot/*.bkl
 
 contrib/src/net/*.cpp
 contrib/src/net/*.h
 contrib/src/net/make*
-contrib/src/net/NetVC.dsp
-contrib/src/net/NetVC.dsw
 contrib/include/wx/net/*.h
 
 contrib/src/svg/*.cpp
 contrib/src/svg/make*
-contrib/src/svg/wxSVGVC.dsp
-contrib/src/svg/wxSVGVC.dsw
 contrib/src/svg/README.TXT
 contrib/include/wx/svg/*.h
 contrib/samples/svg/make*
@@ -249,5 +304,9 @@ 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/svgtest.dsw
+contrib/samples/svg/*.bkl
 contrib/samples/svg/bitmaps/*.xpm
 
index 9bbf15761a496c6fe09feeaa31b3f9def1d652bf..eda8928447a014496d730ba763625328a1d9fbd2 100644 (file)
@@ -32,7 +32,6 @@ utils/dialoged/docs/*.gif
 
 contrib/docs/latex/svg/*.gif
 contrib/docs/latex/svg/*.tex
-contrib/docs/latex/svg/*.gif
 contrib/docs/latex/svg/*.ini
 contrib/docs/latex/svg/*.sty
 
index 10fbf5f1fe62a7f94caea3b6d786f0756c8dfbe4..28660683d2043fc33a30a40da8eceb6cd6db78dd 100644 (file)
@@ -12,6 +12,15 @@ mkinstalldirs
 wx-config.in
 version-script.in
 setup.h_vms
+regen
+
+build/bakefiles/*.bkl
+build/bakefiles/Makefile
+build/bakefiles/*.py
+build/bakefiles/compat/FORMATS.bkmanifest
+build/bakefiles/compat/README
+build/bakefiles/compat/wx24dsp.bkl
+build/bakefiles/compat/wx24dsp.empy
 
 distrib/msw/*.rsp
 distrib/msw/*.bat
@@ -179,6 +188,8 @@ contrib/configure
 contrib/configure.in
 contrib/lib/dummy
 
+samples/samples.bkl
+
 samples/*.txt
 samples/makefile*
 samples/configure
@@ -193,6 +204,7 @@ samples/access/*.xpm
 samples/access/*.ico
 samples/access/*.rc
 samples/access/*.pro
+samples/access/*.bkl
 
 samples/artprov/*.cpp
 samples/artprov/*.h
@@ -206,6 +218,7 @@ samples/artprov/*.bmp
 samples/artprov/*.rc
 samples/artprov/*.wav
 samples/artprov/*.pro
+samples/artprov/*.bkl
 
 samples/calendar/*.cpp
 samples/calendar/*.h
@@ -216,6 +229,7 @@ samples/calendar/*.ico
 samples/calendar/*.xpm
 samples/calendar/*.txt
 samples/calendar/*.pro
+samples/calendar/*.bkl
 
 samples/caret/*.cpp
 samples/caret/*.h
@@ -229,6 +243,7 @@ samples/caret/*.png
 samples/caret/*.ico
 samples/caret/*.txt
 samples/caret/*.pro
+samples/caret/*.bkl
 
 samples/checklst/*.cpp
 samples/checklst/*.h
@@ -241,6 +256,7 @@ samples/checklst/*.xpm
 samples/checklst/*.ico
 samples/checklst/*.bmp
 samples/checklst/*.pro
+samples/checklst/*.bkl
 
 samples/config/*.cpp
 samples/config/*.h
@@ -254,6 +270,7 @@ samples/config/*.bmp
 samples/config/*.rc
 samples/config/*.wav
 samples/config/*.pro
+samples/config/*.bkl
 
 samples/console/testdata.fc
 samples/console/*.cpp
@@ -268,6 +285,7 @@ samples/console/*.png
 samples/console/*.ico
 samples/console/*.txt
 samples/console/*.pro
+samples/console/*.bkl
 
 samples/controls/*.cpp
 samples/controls/*.h
@@ -282,6 +300,7 @@ samples/controls/*.pro
 samples/controls/icons/*.bmp
 samples/controls/icons/*.ico
 samples/controls/icons/*.xpm
+samples/controls/*.bkl
 
 samples/dialup/*.cpp
 samples/dialup/*.h
@@ -295,6 +314,7 @@ samples/dialup/*.png
 samples/dialup/*.ico
 samples/dialup/*.txt
 samples/dialup/*.pro
+samples/dialup/*.bkl
 
 samples/display/*.cpp
 samples/display/*.h
@@ -308,6 +328,7 @@ samples/display/*.png
 samples/display/*.ico
 samples/display/*.txt
 samples/display/*.pro
+samples/display/*.bkl
 
 samples/db/*.cpp
 samples/db/*.h
@@ -321,6 +342,7 @@ samples/db/*.bmp
 samples/db/*.rc
 samples/db/*.wav
 samples/db/*.pro
+samples/db/*.bkl
 
 samples/dnd/*.cpp
 samples/dnd/*.h
@@ -336,6 +358,7 @@ samples/dnd/*.ico
 samples/dnd/*.txt
 samples/dnd/*.cur
 samples/dnd/*.pro
+samples/dnd/*.bkl
 
 samples/drawing/*.cpp
 samples/drawing/*.h
@@ -349,6 +372,7 @@ samples/drawing/*.png
 samples/drawing/*.ico
 samples/drawing/*.txt
 samples/drawing/*.pro
+samples/drawing/*.bkl
 
 samples/dialogs/*.h
 samples/dialogs/*.cpp
@@ -361,6 +385,7 @@ samples/dialogs/*.txt
 samples/dialogs/*.bmp
 samples/dialogs/*.ico
 samples/dialogs/*.pro
+samples/dialogs/*.bkl
 
 samples/docview/*.h
 samples/docview/*.cpp
@@ -373,6 +398,7 @@ samples/docview/*.txt
 samples/docview/*.ico
 samples/docview/*.bmp
 samples/docview/*.pro
+samples/docview/*.bkl
 
 samples/docvwmdi/*.h
 samples/docvwmdi/*.cpp
@@ -385,6 +411,7 @@ samples/docvwmdi/*.txt
 samples/docvwmdi/*.ico
 samples/docvwmdi/*.bmp
 samples/docvwmdi/*.pro
+samples/docvwmdi/*.bkl
 
 samples/dragimag/*.cpp
 samples/dragimag/*.h
@@ -396,6 +423,7 @@ samples/dragimag/*.xpm
 samples/dragimag/*.png
 samples/dragimag/*.bmp
 samples/dragimag/*.pro
+samples/dragimag/*.bkl
 
 samples/dynamic/*.cpp
 samples/dynamic/*.h
@@ -409,6 +437,7 @@ samples/dynamic/*.bmp
 samples/dynamic/*.rc
 samples/dynamic/*.wav
 samples/dynamic/*.pro
+samples/dynamic/*.bkl
 
 samples/erase/*.cpp
 samples/erase/*.h
@@ -422,6 +451,7 @@ samples/erase/*.bmp
 samples/erase/*.rc
 samples/erase/*.wav
 samples/erase/*.pro
+samples/erase/*.bkl
 
 samples/event/*.cpp
 samples/event/*.h
@@ -435,6 +465,7 @@ samples/event/*.xpm
 samples/event/*.ico
 samples/event/*.bmp
 samples/event/*.pro
+samples/event/*.bkl
 
 samples/exec/*.cpp
 samples/exec/*.h
@@ -445,6 +476,7 @@ samples/exec/*.ico
 samples/exec/*.xpm
 samples/exec/*.txt
 samples/exec/*.pro
+samples/exec/*.bkl
 
 samples/font/*.cpp
 samples/font/*.h
@@ -458,6 +490,7 @@ samples/font/*.png
 samples/font/*.ico
 samples/font/*.txt
 samples/font/*.pro
+samples/font/*.bkl
 
 samples/grid/*.cpp
 samples/grid/*.h
@@ -470,6 +503,7 @@ samples/grid/*.xpm
 samples/grid/*.ico
 samples/grid/*.bmp
 samples/grid/*.pro
+samples/grid/*.bkl
 
 samples/help/*.cpp
 samples/help/*.h
@@ -501,6 +535,7 @@ samples/help/doc/*.db
 samples/help/doc/*.tex
 samples/help/doc/*.gif
 samples/help/doc/*.map
+samples/help/*.bkl
 
 samples/htlbox/*.cpp
 samples/htlbox/*.h
@@ -510,9 +545,11 @@ samples/htlbox/*.xpm
 samples/htlbox/*.ico
 samples/htlbox/*.bmp
 samples/htlbox/*.rc
+samples/htlbox/*.bkl
 
 samples/html/makefile*
 samples/html/*.txt
+samples/html/*.bkl
 
 samples/html/about/*.cpp
 samples/html/about/*.h
@@ -528,6 +565,7 @@ samples/html/about/*.txt
 samples/html/about/*.pro
 samples/html/about/data/*.htm
 samples/html/about/data/*.png
+samples/html/about/*.bkl
 
 samples/html/help/*.cpp
 samples/html/help/*.h
@@ -545,6 +583,7 @@ samples/html/help/helpfiles/*.htm
 samples/html/help/helpfiles/*.hhc
 samples/html/help/helpfiles/*.hhk
 samples/html/help/helpfiles/*.hhp
+samples/html/help/*.bkl
 
 samples/html/printing/*.cpp
 samples/html/printing/*.h
@@ -559,6 +598,7 @@ samples/html/printing/*.png
 samples/html/printing/*.ico
 samples/html/printing/*.gif
 samples/html/printing/*.htm
+samples/html/printing/*.bkl
 
 samples/html/test/*.cpp
 samples/html/test/*.h
@@ -574,6 +614,7 @@ samples/html/test/*.htm
 samples/html/test/*.html
 samples/html/test/*.pro
 samples/html/test/*.gif
+samples/html/test/*.bkl
 
 samples/html/virtual/*.cpp
 samples/html/virtual/*.h
@@ -588,6 +629,7 @@ samples/html/virtual/*.ico
 samples/html/virtual/*.htm
 samples/html/virtual/*.html
 samples/html/virtual/*.pro
+samples/html/virtual/*.bkl
 
 samples/html/widget/*.cpp
 samples/html/widget/*.h
@@ -602,6 +644,7 @@ samples/html/widget/*.ico
 samples/html/widget/*.htm
 samples/html/widget/*.html
 samples/html/widget/*.pro
+samples/html/widget/*.bkl
 
 samples/html/zip/*.cpp
 samples/html/zip/*.h
@@ -617,6 +660,7 @@ samples/html/zip/*.htm
 samples/html/zip/*.html
 samples/html/zip/*.zip
 samples/html/zip/*.pro
+samples/html/zip/*.bkl
 
 samples/html/helpview/*.cpp
 samples/html/helpview/*.h
@@ -632,6 +676,7 @@ samples/html/helpview/*.htm
 samples/html/helpview/*.html
 samples/html/helpview/*.pro
 samples/html/helpview/test.zip
+samples/html/helpview/*.bkl
 
 samples/image/*.cpp
 samples/image/*.h
@@ -652,6 +697,7 @@ samples/image/*.cur
 samples/image/*.txt
 samples/image/*.pro
 samples/image/*.ani
+samples/image/*.bkl
 
 samples/internat/*.cpp
 samples/internat/*.h
@@ -672,6 +718,7 @@ samples/internat/de/*.mo
 samples/internat/de/*.po
 samples/internat/ru/*.mo
 samples/internat/ru/*.po
+samples/internat/*.bkl
 
 samples/ipc/*.cpp
 samples/ipc/*.h
@@ -697,6 +744,7 @@ samples/ipc/*.png
 samples/ipc/*.ico
 samples/ipc/*.txt
 samples/ipc/*.pro
+samples/ipc/*.bkl
 
 samples/keyboard/*.cpp
 samples/keyboard/*.h
@@ -709,6 +757,7 @@ samples/keyboard/*.xpm
 samples/keyboard/*.ico
 samples/keyboard/*.bmp
 samples/keyboard/*.pro
+samples/keyboard/*.bkl
 
 samples/layout/*.cpp
 samples/layout/*.h
@@ -720,6 +769,7 @@ samples/layout/*.ico
 samples/layout/*.rc
 samples/layout/*.bmp
 samples/layout/*.pro
+samples/layout/*.bkl
 
 samples/listbox/*.cpp
 samples/listbox/*.h
@@ -728,6 +778,7 @@ samples/listbox/*.rc
 samples/listbox/*.txt
 samples/listbox/makefile*
 samples/listbox/*.xpm
+samples/listbox/*.bkl
 
 samples/listctrl/*.cpp
 samples/listctrl/*.h
@@ -744,6 +795,7 @@ samples/listctrl/*.bmp
 samples/listctrl/*.pro
 samples/listctrl/bitmaps/*.bmp
 samples/listctrl/bitmaps/*.ico
+samples/listctrl/*.bkl
 
 samples/mdi/*.cpp
 samples/mdi/*.h
@@ -758,6 +810,7 @@ samples/mdi/bitmaps/*.bmp
 samples/mdi/bitmaps/*.ico
 samples/mdi/bitmaps/*.xpm
 samples/mdi/bitmaps/*.xbm
+samples/mdi/*.bkl
 
 samples/menu/*.cpp
 samples/menu/*.h
@@ -771,6 +824,7 @@ samples/menu/*.png
 samples/menu/*.ico
 samples/menu/*.txt
 samples/menu/*.pro
+samples/menu/*.bkl
 
 samples/memcheck/*.h
 samples/memcheck/*.cpp
@@ -783,6 +837,7 @@ samples/memcheck/*.txt
 samples/memcheck/*.ico
 samples/memcheck/*.bmp
 samples/memcheck/*.pro
+samples/memcheck/*.bkl
 
 samples/minimal/*.cpp
 samples/minimal/*.h
@@ -793,6 +848,7 @@ samples/minimal/*.xpm
 samples/minimal/*.ico
 samples/minimal/*.rc
 samples/minimal/*.pro
+samples/minimal/*.bkl
 
 samples/minifram/*.h
 samples/minifram/*.cpp
@@ -807,6 +863,7 @@ samples/minifram/*.bmp
 samples/minifram/*.pro
 samples/minifram/bitmaps/*.bmp
 samples/minifram/bitmaps/*.xpm
+samples/minifram/*.bkl
 
 samples/mobile/styles/*.cpp
 samples/mobile/styles/*.h
@@ -815,6 +872,8 @@ samples/mobile/styles/*.jpg
 samples/mobile/wxedit/*.cpp
 samples/mobile/wxedit/*.h
 samples/mobile/wxedit/*.xpm
+samples/mobile/styles/*.bkl
+samples/mobile/wxedit/*.bkl
 
 samples/multimon/*.h
 samples/multimon/*.cpp
@@ -827,6 +886,7 @@ samples/multimon/*.txt
 samples/multimon/*.ico
 samples/multimon/*.bmp
 samples/multimon/*.pro
+samples/multimon/*.bkl
 
 samples/notebook/*.cpp
 samples/notebook/*.h
@@ -839,6 +899,7 @@ samples/notebook/*.xpm
 samples/notebook/*.ico
 samples/notebook/*.txt
 samples/notebook/*.pro
+samples/notebook/*.bkl
 
 samples/odbc/*.h
 samples/odbc/*.cpp
@@ -853,6 +914,7 @@ samples/odbc/*.bmp
 samples/odbc/*.dbf
 samples/odbc/*.cdx
 samples/odbc/*.pro
+samples/odbc/*.bkl
 
 samples/opengl/cube/*.cpp
 samples/opengl/cube/*.h
@@ -861,6 +923,7 @@ samples/opengl/cube/*.ico
 samples/opengl/cube/*.xbm
 samples/opengl/cube/*.pro
 samples/opengl/cube/make*.*
+samples/opengl/cube/*.bkl
 
 samples/opengl/isosurf/*.cpp
 samples/opengl/isosurf/*.h
@@ -870,6 +933,7 @@ samples/opengl/isosurf/*.xbm
 samples/opengl/isosurf/*.pro
 samples/opengl/isosurf/*.dat.gz
 samples/opengl/isosurf/make*.*
+samples/opengl/isosurf/*.bkl
 
 samples/opengl/penguin/*.cpp
 samples/opengl/penguin/*.c
@@ -881,6 +945,7 @@ samples/opengl/penguin/*.xpm
 samples/opengl/penguin/*.pro
 samples/opengl/penguin/make*.*
 samples/opengl/penguin/penguin.lwo
+samples/opengl/penguin/*.bkl
 
 samples/png/*.cpp
 samples/png/*.h
@@ -894,6 +959,7 @@ samples/png/*.ico
 samples/png/*.txt
 samples/png/*.png
 samples/png/*.pro
+samples/png/*.bkl
 
 samples/printing/*.cpp
 samples/printing/*.h
@@ -907,6 +973,7 @@ samples/printing/*.bmp
 samples/printing/*.rc
 samples/printing/*.afm
 samples/printing/*.pro
+samples/printing/*.bkl
 
 samples/propsize/*.cpp
 samples/propsize/*.h
@@ -918,6 +985,19 @@ samples/propsize/*.ico
 samples/propsize/*.bmp
 samples/propsize/*.rc
 samples/propsize/*.pro
+samples/propsize/*.bkl
+
+samples/render/*.cpp
+samples/render/*.h
+samples/render/*.def
+samples/render/makefile*
+samples/render/*.xbm
+samples/render/*.xpm
+samples/render/*.ico
+samples/render/*.bmp
+samples/render/*.rc
+samples/render/*.pro
+samples/render/*.bkl
 
 samples/rotate/*.cpp
 samples/rotate/*.h
@@ -929,6 +1009,7 @@ samples/rotate/*.xpm
 samples/rotate/*.txt
 samples/rotate/*.bmp
 samples/rotate/*.pro
+samples/rotate/*.bkl
 
 samples/sashtest/*.cpp
 samples/sashtest/*.h
@@ -940,6 +1021,7 @@ samples/sashtest/*.xbm
 samples/sashtest/*.xpm
 samples/sashtest/*.ico
 samples/sashtest/*.pro
+samples/sashtest/*.bkl
 
 samples/scroll/*.cpp
 samples/scroll/*.h
@@ -953,6 +1035,7 @@ samples/scroll/*.png
 samples/scroll/*.ico
 samples/scroll/*.txt
 samples/scroll/*.pro
+samples/scroll/*.bkl
 
 samples/scrollsub/*.cpp
 samples/scrollsub/*.h
@@ -966,6 +1049,7 @@ samples/scrollsub/*.png
 samples/scrollsub/*.ico
 samples/scrollsub/*.txt
 samples/scrollsub/*.pro
+samples/scrollsub/*.bkl
 
 samples/shaped/*.cpp
 samples/shaped/*.h
@@ -979,6 +1063,7 @@ samples/shaped/*.png
 samples/shaped/*.ico
 samples/shaped/*.txt
 samples/shaped/*.pro
+samples/shaped/*.bkl
 
 samples/splitter/*.cpp
 samples/splitter/*.h
@@ -991,6 +1076,7 @@ samples/splitter/*.xpm
 samples/splitter/*.ico
 samples/splitter/*.bmp
 samples/splitter/*.pro
+samples/splitter/*.bkl
 
 samples/sockets/*.cpp
 samples/sockets/*.h
@@ -1013,6 +1099,7 @@ samples/sockets/*.xpm
 samples/sockets/*.ico
 samples/sockets/*.rc
 samples/sockets/*.pro
+samples/sockets/*.bkl
 
 samples/statbar/*.cpp
 samples/statbar/*.h
@@ -1024,6 +1111,7 @@ samples/statbar/*.xpm
 samples/statbar/*.bmp
 samples/statbar/*.txt
 samples/statbar/*.pro
+samples/statbar/*.bkl
 
 samples/text/*.cpp
 samples/text/*.h
@@ -1037,6 +1125,7 @@ samples/text/*.png
 samples/text/*.ico
 samples/text/*.txt
 samples/text/*.pro
+samples/text/*.bkl
 
 samples/thread/*.cpp
 samples/thread/*.h
@@ -1050,6 +1139,7 @@ samples/thread/*.png
 samples/thread/*.ico
 samples/thread/*.txt
 samples/thread/*.pro
+samples/thread/*.bkl
 
 samples/typetest/*.cpp
 samples/typetest/*.h
@@ -1061,6 +1151,7 @@ samples/typetest/*.xbm
 samples/typetest/*.xpm
 samples/typetest/*.ico
 samples/typetest/*.pro
+samples/typetest/*.bkl
 
 samples/toolbar/*.cpp
 samples/toolbar/*.h
@@ -1076,6 +1167,7 @@ samples/toolbar/*.bmp
 samples/toolbar/*.rc
 samples/toolbar/*.pro
 samples/toolbar/bitmaps/*.bmp
+samples/toolbar/*.bkl
 
 samples/treectrl/*.cpp
 samples/treectrl/*.h
@@ -1092,6 +1184,7 @@ samples/treectrl/*.bmp
 samples/treectrl/*.pro
 samples/treectrl/bitmaps/*.bmp
 samples/treectrl/bitmaps/*.ico
+samples/treectrl/*.bkl
 
 samples/validate/*.cpp
 samples/validate/*.h
@@ -1105,6 +1198,7 @@ samples/validate/*.xpm
 samples/validate/*.ico
 samples/validate/*.bmp
 samples/validate/*.pro
+samples/validate/*.bkl
 
 samples/widgets/*.cpp
 samples/widgets/*.h
@@ -1117,6 +1211,7 @@ samples/widgets/*.txt
 samples/widgets/*.bmp
 samples/widgets/*.pro
 samples/widgets/icons/*.xpm
+samples/widgets/*.bkl
 
 samples/wizard/*.cpp
 samples/wizard/*.h
@@ -1130,6 +1225,7 @@ samples/wizard/*.png
 samples/wizard/*.ico
 samples/wizard/*.txt
 samples/wizard/*.pro
+samples/wizard/*.bkl
 
 samples/wxtest/*.cpp
 samples/wxtest/*.h
@@ -1143,7 +1239,9 @@ samples/wxtest/*.png
 samples/wxtest/*.ico
 samples/wxtest/*.txt
 samples/wxtest/*.pro
+samples/wxtest/*.bkl
 
+demos/demos.bkl
 demos/makefile*
 demos/configure
 demos/configure.in
@@ -1159,6 +1257,7 @@ demos/bombs/*.ico
 demos/bombs/*.bmp
 demos/bombs/*.rc
 demos/bombs/*.pro
+demos/bombs/*.bkl
 
 demos/forty/*.cpp
 demos/forty/*.h
@@ -1172,6 +1271,7 @@ demos/forty/*.png
 demos/forty/*.ico
 demos/forty/*.txt
 demos/forty/*.pro
+demos/forty/*.bkl
 
 demos/fractal/*.cpp
 demos/fractal/*.h
@@ -1182,6 +1282,7 @@ demos/fractal/*.xpm
 demos/fractal/*.ico
 demos/fractal/*.rc
 demos/fractal/*.pro
+demos/fractal/*.bkl
 
 demos/life/*.cpp
 demos/life/*.inc
@@ -1196,6 +1297,7 @@ demos/life/*.lif
 demos/life/*.pro
 demos/life/bitmaps/*.xpm
 demos/life/bitmaps/*.bmp
+demos/life/*.bkl
 
 demos/poem/*.cpp
 demos/poem/*.h
@@ -1210,6 +1312,7 @@ demos/poem/*.ico
 demos/poem/*.bmp
 demos/poem/*.dat
 demos/poem/*.pro
+demos/poem/*.bkl
 
 demos/dbbrowse/*.cpp
 demos/dbbrowse/*.h
@@ -1244,4 +1347,5 @@ demos/dbbrowse/help.std/*.htm
 demos/dbbrowse/help.std/*.hhc
 demos/dbbrowse/help.std/*.hhp
 demos/dbbrowse/help.std/*.hhk
+demos/dbbrowse/*.bkl
 
index b116f13ca3110c56e09258c1a4404d544484c89c..16d2a9ad5961519492fc655fcd029eee73a3b78f 100644 (file)
@@ -1,15 +1,12 @@
 
 [Icons]
-    Name: {group}\Dialog Editor; Filename: {app}\bin\dialoged.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\dialoged.exe; IconIndex: 0
-    Name: {group}\Dialog Editor Help; Filename: {app}\bin\dialoged.chm; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths
     Name: {group}\Tex2rtf; Filename: {app}\bin\tex2rtf.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\tex2rtf.exe; IconIndex: 0
     Name: {group}\Tex2rtf Help; Filename: {app}\bin\tex2rtf.chm; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths
     Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-;    Name: {group}\Debug View; Filename: {app}\bin\DBGVIEW.EXE; WorkingDir: {app}\bin; IconFilename: {app}\bin\DBGVIEW.EXE; IconIndex: 0
     Name: {group}\Compiling wxWindows; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\wxWindows Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-    Name: {group}\Tutorial; Filename: {app}\docs\pdf\wxTutorial.pdf; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+;    Name: {group}\Tutorial; Filename: {app}\docs\pdf\wxTutorial.pdf; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Document Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Widgets Sample; Filename: {app}\bin\widgets.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\widgets.exe; IconIndex: 0
 
@@ -37,6 +34,6 @@
 ;InnoVer=1.3
 ;AddVerTo=AppVerName
 ;SetupFilename=setup.exe
-;OutputFolder=C:\wx24\wxWindows\deliver
+;OutputFolder=C:\wx2dev\wxWindows\deliver
 ;CopyrightText=Copyright Â© The wxWindows Team
 
index 52c672da3dbabc60595dccca7375485208bf299e..7e295b7c7537d15388def25f881a8385ae971709 100644 (file)
@@ -4,14 +4,14 @@
 
 [Setup]
     MinVersion=4.0,4.0
-    AppName=wxWindows 2.5.0
-    AppId=wxWindows
+    AppName=%APPTITLE% %VERSION%
+    AppId=%APPTITLE%
     CreateUninstallRegKey=1
     UsePreviousAppDir=0
     UsePreviousGroup=0
-    AppVersion=2.5.0
-    AppVerName=wxWindows 2.5.0
-    AppCopyright=Copyright Â© The wxWindows Team
+    AppVersion=%VERSION%
+    AppVerName=%APPTITLE% %VERSION%
+    AppCopyright=Copyright Â© %COPYRIGHTHOLDER%
     BackColor=$FF0000
     BackColor2=$000000
     BackColorDirection=toptobottom
@@ -19,8 +19,6 @@
     WindowStartMaximized=1
     WindowVisible=1
     WindowResizable=1
-    UninstallDisplayName=wxWindows 2.5.0
-    UninstallLogMode=Append
     DirExistsWarning=auto
     UninstallFilesDir={app}
     DisableDirPage=0
     CreateAppDir=1
     DisableProgramGroupPage=0
     AlwaysCreateUninstallIcon=1
-    UninstallIconName=Uninstall wxWindows 2.5.0
     Uninstallable=1
-    DefaultDirName=c:\wxWindows-2.5.0
-    DefaultGroupName=wxWindows 2.5.0
-    LicenseFile=C:\wx24\wxWindows\docs\licence.txt
-    InfoBeforeFile=C:\wx24\wxWindows\docs\readme.txt
-    InfoAfterFile=C:\wx24\wxWindows\docs\msw\install.txt
+    UninstallIconName=Uninstall %APPTITLE% %VERSION%
+    UninstallDisplayName=%APPTITLE% %VERSION%
+    UninstallLogMode=Append
+    DefaultDirName=c:\%APPTITLE%-%VERSION%
+    DefaultGroupName=%APPTITLE% %VERSION%
+    LicenseFile=%LICENSEFILE%
+    InfoBeforeFile=%READMEFILE%
+    InfoAfterFile=%READMEAFTERFILE%
     MessagesFile=compiler:default.isl
     DiskSpanning=1
     DiskSize=1457664
     DiskClusterSize=512
     ReserveBytes=0
     UseSetupLdr=1
-    SourceDir=c:\wx24\wxWindows\deliver\wxWindows-2.5.0
-    OutputDir=c:\wx24\wxWindows\deliver
+    SourceDir=%SOURCEDIR%
+    OutputDir=%OUTPUTDIR%
 
index 9780ebb7bf97b2b283fe91cf1f32c16285be2ff4..caa950dd8c3a4b652f28a4156e3334237c596d10 100644 (file)
@@ -41,5 +41,6 @@ src/mac/macsock/*.lib
 include/wx_pb.h
 include/wx/mac/*.h
 
+samples/samples.r
 samples/minimal/minimal.pbproj/project.pbxproj
 
index 0113038e6c6b3788cdb46f1aeecdcd06351ead2f..797c3981ca18da003c297af9e679c5f49747fbf8 100644 (file)
@@ -53,6 +53,7 @@ samples/multimon/Makefile.in
 samples/notebook/Makefile.in
 samples/printing/Makefile.in
 samples/propsize/Makefile.in
+samples/render/Makefile.in
 samples/rotate/Makefile.in
 samples/sashtest/Makefile.in
 samples/scroll/Makefile.in
@@ -84,8 +85,6 @@ demos/fractal/Makefile.in
 demos/poem/Makefile.in
 demos/life/Makefile.in
 demos/dbbrowse/Makefile.in
-utils/dialoged/Makefile.in
-utils/dialoged/src/Makefile.in
 utils/tex2rtf/Makefile.in
 utils/tex2rtf/src/Makefile.in
 utils/makegen/Makefile.in
@@ -97,6 +96,8 @@ utils/emulator/Makefile.in
 utils/emulator/src/Makefile.in
 utils/helpview/Makefile.in
 utils/helpview/src/Makefile.in
+utils/configtool/Makefile.in
+utils/configtool/src/Makefile.in
 
 contrib/Makefile.in
 contrib/src/Makefile.in
@@ -131,15 +132,11 @@ contrib/samples/stc/Makefile.in
 contrib/samples/applet/Makefile.in
 contrib/samples/animate/Makefile.in
 contrib/samples/fl/Makefile.in
-contrib/samples/fl/fl_demo1/Makefile.in
-contrib/samples/fl/fl_demo2/Makefile.in
-contrib/samples/fl/fl_sample1/Makefile.in
-contrib/samples/fl/fl_sample2/Makefile.in
-contrib/samples/fl/fl_sample3/Makefile.in
 contrib/samples/svg/Makefile.in
 contrib/src/svg/Makefile.in
 
 contrib/src/deprecated/Makefile.in
+contrib/samples/deprecated/Makefile.in
 contrib/samples/deprecated/proplist/Makefile.in
 contrib/samples/deprecated/treelay/Makefile.in
 contrib/samples/deprecated/resource/Makefile.in
diff --git a/distrib/msw/makeinno.sh b/distrib/msw/makeinno.sh
new file mode 100644 (file)
index 0000000..1d788be
--- /dev/null
@@ -0,0 +1,132 @@
+#! /bin/sh
+# Make an Inno Setup distribution list, where files and dirs are represented by
+# sections like this:
+# [Dirs]
+#     Name: {app}\backgrounds
+# 
+# [Files]
+#     Source: C:\program\setup\about.htm; DestDir: {app}\; DestName: about.htm
+#
+#
+# Usage: makeinno.sh sourcedir inno-topfile inno-bottomfile destfile
+# For example: makeinno.sh c:/project/allfiles c:/project/innotop.txt c:/project/innobott.txt c:/project/project.iss
+#
+
+PROGNAME=$0
+SOURCEDIR=$1
+TOPFILE=$2
+BOTTOMFILE=$3
+INNOFILE=$4
+TEMPDIR=/tmp
+
+dochecks()
+{
+    if [ "$SOURCEDIR" = "" ] || [ "$TOPFILE" = "" ] || [ "$BOTTOMFILE" = "" ] || [ "$INNOFILE" = "" ] ; then
+        usage
+    fi
+
+    if [ ! -d $SOURCEDIR ]; then
+        echo "Sorry, the source directory $SOURCEDIR does not exist."
+        usage
+    fi
+
+    if [ ! -f $TOPFILE ]; then
+        echo "Sorry, the Inno Setup header $TOPFILE does not exist."
+        usage
+    fi
+
+    if [ ! -f $BOTTOMFILE ]; then
+        echo "Sorry, the Inno Setup header $BOTTOMFILE does not exist."
+        usage
+    fi
+
+    if [ ! -d $TEMPDIR ]; then
+        mkdir $TEMPDIR
+    fi
+}
+
+doreplace()
+{
+    thefile=$1
+    theexpr=$2
+
+    if [ -f $thefile ]; then
+      sed -e "$theexpr" < $thefile > $thefile.tmp
+      mv $thefile.tmp $thefile
+    else
+      echo "*** $thefile not found."
+    fi
+}
+
+generateinno()
+{
+    # SRCDIR=`cygpath -u $SRCDIR`
+    # DESTDIR=`cygpath -u $DESTDIR`
+    # TEMPDIR=`cygpath -u $TEMP`
+
+
+    # Generate a list of all files in the distribution.
+    # We pass the output through sed in order to remove the preceding "./"
+    cd $SOURCEDIR
+    find . -print | sed -e "s/\.\\///g" > $TEMPDIR/files1.tmp
+
+    echo "[Dirs]" > $TEMPDIR/files2.tmp
+
+    for line in `cat $TEMPDIR/files1.tmp` ; do
+
+        # If a directory, add to file
+        if [ -d $line ] ; then
+            # The relative path
+            # TODO: make into DOS filename form
+            #line2=`cygpath -w $line`
+            line2=$line
+
+            echo "  Name: {app}\\"$line2 >> $TEMPDIR/files2.tmp
+        fi
+    done
+
+    echo "" >> $TEMPDIR/files2.tmp
+    echo "[Files]" >> $TEMPDIR/files2.tmp
+
+    for line in `cat $TEMPDIR/files1.tmp` ; do
+
+        # If not a directory, add to file
+        if [ ! -d $line ] ; then
+            # The relative path
+            # TODO: make into DOS filename form
+            #line2=`cygpath -w $line`
+            line2=$line
+
+            # The absolute path
+            # TODO: make into DOS filename form
+            #line1=`cygpath -w $SOURCEDIR`"\\"$line2
+            line1=$SOURCEDIR"\\"$line2
+            #pathonly=`find $line -printf "%h"`
+            pathonly=`dirname $line`
+
+            echo "  Source: "$line1"; DestDir: {app}\\"$pathonly >> $TEMPDIR/files2.tmp
+        fi
+    done
+
+    echo "" >> $TEMPDIR/files2.tmp
+
+    doreplace $TEMPDIR/files2.tmp "s/\//\\\/g"
+
+    # Concatenate the 3 sections
+    cat $TOPFILE $TEMPDIR/files2.tmp $BOTTOMFILE > $INNOFILE
+
+    rm -f $TEMPDIR/files1.tmp
+}
+
+usage()
+{
+    echo Usage: $PROGNAME sourcedir inno-topfile inno-bottomfile destfile
+    echo For example: $PROGNAME c:/project/allfiles c:/project/innotop.txt c:/project/innobott.txt c:/project/project.iss
+    echo Remember to use paths of the form c:/thing rather than /c/thing.
+    exit 1
+}
+
+dochecks
+generateinno
+
+
diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
new file mode 100644 (file)
index 0000000..311edc9
--- /dev/null
@@ -0,0 +1,622 @@
+#!/bin/sh
+
+# Make a distribution of an application on MSW.
+# Example:
+# ../distrib/msw/makesetup.sh --wxmsw --verbose 2>&1 | cat > log
+
+# If your zip accepts Cygwin-style paths, then
+# use cygpath, else substitute echo
+CYGPATHPROG=cygpath
+#CYGPATHPROG=echo
+
+INNO=1
+SPINMSW=0
+SPINMAC=0
+SPINOS2=0
+SPINDOCS=1
+SPINALL=1
+VERBOSE=0
+ZIPFLAGS=
+
+PROGNAME=$0
+SCRIPTDIR=$WXWIN/distrib/msw
+WEBFILES=c:/wx2dev/wxWebSite
+# Set this to the required version
+VERSION=2.5.0
+
+. $SCRIPTDIR/setup.var
+
+doreplace()
+{
+    thefile=$1
+    theexpr=$2
+
+    if [ -f $thefile ]; then
+      sed -e "$theexpr" < $thefile > $thefile.tmp
+      mv $thefile.tmp $thefile
+    else
+      echo "*** $thefile not found."
+    fi
+}
+
+unix2dosname()
+{
+    echo $1 | sed -e "s/\//\\\\\\\/g" > /tmp/filename.tmp
+    RETVALUE=`cat /tmp/filename.tmp`
+    rm -f /tmp/filename.tmp
+}
+
+unix2dosname2()
+{
+    echo $1 | sed -e "s/\//\\\\/g" > /tmp/filename.tmp
+    RETVALUE=`cat /tmp/filename.tmp`
+    rm -f /tmp/filename.tmp
+}
+
+doinit()
+{
+    if [ "$VERBOSE" != "1" ]; then
+        ZIPFLAGS=-q
+    fi
+}
+
+rearchive()
+{
+    archive=$1
+    dirname=$2
+    changeto=$3
+
+    echo Re-archiving $archive as $dirname
+
+    pushd $changeto
+
+    if [ -d $dirname ]; then
+        rm -f -r $dirname
+    fi
+    mkdir $dirname
+    cd $dirname
+    unzip $ZIPFLAGS ../$archive
+    cd ..
+    rm -f $archive
+    zip $ZIPFLAGS -r $archive $dirname/*
+
+    popd
+}
+
+# Find the version from wx/version.h
+# Not yet used
+findversion()
+{
+       echo "#include <stdio.h>" > /tmp/appver.c
+       echo "#include \"$VERSIONSYMBOLFILE\"" >> /tmp/appver.c
+       echo "int main() { printf(\"%.2f\", $VERSIONSYMBOL); }" >> /tmp/appver.c
+       gcc /tmp/appver.c -I$APPDIR -o /tmp/appver
+    VERSION=`/tmp/appver`
+       rm -f /tmp/appver /tmp/appver.c
+}
+
+dospinos2()
+{
+    cd $APPDIR
+    echo Zipping OS/2
+
+    # Zip up the complete wxOS2-xxx.zip file
+    zip $ZIPFLAGS -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/generic.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/os2.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxOS2-$VERSION.zip  < $APPDIR/distrib/msw/jpeg.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/tiff.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/tiff.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/jpeg.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/utils.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/tex2rtf.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/ogl.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/xml.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/contrib.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/deprecated.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/makefile.rsp
+
+    # Rearchive under wxWindows-$VERSION
+    if [ -d $DESTDIR/wxWindows-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWindows-$VERSION
+    fi
+
+    mkdir $DESTDIR/wxWindows-$VERSION
+    cd $DESTDIR/wxWindows-$VERSION
+    unzip $ZIPFLAGS ../wxOS2-$VERSION.zip
+    echo Overwriting with OS2-specific versions of configure files...
+    unzip $ZIPFLAGS -o $APPDIR/distrib/os2/os2-specific.zip
+    rm -f src/gtk/descrip.mms src/motif/descrip.mms docs/pdf/*.pdf
+    rm -f src/tiff/*.mcp src/jpeg/*.mcp src/png/*.mcp src/zlib/*.mcp
+    rm -f -r docs/html/dialoged docs/html/tex2rtf
+
+    echo Making OS/2 files lower case...
+
+    $SCRIPTDIR/namedown include/wx/os2/*.H
+    $SCRIPTDIR/namedown src/os2/*.CPP src/os2/*.I
+
+    cd $DESTDIR
+
+    rm -f wxOS2-$VERSION.zip
+    zip $ZIPFLAGS -r wxOS2-$VERSION.zip wxWindows-$VERSION/*
+}
+
+dospinmac()
+{
+    cd $APPDIR
+
+    echo Zipping wxMac distribution
+
+    cp $APPDIR/include/wx/mac/setup0.h $APPDIR/include/wx/setup.h
+
+    zip $ZIPFLAGS -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/generic.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/mac.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/cw_mac.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/tiff.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/jpeg.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/utils.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/tex2rtf.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/ogl.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/xml.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/stc.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/contrib.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/deprecated.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/makefile.rsp
+
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-CW-Mac.zip < $APPDIR/distrib/msw/cw_mac.rsp
+
+    rm -f $APPDIR/include/wx/setup.h
+
+    if [ -d $DESTDIR/wxWindows-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWindows-$VERSION
+    fi
+
+    mkdir $DESTDIR/wxWindows-$VERSION
+    cd $DESTDIR/wxWindows-$VERSION
+    unzip $ZIPFLAGS ../wxMac-$VERSION.zip
+    rm -f src/gtk/descrip.mms src/motif/descrip.mms docs/pdf/*.pdf
+    rm -f -r docs/html/dialoged docs/html/tex2rtf docs/htmlhelp
+
+    cd $DESTDIR
+
+    rm -f wxMac-$VERSION.zip
+    zip $ZIPFLAGS -r wxMac-$VERSION.zip wxWindows-$VERSION/*
+}
+
+dospinmsw()
+{
+    cd $APPDIR
+
+    # Create wxWindows-$VERSION-win.zip which is used to create wxMSW
+    echo Zipping individual components
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/generic.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/makefile.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/msw.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/ogl.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/mmedia.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/stc.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/tex2rtf.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/jpeg.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/tiff.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/xml.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/contrib.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/deprecated.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/utils.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
+
+    rearchive wxWindows-$VERSION-win.zip wxWindows-$VERSION $DESTDIR
+
+    echo Removing .mms files
+    zip $ZIPFLAGS -d $DESTDIR/wxWindows-$VERSION-win.zip wxWindows-$VERSION/src/gtk/descrip.mms wxWindows-$VERSION/src/motif/descrip.mms
+}
+
+dospindocs()
+{
+    cd $APPDIR
+
+    echo Creating $DESTDIR/wxWindows-$VERSION-DocSource.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-DocSource.zip < $APPDIR/distrib/msw/docsrc.rsp
+    rearchive wxWindows-$VERSION-DocSource.zip wxWindows-$VERSION $DESTDIR
+
+    echo Creating $DESTDIR/wxWindows-$VERSION-WinHelp.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-WinHelp.zip < $APPDIR/distrib/msw/wx_hlp.rsp
+    rearchive wxWindows-$VERSION-WinHelp.zip wxWindows-$VERSION $DESTDIR
+
+    echo Creating $DESTDIR/wxWindows-$VERSION-HTML.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-HTML.zip < $APPDIR/distrib/msw/wx_html.rsp
+    rearchive wxWindows-$VERSION-HTML.zip wxWindows-$VERSION $DESTDIR
+
+    echo Creating $DESTDIR/wxWindows-$VERSION-PDF.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-PDF.zip < $APPDIR/distrib/msw/wx_pdf.rsp
+    rearchive wxWindows-$VERSION-PDF.zip wxWindows-$VERSION $DESTDIR
+
+    # zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-Word.zip < $APPDIR/distrib/msw/wx_word.rsp
+    # rearchive wxWindows-$VERSION-Word.zip wxWindows-$VERSION $DESTDIR
+
+    echo Creating $DESTDIR/wxWindows-$VERSION-HTB.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-HTB.zip < $APPDIR/distrib/msw/wx_htb.rsp
+    rearchive wxWindows-$VERSION-HTB.zip wxWindows-$VERSION $DESTDIR
+
+    echo Creating $DESTDIR/wxWindows-$VERSION-HTMLHelp.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-HTMLHelp.zip < $APPDIR/distrib/msw/wx_chm.rsp
+    rearchive wxWindows-$VERSION-HTMLHelp.zip wxWindows-$VERSION $DESTDIR
+
+    # Add Linuxy docs to a separate archive to be transported to Linux for the
+    # Linux-based releases
+    echo Creating $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_html.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_pdf.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_htb.rsp
+
+    # PDF/HTML docs that should go into the Windows setup because
+    # there are no WinHelp equivalents
+    echo Creating $DESTDIR/wxWindows-$VERSION-ExtraDoc.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-ExtraDoc.zip < $APPDIR/distrib/msw/extradoc.rsp
+    rearchive wxWindows-$VERSION-ExtraDoc.zip wxWindows-$VERSION $DESTDIR
+}
+
+dospinmisc()
+{
+    cd $APPDIR
+
+    # zip up Univ-specific files
+    echo Creating $DESTDIR/wxWindows-$VERSION-Univ.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-Univ.zip < $APPDIR/distrib/msw/univ.rsp
+    rearchive wxWindows-$VERSION-Univ.zip wxWindows-$VERSION $DESTDIR
+
+    # VC++ project files
+    echo Creating $DESTDIR/wxWindows-$VERSION-VC.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-VC.zip < $APPDIR/distrib/msw/vc.rsp
+    # rearchive wxWindows-$VERSION-VC.zip wxWindows-$VERSION $DESTDIR
+
+    # BC++ project files
+    echo Creating $DESTDIR/wxWindows-$VERSION-BC.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-BC.zip < $APPDIR/distrib/msw/bc.rsp
+    # rearchive wxWindows-$VERSION-BC.zip wxWindows-$VERSION $DESTDIR
+
+    # CodeWarrior project files
+    echo Creating $DESTDIR/wxWindows-$VERSION-CW.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-CW.zip < $APPDIR/distrib/msw/cw.rsp
+    # rearchive wxWindows-$VERSION-CW.zip wxWindows-$VERSION $DESTDIR
+}
+
+dospinsetup()
+{
+    cd $DESTDIR
+
+    # Put all archives for transit to Linux in a zip file
+    echo Creating $DESTDIR/wxWindows-$VERSION-LinuxTransit.zip
+    rm -f $DESTDIR/wxWindows-$VERSION-LinuxTransit.zip
+    zip $ZIPFLAGS $DESTDIR/wxWindows-$VERSION-LinuxTransit.zip wxWindows-$VERSION-LinuxDocs.zip wxWindows-$VERSION-VC.zip wxWindows-$VERSION-CW-Mac.zip
+
+    echo Unzipping the Windows files into wxWindows-$VERSION
+
+    unzip $ZIPFLAGS -o wxWindows-$VERSION-win.zip
+    unzip $ZIPFLAGS -o wxWindows-$VERSION-VC.zip -d wxWindows-$VERSION
+    unzip $ZIPFLAGS -o wxWindows-$VERSION-BC.zip -d wxWindows-$VERSION
+    unzip $ZIPFLAGS -o wxWindows-$VERSION-CW.zip -d wxWindows-$VERSION
+    unzip $ZIPFLAGS -o wxWindows-$VERSION-HTMLHelp.zip
+    unzip $ZIPFLAGS -o wxWindows-$VERSION-ExtraDoc.zip
+
+    # After this change of directory, we're in the
+    # temporary 'wx' directory and not acting on
+    # the source wxWindows directory.
+    cd $DESTDIR/wxWindows-$VERSION
+
+    # Now delete a few files that are unnecessary
+    #attrib -R *
+    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 distrib
+    rm -f *.spec
+    rm -f -r contrib/utils/wxrcedit
+
+    # Now cp some binary files to 'bin'
+    if [ ! -d bin ]; then
+        mkdir bin
+    fi
+    #cp $APPDIR/bin/dialoged.exe bin
+    #cp $APPDIR/bin/dialoged.hlp bin
+    #cp $APPDIR/bin/dialoged.chm bin
+    cp $APPDIR/bin/tex2rtf.exe bin
+    cp $APPDIR/bin/tex2rtf.hlp bin
+    cp $APPDIR/bin/tex2rtf.cnt bin
+    cp $APPDIR/bin/widgets.exe bin
+    cp $APPDIR/bin/widgets.exe.manifest bin
+    cp $APPDIR/bin/life.exe bin
+    cp $APPDIR/bin/life.exe.manifest bin
+    cp $APPDIR/demos/life/breeder.lif bin
+    #cp $APPDIR/docs/htmlhelp/dialoged.chm bin
+    cp $APPDIR/docs/htmlhelp/tex2rtf.chm bin
+
+    if [ ! -d docs/pdf ]; then
+        mkdir docs/pdf
+    fi
+    #cp $APPDIR/docs/pdf/wxTutorial.pdf docs/pdf
+
+    # Make wxMSW-xxx.zip
+    cd $DESTDIR
+    zip $ZIPFLAGS -r wxMSW-$VERSION.zip wxWindows-$VERSION/*
+    cd wxWindows-$VERSION
+
+    echo Generating $SETUPSCRIPTNAME
+    rm -f $SETUPSCRIPTNAME
+
+    sh $SCRIPTDIR/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*.*
+
+    # 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 $APPNAME-$VERSION-setup.exe
+
+    echo Putting all the setup files into a single zip archive
+    zip wxMSW-$VERSION-setup.zip readme-$VERSION.txt setup*.*
+
+    rm -f wxWindows-$VERSION-win.zip
+    rm -f wxWindows-$VERSION-ExtraDoc.zip
+
+    echo If you saw no warnings or errors, $APPTITLE was successfully spun.
+    echo
+}
+
+makesetup()
+{
+#    if [ -d $SETUPIMAGEDIR ]; then
+#        echo Removing contents of existing $SETUPIMAGEDIR
+#        rm -f -r $SETUPIMAGEDIR/*
+#    fi
+
+    if [ ! -d $SETUPIMAGEDIR ]; then
+        echo Making the $SETUPIMAGEDIR for preparing the setup
+        mkdir -p $SETUPIMAGEDIR
+    fi
+
+       # Copying readmes
+    if [ "$READMEFILE" != "" ] && [ -f $READMEFILE ]; then
+        echo Copying readme.txt
+        cp $READMEFILE $SETUPIMAGEDIR
+#    else
+#        echo "*** Warning - $READMEFILE not found"
+    fi
+
+    if [ "$LICENSEFILE" != "" ] && [ -f $LICENSEFILE ]; then
+        echo Copying licence.txt
+        cp $LICENSEFILE $SETUPIMAGEDIR
+ #   else
+ #       echo "*** Warning - $LICENSEFILE not found"
+    fi
+
+    if [ "$MAKEMANUAL" != "0" ]; then
+        if [ -d $MANUALDIR ]; then
+            cd $MANUALDIR
+            make
+        else
+            echo "*** Warning - $MANUALDIR not found"
+        fi
+    fi
+
+    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
+    rm -f $DESTDIR/extradoc*.zip
+    rm -f $DESTDIR/stc*.zip
+    rm -f $DESTDIR/*-win32*.zip
+    rm -f $DESTDIR/setup*.*
+    rm -f $DESTDIR/*.txt
+    rm -f $DESTDIR/make*
+
+    if [ -d $DESTDIR/wx ]; then
+        rm -f -r $DESTDIR/wx
+    fi
+
+    if [ ! -d $DESTDIR ]; then
+        mkdir $DESTDIR
+    fi
+    if [ -d $DESTDIR/wxWindows-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWindows-$VERSION
+    fi
+
+    # Copy FAQ from wxWebSite CVS
+    if [ ! -d $WEBFILES ]; then
+        echo Error - $WEBFILES does not exist
+        exit
+    fi
+
+    echo Copying FAQ and other files from $WEBFILES
+    cp $WEBFILES/site/faq*.htm $APPDIR/docs/html
+    cp $WEBFILES/site/platform.htm $APPDIR/docs/html
+    cp $WEBFILES/site/i18n.htm $APPDIR/docs/html
+
+    # Copy setup0.h files to setup.h
+    cp $APPDIR/include/wx/os2/setup0.h $APPDIR/include/wx/os2/setup.h
+    cp $APPDIR/include/wx/msw/setup0.h $APPDIR/include/wx/msw/setup.h
+    cp $APPDIR/include/wx/univ/setup0.h $APPDIR/include/wx/univ/setup.h
+
+    # Do OS/2 spin
+    if [ "$SPINOS2" = "1" ] || [ "$SPINALL" = "1" ]; then
+        dospinos2
+    fi
+
+    # Do Mac spin
+    if [ "$SPINMAC" = "1" ] || [ "$SPINALL" = "1" ]; then
+        dospinmac
+    fi
+
+    # Do MSW spin
+    if [ "$SPINMSW" = "1" ] || [ "$SPINALL" = "1" ]; then
+        dospinmsw
+    fi
+
+    # Do docs spin
+    if [ "$SPINDOCS" = "1" ] || [ "$SPINALL" = "1" ]; then
+        dospindocs
+    fi
+
+    # Do misc files spin
+    dospinmisc
+
+    cp $APPDIR/docs/changes.txt $DESTDIR/changes-$VERSION.txt
+    cp $APPDIR/docs/msw/install.txt $DESTDIR/install-msw-$VERSION.txt
+    cp $APPDIR/docs/mac/install.txt $DESTDIR/install-mac-$VERSION.txt
+    cp $APPDIR/docs/motif/install.txt $DESTDIR/install-motif-$VERSION.txt
+    cp $APPDIR/docs/gtk/install.txt $DESTDIR/install-gtk-$VERSION.txt
+    cp $APPDIR/docs/x11/install.txt $DESTDIR/install-x11-$VERSION.txt
+    cp $APPDIR/docs/readme.txt $DESTDIR/readme-$VERSION.txt
+    cp $APPDIR/docs/motif/readme.txt $DESTDIR/readme-motif-$VERSION.txt
+    cp $APPDIR/docs/gtk/readme.txt $DESTDIR/readme-gtk-$VERSION.txt
+    cp $APPDIR/docs/x11/readme.txt $DESTDIR/readme-x11-$VERSION.txt
+    cp $APPDIR/docs/x11/readme-nanox.txt $DESTDIR/readme-nanox-$VERSION.txt
+    cp $APPDIR/docs/msw/readme.txt $DESTDIR/readme-msw-$VERSION.txt
+    cp $APPDIR/docs/mac/readme.txt $DESTDIR/readme-mac-$VERSION.txt
+    cp $APPDIR/docs/base/readme.txt $DESTDIR/readme-base-$VERSION.txt
+    cp $APPDIR/docs/os2/install.txt $DESTDIR/install-os2-$VERSION.txt
+    cp $APPDIR/docs/univ/readme.txt $DESTDIR/readme-univ-$VERSION.txt
+    cp $APPDIR/docs/readme_vms.txt $DESTDIR/readme-vms-$VERSION.txt
+    # cp $APPDIR/docs/motif/makewxmotif $DESTDIR/makewxmotif-$VERSION
+    # cp $APPDIR/docs/gtk/makewxgtk $DESTDIR/makewxgtk-$VERSION
+    
+    # Time to regenerate the Inno Install script
+    if [ "$INNO" != "0" ]; then
+        dospinsetup
+    fi
+}
+
+# We can't use e.g. this:
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# because there's not enough space on the command line, plus we need to ignore the
+# blank lines.
+# So if we need to (not in this script so far) we do something like this instead:
+# expandlines $SRC/setup/files.rsp temp.txt
+# zip -@ `$CYGPATHPROG -w $DEST/archive.zip` < temp.txt
+
+expandlines()
+{
+    toexpand=$1
+    outputfile=$2
+
+    rm -f $outputfile
+    touch $outputfile
+    for line in `cat $toexpand` ; do
+      if [ $line != "" ]; then
+        ls $line >> $outputfile
+      fi
+    done
+}
+
+usage()
+{
+    echo "Usage: $PROGNAME [ options ]" 1>&2
+    echo Options:
+    echo "    --help            Display this help message"
+    echo "    --upx             Compress executable with UPX"
+    echo "    --no-upx          Do not compress executable with UPX"
+    echo "    --inno            Build the setup.exe"
+    echo "    --no-inno         Do not build the setup.exe"
+    echo "    --wxmac           Build wxMac distribution"
+    echo "    --wxmsw           Build wxMSW distribution"
+    echo "    --wxos2           Build wxOS2 distribution"
+    echo "    --docs            Build docs archives"
+    echo "    --all             Build all distributions (the default)"
+    echo.
+    echo Note that options only override settings in $SCRIPTDIR/setup.var.
+    exit 1
+}
+
+# Process command line options.
+
+for i in "$@"; do
+    case "$i" in
+       --inno) INNO=1 ;;
+       --no-inno) INNO=0 ;;
+       --upx) UPX=1 ;;
+       --no-upx) UPX=0 ;;
+       --wxmac) SPINMAC=1; SPINALL=0 ;;
+       --wxmsw) SPINMSW=1; SPINALL=0 ;;
+       --wxos2) SPINOS2=1; SPINALL=0 ;;
+       --docs) SPINDOCS=1; SPINALL=0 ;;
+       --all) SPINALL=1 ;;
+       --verbose) VERBOSE=1 ;;
+       *)
+           usage
+           exit
+           ;;
+    esac
+done
+
+doinit
+
+# findversion
+makesetup
+
index 8ab1632efaad79258e4172190a3a10e1718f8f35..1e2bfeaf673587801b7edcb04fe3213eb5c51701 100644 (file)
@@ -23,8 +23,6 @@ contrib/src/mmedia/makefile*
 contrib/src/mmedia/README
 contrib/src/mmedia/*.h
 contrib/src/mmedia/*.cpp
-contrib/src/mmedia/MMediaVC.dsp
-contrib/src/mmedia/MMediaVC.dsw
 contrib/samples/mmedia/*.h
 contrib/samples/mmedia/*.cpp
 contrib/samples/mmedia/makefile*
@@ -34,6 +32,7 @@ contrib/samples/mmedia/*.ico
 contrib/samples/mmedia/*.txt
 contrib/samples/mmedia/*.rc
 contrib/samples/mmedia/*.def
-contrib/samples/mmedia/MMBoardVC.dsp
-contrib/samples/mmedia/MMBoardVC.dsw
+contrib/samples/mmedia/mmboard.dsp
+contrib/samples/mmedia/mmboard.dsw
+contrib/samples/mmedia/*.bkl
 
index 8356fcdcde3624355cef5ef95c90c6a2a410ccf9..1784a8efd9db8be057c3a0b3301e18e74d9187f7 100644 (file)
@@ -1,4 +1,5 @@
-Mingw32-gcc295.patches
+build/msw/config.*
+build/msw/makefile.*
 
 lib/dummy
 lib/wx*.def
@@ -83,6 +84,11 @@ include/wx/msw/*.cur
 include/wx/msw/*.ico
 include/wx/msw/*.bmp
 
+samples/*.rc
+samples/*.xpm
+samples/*.ico
+samples/makefile*
+
 samples/ownerdrw/*.cpp
 samples/ownerdrw/*.h
 samples/ownerdrw/makefile.*
index 462141301e5c72dcb11e69a1a23ec357df8f1ee1..66435582873557de0108e0b1bb5d96261127afcc 100755 (executable)
@@ -33,7 +33,7 @@ case $# in
       elif [ -d "${oldname}" ]; then
         mv "${oldname}" "${oldname}.bak" 
         mv "${oldname}.bak" "${newname:-${oldname}}"
-        echo "Directory ${oldname} converted to directory ${newname:-${oldname}}"
+#        echo "Directory ${oldname} converted to directory ${newname:-${oldname}}"
 #        echo /dev/null
 #Don't convert if the file does not exist
       elif [ ! -f "${oldname}" ]; then
@@ -43,12 +43,12 @@ case $# in
 #        echo "${oldname} not converted, file ${newname} already exists" 2>&1
 #Don't move to subdirectories if they happen to exist
       elif [ -d "${newname}" ]; then
-        echo "${oldname} not converted, directory ${newname} already exists" 2>&1
+#        echo "${oldname} not converted, directory ${newname} already exists" 2>&1
 #Do it
       else
         mv "${oldname}" "${oldname}.bak" 
         mv "${oldname}.bak" "${newname:-${oldname}}"
-        echo "File ${oldname} converted to file ${newname:-${oldname}}"
+#        echo "File ${oldname} converted to file ${newname:-${oldname}}"
       fi
    done
     ;;
diff --git a/distrib/msw/setup.var b/distrib/msw/setup.var
new file mode 100644 (file)
index 0000000..33e4642
--- /dev/null
@@ -0,0 +1,143 @@
+### List of variables for the purposes of generating an application's
+### setup.exe
+
+#-------------------------------------------------------------------------
+# The application name
+#-------------------------------------------------------------------------
+
+APPNAME=wxwin
+
+#-------------------------------------------------------------------------
+# The application title
+#-------------------------------------------------------------------------
+
+APPTITLE="wxWindows"
+
+#-------------------------------------------------------------------------
+# The application author (copyright holder)
+#-------------------------------------------------------------------------
+
+AUTHOR="The wxWindows Team"
+
+#-------------------------------------------------------------------------
+# The application vendor (organisation)
+#-------------------------------------------------------------------------
+
+VENDOR="Anthemion"
+
+#-------------------------------------------------------------------------
+# The application data file extension
+#-------------------------------------------------------------------------
+
+APPEXTENSION=
+
+#-------------------------------------------------------------------------
+# The symbol to use when querying for the version number (not used)
+#-------------------------------------------------------------------------
+
+VERSIONSYMBOL=wxVERSION
+
+#-------------------------------------------------------------------------
+# The top-level directory of the application source tree
+#-------------------------------------------------------------------------
+
+APPDIR=c:/wx2dev/wxWindows
+
+#-------------------------------------------------------------------------
+# The destination directory of the setup
+#-------------------------------------------------------------------------
+
+DESTDIR=$APPDIR/deliver
+
+#-------------------------------------------------------------------------
+# The temporary image directory to use when preparing the setup
+#-------------------------------------------------------------------------
+
+SETUPIMAGEDIR=$APPDIR/deliver/wxWindows-$VERSION
+
+#-------------------------------------------------------------------------
+# The name of the file with $VERSIONSYMBOL in it
+#-------------------------------------------------------------------------
+
+VERSIONSYMBOLFILE=$APPDIR/include/wx/version.h
+
+#-------------------------------------------------------------------------
+# The locations of the project's Inno Setup header and footer files
+#-------------------------------------------------------------------------
+
+INNOTOP=$APPDIR/distrib/msw/innotop.txt
+INNOBOTTOM=$APPDIR/distrib/msw/innobott.txt
+
+#-------------------------------------------------------------------------
+# The location of the generated setup script
+#-------------------------------------------------------------------------
+
+SETUPSCRIPTNAME=$APPDIR/distrib/msw/wxwin2.iss
+
+#-------------------------------------------------------------------------
+# The locations of the readme and license files
+#-------------------------------------------------------------------------
+
+READMEFILE=$APPDIR/docs/readme.txt
+READMEAFTERFILE=$APPDIR/docs/msw/install.txt
+LICENSEFILE=$APPDIR/docs/licence.txt
+
+#-------------------------------------------------------------------------
+# The binary to include in the setup
+#-------------------------------------------------------------------------
+
+APPBINARY=$APPDIR/src/ReleaseStable/$APPNAME.exe
+#APPBINARY=$APPDIR/src/ReleaseDev/$APPNAME.exe
+
+#-------------------------------------------------------------------------
+# The location of the setup compiler
+#-------------------------------------------------------------------------
+
+SETUPCOMPILER="c:/Program Files/Inno Setup 2/compil32.exe"
+
+#-------------------------------------------------------------------------
+# Whether we will compress the binary (0 or 1).
+# Use --upx or --no-upx to override this default value.
+#-------------------------------------------------------------------------
+
+UPX=0
+
+#-------------------------------------------------------------------------
+# Whether we will make a manual (0 or 1)
+# Use --make-manual or --no-make-manual to override this default value.
+#-------------------------------------------------------------------------
+
+MAKEMANUAL=0
+
+#-------------------------------------------------------------------------
+# The manual filename(s)
+#-------------------------------------------------------------------------
+
+MANUALFILES=wx.chm
+
+#-------------------------------------------------------------------------
+# The directory containing the manual source. We assume
+# that there is a Makefile in this directory for making the
+# manual.
+#-------------------------------------------------------------------------
+
+MANUALDIR=$APPDIR/docs
+
+#-------------------------------------------------------------------------
+# The resources file to compile, if any (e.g. myapp.bin).
+# This is just a zip containing files to be used by the
+# application, usually stored in src/resources.
+#
+# If this is left empty, no resources will be compiled.
+#-------------------------------------------------------------------------
+
+RESOURCESFILE=
+
+#-------------------------------------------------------------------------
+# The directory containing the resources.
+#
+# If this is left empty, no resources will be compiled.
+#-------------------------------------------------------------------------
+
+RESOURCESDIR=
+
index 442a116e07a044a59ca1523223fbb9a029d89653..e4c7ae25ddf5dedad1d542ff8a87837e5542ae4b 100644 (file)
@@ -26,8 +26,6 @@ contrib/src/stc/*.xpm
 contrib/src/stc/make*.*
 contrib/src/stc/*.ico
 contrib/src/stc/*.bmp
-contrib/src/stc/StcVC.dsp
-contrib/src/stc/StcVC.dsw
 contrib/src/stc/README.txt
 
 contrib/src/stc/scintilla/README.txt
@@ -49,6 +47,7 @@ contrib/samples/stc/*.ico
 contrib/samples/stc/*.bmp
 contrib/samples/stc/*.xpm
 contrib/samples/stc/*.wxr
-contrib/samples/stc/StcTestVC.dsp
-contrib/samples/stc/StcTestVC.dsw
+contrib/samples/stc/stctest.dsp
+contrib/samples/stc/stctest.dsw
+contrib/samples/stc/*.bkl
 
index 70b576d66615879d622b8f44b4f68e567a30534b..3d72e2aa28f4fc0bead4ec3f15840dd2a1af3dc7 100644 (file)
@@ -1,3 +1,6 @@
+build/msw/*.dsp
+build/msw/*.dsw
+
 src/wxWindows.dsp
 src/wxWindows.dsw
 src/wxUniv.dsp
@@ -20,6 +23,8 @@ src/png/png.dsw
 src/regex/regex.dsp
 src/regex/regex.dsw
 
+src/expat/expat.dsp
+
 samples/samples.dsw
 
 samples/access/access.dsp
@@ -194,6 +199,9 @@ samples/propsize/propsize.dsw
 samples/regtest/regtest.dsp
 samples/regtest/regtest.dsw
 
+samples/render/*.dsp
+samples/render/*.dsw
+
 samples/rotate/rotate.dsp
 samples/rotate/rotate.dsw
 
@@ -361,18 +369,8 @@ contrib/src/animate/AnimateVC.dsw
 contrib/samples/animate/AniTestVC.dsp
 contrib/samples/animate/AniTestVC.dsw
 
-contrib/src/fl/flVC.dsp
-contrib/src/fl/flVC.dsw
-contrib/samples/fl/fl_demo1/fl_demo.dsp
-contrib/samples/fl/fl_demo1/fl_demo.dsw
-contrib/samples/fl/fl_demo2/fl_demo.dsp
-contrib/samples/fl/fl_demo2/fl_demo.dsw
-contrib/samples/fl/fl_sample1/fl_demo.dsp
-contrib/samples/fl/fl_sample1/fl_demo.dsw
-contrib/samples/fl/fl_sample2/fl_demo.dsp
-contrib/samples/fl/fl_sample2/fl_demo.dsw
-contrib/samples/fl/fl_sample3/fl_demo.dsp
-contrib/samples/fl/fl_sample3/fl_demo.dsw
+contrib/samples/fl/*.dsp
+contrib/samples/fl/*.dsw
 
 contrib/src/net/NetVC.dsp
 contrib/src/net/NetVC.dsw
index ac04a8244d5f16987ad396d91d56f16e216e3df9..dc0ed7b9e199cde3807340618279973b01b5c6d6 100644 (file)
@@ -1,3 +1,44 @@
+src/expat/Changes
+src/expat/configure
+src/expat/configure.in
+src/expat/COPYING
+src/expat/expat_config.h.in
+src/expat/Makefile.in
+src/expat/MANIFEST
+src/expat/README
+src/expat/bcb5/*.bpf
+src/expat/bcb5/*.bpr
+src/expat/bcb5/*.mak
+src/expat/bcb5/*.def
+src/expat/bcb5/README.txt
+src/expat/conftools/*.m4
+src/expat/conftools/*.guess
+src/expat/conftools/*.sub
+src/expat/conftools/install-sh
+src/expat/conftools/*.sh
+src/expat/conftools/mkinstalldirs
+src/expat/conftools/PrintPath
+src/expat/doc/*.html
+src/expat/doc/*.png
+src/expat/doc/*.css
+src/expat/doc/*.1
+src/expat/doc/*.sgml
+src/expat/examples/*.c
+src/expat/lib/*.h
+src/expat/lib/*.c
+src/expat/tests/*.c
+src/expat/tests/*.h
+src/expat/tests/*.sh
+src/expat/tests/README.txt
+src/expat/vms/*.mms
+src/expat/vms/*.h
+src/expat/vms/README.vms
+src/expat/win32/*.iss
+src/expat/win32/MANIFEST.txt
+src/expat/xmlwf/*.c
+src/expat/xmlwf/*.h
+src/expat/xmlwf/*.cxx
+
 contrib/docs/html/xrc/*.htm
 contrib/docs/html/xrc/*.gif
 contrib/docs/html/xrc/*.png
@@ -23,8 +64,6 @@ contrib/src/xrc/*.rc
 contrib/src/xrc/*.def
 contrib/src/xrc/*.xbm
 contrib/src/xrc/*.xpm
-contrib/src/xrc/XrcVC.dsp
-contrib/src/xrc/XrcVC.dsw
 contrib/src/xrc/makefile.vc
 contrib/src/xrc/makefile.bcc
 contrib/src/xrc/makefile.b32
@@ -40,12 +79,6 @@ contrib/src/xrc/*.bmp
 contrib/src/xrc/README
 contrib/src/xrc/README.EXPAT
 
-contrib/src/xrc/expat/copying.txt
-contrib/src/xrc/expat/xmlparse/*.c
-contrib/src/xrc/expat/xmlparse/*.h
-contrib/src/xrc/expat/xmltok/*.c
-contrib/src/xrc/expat/xmltok/*.h
-
 contrib/include/wx/xrc/*.h
 
 contrib/samples/xrc/*.cpp
@@ -66,8 +99,9 @@ contrib/samples/xrc/*.txt
 contrib/samples/xrc/*.ico
 contrib/samples/xrc/*.bmp
 contrib/samples/xrc/*.xpm
-contrib/samples/xrc/XrcDemoVC.dsp
-contrib/samples/xrc/XrcDemoVC.dsw
+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
@@ -113,8 +147,9 @@ contrib/utils/wxrc/*.txt
 contrib/utils/wxrc/*.ico
 contrib/utils/wxrc/*.bmp
 contrib/utils/wxrc/*.xpm
-contrib/utils/wxrc/wxRcVC.dsp
-contrib/utils/wxrc/wxRcVC.dsw
+contrib/utils/wxrc/wxrc.dsp
+contrib/utils/wxrc/wxrc.dsw
+contrib/utils/wxrc/*.bkl
 
 contrib/utils/wxrcedit/*.cpp
 contrib/utils/wxrcedit/*.h
diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
deleted file mode 100755 (executable)
index 4ef9c72..0000000
+++ /dev/null
@@ -1,249 +0,0 @@
-@echo off
-rem Zip up an external, generic + Windows distribution of wxWindows 2
-set src=%wxwin%
-set dest=%src%\deliver
-set wise=0
-
-Rem Set this to the required version
-set version=2.3.3
-
-if "%src%" == "" goto usage
-if "%dest%" == "" goto usage
-if "%1%" == "-help" goto usage
-if "%1%" == "--help" goto usage
-if "%1%" == "/?" goto usage
-if "%1%" == "wiseonly" goto dounzip
-if "%1%" == "wise" set wise=1
-echo About to archive an external wxWindows distribution:
-echo   From   %src%
-echo   To     %dest%
-if "%wise" == "1" echo with WISE setup creation.
-echo CTRL-C if this is not correct.
-pause
-
-erase %dest%\wx*.zip
-erase %dest%\*.htb
-erase %dest%\ogl3.zip
-erase %dest%\tex2rtf2.zip
-erase %dest%\wxxml.zip
-erase %dest%\jpeg.zip
-erase %dest%\tiff.zip
-erase %dest%\dialoged.zip
-erase %dest%\utils.zip
-erase %dest%\extradoc.zip
-erase %dest%\*-win32.zip
-
-if exist %dest%\wx\BuildCVS.txt rmdir /S %dest%\wx
-
-cd %src%
-echo Zipping...
-
-Rem Zip up the complete wxMSW-xxx.zip file
-Rem NO, do it by unarchiving component files, deleting/copying some files, then
-Rem rearchiving.
-Rem zip -@ %dest%\wxMSW-%version%.zip < %src%\distrib\msw\generic.rsp
-Rem zip -@ -u %dest%\wxMSW-%version%.zip < %src%\distrib\msw\msw.rsp
-Rem zip -@ -u %dest%\wxMSW-%version%.zip < %src%\distrib\msw\wx_chm.rsp
-Rem zip -@ -u %dest%\wxMSW-%version%.zip  < %src%\distrib\msw\jpeg.rsp
-Rem zip -@ -u %dest%\wxMSW-%version%.zip < %src%\distrib\msw\tiff.rsp
-
-Rem Below is the old-style separated-out format. This is retained only
-Rem for local use, and for creating wxMSW-xxx.zip.
-zip -@ %dest%\wxWindows-%version%-gen.zip < %src%\distrib\msw\generic.rsp
-zip -@ -u %dest%\wxWindows-%version%-gen.zip < %src%\distrib\msw\makefile.rsp
-zip -@ %dest%\wxWindows-%version%-msw.zip < %src%\distrib\msw\msw.rsp
-zip -@ -u %dest%\wxWindows-%version%-msw.zip < %src%\distrib\msw\makefile.rsp
-zip -@ %dest%\wxWindows-%version%-gtk.zip < %src%\distrib\msw\gtk.rsp
-zip -@ -u %dest%\wxWindows-%version%-gtk.zip < %src%\distrib\msw\makefile.rsp
-zip -@ %dest%\wxWindows-%version%-stubs.zip < %src%\distrib\msw\stubs.rsp
-zip -@ %dest%\wxWindows-%version%-mot.zip < %src%\distrib\msw\motif.rsp
-zip -@ -u %dest%\wxWindows-%version%-mot.zip < %src%\distrib\msw\makefile.rsp
-Rem (Obsolete) zip -@ %dest%\wxWindows-%version%-user.zip < %src%\distrib\msw\user.rsp
-
-zip -@ %dest%\wxWindows-%version%-DocSource.zip < %src%\distrib\msw\docsrc.rsp
-zip -@ %dest%\wxWindows-%version%-WinHelp.zip < %src%\distrib\msw\wx_hlp.rsp
-zip -@ %dest%\wxWindows-%version%-HTML.zip < %src%\distrib\msw\wx_html.rsp
-zip -@ %dest%\wxWindows-%version%-PDF.zip < %src%\distrib\msw\wx_pdf.rsp
-zip -@ %dest%\wxWindows-%version%-Word.zip < %src%\distrib\msw\wx_word.rsp
-zip -@ %dest%\wxWindows-%version%-HTB.zip < %src%\distrib\msw\wx_htb.rsp
-zip -@ %dest%\wxWindows-%version%-HTMLHelp.zip < %src%\distrib\msw\wx_chm.rsp
-
-Rem PDF/HTML docs that should go into the Windows setup because
-Rem there are no WinHelp equivalents
-zip -@ %dest%\extradoc.zip < %src%\distrib\msw\extradoc.rsp
-
-rem VC++ project files
-zip -@ %dest%\wxWindows-%version%-vc.zip < %src%\distrib\msw\vc.rsp
-
-rem BC++ project files
-zip -@ %dest%\wxWindows-%version%-bc.zip < %src%\distrib\msw\bc.rsp
-
-rem CodeWarrior project files
-zip -@ %dest%\wxWindows-%version%-cw.zip < %src%\distrib\msw\cw.rsp
-
-rem OGL 3
-zip -@ %dest%\ogl3.zip < %src%\distrib\msw\ogl.rsp
-
-rem wxXML
-zip -@ %dest%\wxxml.zip < %src%\distrib\msw\xml.rsp
-
-rem MMedia
-zip -@ %dest%\mmedia.zip < %src%\distrib\msw\mmedia.rsp
-
-rem STC (Scintilla widget)
-zip -@ %dest%\stc.zip < %src%\distrib\msw\stc.rsp
-
-rem GLCanvas: obsolete, now in main library
-rem zip -@ %dest%\glcanvas.zip < %src%\distrib\msw\glcanvas.rsp
-
-rem Tex2RTF
-zip -@ %dest%\tex2rtf2.zip < %src%\distrib\msw\tex2rtf.rsp
-
-rem JPEG source
-zip -@ %dest%\jpeg.zip < %src%\distrib\msw\jpeg.rsp
-
-rem TIFF source
-zip -@ %dest%\tiff.zip < %src%\distrib\msw\tiff.rsp
-
-rem Dialog Editor source and binary
-erase %dest%\dialoged_source.zip
-zip -@ %dest%\dialoged_source.zip < %src%\distrib\msw\dialoged.rsp
-zip -j %dest%\dialoged.zip %dest%\dialoged_source.zip %src%\bin\dialoged.exe %src%\docs\winhelp\dialoged.hlp %src%\docs\winhelp\dialoged.cnt
-erase %dest%\dialoged_source.zip
-
-rem Misc. utils not in the main distribution
-zip -@ %dest%\utils.zip < %src%\distrib\msw\utils.rsp
-zip -@ -u %dest%\utils.zip < %src%\distrib\msw\utilmake.rsp
-
-copy %src%\docs\changes.txt %dest%
-copy %src%\docs\msw\install.txt %dest%\install_msw.txt
-copy %src%\docs\motif\install.txt %dest%\install_motif.txt
-copy %src%\docs\gtk\install.txt %dest%\install_gtk.txt
-copy %src%\docs\readme.txt %dest%
-copy %src%\docs\motif\readme.txt %dest%\readme_motif.txt
-copy %src%\docs\gtk\readme.txt %dest%\readme_gtk.txt
-copy %src%\docs\msw\readme.txt %dest%\readme_msw.txt
-copy %src%\docs\readme_vms.txt %dest%
-copy %src%\docs\motif\makewxmotif %dest%
-copy %src%\docs\gtk\makewxgtk %dest%
-
-Rem Skip WISE setup if wise is 0.
-if "%wise%" == "0" goto end
-
-:dounzip
-
-Rem Make dialoged-win32.zip and tex2rtf-win32.zip
-
-cd %src%\bin
-
-zip %dest%\dialoged-win32.zip dialoged.*
-zip %dest%\tex2rtf-win32.zip tex2rtf.*
-
-cd %dest%
-
-rem Unzip the Windows files into 'wx'
-mkdir %dest%\wx
-
-Rem After this change of directory, we're in the
-Rem temporary 'wx' directory and not acting on
-Rem the source wxWindows directory.
-cd %dest%\wx
-unzip -o ..\wxWindows-%version%-msw.zip
-unzip -o ..\wxWindows-%version%-gen.zip
-unzip -o ..\wxWindows-%version%-vc.zip
-unzip -o ..\wxWindows-%version%-bc.zip
-unzip -o ..\wxWindows-%version%-HTMLHelp.zip
-unzip -o ..\extradoc.zip
-Rem Need Word file, for Remstar DB classes
-unzip -o ..\wxWindows-%version%-Word.zip
-unzip -o ..\ogl3.zip
-unzip -o ..\wxxml.zip
-unzip -o ..\jpeg.zip
-unzip -o ..\tiff.zip
-unzip -o ..\tex2rtf2.zip
-
-rem Now delete a few files that are unnecessary
-attrib -R *
-erase /Y BuildCVS.txt *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh descrip.mms
-erase /Y configure samples\configure samples\*.in demos\configure demos\*.in contrib\configure contrib\*.in
-erase /Y setup.h.in setup.h_vms
-erase /SY Makefile.in
-erase /Y docs\html\wxbook.htm docs\html\roadmap.htm
-erase /Y contrib\docs\winhelp\mmedia.*
-erase /Y contrib\docs\winhelp\stc.*
-erase /Y contrib\docs\htmlhelp\mmedia.*
-erase /Y contrib\docs\htmlhelp\stc.*
-erase /Y contrib\docs\pdf\*.*
-rmdir /S contrib\docs\latex\ogl
-erase /Y src\mingegcs.bat
-erase /Y distrib
-
-rem Now copy some binary files to 'bin'
-if not isdir bin mkdir bin
-copy %src%\bin\dialoged.exe bin
-copy %src%\bin\tex2rtf.exe bin
-copy %src%\bin\dbgview.* bin
-Rem copy %src%\bin\life.exe bin
-copy %src%\docs\winhelp\dialoged.hlp %src%\docs\winhelp\dialoged.cnt bin
-copy %src%\docs\winhelp\tex2rtf.hlp %src%\docs\winhelp\tex2rtf.cnt bin
-
-Rem Make wxMSW-xxx.zip
-zip -r ..\wxMSW-%version%.zip *
-
-rem Time to regenerate the WISE install script, wxwin2.wse.
-rem NB: if you've changed wxwin2.wse using WISE, call splitwise.exe
-rem from within distrib\msw, to split off wisetop.txt and wisebott.txt.
-echo Calling 'makewise' to generate wxwin2.wse...
-call %WXWIN%\distrib\msw\makewise.bat
-
-erase /Y %dest%\setup.*
-
-rem Now invoke WISE install on the new wxwin2.wse
-set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN%\distrib\msw\wxwin2.wse
-echo Invoking %wisecmd...
-start %wisecmd
-pause Press any key to continue with the wxWindows distribution...
-Rem ren %WXWIN%\deliver\setup.EXE %WXWIN%\deliver\wxMSW-%version%-setup.exe
-
-cd %dest%
-
-Rem tidy up capitalisation of filenames
-ren setup.EXE s
-ren s setup.exe
-
-ren setup.w02 s
-ren s setup.w02
-
-ren setup.w03 s
-ren s setup.w03
-
-ren setup.w04 s
-ren s setup.w04
-
-ren setup.w05 s
-ren s setup.w05
-
-ren setup.w06 s
-ren s setup.w06
-
-ren setup.w07 s
-ren s setup.w07
-
-ren setup.w08 s
-ren s setup.w08
-
-rem Put all the setup files into a single zip archive.
-zip wxMSW-%version%-setup.zip readme.txt setup.*
-
-echo wxWindows archived.
-
-goto end
-
-:usage
-echo DOS wxWindows distribution. Zips up all GTK/Motif/MSW/doc files,
-echo and optionally makes a deliver\wx directory and a setup.exe
-echo if you specify 'wise' (skipping the zipping if you use 'wiseonly').
-echo.
-echo Usage: zipdist [wise | wiseonly]
-
-:end
diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
deleted file mode 100755 (executable)
index f321de1..0000000
+++ /dev/null
@@ -1,359 +0,0 @@
-@echo off
-rem Zip up an external, generic + Windows distribution of wxWindows 2
-rem using Inno Setup + ScriptMaker
-set src=%wxwin
-set dest=%src\deliver
-set webfiles=c:\wx2dev\wxWebSite
-set inno=0
-
-Rem Set this to the required version
-set version=2.4.0
-
-if "%src" == "" goto usage
-if "%dest" == "" goto usage
-if "%1" == "-help" goto usage
-if "%1" == "--help" goto usage
-if "%1" == "/?" goto usage
-if "%1" == "innoonly" goto dounzip
-if "%1" == "inno" set inno=1
-if "%1" == "tidyup" goto tidyup
-echo About to archive an external wxWindows distribution:
-echo   From   %src
-echo   To     %dest
-if "%inno" == "1" echo with Inno Setup creation.
-echo CTRL-C if this is not correct.
-pause
-
-erase %dest\wx*.zip
-erase %dest\*.htb
-erase %dest\ogl3*.zip
-erase %dest\contrib*.zip
-erase %dest\tex2rtf2*.zip
-erase %dest\mmedia*.zip
-erase %dest\jpeg*.zip
-erase %dest\tiff*.zip
-erase %dest\dialoged*.zip
-erase %dest\utils*.zip
-erase %dest\extradoc*.zip
-erase %dest\stc*.zip
-erase %dest\*-win32*.zip
-erase %dest\setup*.*
-erase %dest\*.txt
-erase %dest\make*
-
-if direxist %dest\wx erase /sxyz %dest\wx\
-if not direxist %dest mkdir %dest
-if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
-
-Rem Copy FAQ from wxWebSite CVS
-if not direxist %webfiles% echo Error - %webfiles% does not exist
-if not direxist %webfiles% goto end
-echo Copying FAQ and other files from %webfiles
-copy %webfiles%\site\faq*.htm %src\docs\html
-copy %webfiles%\site\platform.htm %src\docs\html
-copy %webfiles%\site\i18n.htm %src\docs\html
-
-Rem Copy setup0.h files to setup.h
-copy %src%\include\wx\os2\setup0.h %src%\include\wx\os2\setup.h
-copy %src%\include\wx\msw\setup0.h %src%\include\wx\msw\setup.h
-copy %src%\include\wx\univ\setup0.h %src%\include\wx\univ\setup.h
-
-cd %src%
-echo Zipping...
-
-Rem Zip up the complete wxOS2-xxx.zip file
-zip32 -@ %dest\wxOS2-%version%.zip < %src\distrib\msw\generic.rsp
-zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\os2.rsp
-zip32 -@ -u %dest%\wxOS2-%version%.zip  < %src\distrib\msw\jpeg.rsp
-zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\tiff.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tiff.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\jpeg.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\utils.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\dialoged.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\ogl.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\xml.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\deprecated.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
-
-Rem Rearchive under wxWindows-%version%
-if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
-
-mkdir %dest%\wxWindows-%version%
-cd %dest%\wxWindows-%version%
-unzip32 ..\wxOS2-%version%.zip
-echo Overwriting with OS2-specific versions of configure files...
-unzip32 -o %src%\distrib\os2\os2-specific.zip
-erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
-erase /Y src\tiff\*.mcp src\jpeg\*.mcp src\png\*.mcp src\zlib\*.mcp
-erase /SXY docs\html\dialoged docs\html\tex2rtf
-
-echo Making files lower case...
-cd src\os2
-call %src%\distrib\msw\lower.bat
-cd ..\..\include\wx\os2
-call %src%\distrib\msw\lower.bat
-
-cd %dest%
-
-erase wxOS2-%version%.zip
-zip32 -r wxOS2-%version%.zip wxWindows-%version%/*
-
-cd %src%
-
-echo Zipping wxMac distribution
-
-copy %src%\include\wx\mac\setup0.h %src%\include\wx\setup.h
-
-zip32 -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw_mac.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tiff.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\jpeg.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\utils.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\dialoged.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\ogl.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\deprecated.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
-
-zip32 -@ %dest%\wxWindows-%version%-CW-Mac.zip < %src%\distrib\msw\cw_mac.rsp
-
-erase /Y %src%\include\wx\setup.h
-
-if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
-
-mkdir %dest%\wxWindows-%version%
-cd %dest%\wxWindows-%version%
-unzip32 ..\wxMac-%version%.zip
-erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
-erase /SXY docs\html\dialoged docs\html\tex2rtf docs\htmlhelp
-
-cd %dest%
-
-erase wxMac-%version%.zip
-zip32 -r wxMac-%version%.zip wxWindows-%version%/*
-
-cd %src%
-
-Rem Create wxWindows-%version%-win.zip which is used to create wxMSW
-echo Zipping individual components
-zip32 -@ %dest\wxWindows-%version%-win.zip < %src\distrib\msw\generic.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\msw.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\ogl.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\mmedia.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\stc.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\tex2rtf.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\jpeg.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\tiff.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\xml.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\contrib.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\deprecated.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\dialoged.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utils.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utilmake.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\univ.rsp
-
-echo Re-archiving wxWindows-%version%-win.zip
-call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-win.zip wxWindows-%version% %dest%
-
-echo Removing .mms files
-zip32 -d %dest%\wxWindows-%version%-win.zip wxWindows-%version%/src/gtk/descrip.mms wxWindows-%version%/src/motif/descrip.mms
-
-echo Creating %dest\wxWindows-%version%-DocSource.zip
-zip32 -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp
-call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-DocSource.zip wxWindows-%version% %dest%
-
-echo Creating %dest\wxWindows-%version%-WinHelp.zip
-zip32 -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp
-call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-WinHelp.zip wxWindows-%version% %dest%
-
-echo Creating %dest\wxWindows-%version%-HTML.zip
-zip32 -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp
-call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTML.zip wxWindows-%version% %dest%
-
-echo Creating %dest\wxWindows-%version%-PDF.zip
-zip32 -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp
-call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-PDF.zip wxWindows-%version% %dest%
-
-Rem zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp
-Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Word.zip wxWindows-%version% %dest%
-
-echo Creating %dest\wxWindows-%version%-HTB.zip
-zip32 -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp
-call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTB.zip wxWindows-%version% %dest%
-
-echo Creating %dest\wxWindows-%version%-HTMLHelp.zip
-zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
-call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTMLHelp.zip wxWindows-%version% %dest%
-
-Rem Add Linuxy docs to a separate archive to be transported to Linux for the
-Rem Linux-based releases
-echo Creating %dest\wxWindows-%version%-LinuxDocs.zip
-zip32 -@ %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_html.rsp
-zip32 -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_pdf.rsp
-zip32 -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_htb.rsp
-
-Rem PDF/HTML docs that should go into the Windows setup because
-Rem there are no WinHelp equivalents
-echo Creating %dest\wxWindows-%version%-ExtraDoc.zip
-zip32 -@ %dest\wxWindows-%version%-ExtraDoc.zip < %src\distrib\msw\extradoc.rsp
-call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-ExtraDoc.zip wxWindows-%version% %dest%
-
-Rem zip up Univ-specific files
-echo Creating %dest\wxWindows-%version%-Univ.zip
-zip32 -@ %dest\wxWindows-%version%-Univ.zip < %src\distrib\msw\univ.rsp
-call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Univ.zip wxWindows-%version% %dest%
-
-rem VC++ project files
-echo Creating %dest\wxWindows-%version%-VC.zip
-zip32 -@ %dest\wxWindows-%version%-VC.zip < %src\distrib\msw\vc.rsp
-Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-VC.zip wxWindows-%version% %dest%
-
-rem BC++ project files
-echo Creating %dest\wxWindows-%version%-BC.zip
-zip32 -@ %dest\wxWindows-%version%-BC.zip < %src\distrib\msw\bc.rsp
-Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-BC.zip wxWindows-%version% %dest%
-
-rem CodeWarrior project files
-echo Creating %dest\wxWindows-%version%-CW.zip
-zip32 -@ %dest\wxWindows-%version%-CW.zip < %src\distrib\msw\cw.rsp
-Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-CW.zip wxWindows-%version% %dest%
-
-rem Dialog Editor source and binary
-Rem erase %dest\dialoged-source.zip
-Rem zip32 -@ %dest\dialoged-source.zip < %src\distrib\msw\dialoged.rsp
-Rem zip32 -j %dest\dialoged-%version%.zip %dest\dialoged-source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
-Rem erase %dest\dialoged-source.zip
-
-copy %src\docs\changes.txt %dest\changes-%version%.txt
-copy %src\docs\msw\install.txt %dest\install-msw-%version%.txt
-copy %src\docs\mac\install.txt %dest\install-mac-%version%.txt
-copy %src\docs\motif\install.txt %dest\install-motif-%version%.txt
-copy %src\docs\gtk\install.txt %dest\install-gtk-%version%.txt
-copy %src\docs\x11\install.txt %dest\install-x11-%version%.txt
-copy %src\docs\readme.txt %dest\readme-%version%.txt
-copy %src\docs\motif\readme.txt %dest\readme-motif-%version%.txt
-copy %src\docs\gtk\readme.txt %dest\readme-gtk-%version%.txt
-copy %src\docs\x11\readme.txt %dest\readme-x11-%version%.txt
-copy %src\docs\x11\readme-nanox.txt %dest\readme-nanox-%version%.txt
-copy %src\docs\msw\readme.txt %dest\readme-msw-%version%.txt
-copy %src\docs\mac\readme.txt %dest\readme-mac-%version%.txt
-copy %src\docs\base\readme.txt %dest\readme-base-%version%.txt
-copy %src\docs\os2\install.txt %dest\install-os2-%version%.txt
-copy %src\docs\univ\readme.txt %dest\readme-univ-%version%.txt
-copy %src\docs\readme_vms.txt %dest\readme-vms-%version%.txt
-Rem copy %src\docs\motif\makewxmotif %dest\makewxmotif-%version%
-Rem copy %src\docs\gtk\makewxgtk %dest\makewxgtk-%version%
-
-Rem Skip Inno Setup if inno is 0.
-if "%inno" == "0" goto end
-
-:dounzip
-
-Rem Make dialoged-win32.zip and tex2rtf-win32.zip
-
-Rem cd %src\bin
-Rem zip32 %dest\dialoged-win32-%version%.zip dialoged.*
-Rem zip32 %dest\tex2rtf-win32-%version%.zip tex2rtf.*
-
-cd %dest
-
-rem Put all archives for transit to Linux in a zip file
-echo Creating %dest\wxWindows-%version%-LinuxTransit.zip
-erase %dest\wxWindows-%version%-LinuxTransit.zip
-zip32 %dest\wxWindows-%version%-LinuxTransit.zip wxWindows-%version%-LinuxDocs.zip wxWindows-%version%-VC.zip wxWindows-%version%-CW-Mac.zip
-
-echo Unzipping the Windows files into wxWindows-%version%
-
-unzip32 -o wxWindows-%version%-win.zip
-unzip32 -o wxWindows-%version%-VC.zip -d wxWindows-%version
-unzip32 -o wxWindows-%version%-BC.zip -d wxWindows-%version
-unzip32 -o wxWindows-%version%-CW.zip -d wxWindows-%version
-unzip32 -o wxWindows-%version%-HTMLHelp.zip
-unzip32 -o wxWindows-%version%-ExtraDoc.zip
-Rem Need Word file, for Remstar DB classes
-Rem Not any more
-Rem unzip32 -o wxWindows-%version%-Word.zip
-
-Rem After this change of directory, we're in the
-Rem temporary 'wx' directory and not acting on
-Rem the source wxWindows directory.
-cd %dest%\wxWindows-%version%
-
-rem Now delete a few files that are unnecessary
-attrib -R *
-erase /Y BuildCVS.txt descrip.mms
-erase /Y setup.h_vms
-erase /Y docs\html\wxbook.htm docs\html\roadmap.htm
-Rem erase /Y contrib\docs\winhelp\mmedia.*
-Rem erase /Y contrib\docs\winhelp\stc.*
-Rem erase /Y contrib\docs\htmlhelp\mmedia.*
-Rem erase /Y contrib\docs\htmlhelp\stc.*
-Rem erase /Y contrib\docs\pdf\*.*
-erase /sxzy contrib\docs\latex\ogl
-erase /Y src\mingegcs.bat
-erase /Y distrib
-
-rem Now copy some binary files to 'bin'
-if not isdir bin mkdir bin
-copy %src\bin\dialoged.exe bin
-copy %src\bin\dialoged.hlp bin
-copy %src\bin\dialoged.chm bin
-copy %src\bin\tex2rtf.exe bin
-copy %src\bin\tex2rtf.hlp bin
-copy %src\bin\tex2rtf.cnt bin
-copy %src\bin\dbgview.* bin
-copy %src\bin\widgets.exe bin
-copy %src\bin\widgets.exe.manifest bin
-copy %src\bin\life.exe bin
-copy %src\bin\life.exe.manifest bin
-copy %src\demos\life\breeder.lif bin
-copy %src\docs\htmlhelp\dialoged.chm bin
-copy %src\docs\htmlhelp\tex2rtf.chm bin
-
-if not direxist docs\pdf mkdir docs\pdf
-copy %src\docs\pdf\wxTutorial.pdf docs\pdf
-
-Rem Make wxMSW-xxx.zip
-cd %dest%
-zip32 -r wxMSW-%version%.zip wxWindows-%version%/*
-cd wxWindows-%version%
-
-echo Calling 'makeinno' to generate wxwin2.iss...
-call %WXWIN\distrib\msw\makeinno.bat
-
-erase /Y %dest\setup.*
-
-rem Now invoke Inno Setup on the new wxwin2.iss
-set innocmd="C:\Program Files\Inno Setup 2\compil32.exe" /cc %WXWIN\distrib\msw\wxwin2.iss
-echo Invoking %innocmd...
-start "Inno Setup" /w %innocmd%
-Rem pause Press any key to continue with the wxWindows distribution...
-
-:tidyup
-cd %dest
-
-rem Put all the setup files into a single zip archive.
-zip32 wxMSW-%version%-setup.zip readme-%version%.txt setup*.*
-
-erase /Y wxWindows-%version%-win.zip
-erase /Y wxWindows-%version%-ExtraDoc.zip
-
-echo wxWindows archived.
-
-goto end
-
-:usage
-echo DOS wxWindows distribution. Zips up all MSW, OS/2, Mac and doc files,
-echo and optionally makes a setup.exe echo if you specify 'inno'
-echo (skipping the zipping if you use 'innoonly').
-echo.
-echo "Usage: zipdistinno [inno | innoonly]"
-
-:end
diff --git a/distrib/msw/zipmac.bat b/distrib/msw/zipmac.bat
deleted file mode 100755 (executable)
index a50770e..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-@echo off
-Rem Zips up an archive of Mac and generic wxWindows files.
-Rem Produces wxMac-ver.zip, wxWindows-ver-HTML.zip
-set src=%wxwin%
-set dest=%src%\deliver
-
-Rem Set this to the required version
-set version=2.3.4
-
-if "%src%" == "" goto usage
-if "%dest%" == "" goto usage
-if "%1%" == "-help" goto usage
-if "%1%" == "--help" goto usage
-if "%1%" == "/?" goto usage
-echo About to archive a wxMac distribution:
-echo   From   %src%
-echo   To     %dest%
-echo CTRL-C if this is not correct.
-pause
-
-erase %dest%\wx*.zip
-
-cd %src%
-echo Zipping...
-
-zip -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
-zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
-zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
-zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw.rsp
-zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tiff.rsp
-zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\jpeg.rsp
-zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
-zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\dialoged.rsp
-zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\ogl.rsp
-zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp
-
-zip -@ %dest%\wxWindows-%version%-HTML.zip < %src%\distrib\msw\wx_html.rsp
-
-cd %dest%
diff --git a/distrib/msw/zipwxmac.bat b/distrib/msw/zipwxmac.bat
deleted file mode 100755 (executable)
index 472d01c..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-@echo off
-rem Zip up a wxMac distribution, .zip and .sit
-rem using Inno Setup + ScriptMaker
-set src=%wxwin
-set dest=%src\deliver
-set webfiles=c:\wx2dev\wxWebSite
-set stuffit="c:\Program Files\Aladdin Systems\StuffIt 7.5\StuffIt.exe"
-
-Rem Set this to the required version
-set version=2.3.4
-
-if "%src" == "" goto usage
-if "%dest" == "" goto usage
-if "%1" == "-help" goto usage
-if "%1" == "--help" goto usage
-if "%1" == "/?" goto usage
-echo About to archive an external wxMac distribution:
-echo   From   %src
-echo   To     %dest
-echo CTRL-C if this is not correct.
-pause
-
-erase %dest\wxMac*.zip
-erase %dest\wxMac*.sit
-
-if not direxist %dest mkdir %dest
-if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
-
-echo Zipping wxMac distribution
-
-cd %src%
-copy %src%\include\wx\mac\setup0.h %src%\include\wx\setup.h
-
-zip32 -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw_mac.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tiff.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\jpeg.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\utils.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\dialoged.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\ogl.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
-
-erase /Y %src%\include\wx\setup.h
-
-if direxist %dest%\wxMac-%version% erase /sxyz %dest%\wxMac-%version%
-
-mkdir %dest%\wxMac-%version%
-cd %dest%\wxMac-%version%
-unzip32 ..\wxMac-%version%.zip
-erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
-erase /SXY docs\html\dialoged docs\html\tex2rtf
-
-cd %dest%
-
-erase wxMac-%version%.zip
-zip32 -r wxMac-%version%.zip wxMac-%version%/*
-
-erase /sxyz %dest%\wxMac-%version%
-
-Rem echo Making StuffIt archive...
-Rem set stuffitcmd=%stuffit% -stuff -create wxMac-%version%.sit wxWindows-%version%\*
-Rem echo Invoking %stuffitcmd...
-Rem start "StuffIt" /w %stuffitcmd%
-
-echo wxMac archived.
-
-goto end
-
-:usage
-echo DOS wxWindows distribution. Zips up wxMac.
-echo.
-echo "Usage: zipwxmac"
-
-:end
diff --git a/distrib/msw/zipwxos2.bat b/distrib/msw/zipwxos2.bat
deleted file mode 100755 (executable)
index 079245d..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-@echo off
-rem Zip up a wxOS2 distribution.
-set src=%wxwin
-set dest=%src\deliver
-set webfiles=c:\wx2dev\wxWebSite
-
-Rem Set this to the required version
-set version=2.3.4
-
-if "%src" == "" goto usage
-if "%dest" == "" goto usage
-if "%1" == "-help" goto usage
-if "%1" == "--help" goto usage
-if "%1" == "/?" goto usage
-echo About to archive an external wxOS2 distribution:
-echo   From   %src
-echo   To     %dest
-echo CTRL-C if this is not correct.
-pause
-
-erase %dest\wxOS2*.zip
-
-if not direxist %dest mkdir %dest
-if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
-
-echo Zipping wxOS2 distribution
-
-cd %src%
-Rem copy %src%\include\wx\os2\setup0.h %src%\include\wx\setup.h
-
-zip32 -@ %dest\wxOS2-%version%.zip < %src\distrib\msw\generic.rsp
-zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\os2.rsp
-zip32 -@ -u %dest%\wxOS2-%version%.zip  < %src\distrib\msw\jpeg.rsp
-zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\tiff.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tiff.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\jpeg.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\utils.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\dialoged.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\ogl.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\xml.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
-
-Rem erase /Y %src%\include\wx\setup.h
-
-if direxist %dest%\wxOS2-%version% erase /sxyz %dest%\wxOS2-%version%
-
-mkdir %dest%\wxOS2-%version%
-cd %dest%\wxOS2-%version%
-unzip32 ..\wxOS2-%version%.zip
-echo Overwriting with OS2-specific versions of configure files...
-unzip32 -o %src%\distrib\os2\os2-specific.zip
-erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
-erase /Y src\tiff\*.mcp src\jpeg\*.mcp src\png\*.mcp src\zlib\*.mcp
-erase /SXY docs\html\dialoged docs\html\tex2rtf
-
-echo Making files lower case...
-cd src\os2
-call %src%\distrib\msw\lower.bat
-cd ..\..\include\wx\os2
-call %src%\distrib\msw\lower.bat
-
-cd %dest%
-
-erase wxOS2-%version%.zip
-zip32 -r wxOS2-%version%.zip wxOS2-%version%/*
-erase /sxyz wxOS2-%version%
-
-echo wxOS2 archived.
-
-goto end
-
-:usage
-echo DOS wxWindows distribution. Zips up wxOS2.
-echo.
-echo "Usage: zipwxos2"
-
-:end