Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
distrib/msw/contrib.rsp
View File

@@ -65,8 +65,8 @@ contrib/samples/gizmos/multicell/*.txt
contrib/samples/gizmos/multicell/*.ico
contrib/samples/gizmos/multicell/*.bmp
contrib/samples/gizmos/multicell/*.rc
contrib/samples/gizmos/multicell/MulticellVC.dsp
contrib/samples/gizmos/multicell/MulticellVC.dsw
contrib/samples/gizmos/multicell/multicell.dsp
contrib/samples/gizmos/multicell/multicell.dsw
contrib/samples/gizmos/splittree/*.cpp
contrib/samples/gizmos/splittree/*.h
@@ -91,8 +91,8 @@ contrib/samples/gizmos/editlbox/*.txt
contrib/samples/gizmos/editlbox/*.ico
contrib/samples/gizmos/editlbox/*.bmp
contrib/samples/gizmos/editlbox/*.rc
contrib/samples/gizmos/editlbox/EditlboxVC.dsp
contrib/samples/gizmos/editlbox/EditlboxVC.dsw
contrib/samples/gizmos/editlbox/editlbox.dsp
contrib/samples/gizmos/editlbox/editlbox.dsw
contrib/samples/gizmos/dynsash/*.cpp
contrib/samples/gizmos/dynsash/*.h
@@ -104,8 +104,8 @@ contrib/samples/gizmos/dynsash/*.txt
contrib/samples/gizmos/dynsash/*.ico
contrib/samples/gizmos/dynsash/*.bmp
contrib/samples/gizmos/dynsash/*.rc
contrib/samples/gizmos/dynsash/DynsashVC.dsp
contrib/samples/gizmos/dynsash/SynsashVC.dsw
contrib/samples/gizmos/dynsash/dynsash.dsp
contrib/samples/gizmos/dynsash/dynsash.dsw
contrib/samples/gizmos/dynsash_switch/*.cpp
contrib/samples/gizmos/dynsash_switch/*.h
@@ -117,8 +117,8 @@ contrib/samples/gizmos/dynsash_switch/*.txt
contrib/samples/gizmos/dynsash_switch/*.ico
contrib/samples/gizmos/dynsash_switch/*.bmp
contrib/samples/gizmos/dynsash_switch/*.rc
contrib/samples/gizmos/dynsash_switch/DynsashSwitchVC.dsp
contrib/samples/gizmos/dynsash_switch/DynsashSwitchVC.dsw
contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw
contrib/samples/animate/*.cpp
contrib/samples/animate/*.h
@@ -130,8 +130,8 @@ contrib/samples/animate/*.txt
contrib/samples/animate/*.ico
contrib/samples/animate/*.bmp
contrib/samples/animate/*.rc
contrib/samples/animate/AnimVC.dsp
contrib/samples/animate/AnimVC.dsw
contrib/samples/animate/AniTestVC.dsp
contrib/samples/animate/AniTestVC.dsw
contrib/samples/fl/makefile*
contrib/samples/fl/bitmaps/*.bmp

251
distrib/msw/copybase.bat
View File

@@ -1,9 +1,10 @@
@echo off
rem VZ: this is quick and _very_ dirty
rem VZ: this is quick and _very_ dirty, to be replaced by a script directly
rem parsing the files.txt and include/wx/version.h...
set VER=2.3.3
set DEST=s:\upload\wxBase-%VER%
set VER=2.3.4
set DEST=t:\wxBase-%VER%
mkdir %DEST%
mkdir %DEST%\include
@@ -20,26 +21,46 @@ mkdir %DEST%\src\msw
mkdir %DEST%\src\regex
mkdir %DEST%\src\unix
mkdir %DEST%\src\zlib
mkdir %DEST%\lib
chdir %WXWIN%
rem Copy the files to the root directory
copy /q configure.in %DEST%
copy /q configure %DEST%
copy /q wxwin.m4 %DEST%
copy /q aclocal.m4 %DEST%
copy /q config.sub %DEST%
copy /q config.guess %DEST%
copy /q install-sh %DEST%
copy /q mkinstalldirs %DEST%
copy /q wx-config.in %DEST%
copy /q setup.h.in %DEST%
copy /q Makefile.in %DEST%
copy /q wxBase.spec %DEST%
copy /q docs\changes.txt %DEST%\CHANGES.txt
copy /q docs\licence.txt %DEST%\LICENCE.txt
copy /q docs\install.txt %DEST%\README.txt
copy /q docs\symbols.txt %DEST%\SYMBOLS.txt
copy /q docs\base\readme.txt %DEST%\README.txt
rem Copy the project files
rem Copy the project/make files
copy /q src\wxBase.dsp %DEST%\src\wxBase.dsp
copy /q src\wxBase.dsw %DEST%\src\wxBase.dsw
copy /q include\wx\msw\setup.h %DEST%\include\wx\msw\setup.h
copy /q include\wx\msw\setup0.h %DEST%\include\wx\msw\setup.h
copy /q src\makeb32.env %DEST%\src\makeb32.env
copy /q src\makelib.b32 %DEST%\src\makelib.b32
copy /q src\makeprog.b32 %DEST%\src\makeprog.b32
copy /q src\msw\makebase.b32 %DEST%\src\msw\makebase.b32
copy /q src\*.in %DEST%\src
rem Copy the sample
copy /q samples\console\console.cpp %DEST%\samples\console\console.cpp
copy /q samples\console\console.dsp %DEST%\samples\console\console.dsp
copy /q samples\console\makefile.b32 %DEST%\samples\console\makefile.b32
copy /q samples\console\makefile.unx %DEST%\samples\console
copy /q samples\console\Makefile.in %DEST%\samples\console
copy /q samples\console\testdata.fc %DEST%\samples\console\testdata.fc
rem Copy regex and zlib files
@@ -51,101 +72,27 @@ rem The files not in src/files.lst
copy /q src\msw\dummy.cpp %DEST%\src\msw\dummy.cpp
copy /q src\msw\dummydll.cpp %DEST%\src\msw\dummydll.cpp
copy /q src\common\execcmn.cpp %DEST%\src\common\execcmn.cpp
copy /q src\common\unictabl.inc %DEST%\src\common\unictabl.inc
copy /q src\common\unzip.h %DEST%\src\common\unzip.h
rem The rest is generated from src/files.lst
copy /q include\wx\app.h %DEST%\include\wx\app.h
copy /q include\wx\arrimpl.cpp %DEST%\include\wx\arrimpl.cpp
copy /q include\wx\buffer.h %DEST%\include\wx\buffer.h
copy /q include\wx\chkconf.h %DEST%\include\wx\chkconf.h
copy /q include\wx\clntdata.h %DEST%\include\wx\clntdata.h
copy /q include\wx\cmdline.h %DEST%\include\wx\cmdline.h
copy /q include\wx\confbase.h %DEST%\include\wx\confbase.h
copy /q include\wx\config.h %DEST%\include\wx\config.h
copy /q include\wx\date.h %DEST%\include\wx\date.h
copy /q include\wx\datetime.h %DEST%\include\wx\datetime.h
copy /q include\wx\datetime.inl %DEST%\include\wx\datetime.inl
copy /q include\wx\datstrm.h %DEST%\include\wx\datstrm.h
copy /q include\wx\db.h %DEST%\include\wx\db.h
copy /q include\wx\dbtable.h %DEST%\include\wx\dbtable.h
copy /q include\wx\dde.h %DEST%\include\wx\dde.h
copy /q include\wx\debug.h %DEST%\include\wx\debug.h
copy /q include\wx\defs.h %DEST%\include\wx\defs.h
copy /q include\wx\dir.h %DEST%\include\wx\dir.h
copy /q include\wx\dynarray.h %DEST%\include\wx\dynarray.h
copy /q include\wx\dynlib.h %DEST%\include\wx\dynlib.h
copy /q include\wx\encconv.h %DEST%\include\wx\encconv.h
copy /q include\wx\event.h %DEST%\include\wx\event.h
copy /q include\wx\ffile.h %DEST%\include\wx\ffile.h
copy /q include\wx\file.h %DEST%\include\wx\file.h
copy /q include\wx\fileconf.h %DEST%\include\wx\fileconf.h
copy /q include\wx\filefn.h %DEST%\include\wx\filefn.h
copy /q include\wx\filename.h %DEST%\include\wx\filename.h
copy /q include\wx\filesys.h %DEST%\include\wx\filesys.h
copy /q include\wx\fontenc.h %DEST%\include\wx\fontenc.h
copy /q include\wx\fontmap.h %DEST%\include\wx\fontmap.h
copy /q include\wx\fs_inet.h %DEST%\include\wx\fs_inet.h
copy /q include\wx\fs_mem.h %DEST%\include\wx\fs_mem.h
copy /q include\wx\fs_zip.h %DEST%\include\wx\fs_zip.h
copy /q include\wx\gsocket.h %DEST%\include\wx\gsocket.h
copy /q include\wx\hash.h %DEST%\include\wx\hash.h
copy /q include\wx\intl.h %DEST%\include\wx\intl.h
copy /q include\wx\ioswrap.h %DEST%\include\wx\ioswrap.h
copy /q include\wx\ipcbase.h %DEST%\include\wx\ipcbase.h
copy /q include\wx\list.h %DEST%\include\wx\list.h
copy /q include\wx\listimpl.cpp %DEST%\include\wx\listimpl.cpp
copy /q include\wx\log.h %DEST%\include\wx\log.h
copy /q include\wx\longlong.h %DEST%\include\wx\longlong.h
copy /q include\wx\memconf.h %DEST%\include\wx\memconf.h
copy /q include\wx\memory.h %DEST%\include\wx\memory.h
copy /q include\wx\memtext.h %DEST%\include\wx\memtext.h
copy /q include\wx\mimetype.h %DEST%\include\wx\mimetype.h
copy /q include\wx\module.h %DEST%\include\wx\module.h
copy /q include\wx\mstream.h %DEST%\include\wx\mstream.h
copy /q include\wx\object.h %DEST%\include\wx\object.h
copy /q include\wx\objstrm.h %DEST%\include\wx\objstrm.h
copy /q include\wx\platform.h %DEST%\include\wx\platform.h
copy /q include\wx\process.h %DEST%\include\wx\process.h
copy /q include\wx\regex.h %DEST%\include\wx\regex.h
copy /q include\wx\sckaddr.h %DEST%\include\wx\sckaddr.h
copy /q include\wx\sckipc.h %DEST%\include\wx\sckipc.h
copy /q include\wx\sckstrm.h %DEST%\include\wx\sckstrm.h
copy /q include\wx\serbase.h %DEST%\include\wx\serbase.h
copy /q include\wx\snglinst.h %DEST%\include\wx\snglinst.h
copy /q include\wx\socket.h %DEST%\include\wx\socket.h
copy /q include\wx\strconv.h %DEST%\include\wx\strconv.h
copy /q include\wx\stream.h %DEST%\include\wx\stream.h
copy /q include\wx\string.h %DEST%\include\wx\string.h
copy /q include\wx\sysopt.h %DEST%\include\wx\sysopt.h
copy /q include\wx\textbuf.h %DEST%\include\wx\textbuf.h
copy /q include\wx\textfile.h %DEST%\include\wx\textfile.h
copy /q include\wx\thread.h %DEST%\include\wx\thread.h
copy /q include\wx\time.h %DEST%\include\wx\time.h
copy /q include\wx\timer.h %DEST%\include\wx\timer.h
copy /q include\wx\tokenzr.h %DEST%\include\wx\tokenzr.h
copy /q include\wx\txtstrm.h %DEST%\include\wx\txtstrm.h
copy /q include\wx\unzip.h %DEST%\include\wx\unzip.h
copy /q include\wx\url.h %DEST%\include\wx\url.h
copy /q include\wx\utils.h %DEST%\include\wx\utils.h
copy /q include\wx\variant.h %DEST%\include\wx\variant.h
copy /q include\wx\vector.h %DEST%\include\wx\vector.h
copy /q include\wx\version.h %DEST%\include\wx\version.h
copy /q include\wx\wfstream.h %DEST%\include\wx\wfstream.h
copy /q include\wx\wx.h %DEST%\include\wx\wx.h
copy /q include\wx\wxchar.h %DEST%\include\wx\wxchar.h
copy /q include\wx\wxprec.h %DEST%\include\wx\wxprec.h
copy /q include\wx\zipstrm.h %DEST%\include\wx\zipstrm.h
copy /q include\wx\zstream.h %DEST%\include\wx\zstream.h
copy /q include\wx\unix\gsockunx.h %DEST%\include\wx\unix\gsockunx.h
copy /q include\wx\unix\mimetype.h %DEST%\include\wx\unix\mimetype.h
copy /q include\wx\msw\dde.h %DEST%\include\wx\msw\dde.h
copy /q include\wx\msw\mimetype.h %DEST%\include\wx\msw\mimetype.h
copy /q include\wx\protocol\file.h %DEST%\include\wx\protocol\file.h
copy /q include\wx\protocol\ftp.h %DEST%\include\wx\protocol\ftp.h
copy /q include\wx\protocol\http.h %DEST%\include\wx\protocol\http.h
copy /q include\wx\protocol\protocol.h %DEST%\include\wx\protocol\protocol.h
copy /q include\wx\msw\gsockmsw.h %DEST%\include\wx\msw\gsockmsw.h
copy /q include\wx\msw\missing.h %DEST%\include\wx\msw\missing.h
copy /q include\wx\msw\mslu.h %DEST%\include\wx\msw\mslu.h
copy /q include\wx\msw\msvcrt.h %DEST%\include\wx\msw\msvcrt.h
copy /q include\wx\msw\private.h %DEST%\include\wx\msw\private.h
copy /q include\wx\msw\regconf.h %DEST%\include\wx\msw\regconf.h
copy /q include\wx\msw\registry.h %DEST%\include\wx\msw\registry.h
rem The rest is generated from src/files.lst by pasting the ALL_SOURCES and
rem ALL_HEADERS here and doing
rem
rem .,$s@^\s*\(.*\)/\([^ ]*\)\( \\\)\?$@copy /q src\\\1\\\2 %DEST%\\src\\\1\\\2
rem
rem and
rem
rem .,$s@/@\\@|exe "normal "|.,$s@^\s*\([^ ]*\)\( \\\)\?$@copy /q include\\wx\\\1 %DEST%\\include\\wx\\\1
rem
copy /q src\common\init.cpp %DEST%\src\common\init.cpp
copy /q src\common\appcmn.cpp %DEST%\src\common\appcmn.cpp
copy /q src\common\clntdata.cpp %DEST%\src\common\clntdata.cpp
@@ -158,6 +105,7 @@ copy /q src\common\dbtable.cpp %DEST%\src\common\dbtable.cpp
copy /q src\common\dircmn.cpp %DEST%\src\common\dircmn.cpp
copy /q src\common\dynarray.cpp %DEST%\src\common\dynarray.cpp
copy /q src\common\dynlib.cpp %DEST%\src\common\dynlib.cpp
copy /q src\common\dynload.cpp %DEST%\src\common\dynload.cpp
copy /q src\common\encconv.cpp %DEST%\src\common\encconv.cpp
copy /q src\common\event.cpp %DEST%\src\common\event.cpp
copy /q src\common\extended.c %DEST%\src\common\extended.c
@@ -173,6 +121,7 @@ copy /q src\common\fs_mem.cpp %DEST%\src\common\fs_mem.cpp
copy /q src\common\fs_zip.cpp %DEST%\src\common\fs_zip.cpp
copy /q src\common\ftp.cpp %DEST%\src\common\ftp.cpp
copy /q src\common\hash.cpp %DEST%\src\common\hash.cpp
copy /q src\common\hashmap.cpp %DEST%\src\common\hashmap.cpp
copy /q src\common\http.cpp %DEST%\src\common\http.cpp
copy /q src\common\intl.cpp %DEST%\src\common\intl.cpp
copy /q src\common\ipcbase.cpp %DEST%\src\common\ipcbase.cpp
@@ -182,9 +131,9 @@ copy /q src\common\longlong.cpp %DEST%\src\common\longlong.cpp
copy /q src\common\memory.cpp %DEST%\src\common\memory.cpp
copy /q src\common\mimecmn.cpp %DEST%\src\common\mimecmn.cpp
copy /q src\common\module.cpp %DEST%\src\common\module.cpp
copy /q src\common\msgout.cpp %DEST%\src\common\msgout.cpp
copy /q src\common\mstream.cpp %DEST%\src\common\mstream.cpp
copy /q src\common\object.cpp %DEST%\src\common\object.cpp
copy /q src\common\objstrm.cpp %DEST%\src\common\objstrm.cpp
copy /q src\common\process.cpp %DEST%\src\common\process.cpp
copy /q src\common\protocol.cpp %DEST%\src\common\protocol.cpp
copy /q src\common\regex.cpp %DEST%\src\common\regex.cpp
@@ -192,7 +141,6 @@ copy /q src\common\sckaddr.cpp %DEST%\src\common\sckaddr.cpp
copy /q src\common\sckfile.cpp %DEST%\src\common\sckfile.cpp
copy /q src\common\sckipc.cpp %DEST%\src\common\sckipc.cpp
copy /q src\common\sckstrm.cpp %DEST%\src\common\sckstrm.cpp
copy /q src\common\serbase.cpp %DEST%\src\common\serbase.cpp
copy /q src\common\socket.cpp %DEST%\src\common\socket.cpp
copy /q src\common\strconv.cpp %DEST%\src\common\strconv.cpp
copy /q src\common\stream.cpp %DEST%\src\common\stream.cpp
@@ -229,3 +177,104 @@ copy /q src\msw\snglinst.cpp %DEST%\src\msw\snglinst.cpp
copy /q src\msw\thread.cpp %DEST%\src\msw\thread.cpp
copy /q src\msw\utils.cpp %DEST%\src\msw\utils.cpp
copy /q src\msw\utilsexc.cpp %DEST%\src\msw\utilsexc.cpp
copy /q src\msw\volume.cpp %DEST%\src\msw\volume.cpp
copy /q include\wx\app.h %DEST%\include\wx\app.h
copy /q include\wx\arrimpl.cpp %DEST%\include\wx\arrimpl.cpp
copy /q include\wx\buffer.h %DEST%\include\wx\buffer.h
copy /q include\wx\build.h %DEST%\include\wx\build.h
copy /q include\wx\chkconf.h %DEST%\include\wx\chkconf.h
copy /q include\wx\clntdata.h %DEST%\include\wx\clntdata.h
copy /q include\wx\cmdline.h %DEST%\include\wx\cmdline.h
copy /q include\wx\confbase.h %DEST%\include\wx\confbase.h
copy /q include\wx\config.h %DEST%\include\wx\config.h
copy /q include\wx\date.h %DEST%\include\wx\date.h
copy /q include\wx\datetime.h %DEST%\include\wx\datetime.h
copy /q include\wx\datetime.inl %DEST%\include\wx\datetime.inl
copy /q include\wx\datstrm.h %DEST%\include\wx\datstrm.h
copy /q include\wx\db.h %DEST%\include\wx\db.h
copy /q include\wx\dbtable.h %DEST%\include\wx\dbtable.h
copy /q include\wx\dde.h %DEST%\include\wx\dde.h
copy /q include\wx\debug.h %DEST%\include\wx\debug.h
copy /q include\wx\defs.h %DEST%\include\wx\defs.h
copy /q include\wx\dir.h %DEST%\include\wx\dir.h
copy /q include\wx\dynarray.h %DEST%\include\wx\dynarray.h
copy /q include\wx\dynlib.h %DEST%\include\wx\dynlib.h
copy /q include\wx\dynload.h %DEST%\include\wx\dynload.h
copy /q include\wx\encconv.h %DEST%\include\wx\encconv.h
copy /q include\wx\event.h %DEST%\include\wx\event.h
copy /q include\wx\features.h %DEST%\include\wx\features.h
copy /q include\wx\ffile.h %DEST%\include\wx\ffile.h
copy /q include\wx\file.h %DEST%\include\wx\file.h
copy /q include\wx\fileconf.h %DEST%\include\wx\fileconf.h
copy /q include\wx\filefn.h %DEST%\include\wx\filefn.h
copy /q include\wx\filename.h %DEST%\include\wx\filename.h
copy /q include\wx\filesys.h %DEST%\include\wx\filesys.h
copy /q include\wx\fontenc.h %DEST%\include\wx\fontenc.h
copy /q include\wx\fontmap.h %DEST%\include\wx\fontmap.h
copy /q include\wx\fs_inet.h %DEST%\include\wx\fs_inet.h
copy /q include\wx\fs_mem.h %DEST%\include\wx\fs_mem.h
copy /q include\wx\fs_zip.h %DEST%\include\wx\fs_zip.h
copy /q include\wx\gsocket.h %DEST%\include\wx\gsocket.h
copy /q include\wx\hash.h %DEST%\include\wx\hash.h
copy /q include\wx\hashmap.h %DEST%\include\wx\hashmap.h
copy /q include\wx\intl.h %DEST%\include\wx\intl.h
copy /q include\wx\ioswrap.h %DEST%\include\wx\ioswrap.h
copy /q include\wx\ipc.h %DEST%\include\wx\ipc.h
copy /q include\wx\ipcbase.h %DEST%\include\wx\ipcbase.h
copy /q include\wx\isql.h %DEST%\include\wx\isql.h
copy /q include\wx\isqlext.h %DEST%\include\wx\isqlext.h
copy /q include\wx\list.h %DEST%\include\wx\list.h
copy /q include\wx\listimpl.cpp %DEST%\include\wx\listimpl.cpp
copy /q include\wx\log.h %DEST%\include\wx\log.h
copy /q include\wx\longlong.h %DEST%\include\wx\longlong.h
copy /q include\wx\memconf.h %DEST%\include\wx\memconf.h
copy /q include\wx\memory.h %DEST%\include\wx\memory.h
copy /q include\wx\memtext.h %DEST%\include\wx\memtext.h
copy /q include\wx\mimetype.h %DEST%\include\wx\mimetype.h
copy /q include\wx\module.h %DEST%\include\wx\module.h
copy /q include\wx\msgout.h %DEST%\include\wx\msgout.h
copy /q include\wx\mstream.h %DEST%\include\wx\mstream.h
copy /q include\wx\object.h %DEST%\include\wx\object.h
copy /q include\wx\platform.h %DEST%\include\wx\platform.h
copy /q include\wx\process.h %DEST%\include\wx\process.h
copy /q include\wx\regex.h %DEST%\include\wx\regex.h
copy /q include\wx\sckaddr.h %DEST%\include\wx\sckaddr.h
copy /q include\wx\sckipc.h %DEST%\include\wx\sckipc.h
copy /q include\wx\sckstrm.h %DEST%\include\wx\sckstrm.h
copy /q include\wx\snglinst.h %DEST%\include\wx\snglinst.h
copy /q include\wx\socket.h %DEST%\include\wx\socket.h
copy /q include\wx\strconv.h %DEST%\include\wx\strconv.h
copy /q include\wx\stream.h %DEST%\include\wx\stream.h
copy /q include\wx\string.h %DEST%\include\wx\string.h
copy /q include\wx\sysopt.h %DEST%\include\wx\sysopt.h
copy /q include\wx\textbuf.h %DEST%\include\wx\textbuf.h
copy /q include\wx\textfile.h %DEST%\include\wx\textfile.h
copy /q include\wx\thread.h %DEST%\include\wx\thread.h
copy /q include\wx\thrimpl.cpp %DEST%\include\wx\thrimpl.cpp
copy /q include\wx\time.h %DEST%\include\wx\time.h
copy /q include\wx\timer.h %DEST%\include\wx\timer.h
copy /q include\wx\tokenzr.h %DEST%\include\wx\tokenzr.h
copy /q include\wx\txtstrm.h %DEST%\include\wx\txtstrm.h
copy /q include\wx\url.h %DEST%\include\wx\url.h
copy /q include\wx\utils.h %DEST%\include\wx\utils.h
copy /q include\wx\variant.h %DEST%\include\wx\variant.h
copy /q include\wx\vector.h %DEST%\include\wx\vector.h
copy /q include\wx\version.h %DEST%\include\wx\version.h
copy /q include\wx\volume.h %DEST%\include\wx\volume.h
copy /q include\wx\wfstream.h %DEST%\include\wx\wfstream.h
copy /q include\wx\wx.h %DEST%\include\wx\wx.h
copy /q include\wx\wxchar.h %DEST%\include\wx\wxchar.h
copy /q include\wx\wxprec.h %DEST%\include\wx\wxprec.h
copy /q include\wx\zipstrm.h %DEST%\include\wx\zipstrm.h
copy /q include\wx\zstream.h %DEST%\include\wx\zstream.h
copy /q include\wx\unix\gsockunx.h %DEST%\include\wx\unix\gsockunx.h
copy /q include\wx\unix\mimetype.h %DEST%\include\wx\unix\mimetype.h
copy /q include\wx\msw\dde.h %DEST%\include\wx\msw\dde.h
copy /q include\wx\msw\gccpriv.h %DEST%\include\wx\msw\gccpriv.h
copy /q include\wx\msw\mimetype.h %DEST%\include\wx\msw\mimetype.h
copy /q include\wx\msw\winundef.h %DEST%\include\wx\msw\winundef.h
copy /q include\wx\protocol\file.h %DEST%\include\wx\protocol\file.h
copy /q include\wx\protocol\ftp.h %DEST%\include\wx\protocol\ftp.h
copy /q include\wx\protocol\http.h %DEST%\include\wx\protocol\http.h
copy /q include\wx\protocol\protocol.h %DEST%\include\wx\protocol\protocol.h

1
distrib/msw/filerepl.bat
View File

@@ -10,6 +10,7 @@ set files=%3
echo s/%keyword/%repl/g > script.tmp
call %wxwin\distrib\msw\expdwild.bat %3 list.tmp
Rem goto end
set len=%@LINES[%files]
do i = 0 to %len by 1

27
distrib/msw/generic.rsp
View File

@@ -8,11 +8,9 @@ config.sub
configure.in
setup.h.in
install-sh
missing
mkinstalldirs
modules
template.mak
wx-config.in
version-script.in
setup.h_vms
distrib/msw/*.rsp
@@ -28,19 +26,18 @@ distrib/msw/tmake/makeall.bat
distrib/msw/tmake/makeall.sh
distrib/msw/tmake/wxwin.pro
distrib/msw/tmake/tmake.conf
distrib/gtk/*
locale/*.po
locale/*.mo
locale/Makefile
art/*.xpm
art/*.ico
art/*.png
art/motif/*.xpm
art/gtk/*.xpm
docs/readme.txt
docs/readme_vms.txt
docs/install.txt
docs/changes.txt
docs/todo.txt
docs/licence.txt
@@ -48,18 +45,10 @@ docs/licendoc.txt
docs/preamble.txt
docs/gpl.txt
docs/lgpl.txt
docs/symbols.txt
docs/bugs.txt
docs/index.htm
docs/html/*.htm
docs/html/*.gif
docs/html/*.png
docs/html/icons/*.gif
docs/html/icons/*.png
docs/html/icons/*.jpg
docs/html/images/*.gif
docs/html/images/*.png
docs/html/images/*.jpg
docs/tech/*.txt
docs/tech/*.htm
@@ -152,19 +141,9 @@ lib/dummy
tools/gettext/*.*
bitmaps/xpm/16x16/*.*
bitmaps/xpm/32x32/*.*
bitmaps/xpm/64x64/*.*
bitmaps/xpm/misc/*.*
bitmaps/*.*
bitmaps/bmp/16x15/*.*
bitmaps/bmp/10x8/*.*
bitmaps/ico/32x32/*.*
misc/afm/*.afm
misc/gs_afm/*.afm
utils/*.txt
utils/make*.*
utils/configure
utils/configure.in

4
distrib/msw/innobott.txt
View File

@@ -32,10 +32,10 @@
; DO NOT DELETE THEM or you may be unable to reload the script
;[ScriptSetup]
;VerNum=2.3.3
;VerNum=2.3.4
;InnoVer=1.3
;AddVerTo=AppVerName
;SetupFilename=setup.exe
;OutputFolder=C:\wx2dev\wxWindows\deliver
;OutputFolder=C:\wx24\wxWindows\deliver
;CopyrightText=Copyright <20> The wxWindows Team

24
distrib/msw/innotop.txt
View File

@@ -4,13 +4,13 @@
[Setup]
MinVersion=4.0,4.0
AppName=wxWindows 2.3.3
AppName=wxWindows 2.3.4
AppId=wxWindows
CreateUninstallRegKey=1
UsePreviousAppDir=0
UsePreviousGroup=0
AppVersion=2.3.3
AppVerName=wxWindows 2.3.3
AppVersion=2.3.4
AppVerName=wxWindows 2.3.4
AppCopyright=Copyright <20> The wxWindows Team
BackColor=$FF0000
BackColor2=$000000
@@ -19,7 +19,7 @@
WindowStartMaximized=1
WindowVisible=1
WindowResizable=1
UninstallDisplayName=wxWindows 2.3.3
UninstallDisplayName=wxWindows 2.3.4
UninstallLogMode=Append
DirExistsWarning=auto
UninstallFilesDir={app}
@@ -28,19 +28,19 @@
CreateAppDir=1
DisableProgramGroupPage=0
AlwaysCreateUninstallIcon=1
UninstallIconName=Uninstall wxWindows 2.3.3
UninstallIconName=Uninstall wxWindows 2.3.4
Uninstallable=1
DefaultDirName=c:\wxWindows_2.3.3
DefaultGroupName=wxWindows 2.3.3
LicenseFile=C:\wx2dev\wxWindows\docs\licence.txt
InfoBeforeFile=C:\wx2dev\wxWindows\docs\readme.txt
InfoAfterFile=C:\wx2dev\wxWindows\docs\msw\install.txt
DefaultDirName=c:\wxWindows_2.3.4
DefaultGroupName=wxWindows 2.3.4
LicenseFile=C:\wx24\wxWindows\docs\licence.txt
InfoBeforeFile=C:\wx24\wxWindows\docs\readme.txt
InfoAfterFile=C:\wx24\wxWindows\docs\msw\install.txt
MessagesFile=compiler:default.isl
DiskSpanning=1
DiskSize=1457664
DiskClusterSize=512
ReserveBytes=0
UseSetupLdr=1
SourceDir=c:\wx2dev\wxWindows\deliver\wxWindows-2.3.3
OutputDir=c:\wx2dev\wxWindows\deliver
SourceDir=c:\wx24\wxWindows\deliver\wxWindows-2.3.4
OutputDir=c:\wx24\wxWindows\deliver

708
distrib/msw/tardist
View File

@@ -29,6 +29,339 @@ expandlines()
done
}
doinit()
{
cd $WXSRC
echo Removing backup files...
rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
rm -f $WXDEST/wx*-${WXVER}*.tar.gz
# Copy setup files
cp $WXSRC/include/wx/os2/SETUP0.H $WXSRC/include/wx/os2/setup.h
cp $WXSRC/include/wx/msw/setup0.h $WXSRC/include/wx/msw/setup.h
cp $WXSRC/include/wx/univ/setup0.h $WXSRC/include/wx/univ/setup.h
# Copy readme and other files
cp $WXSRC/docs/readme.txt $WXDEST/readme-${WXVER}.txt
cp $WXSRC/docs/changes.txt $WXDEST/changes-${WXVER}.txt
cp $WXSRC/docs/mgl/readme.txt $WXDEST/readme-mgl-${WXVER}.txt
cp $WXSRC/docs/mgl/install.txt $WXDEST/install-mgl-${WXVER}.txt
cp $WXSRC/docs/x11/readme.txt $WXDEST/readme-x11-${WXVER}.txt
cp $WXSRC/docs/x11/readme-nanox.txt $WXDEST/readme-nanox-${WXVER}.txt
cp $WXSRC/docs/x11/install.txt $WXDEST/install-x11-${WXVER}.txt
cp $WXSRC/docs/motif/readme.txt $WXDEST/readme-motif-${WXVER}.txt
cp $WXSRC/docs/motif/install.txt $WXDEST/install-motif-${WXVER}.txt
cp $WXSRC/docs/msw/readme.txt $WXDEST/readme-msw-${WXVER}.txt
cp $WXSRC/docs/msw/install.txt $WXDEST/install-msw-${WXVER}.txt
cp $WXSRC/docs/gtk/readme.txt $WXDEST/readme-gtk-${WXVER}.txt
cp $WXSRC/docs/gtk/install.txt $WXDEST/install-gtk-${WXVER}.txt
cp $WXSRC/docs/mac/readme.txt $WXDEST/readme-mac-${WXVER}.txt
cp $WXSRC/docs/mac/install.txt $WXDEST/install-mac-${WXVER}.txt
cp $WXSRC/docs/os2/install.txt $WXDEST/install-os2-${WXVER}.txt
}
dospinwxgtk()
{
echo Tarring wxGTK...
cd $WXSRC
cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxgtk_in.txt
expandlines /tmp/wxgtk_in.txt /tmp/wxgtk.txt
$TAR cf $WXDEST/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
echo Re-tarring wxGTK in a subdirectory...
cd $WXDEST
mkdir wxGTK-${WXVER}
cd wxGTK-${WXVER}
$TAR xf ../wxGTK-${WXVER}.tar
cd ..
rm -f wxGTK-${WXVER}.tar
$TAR cf $WXDEST/wxGTK-${WXVER}.tar wxGTK-${WXVER}/*
rm -f -r wxGTK-${WXVER}
gzip $WXDEST/wxGTK-${WXVER}.tar
}
dospinwxmotif()
{
echo Tarring wxMotif...
cd $WXSRC
cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmotif_in.txt
expandlines /tmp/wxmotif_in.txt /tmp/wxmotif.txt
$TAR cf $WXDEST/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
echo Re-tarring wxMotif in a subdirectory...
cd $WXDEST
mkdir wxMotif-${WXVER}
cd wxMotif-${WXVER}
$TAR xf ../wxMotif-${WXVER}.tar
cd ..
rm -f wxMotif-${WXVER}.tar
$TAR cf $WXDEST/wxMotif-${WXVER}.tar wxMotif-${WXVER}/*
rm -f -r wxMotif-${WXVER}
gzip $WXDEST/wxMotif-${WXVER}.tar
}
dospinwxx11()
{
echo Tarring wxX11...
### wxX11: combined wxMotif and wxX11 distributions
cd $WXSRC
cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt
expandlines /tmp/wxx11_in.txt /tmp/wxx11.txt
$TAR cf $WXDEST/wxX11-${WXVER}.tar -T /tmp/wxx11.txt
echo Re-tarring wxX11 in a subdirectory...
cd $WXDEST
mkdir wxX11-${WXVER}
cd wxX11-${WXVER}
$TAR xf ../wxX11-${WXVER}.tar
cd ..
rm -f wxX11-${WXVER}.tar
$TAR cf $WXDEST/wxX11-${WXVER}.tar wxX11-${WXVER}/*
rm -f -r wxX11-${WXVER}
gzip $WXDEST/wxX11-${WXVER}.tar
}
### wxMSW
# cd $WXSRC
# cat $WXSRC/distrib/msw/msw.rsp $WXSRC/distrib/msw/vc.rsp $WXSRC/distrib/msw/bc.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmsw_in.txt
# expandlines /tmp/wxmsw_in.txt /tmp/wxmsw.txt
# $TAR cf $WXDEST/wxMSW-${WXVER}.tar -T /tmp/wxmsw.txt
# gzip $WXDEST/wxMSW-${WXVER}.tar
dospinwxmac()
{
echo Tarring wxMac...
### wxMac
cp $WXSRC/include/wx/mac/setup0.h $WXSRC/include/wx/setup.h
cd $WXSRC
cat $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
$TAR cf $WXDEST/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
rm -f $WXSRC/include/wx/setup.h
echo Re-tarring wxMac in a subdirectory...
cd $WXDEST
mkdir wxMac-${WXVER}
cd wxMac-${WXVER}
$TAR xf ../wxMac-${WXVER}.tar
rm -f -r contrib/src/mmedia contrib/samples/mmedia
cd ..
rm -f wxMac-${WXVER}.tar
$TAR cf $WXDEST/wxMac-${WXVER}.tar wxMac-${WXVER}/*
rm -f -r wxMac-${WXVER}
gzip $WXDEST/wxMac-${WXVER}.tar
}
### wxUniv: universal-specific files
#cd $WXSRC
#cat $WXSRC/distrib/msw/univ.rsp > /tmp/wxuniv_in.txt
#expandlines /tmp/wxuniv_in.txt /tmp/wxuniv.txt
#$TAR cf $WXDEST/wxWindows-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
#
#echo Re-tarring wxUniversal in a subdirectory...
#cd $WXDEST
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-Univ.tar
#cd ..
#rm -f wxWindows-${WXVER}-Univ.tar
#$TAR cf $WXDEST/wxWindows-${WXVER}-Univ.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $WXDEST/wxWindows-${WXVER}-Univ.tar
dospinwxall()
{
echo Tarring wxAll...
### wxAll: all distributions in one giant archive
cd $WXSRC
cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/msw.rsp $WXSRC/distrib/msw/vc.rsp $WXSRC/distrib/msw/cw.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/os2.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/mgl.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/utilmake.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/mmedia.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp $WXSRC/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
expandlines /tmp/wxall_in.txt /tmp/wxall.txt
$TAR cf $WXDEST/wxAll-${WXVER}.tar -T /tmp/wxall.txt
echo Re-tarring wxAll in a subdirectory...
cd $WXDEST
mkdir wxWindows-${WXVER}
# If we have the full set of VC++ project files,
# get them
if [ -f $WXDEST/extra/wxWindows-${WXVER}-VC.zip ]; then
unzip -o $WXDEST/extra/wxWindows-${WXVER}-VC.zip
else
echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-VC.zip"
fi
cd wxWindows-${WXVER}
$TAR xf ../wxAll-${WXVER}.tar
# Translate all .dsp and .dsw files to DOS format
unix2dos --unix2dos `cat $WXSRC/distrib/msw/vc.rsp`
# Copy OS/2 specific configure files
cp $WXSRC/distrib/os2/os2-specific.zip docs/os2
# Copy the OS/2 files which probably haven't been copied yet
mkdir include/wx/os2
mkdir src/os2
cp $WXSRC/include/wx/os2/*.H include/wx/os2
cp $WXSRC/src/os2/*.CPP $WXSRC/src/os2/*.I src/os2
# Make all OS/2 files lower case
$WXSRC/distrib/msw/namedown include/wx/os2/*.H
$WXSRC/distrib/msw/namedown src/os2/*.CPP src/os2/*.I
cd ..
rm -f wxAll-${WXVER}.tar
$TAR cf $WXDEST/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $WXDEST/wxAll-${WXVER}.tar
}
dospinwxdocs()
{
echo Tarring wxDocs...
### Doc sources
#cd $WXSRC
#cat $WXSRC/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt
#expandlines /tmp/docsrc_in.txt /tmp/docsrc.txt
#$TAR cf $WXDEST/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
#
#echo Re-tarring docs in a subdirectory...
#cd $WXDEST
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-doc.tar
#cd ..
#rm -f wxWindows-${WXVER}-doc.tar
#$TAR cf $WXDEST/wxWindows-${WXVER}-doc.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $WXDEST/wxWindows-${WXVER}-doc.tar
### HTML docs
cd $WXSRC
cat $WXSRC/distrib/msw/wx_html.rsp > /tmp/html_in.txt
expandlines /tmp/html_in.txt /tmp/html.txt
$TAR cf $WXDEST/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
echo Re-tarring HTML in a subdirectory...
cd $WXDEST
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxWindows-${WXVER}-HTML.tar
cd ..
rm -f wxWindows-${WXVER}-HTML.tar
$TAR cf $WXDEST/wxWindows-${WXVER}-HTML.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $WXDEST/wxWindows-${WXVER}-HTML.tar
### HTB docs
cd $WXSRC
cat $WXSRC/distrib/msw/wx_htb.rsp > /tmp/htb_in.txt
expandlines /tmp/htb_in.txt /tmp/htb.txt
$TAR cf $WXDEST/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
echo Re-tarring HTB in a subdirectory...
cd $WXDEST
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxWindows-${WXVER}-HTB.tar
cd ..
rm -f wxWindows-${WXVER}-HTB.tar
$TAR cf $WXDEST/wxWindows-${WXVER}-HTB.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $WXDEST/wxWindows-${WXVER}-HTB.tar
### PDF docs
cd $WXSRC
cat $WXSRC/distrib/msw/wx_pdf.rsp > /tmp/pdf_in.txt
expandlines /tmp/pdf_in.txt /tmp/pdf.txt
$TAR cf $WXDEST/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt
echo Re-tarring PDF in a subdirectory...
cd $WXDEST
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxWindows-${WXVER}-PDF.tar
cd ..
rm -f wxWindows-${WXVER}-PDF.tar
$TAR cf $WXDEST/wxWindows-${WXVER}-PDF.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $WXDEST/wxWindows-${WXVER}-PDF.tar
}
### Tex2RTF
#cd $WXSRC
#cat $WXSRC/distrib/msw/tex2rtf.rsp > /tmp/tex2rtf_in.txt
#expandlines /tmp/tex2rtf_in.txt /tmp/tex2rtf.txt
#$TAR cf $WXDEST/wxWindows-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
#
#echo Re-tarring Tex2RTF in a subdirectory...
#cd $WXDEST
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-tex2rtf.tar
#cd ..
#rm -f wxWindows-${WXVER}-tex2rtf.tar
#$TAR cf $WXDEST/wxWindows-${WXVER}-tex2rtf.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $WXDEST/wxWindows-${WXVER}-tex2rtf.tar
### OGL
#cd $WXSRC
#cat $WXSRC/distrib/msw/ogl.rsp > /tmp/ogl_in.txt
#expandlines /tmp/ogl_in.txt /tmp/ogl.txt
#$TAR cf $WXDEST/wxWindows-${WXVER}-ogl.tar -T /tmp/ogl.txt
#
#echo Re-tarring OGL in a subdirectory...
#cd $WXDEST
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-ogl.tar
#cd ..
#rm -f wxWindows-${WXVER}-ogl.tar
#$TAR cf $WXDEST/wxWindows-${WXVER}-ogl.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $WXDEST/wxWindows-${WXVER}-ogl.tar
### JPEG
#cd $WXSRC
#cat $WXSRC/distrib/msw/jpeg.rsp > /tmp/jpeg_in.txt
#expandlines /tmp/jpeg_in.txt /tmp/jpeg.txt
#$TAR cf $WXDEST/wxWindows-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
#
#echo Re-tarring jpeg in a subdirectory...
#cd $WXDEST
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-jpeg.tar
#cd ..
#rm -f wxWindows-${WXVER}-jpeg.tar
#$TAR cf $WXDEST/wxWindows-${WXVER}-jpeg.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $WXDEST/wxWindows-${WXVER}-jpeg.tar
### TIFF
#cd $WXSRC
#cat $WXSRC/distrib/msw/tiff.rsp > /tmp/tiff_in.txt
#expandlines /tmp/tiff_in.txt /tmp/tiff.txt
#$TAR cf $WXDEST/wxWindows-${WXVER}-tiff.tar -T /tmp/tiff.txt
#
#echo Re-tarring docs in a subdirectory...
#cd $WXDEST
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-tiff.tar
#cd ..
#rm -f wxWindows-${WXVER}-tiff.tar
#$TAR cf $WXDEST/wxWindows-${WXVER}-tiff.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $WXDEST/wxWindows-${WXVER}-tiff.tar
init=""
if [ "$1" = "" ]
@@ -49,327 +382,84 @@ then
exit
fi
PROGNAME=$0
WXSRC=$1
WXDEST=$2
WXVER=$3
SPINWXALL=0
SPINWXX11=0
SPINWXGTK=0
SPINWXMOTIF=0
SPINWXMAC=0
SPINWXDOCS=0
SPINEVERYTHING=0
usage()
{
echo Usage: $PROGNAME "src-dir dest-dir version-number [ options ]"
echo Options:
echo " --help Display this help message"
echo " --wxall Spin wxAll"
echo " --wxgtk Spin wxGTK"
echo " --wxmotif Spin wxMotif"
echo " --wxmac Spin wxMac"
echo " --wxx11 Spin wxX11"
echo " --wxdocs Spin docs"
echo " --all Spin EVERYTHING"
exit 1
}
# Process command line options.
shift 3
for i in "$@"; do
case "$i" in
--wxall) SPINWXALL=1 ;;
--wxx11) SPINWXX11=1 ;;
--wxgtk) SPINWXGTK=1 ;;
--wxmotif) SPINWXMOTIF=1 ;;
--wxmac) SPINWXMAC=1 ;;
--wxdocs) SPINWXDOCS=1 ;;
--all) SPINEVERYTHING=1 ;;
*)
usage
exit
;;
esac
done
echo About to archive wxWindows:
echo From $1
echo To $2
echo From $WXSRC
echo To $WXDEST
echo Version $WXVER
echo CTRL-C if this is not correct.
read dummy
cd $1
doinit
echo Removing backup files...
rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
rm -f $2/wx*-${WXVER}*.tar.gz
# Copy setup files
cp $1/include/wx/os2/SETUP0.H $1/include/wx/os2/setup.h
cp $1/include/wx/msw/setup0.h $1/include/wx/msw/setup.h
echo Tarring...
### Generic
#cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp > /tmp/wxgen_in.txt
#expandlines /tmp/wxgen_in.txt /tmp/wxgen.txt
#$TAR cf $2/wxWindows-${WXVER}-gen.tar -T /tmp/wxgen.txt
#gzip $2/wxWindows-${WXVER}-gen.tar
#mv $2/wxWindows-${WXVER}-gen.tar.gz $2/wxWindows-${WXVER}-gen.tgz
### wxGTK
cd $1
cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxgtk_in.txt
expandlines /tmp/wxgtk_in.txt /tmp/wxgtk.txt
$TAR cf $2/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
echo Re-tarring wxGTK in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxGTK-${WXVER}.tar
cd ..
rm -f wxGTK-${WXVER}.tar
$TAR cf $2/wxGTK-${WXVER}.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $2/wxGTK-${WXVER}.tar
### wxMotif
cd $1
cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmotif_in.txt
expandlines /tmp/wxmotif_in.txt /tmp/wxmotif.txt
$TAR cf $2/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
echo Re-tarring wxMotif in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxMotif-${WXVER}.tar
cd ..
rm -f wxMotif-${WXVER}.tar
$TAR cf $2/wxMotif-${WXVER}.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $2/wxMotif-${WXVER}.tar
### wxX11: combined wxMotif and wxX11 distributions
cd $1
cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt
expandlines /tmp/wxx11_in.txt /tmp/wxx11.txt
$TAR cf $2/wxX11-${WXVER}.tar -T /tmp/wxx11.txt
echo Re-tarring wxX11 in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxX11-${WXVER}.tar
cd ..
rm -f wxX11-${WXVER}.tar
$TAR cf $2/wxX11-${WXVER}.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $2/wxX11-${WXVER}.tar
### wxMSW
# cd $1
# cat $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/bc.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmsw_in.txt
# expandlines /tmp/wxmsw_in.txt /tmp/wxmsw.txt
# $TAR cf $2/wxMSW-${WXVER}.tar -T /tmp/wxmsw.txt
# gzip $2/wxMSW-${WXVER}.tar
### wxMac
cp $1/include/wx/mac/setup0.h $1/include/wx/setup.h
cd $1
cat $1/distrib/msw/mac.rsp $1/distrib/msw/generic.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
$TAR cf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
rm -f $1/include/wx/setup.h
echo Re-tarring wxMac in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxMac-${WXVER}.tar
rm -f -r contrib/src/mmedia contrib/samples/mmedia
cd ..
rm -f wxMac-${WXVER}.tar
$TAR cf $2/wxMac-${WXVER}.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $2/wxMac-${WXVER}.tar
### wxUniv: universal-specific files
cd $1
cat $1/distrib/msw/univ.rsp > /tmp/wxuniv_in.txt
expandlines /tmp/wxuniv_in.txt /tmp/wxuniv.txt
$TAR cf $2/wxWindows-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
echo Re-tarring wxUniversal in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxWindows-${WXVER}-Univ.tar
cd ..
rm -f wxWindows-${WXVER}-Univ.tar
$TAR cf $2/wxWindows-${WXVER}-Univ.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $2/wxWindows-${WXVER}-Univ.tar
### wxAll: all distributions in one giant archive
cd $1
cat $1/distrib/msw/generic.rsp $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/mac.rsp $1/distrib/msw/os2.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/mgl.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/utilmake.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/mmedia.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp $1/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
expandlines /tmp/wxall_in.txt /tmp/wxall.txt
$TAR cf $2/wxAll-${WXVER}.tar -T /tmp/wxall.txt
echo Re-tarring wxAll in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
# If we have the full set of VC++ project files,
# get them
if [ -f $2/extra/wxWindows-${WXVER}-VC.zip ]; then
unzip -o $2/extra/wxWindows-${WXVER}-VC.zip
else
echo "Warning - did not find $2/deliver/extra/wxWindows-${WXVER}-VC.zip"
if [ "$SPINWXX11" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
dospinwxx11
fi
cd wxWindows-${WXVER}
$TAR xf ../wxAll-${WXVER}.tar
if [ "$SPINWXGTK" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
dospinwxgtk
fi
# Translate all .dsp and .dsw files to DOS format
unix2dos --unix2dos `cat $1/distrib/msw/vc.rsp`
if [ "$SPINWXMAC" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
dospinwxmac
fi
# Copy OS/2 specific configure files
cp $1/distrib/os2/os2-specific.zip docs/os2
if [ "$SPINWXMOTIF" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
dospinwxmotif
fi
# Copy the OS/2 files which probably haven't been copied yet
mkdir include/wx/os2
mkdir src/os2
cp $1/include/wx/os2/*.H include/wx/os2
cp $1/src/os2/*.CPP $1/src/os2/*.I src/os2
if [ "$SPINWXDOCS" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
dospinwxdocs
fi
# Make all OS/2 files lower case
$1/distrib/msw/namedown include/wx/os2/*.H
$1/distrib/msw/namedown src/os2/*.CPP src/os2/*.I
cd ..
rm -f wxAll-${WXVER}.tar
$TAR cf $2/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $2/wxAll-${WXVER}.tar
if [ "$SPINWXALL" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
dospinwxall
fi
### Doc sources
#cd $1
#cat $1/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt
#expandlines /tmp/docsrc_in.txt /tmp/docsrc.txt
#$TAR cf $2/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
#
#echo Re-tarring docs in a subdirectory...
#cd $2
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-doc.tar
#cd ..
#rm -f wxWindows-${WXVER}-doc.tar
#$TAR cf $2/wxWindows-${WXVER}-doc.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $2/wxWindows-${WXVER}-doc.tar
### HTML docs
cd $1
cat $1/distrib/msw/wx_html.rsp > /tmp/html_in.txt
expandlines /tmp/html_in.txt /tmp/html.txt
$TAR cf $2/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
echo Re-tarring HTML in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxWindows-${WXVER}-HTML.tar
cd ..
rm -f wxWindows-${WXVER}-HTML.tar
$TAR cf $2/wxWindows-${WXVER}-HTML.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $2/wxWindows-${WXVER}-HTML.tar
### HTB docs
cd $1
cat $1/distrib/msw/wx_htb.rsp > /tmp/htb_in.txt
expandlines /tmp/htb_in.txt /tmp/htb.txt
$TAR cf $2/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
echo Re-tarring HTB in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxWindows-${WXVER}-HTB.tar
cd ..
rm -f wxWindows-${WXVER}-HTB.tar
$TAR cf $2/wxWindows-${WXVER}-HTB.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $2/wxWindows-${WXVER}-HTB.tar
### PDF docs
cd $1
cat $1/distrib/msw/wx_pdf.rsp > /tmp/pdf_in.txt
expandlines /tmp/pdf_in.txt /tmp/pdf.txt
$TAR cf $2/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt
echo Re-tarring PDF in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxWindows-${WXVER}-PDF.tar
cd ..
rm -f wxWindows-${WXVER}-PDF.tar
$TAR cf $2/wxWindows-${WXVER}-PDF.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $2/wxWindows-${WXVER}-PDF.tar
### Tex2RTF
#cd $1
#cat $1/distrib/msw/tex2rtf.rsp > /tmp/tex2rtf_in.txt
#expandlines /tmp/tex2rtf_in.txt /tmp/tex2rtf.txt
#$TAR cf $2/wxWindows-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
#
#echo Re-tarring Tex2RTF in a subdirectory...
#cd $2
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-tex2rtf.tar
#cd ..
#rm -f wxWindows-${WXVER}-tex2rtf.tar
#$TAR cf $2/wxWindows-${WXVER}-tex2rtf.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $2/wxWindows-${WXVER}-tex2rtf.tar
### OGL
#cd $1
#cat $1/distrib/msw/ogl.rsp > /tmp/ogl_in.txt
#expandlines /tmp/ogl_in.txt /tmp/ogl.txt
#$TAR cf $2/wxWindows-${WXVER}-ogl.tar -T /tmp/ogl.txt
#
#echo Re-tarring OGL in a subdirectory...
#cd $2
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-ogl.tar
#cd ..
#rm -f wxWindows-${WXVER}-ogl.tar
#$TAR cf $2/wxWindows-${WXVER}-ogl.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $2/wxWindows-${WXVER}-ogl.tar
### JPEG
#cd $1
#cat $1/distrib/msw/jpeg.rsp > /tmp/jpeg_in.txt
#expandlines /tmp/jpeg_in.txt /tmp/jpeg.txt
#$TAR cf $2/wxWindows-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
#
#echo Re-tarring jpeg in a subdirectory...
#cd $2
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-jpeg.tar
#cd ..
#rm -f wxWindows-${WXVER}-jpeg.tar
#$TAR cf $2/wxWindows-${WXVER}-jpeg.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $2/wxWindows-${WXVER}-jpeg.tar
### TIFF
#cd $1
#cat $1/distrib/msw/tiff.rsp > /tmp/tiff_in.txt
#expandlines /tmp/tiff_in.txt /tmp/tiff.txt
#$TAR cf $2/wxWindows-${WXVER}-tiff.tar -T /tmp/tiff.txt
#
#echo Re-tarring docs in a subdirectory...
#cd $2
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-tiff.tar
#cd ..
#rm -f wxWindows-${WXVER}-tiff.tar
#$TAR cf $2/wxWindows-${WXVER}-tiff.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $2/wxWindows-${WXVER}-tiff.tar
# Copy readme and other files
cd $1
cp $1/docs/readme.txt $2/readme-${WXVER}.txt
cp $1/docs/changes.txt $2/changes-${WXVER}.txt
cp $1/docs/mgl/readme.txt $2/readme-mgl-${WXVER}.txt
cp $1/docs/mgl/install.txt $2/install-mgl-${WXVER}.txt
cp $1/docs/x11/readme.txt $2/readme-x11-${WXVER}.txt
cp $1/docs/x11/readme-nanox.txt $2/readme-nanox-${WXVER}.txt
cp $1/docs/x11/install.txt $2/install-x11-${WXVER}.txt
cp $1/docs/motif/readme.txt $2/readme-motif-${WXVER}.txt
cp $1/docs/motif/install.txt $2/install-motif-${WXVER}.txt
cp $1/docs/msw/readme.txt $2/readme-msw-${WXVER}.txt
cp $1/docs/msw/install.txt $2/install-msw-${WXVER}.txt
cp $1/docs/gtk/readme.txt $2/readme-gtk-${WXVER}.txt
cp $1/docs/gtk/install.txt $2/install-gtk-${WXVER}.txt
cp $1/docs/mac/readme.txt $2/readme-mac-${WXVER}.txt
cp $1/docs/mac/install.txt $2/install-mac-${WXVER}.txt
cp $1/docs/os2/install.txt $2/install-os2-${WXVER}.txt
echo Done!

1
distrib/msw/tarwxall
View File

@@ -103,6 +103,7 @@ $1/distrib/msw/namedown include/wx/os2/*.H
$1/distrib/msw/namedown src/os2/*.CPP src/os2/*.I
cd ..
rm -f wxAll-${WXVER}.tar
$TAR cf $2/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}

10
distrib/msw/tarwxmac
View File

@@ -63,7 +63,7 @@ echo Removing backup files...
rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
rm -f $2/wxMac-${WXVER}*.tar.gz
rm -f -r $2/wxWindows-${WXVER}
rm -f -r $2/wxMac-${WXVER}
cp $1/include/wx/mac/setup0.h $1/include/wx/setup.h
@@ -78,8 +78,8 @@ rm -f $1/include/wx/setup.h
echo Re-tarring in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
mkdir wxMac-${WXVER}
cd wxMac-${WXVER}
$TAR xf ../wxMac-${WXVER}.tar
# Remove mmedia
@@ -87,8 +87,8 @@ rm -f -r contrib/src/mmedia contrib/samples/mmedia
cd ..
rm -f wxMac-${WXVER}.tar
$TAR cf $2/wxMac-${WXVER}.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
$TAR cf $2/wxMac-${WXVER}.tar wxMac-${WXVER}/*
rm -f -r wxMac-${WXVER}
gzip $2/wxMac-${WXVER}.tar
# Copy readme and other files

85
distrib/msw/tarwxx11 Executable file
View File

@@ -0,0 +1,85 @@
#!/bin/sh
# tarwxall: make up a tar.gz distribution of wxX11
# Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
# 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.
TAR=tar
ARCH=`arch`
if [ "$ARCH" = "ppc" ]; then
TAR=gnutar
fi
expandlines()
{
toexpand=$1
outputfile=$2
rm -f $outputfile
touch $outputfile
for line in `cat $toexpand` ; do
if [ "$line" != "" ]; then
ls $line >> $outputfile
fi
uniq < $outputfile > /tmp/uniqtemp.txt
mv /tmp/uniqtemp.txt $outputfile
done
}
init=""
if [ "$1" = "" ]
then
echo Usage: tarwxx11 wx-dir output-dir version
exit
fi
if [ "$2" = "" ]
then
echo Usage: tarwxx11 wx-dir output-dir version
exit
fi
if [ "$3" = "" ]
then
echo Usage: tarwxx11 wx-dir output-dir version
exit
fi
WXVER=$3
echo About to archive wxAll:
echo From $1
echo To $2
echo CTRL-C if this is not correct.
read dummy
cd $1
echo Removing backup files...
rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
rm -f $2/wxX11-${WXVER}*.tar.gz
rm -f $2/wxX11-${WXVER}
### wxX11: combined wxMotif and wxX11 distributions
cd $1
cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt
expandlines /tmp/wxx11_in.txt /tmp/wxx11.txt
$TAR cf $2/wxX11-${WXVER}.tar -T /tmp/wxx11.txt
echo Re-tarring wxX11 in a subdirectory...
cd $2
mkdir wxX11-${WXVER}
cd wxX11-${WXVER}
$TAR xf ../wxX11-${WXVER}.tar
cd ..
rm -f wxX11-${WXVER}.tar
$TAR cf $2/wxX11-${WXVER}.tar wxX11-${WXVER}/*
rm -f -r wxX11-${WXVER}
gzip $2/wxX11-${WXVER}.tar

187
distrib/msw/tmake/b32.t
View File

@@ -13,12 +13,20 @@
IncludeTemplate("filelist.t");
#! now transform these hashes into $project tags
foreach $file (sort keys %wxGeneric) {
my $tag = "";
next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;
foreach $file (sort keys %wxUNIV) {
next if $wxUNIV{$file} =~ /\T\b/;
$file =~ s/cp?p?$/obj/;
$project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
$obj = "\$(UNIVDIR)\\" . $file . " ";
$project{"WXUNIVOBJS"} .= "\$(MSWDIR)\\" . $file . " "
}
foreach $file (sort keys %wxUNIV) {
next unless $wxUNIV{$file} =~ /\T\b/;
$file =~ s/cp?p?$/obj/;
$obj = "\$(UNIVTHEMEDIR)\\" . $file . " ";
$project{"WXUNIVTHEMEOBJS"} .= "\$(MSWDIR)\\" . $file . " "
}
foreach $file (sort keys %wxHTML) {
@@ -38,6 +46,7 @@
$project{"WXCOBJS"} .= $obj if $isCFile;
}
#! MSW dir for native port
foreach $file (sort keys %wxMSW) {
next if $wxMSW{$file} =~ /\b16\b/;
@@ -61,6 +70,57 @@
}
$project{"WXCOBJS"} .= $obj if $isCFile;
}
#! Now do MSW dir for UNIV
foreach $file (sort keys %wxMSW) {
next unless $wxMSW{$file} =~ /\b(L|B)\b/;
#! if ( $file =~ /^automtn/ ) {
#! #! comment in old makefile.b32 seems to imply that this file can not
#! #! be compiled with Borland (leads to crash in oleauto sample)
#! No longer true, at least for BC++ 5.2
#! next;
#! }
$isCFile = $file =~ /\.c$/;
my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
$file =~ s/cp?p?$/obj/;
my $obj = "\$(MSWDIR)\\" . $file . " ";
$project{"WXMSWUNIVOBJS"} .= $obj;
if ( $isOleObj ) {
#! remember that this file is in ole subdir
$project{"WXOLEUNIVOBJS"} .= $obj;
}
$project{"WXCUNIVOBJS"} .= $obj if $isCFile;
}
#! Generic Dir for Native Port
foreach $file (sort keys %wxGeneric) {
my $tag = "";
next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;
$file =~ s/cp?p?$/obj/;
$project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
}
#! Generic Dir for UNIV Port
foreach $file (sort keys %wxGeneric) {
my $filereal = $file;
if ( $file =~ /^([^.]+)g.cpp$/ ) {
$filereal = "$1.cpp";
}
$file =~ s/cp?p?$/obj/;
$filereal =~ s/cp?p?$/obj/;
next if $project{"WXMSWUNIVOBJS"} =~ /\b$filereal\b/ ||
$project{"WXUNIVOBJS"} =~ /\b$filereal\b/;
$project{"WXGENERICUNIVOBJS"} .= "\$(MSWDIR)\\" . $file . " "
}
#$}
# This file was automatically generated by tmake
@@ -87,6 +147,7 @@
WXDIR = $(WXWIN)
THISDIR = $(WXDIR)\src\msw
# Set all these to 1 if you want to build a dynamic library
!if "$(DLL)" == "1"
WXMAKINGDLL=1
@@ -128,31 +189,35 @@ GENDIR=..\generic
COMMDIR=..\common
HTMLDIR=..\html
OLEDIR=.\ole
UNIVDIR=..\univ
UNIVTHEMEDIR=..\univ\themes
MSWDIR=.
DOCDIR = $(WXDIR)\docs
GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
# Not needed:
# $(MSWDIR)\colrdlgg.obj \
# $(MSWDIR)\fontdlgg.obj \
# $(MSWDIR)\msgdlgg.obj \
# $(MSWDIR)\printps.obj \
# $(MSWDIR)\prntdlgg.obj \
# $(MSWDIR)\listctrl.obj \
# $(MSWDIR)\notebook.obj \
# $(MSWDIR)\treectrl.obj
MSWOBJS = #$ ExpandList("WXMSWOBJS");
GENERICUNIVOBJS= #$ ExpandList("WXGENERICUNIVOBJS");
MSWUNIVOBJS = #$ ExpandList("WXMSWUNIVOBJS");
UNIVOBJS = #$ ExpandList("WXUNIVOBJS");
UNIVTHEMEOBJS = #$ ExpandList("WXUNIVTHEMEOBJS");
HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
COMMONOBJS = \
$(MSWDIR)\y_tab.obj \
#$ ExpandList("WXCOMMONOBJS");
MSWOBJS = #$ ExpandList("WXMSWOBJS");
HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
!if "$(WXUSINGUNIV)" == "1"
OBJECTS = $(COMMONOBJS) $(GENERICUNIVOBJS) $(MSWUNIVOBJS) $(HTMLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS)
!else
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
!endif
default: wx
@@ -168,7 +233,7 @@ makesetuph:
# Copy include\wx\msw\setup.h to the architecture-specific location
makearchsetuph:
copy $(WXDIR)\include\wx\msw\setup.h $(ARCHSETUPH)
copy $(SETUPSRCDIR)\setup.h $(ARCHSETUPH)
cd $(WXDIR)\src\msw
$(ARCHINCDIR)\wx:
@@ -219,6 +284,27 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
# $(OBJECTS): $(WXDIR)\include\wx\setup.h
!if "$(WXUSINGUNIV)" == "1"
########################################################
# MSW objects (compile Native or UNIV) - UNIV
#${
$_ = $project{"WXMSWUNIVOBJS"};
my @objs = split;
foreach (@objs) {
$text .= $_ . ": ";
if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }
$suffix = $project{"WXCUNIVOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
s/obj$/$suffix/;
$text .= $_ . "\n\n";
}
#$}
!else
########################################################
# MSW objects (compile Native or UNIV) - Native
#${
$_ = $project{"WXMSWOBJS"};
my @objs = split;
@@ -230,6 +316,38 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
$text .= $_ . "\n\n";
}
#$}
!endif
!if "$(WXUSINGUNIV)" == "1"
########################################################
# UNIV objects
#${
$_ = $project{"WXUNIVOBJS"};
my @objs = split;
foreach (@objs) {
$text .= $_ . ": ";
s/MSWDIR/UNIVDIR/;
s/obj$/\$(SRCSUFF)/;
$text .= $_ . "\n\n";
}
#$}
########################################################
# UNIV THEME objects
#${
$_ = $project{"WXUNIVTHEMEOBJS"};
my @objs = split;
foreach (@objs) {
$text .= $_ . ": ";
s/MSWDIR/UNIVTHEMEDIR/;
s/obj$/\$(SRCSUFF)/;
$text .= $_ . "\n\n";
}
#$}
!endif
########################################################
# Common objects (always compiled)
@@ -246,9 +364,29 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
}
#$}
!if "$(WXUSINGUNIV)" == "1"
########################################################
# Generic objects (not always compiled, depending on
# whether platforms have native implementations)
# Native
#${
$_ = $project{"WXGENERICUNIVOBJS"};
my @objs = split;
foreach (@objs) {
$text .= $_ . ": ";
s/MSWDIR/GENDIR/;
s/obj$/\$(SRCSUFF)/;
$text .= $_ . "\n\n";
}
#$}
!else
########################################################
# Generic objects (not always compiled, depending on
# whether platforms have native implementations)
# Native
#${
$_ = $project{"WXGENERICOBJS"};
@@ -260,6 +398,7 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
$text .= $_ . "\n\n";
}
#$}
!endif
########################################################
# HTML objects (always compiled)
@@ -293,7 +432,7 @@ all_execs:
png: $(CFG)
cd $(WXDIR)\src\png
${MAKE} -f makefile.b32
${MAKE} -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\src\msw
clean_png:
@@ -303,7 +442,7 @@ clean_png:
zlib: $(CFG)
cd $(WXDIR)\src\zlib
${MAKE} -f makefile.b32 lib
${MAKE} -f makefile.b32 FINAL=$(FINAL) lib
cd $(WXDIR)\src\msw
clean_zlib:
@@ -313,7 +452,7 @@ clean_zlib:
jpeg: $(CFG)
cd $(WXDIR)\src\jpeg
${MAKE} -f makefile.b32
${MAKE} -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\src\msw
clean_jpeg:
@@ -323,7 +462,7 @@ clean_jpeg:
regex: $(CFG)
cd $(WXDIR)\src\regex
${MAKE} -f makefile.b32 lib
${MAKE} -f makefile.b32 FINAL=$(FINAL) lib
cd $(WXDIR)\src\msw
clean_regex:
@@ -333,7 +472,7 @@ clean_regex:
tiff: $(CFG)
cd $(WXDIR)\src\tiff
${MAKE} -f makefile.b32 lib
${MAKE} -f makefile.b32 FINAL=$(FINAL) lib
cd $(WXDIR)\src\msw
clean_tiff:
@@ -360,7 +499,7 @@ $(CFG): makefile.b32
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
-D__WXWIN__
-D__WXMSW__
-D$(PORT)
-D__WINDOWS__
-DWIN32
$(OPT)

20
distrib/msw/tmake/b32base.t
View File

@@ -85,8 +85,8 @@ wxUSE_GUI=0
!include $(WXDIR)\src\makeb32.env
PERIPH_LIBS=
PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET)
PERIPH_TARGET=zlib regex $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_zlib clean_regex $(PERIPH_CLEAN_TARGET)
!if "$(DLL)" == "0"
DUMMY=dummy
@@ -106,7 +106,6 @@ MSWDIR=.
DOCDIR = $(WXDIR)\docs
COMMONOBJS = \
$(MSWDIR)\y_tab.obj \
#$ ExpandList("WXCOMMONOBJS");
MSWOBJS = #$ ExpandList("WXMSWOBJS");
@@ -164,19 +163,6 @@ dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\includ
version.res:
brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
$(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
# cl @<<
# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
# <<
$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c
copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
#${
$_ = $project{"WXMSWOBJS"};
my @objs = split;
@@ -305,8 +291,6 @@ clean: $(PERIPH_CLEAN_TARGET)
-erase *.pch
-erase *.csm
-erase "wx32.#??"
-erase ..\common\y_tab.c
-erase ..\common\lex_yy.c
cleanall: clean

722
distrib/msw/tmake/b32univ.t
View File

@@ -1,722 +0,0 @@
#!#############################################################################
#! File: b32.t
#! Purpose: tmake template file from which makefile.b32 is generated by running
#! tmake -t b32 wxwin.pro
#! Author: Vadim Zeitlin
#! Created: 14.07.99
#! Version: $Id$
#!#############################################################################
#${
#! include the code which parses filelist.txt file and initializes
#! %wxCommon, %wxGeneric and %wxMSW hashes.
IncludeTemplate("filelist.t");
#! now transform these hashes into $project tags
foreach $file (sort keys %wxUNIV) {
next if $wxUNIV{$file} =~ /\T\b/;
$file =~ s/cp?p?$/obj/;
$obj = "\$(UNIVDIR)\\" . $file . " ";
$project{"WXUNIVOBJS"} .= "\$(MSWDIR)\\" . $file . " "
}
foreach $file (sort keys %wxUNIV) {
next unless $wxUNIV{$file} =~ /\T\b/;
$file =~ s/cp?p?$/obj/;
$obj = "\$(UNIVTHEMEDIR)\\" . $file . " ";
$project{"WXUNIVTHEMEOBJS"} .= "\$(MSWDIR)\\" . $file . " "
}
foreach $file (sort keys %wxHTML) {
next if $wxHTML{$file} =~ /\b16\b/;
$file =~ s/cp?p?$/obj/;
$project{"WXHTMLOBJS"} .= "\$(MSWDIR)\\" . $file . " "
}
foreach $file (sort keys %wxCommon) {
next if $wxCommon{$file} =~ /\b(16|U)\b/;
$isCFile = $file =~ /\.c$/;
$file =~ s/cp?p?$/obj/;
$obj = "\$(MSWDIR)\\" . $file . " ";
$project{"WXCOMMONOBJS"} .= $obj;
$project{"WXCOBJS"} .= $obj if $isCFile;
}
foreach $file (sort keys %wxMSW) {
next unless $wxMSW{$file} =~ /\b(L|B)\b/;
#! if ( $file =~ /^automtn/ ) {
#! #! comment in old makefile.b32 seems to imply that this file can not
#! #! be compiled with Borland (leads to crash in oleauto sample)
#! No longer true, at least for BC++ 5.2
#! next;
#! }
$isCFile = $file =~ /\.c$/;
my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
$file =~ s/cp?p?$/obj/;
my $obj = "\$(MSWDIR)\\" . $file . " ";
$project{"WXMSWOBJS"} .= $obj;
if ( $isOleObj ) {
#! remember that this file is in ole subdir
$project{"WXOLEOBJS"} .= $obj;
}
$project{"WXCOBJS"} .= $obj if $isCFile;
}
foreach $file (sort keys %wxGeneric) {
my $filereal = $file;
if ( $file =~ /^([^.]+)g.cpp$/ ) {
$filereal = "$1.cpp";
}
$file =~ s/cp?p?$/obj/;
$filereal =~ s/cp?p?$/obj/;
next if $project{"WXMSWOBJS"} =~ /\b$filereal\b/ ||
$project{"WXUNIVOBJS"} =~ /\b$filereal\b/;
$project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
}
#$}
# This file was automatically generated by tmake
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
#
# File: makefile.b32
# Author: Julian Smart
# Created: 1998
# Updated:
# Copyright:
#
# "%W% %G%"
#
# Makefile : Builds wxWindows library wx.lib for MS Windows,
# and Borland C++ (32-bit).
# BCCDIR now defined in ../makeb32.env
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
!endif
WXDIR = $(WXWIN)
THISDIR = $(WXDIR)\src\msw
# Set all these to 1 if you want to build a dynamic library
!if "$(DLL)" == "1"
WXMAKINGDLL=1
WXBUILDDLL=1
!endif
!include $(WXDIR)\src\makeb32.env
# Please set these according to the settings in wx_setup.h, so we can include
# the appropriate libraries in wx.lib
USE_CTL3D=0
PERIPH_LIBS=
PERIPH_TARGET=
PERIPH_CLEAN_TARGET=
!if "$(USE_CTL3D)" == "1"
#Use WIN32S/WIN95 32 bit version ctl3d32.dll under win95 (Andre Beltman)
PERIPH_LIBS=$(WXDIR)\lib\ctl3d32.lib $(PERIPH_LIBS)
PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
!endif
#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
PERIPH_LIBS=
PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET)
!if "$(DLL)" == "0"
DUMMY=dummy
!else
DUMMY=dummydll
LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex
!endif
LIBTARGET=$(WXLIB)
GENDIR=..\generic
COMMDIR=..\common
HTMLDIR=..\html
OLEDIR=.\ole
UNIVDIR=..\univ
UNIVTHEMEDIR=..\univ\themes
MSWDIR=.
DOCDIR = $(WXDIR)\docs
GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
# Not needed:
# $(MSWDIR)\colrdlgg.obj \
# $(MSWDIR)\fontdlgg.obj \
# $(MSWDIR)\msgdlgg.obj \
# $(MSWDIR)\printps.obj \
# $(MSWDIR)\prntdlgg.obj \
# $(MSWDIR)\listctrl.obj \
# $(MSWDIR)\notebook.obj \
# $(MSWDIR)\treectrl.obj
COMMONOBJS = \
$(MSWDIR)\y_tab.obj \
#$ ExpandList("WXCOMMONOBJS");
MSWOBJS = #$ ExpandList("WXMSWOBJS");
HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
UNIVOBJS = #$ ExpandList("WXUNIVOBJS");
UNIVTHEMEOBJS = #$ ExpandList("WXUNIVTHEMEOBJS");
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS)
default: wx
wx: $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
all: wx
# Copy the in-CVS setup0.h to setup.h if necessary
makesetuph:
cd $(WXDIR)\include\wx\msw
if not exist setup.h copy setup0.h setup.h
cd $(WXDIR)\src\msw
# Copy include\wx\univ\setup.h to the architecture-specific location
makearchsetuph:
copy $(WXDIR)\include\wx\univ\setup.h $(ARCHSETUPH)
cd $(WXDIR)\src\msw
$(ARCHINCDIR)\wx:
-mkdir $(ARCHINCDIR)
-mkdir $(ARCHINCDIR)\wx
!if "$(DLL)" == "0"
$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET)
tlib "$(LIBTARGET)" /P1024 @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
!
!else
$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET)
-erase $(WXLIBDIR)\wx.dll
$(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&!
c0d32.obj $(OBJECTS)
$(WXLIBDIR)\wx
nul
$(PERIPH_LIBS) $(LIBS)
wxb32
!
-erase $(WXLIBDIR)\version.res
brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
!endif
dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h version.res
$(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
# cl @<<
# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
# <<
$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c
copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
# $(OBJECTS): $(WXDIR)\include\wx\setup.h
#${
$_ = $project{"WXMSWOBJS"};
my @objs = split;
foreach (@objs) {
$text .= $_ . ": ";
if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }
$suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
s/obj$/$suffix/;
$text .= $_ . "\n\n";
}
#$}
########################################################
# Common objects (always compiled)
#${
$_ = $project{"WXCOMMONOBJS"};
my @objs = split;
foreach (@objs) {
$text .= $_ . ": ";
$suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
s/MSWDIR/COMMDIR/;
s/obj$/$suffix/;
$text .= $_ . "\n\n";
}
#$}
########################################################
# Generic objects (not always compiled, depending on
# whether platforms have native implementations)
#${
$_ = $project{"WXGENERICOBJS"};
my @objs = split;
foreach (@objs) {
$text .= $_ . ": ";
s/MSWDIR/GENDIR/;
s/obj$/\$(SRCSUFF)/;
$text .= $_ . "\n\n";
}
#$}
########################################################
# HTML objects (always compiled)
#${
$_ = $project{"WXHTMLOBJS"};
my @objs = split;
foreach (@objs) {
$text .= $_ . ": ";
s/MSWDIR/HTMLDIR/;
s/obj$/\$(SRCSUFF)/;
$text .= $_ . "\n\n";
}
#$}
########################################################
# UNIV objects (always compiled)
#${
$_ = $project{"WXUNIVOBJS"};
my @objs = split;
foreach (@objs) {
$text .= $_ . ": ";
s/MSWDIR/UNIVDIR/;
s/obj$/\$(SRCSUFF)/;
$text .= $_ . "\n\n";
}
#$}
########################################################
# UNIV THEME objects (always compiled)
#${
$_ = $project{"WXUNIVTHEMEOBJS"};
my @objs = split;
foreach (@objs) {
$text .= $_ . ": ";
s/MSWDIR/UNIVTHEMEDIR/;
s/obj$/\$(SRCSUFF)/;
$text .= $_ . "\n\n";
}
#$}
all_utils:
cd $(WXDIR)\utils
make -f makefile.b32
cd $(WXDIR)\src\msw
all_samples:
cd $(WXDIR)\samples
make -f makefile.b32
cd $(WXDIR)\src\msw
all_execs:
cd $(WXDIR)\utils
make -f makefile.b32 all_execs
cd $(WXDIR)\src\msw
png: $(CFG)
cd $(WXDIR)\src\png
make -f makefile.b32
cd $(WXDIR)\src\msw
clean_png:
cd $(WXDIR)\src\png
make -f makefile.b32 clean
cd $(WXDIR)\src\msw
zlib: $(CFG)
cd $(WXDIR)\src\zlib
make -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_zlib:
cd $(WXDIR)\src\zlib
make -f makefile.b32 clean
cd $(WXDIR)\src\msw
jpeg: $(CFG)
cd $(WXDIR)\src\jpeg
make -f makefile.b32
cd $(WXDIR)\src\msw
clean_jpeg:
cd $(WXDIR)\src\jpeg
make -f makefile.b32 clean
cd $(WXDIR)\src\msw
regex: $(CFG)
cd $(WXDIR)\src\regex
make -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_regex:
cd $(WXDIR)\src\regex
make -f makefile.b32 clean
cd $(WXDIR)\src\msw
tiff: $(CFG)
cd $(WXDIR)\src\tiff
make -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_tiff:
cd $(WXDIR)\src\tiff
make -f makefile.b32 clean
cd $(WXDIR)\src\msw
$(CFG): makeuniv.b32
copy &&!
-Hc
-H=$(WXDIR)\src\msw\wx32.csm
-3
-d
-a1 # byte alignment
-R-
-X
-w-par
-w-aus
-w-hid # virtual function A hides virtual function B
-tWM
-I$(ARCHINCDIR);$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
-I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
-D__WXWIN__
-D__WINDOWS__
-D__WXUNIVERSAL__
-D_WIN32
-DWIN32
$(OPT)
$(DEBUG_FLAGS)
$(WIN95FLAG)
! $(CFG)
clean: $(PERIPH_CLEAN_TARGET)
-erase $(LIBTARGET)
-erase $(WXLIBDIR)\wx.dll
-erase $(WXLIBDIR)\wx.tds
-erase $(WXLIBDIR)\wx.il?
-erase *.obj
-erase *.pch
-erase *.csm
-erase *.cfg
-erase "wx32.#??"
-erase ..\common\y_tab.c
-erase ..\common\lex_yy.c
cleanall: clean
# Making documents
docs: allhlp allhtml allpdfrtf
alldocs: docs
hlp: wxhlp portinghlp
wxhlp: $(DOCDIR)/winhelp/wx.hlp
prophlp: $(DOCDIR)/winhelp/prop.hlp
refhlp: $(DOCDIR)/winhelp/techref.hlp
rtf: $(DOCDIR)/winhelp/wx.rtf
proprtf: $(DOCDIR)/winhelp/prop.rtf
pdfrtf: $(DOCDIR)/pdf/wx.rtf
proppdfrtf: $(DOCDIR)/pdf/prop.rtf
refpdfrtf: $(DOCDIR)/pdf/techref.rtf
html: wxhtml portinghtml
wxhtml: $(DOCDIR)\html\wx\wx.htm
htmlhelp: $(DOCDIR)\html\wx\wx.chm
prophtml: $(DOCDIR)\html\proplist\prop.htm
ps: wxps referencps
wxps: $(WXDIR)\docs\ps\wx.ps
propps: $(WXDIR)\docs\ps\prop.ps
referencps: $(WXDIR)\docs\ps\referenc.ps
portinghtml: $(DOCDIR)\html\porting\port.htm
portingrtf: $(DOCDIR)/winhelp/porting.rtf
portinghlp: $(DOCDIR)/winhelp/porting.hlp
portingpdfrtf: $(DOCDIR)/pdf/porting.rtf
portingps: $(WXDIR)\docs\ps\porting.ps
allhlp: wxhlp portinghlp prophlp
cd $(WXDIR)\utils\dialoged\src
make -f makefile.b32 hlp
cd $(THISDIR)
# cd $(WXDIR)\utils\wxhelp\src
# make -f makefile.b32 hlp
# cd $(WXDIR)\utils\tex2rtf\src
# make -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxgraph\src
# make -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxchart\src
# make -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxtree\src
# make -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxbuild\src
# make -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxgrid\src
# make -f makefile.b32 hlp
allhtml: wxhtml portinghtml prophtml
cd $(WXDIR)\utils\dialoged\src
make -f makefile.b32 html
cd $(THISDIR)
# make -f makefile.b32 html
# cd $(WXDIR)\utils\dialoged\src
# make -f makefile.b32 html
# cd $(WXDIR)\utils\hytext\src
# make -f makefile.b32 html
# cd $(WXDIR)\utils\wxhelp\src
# make -f makefile.b32 html
# cd $(WXDIR)\utils\tex2rtf\src
# make -f makefile.b32 html
# cd $(WXDIR)\utils\wxgraph\src
# make -f makefile.b32 html
# cd $(WXDIR)\utils\wxchart\src
# make -f makefile.b32 html
# cd $(WXDIR)\utils\wxtree\src
# make -f makefile.b32 html
allps: wxps referencps portingps propps
cd $(WXDIR)\utils\dialoged\src
make -f makefile.b32 ps
cd $(THISDIR)
allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
cd $(WXDIR)\utils\dialoged\src
make -f makefile.b32 pdfrtf
cd $(THISDIR)
# cd $(WXDIR)\utils\wxhelp\src
# make -f makefile.b32 ps
# cd $(WXDIR)\utils\tex2rtf\src
# make -f makefile.b32 ps
# cd $(WXDIR)\utils\wxgraph\src
# make -f makefile.b32 ps
# cd $(WXDIR)\utils\wxchart\src
# make -f makefile.b32 ps
# cd $(WXDIR)\utils\wxtree\src
# make -f makefile.b32 ps
# cd $(THISDIR)
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
cd $(DOCDIR)/latex/wx
-erase wx.ph
hc wx
move wx.hlp $(DOCDIR)\winhelp\wx.hlp
move wx.cnt $(DOCDIR)\winhelp\wx.cnt
cd $(THISDIR)
$(DOCDIR)/winhelp/porting.hlp: $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj
cd $(DOCDIR)/latex/porting
-erase porting.ph
hc porting
move porting.hlp $(DOCDIR)\winhelp\porting.hlp
move porting.cnt $(DOCDIR)\winhelp\porting.cnt
cd $(THISDIR)
$(DOCDIR)/winhelp/prop.hlp: $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj
cd $(DOCDIR)/latex/proplist
-erase prop.ph
hc prop
move prop.hlp $(DOCDIR)\winhelp\prop.hlp
move prop.cnt $(DOCDIR)\winhelp\prop.cnt
cd $(THISDIR)
$(DOCDIR)/winhelp/techref.hlp: $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
cd $(DOCDIR)/latex/techref
-erase techref.ph
hc techref
move techref.hlp $(DOCDIR)\winhelp\techref.hlp
move techref.cnt $(DOCDIR)\winhelp\techref.cnt
cd $(THISDIR)
$(DOCDIR)/latex/wx/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
cd $(DOCDIR)\latex\wx
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
cd $(THISDIR)
$(DOCDIR)/latex/porting/porting.rtf: $(DOCDIR)/latex/porting/porting.tex
cd $(DOCDIR)\latex\porting
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp
cd $(THISDIR)
$(DOCDIR)/latex/proplist/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
cd $(DOCDIR)\latex\proplist
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.rtf -twice -winhelp
cd $(THISDIR)
$(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
cd $(DOCDIR)\latex\techref
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp
cd $(THISDIR)
$(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
cd $(DOCDIR)\latex\wx
-copy *.wmf $(DOCDIR)\pdf
-copy *.bmp $(DOCDIR)\pdf
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
cd $(THISDIR)
$(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex
cd $(DOCDIR)\latex\porting
-copy *.wmf $(DOCDIR)\pdf
-copy *.bmp $(DOCDIR)\pdf
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf
cd $(THISDIR)
$(DOCDIR)/pdf/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
cd $(DOCDIR)\latex\proplist
-copy *.wmf $(DOCDIR)\pdf
-copy *.bmp $(DOCDIR)\pdf
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf
cd $(THISDIR)
$(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
cd $(DOCDIR)\latex\techref
-copy *.wmf $(DOCDIR)\pdf
-copy *.bmp $(DOCDIR)\pdf
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
cd $(THISDIR)
$(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
cd $(DOCDIR)\latex\wx
-mkdir $(DOCDIR)\html\wx
-start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
-erase $(DOCDIR)\html\wx\*.con
-erase $(DOCDIR)\html\wx\*.ref
-erase $(DOCDIR)\latex\wx\*.con
-erase $(DOCDIR)\latex\wx\*.ref
cd $(THISDIR)
$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
cd $(DOCDIR)\html\wx
-hhc wx.hhp
cd $(THISDIR)
$(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex
cd $(DOCDIR)\latex\porting
-mkdir $(DOCDIR)\html\porting
-start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html
-erase $(DOCDIR)\html\porting\*.con
-erase $(DOCDIR)\html\porting\*.ref
-erase $(DOCDIR)\latex\porting\*.con
-erase $(DOCDIR)\latex\porting\*.ref
cd $(THISDIR)
$(DOCDIR)\html\proplist\prop.htm: $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex
cd $(DOCDIR)\latex\proplist
-mkdir $(DOCDIR)\html\proplist
-start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html
-erase $(DOCDIR)\html\proplist\*.con
-erase $(DOCDIR)\html\proplist\*.ref
-erase $(DOCDIR)\latex\proplist\*.con
-erase $(DOCDIR)\latex\proplist\*.ref
cd $(THISDIR)
$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
cd $(WXDIR)\docs\latex\wx
-latex manual
-latex manual
-makeindx manual
-bibtex manual
-latex manual
-latex manual
cd $(THISDIR)
$(WXDIR)\docs\latex\porting\porting.dvi: $(DOCDIR)/latex/porting/porting.tex
cd $(WXDIR)\docs\latex\porting
-latex porting
-latex porting
-makeindx porting
-bibtex porting
-latex porting
-latex porting
cd $(THISDIR)
$(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi
cd $(WXDIR)\docs\latex\wx
-dvips32 -o wx.ps manual
move wx.ps $(WXDIR)\docs\ps\wx.ps
cd $(THISDIR)
$(WXDIR)\docs\ps\porting.ps: $(WXDIR)\docs\latex\porting\porting.dvi
cd $(WXDIR)\docs\latex\porting
-dvips32 -o porting.ps porting
move porting.ps $(WXDIR)\docs\ps\porting.ps
cd $(THISDIR)
$(WXDIR)\docs\latex\wx\referenc.dvi: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
cd $(WXDIR)\docs\latex\wx
-latex referenc
-latex referenc
-makeindx referenc
-bibtex referenc
-latex referenc
-latex referenc
cd $(THISDIR)
$(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi
cd $(WXDIR)\docs\latex\wx
-dvips32 -o referenc.ps referenc
move referenc.ps $(WXDIR)\docs\ps\referenc.ps
cd $(THISDIR)
# In order to force document reprocessing
touchmanual:
-touch $(WXDIR)\docs\latex\wx\manual.tex
updatedocs: touchmanual alldocs
# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
# Office StartUp folder, and PDFMaker should be installed.
updatepdf: # touchmanual pdfrtf
start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
MFTYPE=b32
# Can't use this or we'll have to distribute all tmake files with wxWindows
# makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
self:
cd $(WXWIN)\distrib\msw\tmake
tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
copy makefile.$(MFTYPE) $(WXWIN)\src\msw

2
distrib/msw/tmake/filelist.t
View File

@@ -97,6 +97,8 @@
$wxGTKINCLUDE{$filename} = $fileflags;
} elsif ( $filetype eq "OS2H" ) {
$wxOS2PMINCLUDE{$filename} = $fileflags;
} elsif ( $filetype eq "MGLH" ) {
$wxMGLINCLUDE{$filename} = $fileflags;
} elsif ( $filetype eq "X11H" ) {
$wxX11INCLUDE{$filename} = $fileflags;
} elsif ( $filetype eq "UnivH" ) {

37
distrib/msw/tmake/filelist.txt
View File

@@ -30,6 +30,7 @@
# MotifH /include/wx/motif
# MSWH /include/wx/msw
# OS2H /include/wx/os2
# MGLH /include/wx/mgl
# X11H /include/wx/x11
# GenericH /include/wx/generic
# HtmlH /include/wx/html
@@ -90,7 +91,7 @@ imaglist.cpp Generic NotWin32
laywin.cpp Generic
listctrl.cpp Generic NotWin32
logg.cpp Generic
mdig.cpp Generic NotWin32,NotGTK,NotOS2,NotMac
mdig.cpp Generic NotWin32,NotGTK,NotMac
msgdlgg.cpp Generic Generic
notebook.cpp Generic NotWin32,NotGTK,NotOS2,NotMGL,NotX11,NotMac,NotMicro
numdlgg.cpp Generic
@@ -294,7 +295,9 @@ enhmeta.cpp MSW Win32Only
helpbest.cpp MSW Win32Only
evtloop.cpp MSW LowLevel
fdrepdlg.cpp MSW Win32Only
filedlg.cpp MSW
# FIXME: the generic implementation doesn't work under MSW, so we must
# the native dialog under MSW
filedlg.cpp MSW LowLevel
font.cpp MSW LowLevel
fontdlg.cpp MSW
fontenum.cpp MSW LowLevel
@@ -687,12 +690,10 @@ iniconf.cpp OS2
joystick.cpp OS2
listbox.cpp OS2
main.cpp OS2
mdi.cpp OS2
menu.cpp OS2
menuitem.cpp OS2
metafile.cpp OS2
mimetype.cpp OS2
minifram.cpp OS2
msgdlg.cpp OS2
nativdlg.cpp OS2
notebook.cpp OS2
@@ -745,7 +746,6 @@ m_list.cpp HTML
m_dflist.cpp HTML
m_pre.cpp HTML
m_tables.cpp HTML
m_meta.cpp HTML
m_style.cpp HTML
htmprint.cpp HTML
@@ -1230,6 +1230,28 @@ textctrl.h X11H
toplevel.h X11H
window.h X11H
app.h MGLH
bitmap.h MGLH
brush.h MGLH
clipbrd.h MGLH
colour.h MGLH
cursor.h MGLH
dc.h MGLH
dcclient.h MGLH
dcmemory.h MGLH
dcscreen.h MGLH
font.h MGLH
fontutil.h MGLH
gdiobj.h MGLH
icon.h MGLH
palette.h MGLH
pen.h MGLH
popupwin.h MGLH
private.h MGLH
region.h MGLH
toplevel.h MGLH
window.h MGLH
accel.h MSWH
app.h MSWH
bitmap.h MSWH
@@ -1267,7 +1289,7 @@ fontdlg.h MSWH
frame.h MSWH
gauge95.h MSWH
gaugemsw.h MSWH
gccpriv.h MSWH
gccpriv.h MSWH Base
gdiimage.h MSWH
gdiobj.h MSWH
glcanvas.h MSWH
@@ -1392,7 +1414,6 @@ dialog.h OS2H
radiobox.h OS2H
toolbar.h OS2H
checkbox.h OS2H
mdi.h OS2H
radiobut.h OS2H
tooltip.h OS2H
checklst.h OS2H
@@ -1479,7 +1500,7 @@ helphtml.h GenericH
imaglist.h GenericH
laywin.h GenericH
listctrl.h GenericH NotWin32
mdig.h GenericH NotWin32,NotGTK,NotOS2,NotMac
mdig.h GenericH NotWin32,NotGTK,NotMac
msgdlgg.h GenericH
notebook.h GenericH
paletteg.h GenericH NotMSW,NotX,NotX11,NotOS2

7
distrib/msw/tmake/g95.t
View File

@@ -343,9 +343,12 @@ $(ARCHINCDIR)/wx:
mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
$(SETUP_H): $(ARCHINCDIR)/wx
$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
# Copy ALWAYS uses forward slashes now.
$(SETUP_H): $(ARCHINCDIR)/wx
$(COPY) $(WXDIR)/include/wx/msw/setup.h $(subst $(BACKSLASH),/,$@)
# $(COPY) $(WXDIR)/include/wx/msw/setup.h $@
# $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
ifndef WXMAKINGDLL

2
distrib/msw/tmake/gtk.t
View File

@@ -13,8 +13,6 @@
IncludeTemplate("filelist.t");
#! find all our sources
$project{"COMMONOBJS"} .= "parser.o ";
foreach $file (sort keys %wxGeneric) {
next if $wxGeneric{$file} =~ /\bNotGTK\b/;

1
distrib/msw/tmake/mac.t
View File

@@ -13,7 +13,6 @@
IncludeTemplate("filelist.t");
#! find all our sources
$project{"COMMONOBJS"} .= "parser.o ";
#! MoreFiles sources
$project{"GUIOBJS"} .= "DirectoryCopy.o ";
$project{"GUIOBJS"} .= "FSpCompat.o ";

1
distrib/msw/tmake/mgl.t
View File

@@ -13,7 +13,6 @@
IncludeTemplate("filelist.t");
#! find all our sources
$project{"COMMONOBJS"} .= "parser.o ";
foreach $file (sort keys %wxGeneric) {
next if $wxGeneric{$file} =~ /\bNotMGL\b/;

1
distrib/msw/tmake/motif.t
View File

@@ -13,7 +13,6 @@
IncludeTemplate("filelist.t");
#! find all our sources
$project{"COMMONOBJS"} .= "parser.o ";
$project{"GUIOBJS"} .= "xmcombo.o ";
foreach $file (sort keys %wxGeneric) {

2
distrib/msw/tmake/msw.t
View File

@@ -13,8 +13,6 @@
IncludeTemplate("filelist.t");
#! find all our sources
$project{"COMMONOBJS"} .= "parser.o ";
foreach $file (sort keys %wxGeneric) {
next if $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/;

11
distrib/msw/tmake/vc.t
View File

@@ -589,19 +589,26 @@ $(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
cd $(THISDIR)
# This target does two sets of HTML: one using a style sheet, for
# the purposes of the CHM file, and one without.
$(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
cd $(DOCDIR)\latex\wx
-mkdir $(DOCDIR)\html\wx
copy *.gif $(DOCDIR)\html\wx
-start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
-mkdir $(DOCDIR)\mshtml
-mkdir $(DOCDIR)\mshtml\wx
copy *.gif $(DOCDIR)\mshtml\wx
-start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\mshtml\wx\wx.htm -twice -html -macros $(DOCDIR)\latex\wx\tex2rtf_css.ini
-erase $(DOCDIR)\html\wx\*.con
-erase $(DOCDIR)\html\wx\*.ref
-erase $(DOCDIR)\latex\wx\*.con
-erase $(DOCDIR)\latex\wx\*.ref
cd $(THISDIR)
$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
cd $(DOCDIR)\html\wx
$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.hhp
cd $(DOCDIR)\mshtml\wx
copy $(DOCDIR)\latex\wx\wx.css .
-hhc wx.hhp
-mkdir ..\..\htmlhelp
-erase $(DOCDIR)\htmlhelp\wx.chm

2
distrib/msw/tmake/vc6app.t
View File

@@ -49,7 +49,7 @@
} else {
$project{"VC_PROJ_TYPE"} = 'Win32 (x86) Console Application';
$project{"VC_PROJ_CODE"} = '0x0103';
$vc_base_libs = 'kernel32.lib user32.lib advapi32.lib ';
$vc_base_libs = 'kernel32.lib user32.lib advapi32.lib shell32.lib ';
if ( Config("wx") ) {
$vc_base_libs .= 'wsock32.lib ';
}

2
distrib/msw/tmake/x11.t
View File

@@ -13,8 +13,6 @@
IncludeTemplate("filelist.t");
#! find all our sources
$project{"COMMONOBJS"} .= "parser.o ";
foreach $file (sort keys %wxX11) {
($fileobj = $file) =~ s/cp?p?$/\o/;

2
distrib/msw/vc.rsp
View File

@@ -285,6 +285,8 @@ utils/helpgen/src/HelpGenVC.dsw
utils/helpview/src/helpview.dsp
utils/helpview/src/helpview.dsw
utils/helpview/src/client.dsp
utils/helpview/src/client.dsw
contrib/src/ogl/OglVC.dsp
contrib/src/ogl/OglVC.dsw

5
distrib/msw/zipdistinno.bat
View File

@@ -7,7 +7,7 @@ set webfiles=c:\wx2dev\wxWebSite
set inno=1
Rem Set this to the required version
set version=2.3.3
set version=2.3.4
if "%src" == "" goto usage
if "%dest" == "" goto usage
@@ -45,7 +45,7 @@ if direxist %dest\wx erase /sxyz %dest\wx\
if not direxist %dest mkdir %dest
if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
# Copy FAQ from wxWebSite CVS
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
@@ -56,6 +56,7 @@ 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...

2
distrib/msw/zipmac.bat
View File

@@ -5,7 +5,7 @@ set src=%wxwin%
set dest=%src%\deliver
Rem Set this to the required version
set version=2.3.1
set version=2.3.4
if "%src%" == "" goto usage
if "%dest%" == "" goto usage

12
distrib/msw/zipwxmac.bat
View File

@@ -7,7 +7,7 @@ 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.3
set version=2.3.4
if "%src" == "" goto usage
if "%dest" == "" goto usage
@@ -47,10 +47,10 @@ zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
erase /Y %src%\include\wx\setup.h
if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
if direxist %dest%\wxMac-%version% erase /sxyz %dest%\wxMac-%version%
mkdir %dest%\wxWindows-%version%
cd %dest%\wxWindows-%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
@@ -58,7 +58,9 @@ erase /SXY docs\html\dialoged docs\html\tex2rtf
cd %dest%
erase wxMac-%version%.zip
zip32 -r wxMac-%version%.zip wxWindows-%version%/*
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%\*

11
distrib/msw/zipwxos2.bat
View File

@@ -5,7 +5,7 @@ set dest=%src\deliver
set webfiles=c:\wx2dev\wxWebSite
Rem Set this to the required version
set version=2.3.3
set version=2.3.4
if "%src" == "" goto usage
if "%dest" == "" goto usage
@@ -44,10 +44,10 @@ zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
Rem erase /Y %src%\include\wx\setup.h
if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
if direxist %dest%\wxOS2-%version% erase /sxyz %dest%\wxOS2-%version%
mkdir %dest%\wxWindows-%version%
cd %dest%\wxWindows-%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
@@ -64,7 +64,8 @@ call %src%\distrib\msw\lower.bat
cd %dest%
erase wxOS2-%version%.zip
zip32 -r wxOS2-%version%.zip wxWindows-%version%/*
zip32 -r wxOS2-%version%.zip wxOS2-%version%/*
erase /sxyz wxOS2-%version%
echo wxOS2 archived.

BIN
distrib/os2/os2-specific.zip
View File

Binary file not shown.