Script updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 11:44:00 +00:00
parent c135b1e269
commit 7bb7fa834b
9 changed files with 334 additions and 134 deletions
--- a/distrib/msw/base.rsp
+++ b/distrib/msw/base.rsp
@@ -0,0 +1,110 @@
+*.spec
+BuildCVS.txt
+*.m4
+autogen.sh
+configure
+config.guess
+config.sub
+configure.in
+setup.h.in
+install-sh
+mkinstalldirs
+wx-config.in
+wx-config-inplace.in
+version-script.in
+setup.h_vms
+regen
+
+build/msw/config.*
+build/msw/makefile.*
+
+src/common/*.cpp
+src/common/extended.c
+src/common/unzip.c
+src/common/unzip.h
+src/common/*.inc
+src/common/base.rc
+
+src/msw/*.cpp
+src/msw/*.h
+src/msw/makefile.*
+src/msw/makebase.b32
+src/msw/makeuniv.b32
+src/msw/*.lst
+src/msw/*.def
+src/msw/*.inc
+src/msw/winestub.c
+src/msw/gsocket.c
+src/msw/gsockmsw.c
+src/msw/version.rc
+
+src/msw/ole/*.cpp
+src/msw/*.prj
+
+src/msw/wince/*.cpp
+src/msw/wince/*.c
+
+src/unix/*.cpp
+src/unix/*.c
+
+src/zlib/*.c
+src/zlib/*.h
+src/zlib/INDEX
+src/zlib/README
+src/zlib/ChangeLog
+src/zlib/configure
+src/zlib/*.txt
+src/zlib/makefile*
+src/zlib/*.com
+src/zlib/*.3
+
+src/regex/COPYRIGHT
+src/regex/makefile*
+src/regex/README
+src/regex/WHATSNEW
+src/regex/mkh
+src/regex/*.h
+src/regex/*.ih
+src/regex/*.c
+src/regex/tests
+src/regex/regex.3
+src/regex/regex.7
+
+include/wx/*.h
+include/wx/*.inl
+include/wx/*.cpp
+include/wx/protocol/*.h
+include/wx/wx_setup.vms
+include/wx/common/*.h
+include/wx/unix/*.h
+lib/dummy
+
+include/wx/msw/*.h
+include/wx/msw/*.rc
+include/wx/msw/wx.manifest
+include/wx/msw/ctl3d/*.h
+include/wx/msw/gnuwin32/*.h
+include/wx/msw/gnuwin32/*.def
+include/wx/msw/gnuwin32/gl/*.h
+include/wx/msw/ole/*.h
+include/wx/msw/*.cur
+include/wx/msw/*.ico
+include/wx/msw/*.bmp
+
+include/wx/msw/wince/*.h
+
+samples/console/testdata.fc
+samples/console/*.cpp
+samples/console/*.h
+samples/console/makefile*
+samples/console/*.rc
+samples/console/*.def
+samples/console/*.bmp
+samples/console/*.xpm
+samples/console/*.xbm
+samples/console/*.png
+samples/console/*.ico
+samples/console/*.txt
+samples/console/*.pro
+samples/console/*.bkl
+
--- a/distrib/msw/dmc.rsp
+++ b/distrib/msw/dmc.rsp
@@ -140,4 +140,5 @@ utils/hhp2cached/makefile.dmc
 utils/makefile.dmc
 utils/tex2rtf/src/makefile.dmc
 utils/wxrc/makefile.dmc
+contrib/utils/wxrcedit/makefile.dmc

--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -64,25 +64,10 @@ docs/html/images/*.gif
 docs/tech/*.txt
 docs/tech/*.htm

-src/makeenvs/*.env
-
-src/*.inc
-src/mkdir
-src/make.env.in
-src/makeprog.env.in
-src/makelib.env.in
-src/files.lst
-
 src/common/*.cpp
-src/common/dosyacc.c
-src/common/doslex.c
-src/common/vmsyacc.c
-src/common/vmslex.c
 src/common/extended.c
 src/common/unzip.c
 src/common/unzip.h
-src/common/*.l
-src/common/*.y
 src/common/*.inc
 src/common/base.rc

@@ -594,6 +579,20 @@ samples/html/help/helpfiles/*.hhk
 samples/html/help/helpfiles/*.hhp
 samples/html/help/*.bkl

+samples/html/htmlctrl/*.cpp
+samples/html/htmlctrl/*.h
+samples/html/htmlctrl/makefile*
+samples/html/htmlctrl/*.rc
+samples/html/htmlctrl/*.def
+samples/html/htmlctrl/*.bmp
+samples/html/htmlctrl/*.xpm
+samples/html/htmlctrl/*.xbm
+samples/html/htmlctrl/*.png
+samples/html/htmlctrl/*.ico
+samples/html/htmlctrl/*.txt
+samples/html/htmlctrl/*.pro
+samples/html/htmlctrl/*.bkl
+
 samples/html/printing/*.cpp
 samples/html/printing/*.h
 samples/html/printing/makefile*
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -33,6 +33,7 @@ samples/ipc/Makefile.in
 samples/html/Makefile.in
 samples/html/about/Makefile.in
 samples/html/help/Makefile.in
+samples/html/htmlctrl/Makefile.in
 samples/html/helpview/Makefile.in
 samples/html/printing/Makefile.in
 samples/html/test/Makefile.in
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -13,9 +13,10 @@ INNO=1
 SPINMSW=0
 SPINMAC=0
 SPINOS2=0
-SPINDOCS=1
-SPINALL=1
-SPINWXALL=1
+SPINDOCS=0
+SPINALL=0
+SPINWXALL=0
+SPINBASE=0
 GETMAKEFILES=0
 VERBOSE=0
 ZIPFLAGS=
@@ -85,6 +86,29 @@ rearchive()
    popd
 }

+rearchivetar()
+{
+    archive=$1
+    dirname=$2
+    changeto=$3
+
+    echo Re-tarring $archive as $dirname
+
+    pushd $changeto
+
+    if [ -d $dirname ]; then
+        rm -f -r $dirname
+    fi
+    mkdir $dirname
+    cd $dirname
+    tar xfz ../$archive
+    cd ..
+    rm -f $archive
+    tar cfz $archive $dirname/*
+
+    popd
+}
+
 # Find the version from wx/version.h
 # Not yet used
 findversion()
@@ -226,69 +250,22 @@ dospinmsw()
    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/wince.rsp
    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/dmc.rsp

-#    rearchive wxWidgets-$VERSION-win.zip wxWidgets-$VERSION $DESTDIR
-
-    if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
-        rm -f -r $DESTDIR/wxWidgets-$VERSION
-    fi
-
-    mkdir $DESTDIR/wxWidgets-$VERSION
-    cd $DESTDIR/wxWidgets-$VERSION
-    unzip $ZIPFLAGS ../wxWidgets-$VERSION-win.zip
-
-    echo Removing .mms files
-    rm -f src/gtk/descrip.mms src/motif/descrip.mms
-
-    echo Copying readme files...
-    cp $APPDIR/docs/msw/readme.txt README-MSW.txt
-    cp $APPDIR/docs/msw/install.txt INSTALL-MSW.txt
-    cp $APPDIR/docs/licence.txt LICENCE.txt
-    cp $APPDIR/docs/lgpl.txt COPYING.LIB
-    cp $APPDIR/docs/changes.txt CHANGES.txt
-    cp $APPDIR/docs/readme.txt README.txt
-
-    cd $DESTDIR
-
-    rm -f wxWidgets-$VERSION-win.zip
-    zip $ZIPFLAGS -r wxWidgets-$VERSION-win.zip wxWidgets-$VERSION/*
 }

 dospinwxall()
 {
    cd $APPDIR

-    # Create wxWidgets-$VERSION-all.zip which is used to create wxMSW
    echo Zipping individual components
    rm -f $DESTDIR/wxWidgets-$VERSION-all.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/generic.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/makefile.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/msw.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/ogl.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/mmedia.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/stc.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/tex2rtf.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/jpeg.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/tiff.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/xml.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/contrib.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/deprecated.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/utils.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/utilmake.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/univ.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/wince.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/dmc.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/cw.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/cw_mac.rsp

-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/x11.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/cocoa.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/motif.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/mac.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/wince.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/mgl.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < $APPDIR/distrib/msw/os2.rsp
+    # Save adding all the wxMSW files again    
+    if [ ! -f $DESTDIR/wxWidgets-$VERSION-win.zip ]; then
+        dospinmsw
+    fi
+    cp $DESTDIR/wxWidgets-$VERSION-win.zip $DESTDIR/wxWidgets-$VERSION-all.zip

-#    rearchive wxWidgets-$VERSION-all.zip wxWidgets-$VERSION $DESTDIR
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < `cat $APPDIR/distrib/msw/cw_mac.rsp $APPDIR/distrib/msw/x11.rsp $APPDIR/distrib/msw/cocoa.rsp $APPDIR/distrib/msw/motif.rsp $APPDIR/distrib/msw/mac.rsp $APPDIR/distrib/msw/wince.rsp $APPDIR/distrib/msw/mgl.rsp $APPDIR/distrib/msw/os2.rsp`

    if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
        rm -f -r $DESTDIR/wxWidgets-$VERSION
@@ -310,6 +287,35 @@ dospinwxall()
    zip $ZIPFLAGS -r wxAll-$VERSION.zip wxWidgets-$VERSION/*
 }

+dospinbase()
+{
+    cd $APPDIR
+
+    echo Zipping wxBase
+    rm -f $DESTDIR/wxBase-$VERSION.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxBase-$VERSION.zip < $APPDIR/distrib/msw/base.rsp
+
+    if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWidgets-$VERSION
+    fi
+
+    mkdir $DESTDIR/wxWidgets-$VERSION
+    cd $DESTDIR/wxWidgets-$VERSION
+    unzip $ZIPFLAGS ../wxBase-$VERSION.zip
+
+    echo Copying readme files...
+    cp $APPDIR/docs/base/readme.txt README.txt
+    cp $APPDIR/docs/licence.txt LICENCE.txt
+    cp $APPDIR/docs/lgpl.txt COPYING.LIB
+    cp $APPDIR/docs/changes.txt CHANGES.txt
+    cp $APPDIR/docs/readme.txt README2.txt
+
+    cd $DESTDIR
+
+    rm -f wxBase-$VERSION.zip
+    zip $ZIPFLAGS -r wxBase-$VERSION.zip wxWidgets-$VERSION/*
+}
+
 dospindocs()
 {
    cd $APPDIR
@@ -330,6 +336,10 @@ dospindocs()
    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-PDF.zip < $APPDIR/distrib/msw/wx_pdf.rsp
    rearchive wxWidgets-$VERSION-PDF.zip wxWidgets-$VERSION $DESTDIR

+    echo Creating $DESTDIR/wxWidgets-$VERSION-PDF.tar.gz
+    tar zcf /c/wx2dev/wxWindows/deliver/wxWidgets-$VERSION-PDF.tar.gz docs/pdf/*.pdf
+    rearchivetar wxWidgets-$VERSION-PDF.tar.gz wxWidgets-$VERSION /c/wx2dev/wxWindows/deliver
+
    # zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-Word.zip < $APPDIR/distrib/msw/wx_word.rsp
    # rearchive wxWidgets-$VERSION-Word.zip wxWidgets-$VERSION $DESTDIR

@@ -401,7 +411,9 @@ dospinsetup()

    echo Unzipping the Windows files into wxWidgets-$VERSION

-    unzip $ZIPFLAGS -o wxWidgets-$VERSION-win.zip
+    mkdir -p wxWidgets-$VERSION
+
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-win.zip -d wxWidgets-$VERSION
    unzip $ZIPFLAGS -o wxWidgets-$VERSION-VC.zip -d wxWidgets-$VERSION
    unzip $ZIPFLAGS -o wxWidgets-$VERSION-BC.zip -d wxWidgets-$VERSION
    unzip $ZIPFLAGS -o wxWidgets-$VERSION-CW.zip -d wxWidgets-$VERSION
@@ -423,6 +435,15 @@ dospinsetup()
    rm -f -r distrib
    rm -f *.spec
    rm -f -r contrib/utils/wxrcedit
+    rm -f src/gtk/descrip.mms src/motif/descrip.mms
+
+    echo Copying readme files...
+    cp $APPDIR/docs/msw/readme.txt README-MSW.txt
+    cp $APPDIR/docs/msw/install.txt INSTALL-MSW.txt
+    cp $APPDIR/docs/licence.txt LICENCE.txt
+    cp $APPDIR/docs/lgpl.txt COPYING.LIB
+    cp $APPDIR/docs/changes.txt CHANGES.txt
+    cp $APPDIR/docs/readme.txt README.txt

    # Now cp some binary files to 'bin'
    if [ ! -d bin ]; then
@@ -622,6 +643,11 @@ makesetup()
        dospinmsw
    fi

+    # Do wxBase spin
+    if [ "$SPINBASE" = "1" ]; then
+        dospinbase
+    fi
+
    # Do wxAll spin
    if [ "$SPINWXALL" = "1" ] || [ "$SPINALL" = "1" ]; then
        dospinwxall
@@ -730,6 +756,7 @@ usage()
    echo "    --wxmsw           Build wxMSW distribution"
    echo "    --wxos2           Build wxOS2 distribution"
    echo "    --wxall           Build wxAll zip distribution"
+    echo "    --wxbase          Build wxBase zip distribution"
    echo "    --docs            Build docs archives"
    echo "    --all             Build all distributions (the default)"
    echo "    --getmakefiles    Get out-of-CVS makefiles and unarchive into the wxWidgets source tree"
@@ -751,6 +778,7 @@ for i in "$@"; do
 	--wxmsw) SPINMSW=1; SPINALL=0; SPINWXALL=0 ;;
 	--wxos2) SPINOS2=1; SPINALL=0 ;;
 	--wxall) SPINWXALL=1; SPINALL=0 ;;
+	--wxbase) SPINBASE=1; SPINALL=0 ;;
 	--getmakefiles) GETMAKEFILES=1; SPINALL=0 ;;
 	--docs) SPINDOCS=1; SPINALL=0 ;;
 	--all) SPINALL=1 ;;
--- a/distrib/msw/mmedia.rsp
+++ b/distrib/msw/mmedia.rsp
@@ -19,7 +19,7 @@ contrib/docs/latex/mmedia/*.wmf

 contrib/include/wx/mmedia/*.h
 contrib/include/wx/mmedia/internal/*.h
-contrib/src/mmedia/makefile*
+contrib/build/mmedia/makefile*
 contrib/src/mmedia/README
 contrib/src/mmedia/*.h
 contrib/src/mmedia/*.cpp
--- a/distrib/msw/utils.rsp
+++ b/distrib/msw/utils.rsp
@@ -49,3 +49,37 @@ utils/helpview/src/*.bkl
 utils/helpview/src/test.zip
 utils/helpview/src/bitmaps/*.xpm

+utils/configtool/src/*.h
+utils/configtool/src/*.cpp
+utils/configtool/src/*.def
+utils/configtool/src/*.rc
+utils/configtool/src/makefile*
+utils/configtool/src/*.xbm
+utils/configtool/src/*.xpm
+utils/configtool/src/*.txt
+utils/configtool/src/*.htb
+utils/configtool/src/*.ico
+utils/configtool/src/*.xml
+utils/configtool/src/*.bkl
+utils/configtool/src/*.pjd
+utils/configtool/src/bitmaps/*.xpm
+utils/configtool/src/bitmaps/*.png
+
+utils/configtool/scripts/inno*.txt
+utils/configtool/scripts/makesetup.sh
+utils/configtool/scripts/makeinno.sh
+utils/configtool/scripts/maketarball.sh
+utils/configtool/scripts/setup.sh
+utils/configtool/docs/*.txt
+utils/configtool/docs/manual/*.tex
+utils/configtool/docs/manual/*.ini
+utils/configtool/docs/manual/*.gif
+utils/configtool/docs/manual/*.bmp
+utils/configtool/docs/manual/*.png
+utils/configtool/docs/manual/*.ini
+utils/configtool/docs/manual/*.ini
+utils/configtool/docs/manual/Makefile
+utils/configtool/docs/code/*.doxy
+utils/configtool/docs/code/Makefile
+utils/configtool/configs/wxwin250.wxs
+
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -128,10 +128,10 @@ samples/image/image.dsw
 samples/internat/internat.dsp
 samples/internat/internat.dsw

-samples/ipc/client.dsp
-samples/ipc/client.dsw
-samples/ipc/server.dsp
-samples/ipc/server.dsw
+samples/ipc/ipc_client.dsp
+samples/ipc/ipc_client.dsw
+samples/ipc/ipc_server.dsp
+samples/ipc/ipc_server.dsw

 samples/keyboard/keyboard.dsp
 samples/keyboard/keyboard.dsw
@@ -216,10 +216,10 @@ samples/scrollsub/scrollsub.dsw
 samples/shaped/shaped.dsp
 samples/shaped/shaped.dsw

-samples/sockets/client.dsp
-samples/sockets/server.dsp
-samples/sockets/client.dsw
-samples/sockets/server.dsw
+samples/sockets/sockets_client.dsp
+samples/sockets/sockets_server.dsp
+samples/sockets/sockets_client.dsw
+samples/sockets/sockets_server.dsw

 samples/sound/sound.dsp
 samples/sound/sound.dsw
@@ -236,6 +236,9 @@ samples/statbar/statbar.dsw
 samples/taskbar/taskbar.dsp
 samples/taskbar/taskbar.dsw

+samples/tab/tab.dsp
+samples/tab/tab.dsw
+
 samples/text/text.dsp
 samples/text/text.dsw

@@ -245,8 +248,8 @@ samples/thread/thread.dsw
 samples/toolbar/toolbar.dsp
 samples/toolbar/toolbar.dsw

-samples/treectrl/treetest.dsp
-samples/treectrl/treetest.dsw
+samples/treectrl/treectrl.dsp
+samples/treectrl/treectrl.dsw

 samples/typetest/typetest.dsp
 samples/typetest/typetest.dsw
@@ -376,7 +379,16 @@ contrib/samples/deprecated/resource/resource.dsw
 contrib/samples/deprecated/treelay/treelay.dsp
 contrib/samples/deprecated/treelay/treelay.dsw

-contrib/src/foldbar/foldbar.dsp
+contrib/build/foldbar/foldbar.dsp
+contrib/build/foldbar/foldbar.dsw
 contrib/samples/foldbar/extended/extended.dsp
-contrib/samples/foldbar/foldpanelbar/foldpanelbar.dsp
+contrib/samples/foldbar/extended/extended.dsw
+contrib/samples/foldbar/foldpanelbar/foldtest.dsp
+contrib/samples/foldbar/foldpanelbar/foldtest.dsw
+
+utils/configtool/src/configtool.dsp
+utils/configtool/src/configtool.dsw
+
+utils/hhp2cached/hhp2cached.dsp
+utils/hhp2cached/hhp2cached.dsw

--- a/distrib/msw/wince.rsp
+++ b/distrib/msw/wince.rsp
@@ -1,10 +1,5 @@
 build/wince/wx.vcw
-build/wince/wx_gl.vcp
-build/wince/wx_mono.vcp
-build/wince/wx_wxexpat.vcp
-build/wince/wx_wxjpeg.vcp
-build/wince/wx_wxpng.vcp
-build/wince/wx_wxzlib.vcp
+build/wince/wx_*.vcp

 samples/access/access.vcp
 samples/access/access.vcw
@@ -72,6 +67,9 @@ samples/event/event.vcw
 samples/exec/exec.vcp
 samples/exec/exec.vcw

+samples/except/except.vcp
+samples/except/except.vcw
+
 samples/font/font.vcp
 samples/font/font.vcw

@@ -92,6 +90,8 @@ samples/html/helpview/helpview.vcp
 samples/html/helpview/helpview.vcw
 samples/html/printing/printing.vcp
 samples/html/printing/printing.vcw
+samples/html/htmlctrl/helpctrl.vcp
+samples/html/htmlctrl/helpctrl.vcw
 samples/html/test/test.vcp
 samples/html/test/test.vcw
 samples/html/virtual/virtual.vcp
@@ -110,10 +110,10 @@ samples/internat/internat.vcw
 samples/keyboard/keyboard.vcp
 samples/keyboard/keyboard.vcw

-samples/ipc/client.vcp
-samples/ipc/client.vcw
-samples/ipc/server.vcp
-samples/ipc/server.vcw
+samples/ipc/ipc_client.vcp
+samples/ipc/ipc_client.vcw
+samples/ipc/ipc_server.vcp
+samples/ipc/ipc_server.vcw

 samples/joytest/joytest.vcp
 samples/joytest/joytest.vcw
@@ -121,8 +121,8 @@ samples/joytest/joytest.vcw
 samples/layout/layout.vcp
 samples/layout/layout.vcw

-samples/listbox/lboxtest.vcp
-samples/listbox/lboxtest.vcw
+samples/listbox/listbox.vcp
+samples/listbox/listbox.vcw

 samples/listctrl/listctrl.vcp
 samples/listctrl/listctrl.vcw
@@ -177,8 +177,10 @@ samples/propsize/propsize.vcw
 samples/regtest/regtest.vcp
 samples/regtest/regtest.vcw

-samples/render/render.vcp
-samples/render/render.vcw
+samples/render/render_renddll.vcp
+samples/render/render_renddll.vcw
+samples/render/render_render.vcp
+samples/render/render_render.vcw

 samples/rotate/rotate.vcp
 samples/rotate/rotate.vcw
@@ -209,6 +211,9 @@ samples/splitter/splitter.vcw
 samples/statbar/statbar.vcp
 samples/statbar/statbar.vcw

+samples/tab/tab.vcp
+samples/tab/tab.vcw
+
 samples/taskbar/taskbar.vcp
 samples/taskbar/taskbar.vcw

@@ -221,8 +226,8 @@ samples/thread/thread.vcw
 samples/toolbar/toolbar.vcp
 samples/toolbar/toolbar.vcw

-samples/treectrl/treetest.vcp
-samples/treectrl/treetest.vcw
+samples/treectrl/treectrl.vcp
+samples/treectrl/treectrl.vcw

 samples/typetest/typetest.vcp
 samples/typetest/typetest.vcw
@@ -278,8 +283,8 @@ utils/helpview/src/helpview.vcw
 utils/helpview/src/client.vcp
 utils/helpview/src/client.vcw

-contrib/src/ogl/ogl.vcp
-contrib/src/ogl/ogl.vcw
+contrib/build/ogl/ogl.vcp
+contrib/build/ogl/ogl.vcw

 contrib/samples/ogl/ogledit/ogledit.vcp
 contrib/samples/ogl/ogledit/ogledit.vcw
@@ -292,14 +297,14 @@ src/xrc/xrc.vcw
 samples/xrc/xrcdemo.vcp
 samples/xrc/xrcdemo.vcw

-contrib/src/mmedia/mmedia.vcp
-contrib/src/mmedia/mmedia.vcw
+contrib/build/mmedia/mmedia.vcp
+contrib/build/mmedia/mmedia.vcw

 contrib/samples/mmedia/mmboard.vcp
 contrib/samples/mmedia/mmboard.vcw

-contrib/src/stc/stc.vcp
-contrib/src/stc/stc.vcw
+contrib/build/stc/stc.vcp
+contrib/build/stc/stc.vcw

 contrib/samples/stc/stctest.vcp
 contrib/samples/stc/stctest.vcw
@@ -307,19 +312,19 @@ contrib/samples/stc/stctest.vcw
 contrib/utils/wxrc/wxrc.vcp
 contrib/utils/wxrc/wxrc.vcw

-contrib/utils/convertrc/convert.vcp
-contrib/utils/convertrc/convert.vcw
+contrib/utils/convertrc/convertrc.vcp
+contrib/utils/convertrc/convertrc.vcw

 contrib/utils/wxrcedit/wxrcedit.vcp
 contrib/utils/wxrcedit/wxrcedit.vcw

-contrib/src/plot/plot.vcp
-contrib/src/plot/plot.vcw
+contrib/build/plot/plot.vcp
+contrib/build/plot/plot.vcw
 contrib/samples/plot/plot.vcp
 contrib/samples/plot/plot.vcw

-contrib/src/gizmos/gizmos.vcp
-contrib/src/gizmos/gizmos.vcw
+contrib/build/gizmos/gizmos.vcp
+contrib/build/gizmos/gizmos.vcw
 contrib/samples/gizmos/dynsash/dynsash.vcp
 contrib/samples/gizmos/dynsash/dynsash.vcw
 contrib/samples/gizmos/dynsash_switch/dynsash_switch.vcp
@@ -330,29 +335,31 @@ contrib/samples/gizmos/multicell/multicell.vcp
 contrib/samples/gizmos/multicell/multicell.vcw
 contrib/samples/gizmos/splittree/splittree.vcp
 contrib/samples/gizmos/splittree/splittree.vcw
+contrib/samples/gizmos/led/led.vcp
+contrib/samples/gizmos/led/led.vcw

-contrib/src/animate/animate.vcp
-contrib/src/animate/animate.vcw
+contrib/build/animate/animate.vcp
+contrib/build/animate/animate.vcw
 contrib/samples/animate/anitest.vcp
 contrib/samples/animate/anitest.vcw

-contrib/src/fl/fl.vcp
-contrib/src/fl/fl.vcw
-contrib/samples/fl/fl_demo1/fl_demo.vcp
-contrib/samples/fl/fl_demo1/fl_demo.vcw
-contrib/samples/fl/fl_demo2/fl_demo.vcp
-contrib/samples/fl/fl_demo2/fl_demo.vcw
-contrib/samples/fl/fl_sample1/fl_demo.vcp
-contrib/samples/fl/fl_sample1/fl_demo.vcw
-contrib/samples/fl/fl_sample2/fl_demo.vcp
-contrib/samples/fl/fl_sample2/fl_demo.vcw
-contrib/samples/fl/fl_sample3/fl_demo.vcp
-contrib/samples/fl/fl_sample3/fl_demo.vcw
+contrib/build/fl/fl.vcp
+contrib/build/fl/fl.vcw
+contrib/samples/fl/fl_fl_demo1.vcp
+contrib/samples/fl/fl_fl_demo1.vcw
+contrib/samples/fl/fl_fl_demo2.vcp
+contrib/samples/fl/fl_fl_demo2.vcw
+contrib/samples/fl/fl_fl_sample1.vcp
+contrib/samples/fl/fl_fl_sample1.vcw
+contrib/samples/fl/fl_fl_sample2.vcp
+contrib/samples/fl/fl_fl_sample2.vcw
+contrib/samples/fl/fl_fl_sample3.vcp
+contrib/samples/fl/fl_fl_sample3.vcw

-contrib/src/net/net.vcp
-contrib/src/net/net.vcw
+contrib/build/net/net.vcp
+contrib/build/net/net.vcw

-contrib/src/deprecated/deprecated.vcp
+contrib/build/deprecated/deprecated.vcp

 contrib/samples/deprecated/proplist/proplist.vcp
 contrib/samples/deprecated/proplist/proplist.vcw
@@ -363,10 +370,18 @@ contrib/samples/deprecated/resource/resource.vcw
 contrib/samples/deprecated/treelay/treelay.vcp
 contrib/samples/deprecated/treelay/treelay.vcw

-contrib/src/foldbar/foldbar.vcp
-contrib/src/foldbar/foldbar.vcw
+contrib/build/foldbar/foldbar.vcp
+contrib/build/foldbar/foldbar.vcw
 contrib/samples/foldbar/extended/extended.vcp
 contrib/samples/foldbar/extended/extended.vcw
-contrib/samples/foldbar/foldpanelbar/foldpanelbar.vcp
-contrib/samples/foldbar/foldpanelbar/foldpanelbar.vcw
+contrib/samples/foldbar/foldpanelbar/foldtest.vcp
+contrib/samples/foldbar/foldpanelbar/foldtest.vcw
+
+contrib/build/svg/svg.vcp
+contrib/build/svg/svg.vcw
+contrib/samples/svg/svgtest.vcp
+contrib/samples/svg/svgtest.vcw
+
+utils/configtool/src/configtool.vcp
+utils/configtool/src/configtool.vcw