Updated some version numbers; added script to automate builds with difference

compilers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-08-12 17:22:23 +00:00
parent e0f38535d6
commit c83d183606
10 changed files with 820 additions and 11 deletions

686
distrib/msw/makeall.bat Executable file
View File

@@ -0,0 +1,686 @@
Rem @echo off
Rem This script compiles wxWindows and some samples/demos with
Rem a range of compilers.
Rem Note that it currently uses batch scripts local to Julian Smart's machine,
Rem to set up the environment correctly.
Rem This is a 4DOS batch file, though 4DOS dependencies have been kept to
Rem a minimum.
Rem Julian Smart, August 12th, 2000
Rem TODO: making a Unicode distribution by modifying setup.h programmatically.
Rem TODO: check differing setup.h options, again by programmatic modification
set WXDIR=%WXWIN%
set FATWXWIN=%WXDIR%
set FULLWXWIN=%WXDIR%
if not %@INDEX["%WXDIR%","wxWindows"] == "-1" set FATWXWIN=%@PATH[%WXDIR%]wxwind~
if not %@INDEX["%WXDIR%","wxWindows"] == "-1" set FULLWXWIN=%@PATH[%WXDIR%]wxWindows
echo Full wxWindows path is %FULLWXWIN%, FAT path is %FATWXWIN%
set BUILDDEST=o:\wxWinBuild
Rem Only carry on if we haven't specified a single target
set CARRYON=0
rem goto end
if "%1" == "vc6" goto dovc6
if "%1" == "bc55" goto dobc55
if "%1" == "bc50" goto dobc50
if "%1" == "ming2992" goto doming2952
if "%1" == "cygwin11" goto docygwin11
if "%1" == "vc1" goto dovc1
if "%1" == "bc16" goto dobc16
set CARRYON=1
if not direxist %BUILDDEST% mkdir /S %BUILDDEST%
:dovc6
echo Starting wxWindows build at %_TIME, %_DATE
Rem First, VC++ 6.
echo === VC++ 6 ===
echo ==============
Rem Set up the environment
call msvc6
echo *** VC++ Debug ***
Rem VC++ Debug
cd %WXDIR%\src\msw
nmake -f makefile.vc cleanall
nmake -f makefile.vc
if not direxist %BUILDDEST%\VC6Debug mkdir /S %BUILDDEST%\VC6Debug
erase /F /Y %BUILDDEST%\VC6Debug
cd %WXDIR%\samples
nmake -f makefile.vc clean
Rem Make one sample, just to make sure Debug mode is OK
cd %WXDIR%\samples\controls
nmake -f makefile.vc
copy controls.exe %BUILDDEST%\VC6Debug
nmake -f makefile.vc clean
cd %WXDIR%\src\msw
nmake -f makefile.vc cleanall
echo *** VC++ Release ***
nmake -f makefile.vc cleanall FINAL=1
nmake -f makefile.vc FINAL=1
if not direxist %BUILDDEST%\VC6Release mkdir /S %BUILDDEST%\VC6Release
erase /F /Y %BUILDDEST%\VC6Release
cd %WXDIR%\samples
nmake -f makefile.vc clean FINAL=1
nmake -f makefile.vc FINAL=1
Rem Copy all executables to VC6Release
copy /S *.exe %BUILDDEST%\VC6Release
nmake -f makefile.vc clean FINAL=1
cd %WXDIR%\demos
nmake -f makefile.vc clean FINAL=1
nmake -f makefile.vc FINAL=1
Rem Copy all executables to VC6Release
copy /S *.exe %BUILDDEST%\VC6Release
nmake -f makefile.vc clean FINAL=1
Rem Compile OGL
cd %WXDIR%\contrib\src\ogl
nmake -f makefile.vc clean FINAL=1
nmake -f makefile.vc FINAL=1
cd %WXDIR%\contrib\samples\ogl\ogledit
nmake -f makefile.vc clean FINAL=1
nmake -f makefile.vc FINAL=1
copy *.exe %BUILDDEST%\VC6Release
nmake -f makefile.vc clean FINAL=1
cd %WXDIR%\contrib\samples\ogl\studio
nmake -f makefile.vc clean FINAL=1
nmake -f makefile.vc FINAL=1
copy *.exe %BUILDDEST%\VC6Release
nmake -f makefile.vc clean FINAL=1
cd %WXDIR%\contrib\src\ogl
nmake -f makefile.vc clean FINAL=1
Rem Compile Dialog Editor
cd %WXDIR%\utils\dialoged\src
nmake -f makefile.vc clean FINAL=1
nmake -f makefile.vc FINAL=1
copy *.exe %BUILDDEST%\VC6Release
nmake -f makefile.vc clean FINAL=1
Rem Compile Tex2RTF
cd %WXDIR%\utils\tex2rtf\src
nmake -f makefile.vc clean FINAL=1
nmake -f makefile.vc FINAL=1
copy *.exe %BUILDDEST%\VC6Release
nmake -f makefile.vc clean FINAL=1
Rem Clean up
cd %WXDIR%\src\msw
nmake -f makefile.vc cleanall FINAL=1
echo *** VC++ Debug DLL ***
nmake -f makefile.vc cleanall WXMAKINGDLL=1
nmake -f makefile.vc dll pch
if not direxist %BUILDDEST%\VC6DebugDLL mkdir /S %BUILDDEST%\VC6DebugDLL
erase /F /Y %BUILDDEST%\VC6DebugDLL
copy %WXDIR%\lib\*d.dll %BUILDDEST%\VC6DebugDLL
Rem Make one sample, for a sanity check
cd %WXDIR%\samples\controls
nmake -f makefile.vc WXUSINGDLL=1
copy controls.exe %BUILDDEST%\VC6DebugDLL
nmake -f makefile.vc clean
cd %WXDIR%\src\msw
nmake -f makefile.vc cleanall WXMAKINGDLL=1
echo *** VC++ Release DLL ***
nmake -f makefile.vc cleanall FINAL=1 WXMAKINGDLL=1
nmake -f makefile.vc dll pch FINAL=1
if not direxist %BUILDDEST%\VC6ReleaseDLL mkdir /S %BUILDDEST%\VC6ReleaseDLL
erase /F /Y %BUILDDEST%\VC6ReleaseDLL
copy %WXDIR%\lib\*.dll %BUILDDEST%\VC6ReleaseDLL
Rem Make one sample, for a sanity check
cd %WXDIR%\samples\controls
nmake -f makefile.vc WXUSINGDLL=1 FINAL=1
copy controls.exe %BUILDDEST%\VC6ReleaseDLL
nmake -f makefile.vc clean FINAL=1
cd %WXDIR%\src\msw
nmake -f makefile.vc cleanall WXMAKINGDLL=1 FINAL=1
if "%CARRYON" == "0" goto end
:dobc55
echo === BC++ 5.5 ===
echo ================
call bcb55
echo *** WIN32 BC++ Debug ***
Rem WIN32 BC++ Debug
cd %WXDIR%\src\msw
make -f makefile.b32 cleanall
make -f makefile.b32
if not direxist %BUILDDEST%\BC55Debug mkdir /S %BUILDDEST%\BC55Debug
erase /F /Y %BUILDDEST%\BC55Debug
cd %WXDIR%\samples
make -f makefile.b32 clean
Rem Make one sample, just to make sure Debug mode is OK
cd %WXDIR%\samples\controls
make -f makefile.b32
copy controls.exe %BUILDDEST%\BC55Debug
make -f makefile.b32 clean
cd %WXDIR%\src\msw
make -f makefile.b32 cleanall
echo *** WIN32 BC++ Release ***
make -f makefile.b32 cleanall FINAL=1
make -f makefile.b32 FINAL=1
if not direxist %BUILDDEST%\BC55Release mkdir /S %BUILDDEST%\BC55Release
erase /F /Y %BUILDDEST%\BC55Release
cd %WXDIR%\samples
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
Rem Copy all executables to BC55Release
copy /S *.exe %BUILDDEST%\BC55Release
make -f makefile.b32 clean FINAL=1
cd %WXDIR%\demos
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
Rem Copy all executables to BC55Release
copy /S *.exe %BUILDDEST%\BC55Release
make -f makefile.b32 clean FINAL=1
Rem Compile OGL
cd %WXDIR%\contrib\src\ogl
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
cd %WXDIR%\contrib\samples\ogl\ogledit
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
copy *.exe %BUILDDEST%\BC55Release
make -f makefile.b32 clean FINAL=1
cd %WXDIR%\contrib\samples\ogl\studio
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
copy *.exe %BUILDDEST%\BC55Release
make -f makefile.b32 clean FINAL=1
cd %WXDIR%\contrib\src\ogl
make -f makefile.b32 clean FINAL=1
Rem Compile Dialog Editor
cd %WXDIR%\utils\dialoged\src
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
copy *.exe %BUILDDEST%\BC55Release
make -f makefile.b32 clean FINAL=1
Rem Compile Tex2RTF
cd %WXDIR%\utils\tex2rtf\src
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
copy *.exe %BUILDDEST%\BC55Release
make -f makefile.b32 clean FINAL=1
Rem Clean up
cd %WXDIR%\src\msw
make -f makefile.b32 cleanall FINAL=1
echo *** WIN32 BC++ Debug DLL ***
make -f makefile.b32 cleanall WXMAKINGDLL=1
make -f makefile.b32 DLL=1
if not direxist %BUILDDEST%\BC55DebugDLL mkdir /S %BUILDDEST%\BC55DebugDLL
erase /F /Y %BUILDDEST%\BC55DebugDLL
copy %WXDIR%\lib\*.dll %BUILDDEST%\BC55DebugDLL
Rem Make one sample, for a sanity check
cd %WXDIR%\samples\controls
make -f makefile.b32 WXUSINGDLL=1
copy controls.exe %BUILDDEST%\BC55DebugDLL
make -f makefile.b32 clean
cd %WXDIR%\src\msw
make -f makefile.b32 cleanall WXMAKINGDLL=1
echo *** WIN32 BC++ Release DLL ***
make -f makefile.b32 cleanall FINAL=1 WXMAKINGDLL=1
make -f makefile.b32 DLL=1 FINAL=1
if not direxist %BUILDDEST%\BC55ReleaseDLL mkdir /S %BUILDDEST%\BC55ReleaseDLL
erase /F /Y %BUILDDEST%\BC55ReleaseDLL
copy %WXDIR%\lib\*.dll %BUILDDEST%\BC55ReleaseDLL
Rem Make one sample, for a sanity check
cd %WXDIR%\samples\controls
make -f makefile.b32 WXUSINGDLL=1 FINAL=1
copy controls.exe %BUILDDEST%\BC55ReleaseDLL
make -f makefile.b32 clean FINAL=1
cd %WXDIR%\src\msw
make -f makefile.b32 cleanall
if "%CARRYON" == "0" goto end
:dobc50
echo === BC++ 5.0 ===
echo ================
call borland
echo *** WIN32 BC++ Debug ***
Rem WIN32 BC++ Debug
cd %WXDIR%\src\msw
make -f makefile.b32 cleanall
make -f makefile.b32
if not direxist %BUILDDEST%\BC50Debug mkdir /S %BUILDDEST%\BC50Debug
erase /F /Y %BUILDDEST%\BC50Debug
cd %WXDIR%\samples
make -f makefile.b32 clean
Rem Make one sample, just to make sure Debug mode is OK
cd %WXDIR%\samples\controls
make -f makefile.b32
copy controls.exe %BUILDDEST%\BC50Debug
make -f makefile.b32 clean
cd %WXDIR%\src\msw
make -f makefile.b32 cleanall
echo *** WIN32 BC++ Release ***
make -f makefile.b32 cleanall FINAL=1
make -f makefile.b32 FINAL=1
if not direxist %BUILDDEST%\BC50Release mkdir /S %BUILDDEST%\BC50Release
erase /F /Y %BUILDDEST%\BC50Release
cd %WXDIR%\samples
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
Rem Copy all executables to BC50Release
copy /S *.exe %BUILDDEST%\BC50Release
make -f makefile.b32 clean FINAL=1
cd %WXDIR%\demos
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
Rem Copy all executables to BC50Release
copy /S *.exe %BUILDDEST%\BC50Release
make -f makefile.b32 clean FINAL=1
Rem Compile OGL
cd %WXDIR%\contrib\src\ogl
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
cd %WXDIR%\contrib\samples\ogl\ogledit
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
copy *.exe %BUILDDEST%\BC50Release
make -f makefile.b32 clean FINAL=1
cd %WXDIR%\contrib\samples\ogl\studio
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
copy *.exe %BUILDDEST%\BC50Release
make -f makefile.b32 clean FINAL=1
cd %WXDIR%\contrib\src\ogl
make -f makefile.b32 clean FINAL=1
Rem Compile Dialog Editor
cd %WXDIR%\utils\dialoged\src
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
copy *.exe %BUILDDEST%\BC50Release
make -f makefile.b32 clean FINAL=1
Rem Compile Tex2RTF
cd %WXDIR%\utils\tex2rtf\src
make -f makefile.b32 clean FINAL=1
make -f makefile.b32 FINAL=1
copy *.exe %BUILDDEST%\BC50Release
make -f makefile.b32 clean FINAL=1
Rem Clean up
cd %WXDIR%\src\msw
make -f makefile.b32 cleanall FINAL=1
echo *** WIN32 BC++ Debug DLL ***
make -f makefile.b32 cleanall WXMAKINGDLL=1
make -f makefile.b32 DLL=1
if not direxist %BUILDDEST%\BC50DebugDLL mkdir /S %BUILDDEST%\BC50DebugDLL
erase /F /Y %BUILDDEST%\BC50DebugDLL
copy %WXDIR%\lib\*.dll %BUILDDEST%\BC50DebugDLL
Rem Make one sample, for a sanity check
cd %WXDIR%\samples\controls
make -f makefile.b32 WXUSINGDLL=1
copy controls.exe %BUILDDEST%\BC50DebugDLL
make -f makefile.b32 clean
cd %WXDIR%\src\msw
make -f makefile.b32 cleanall WXMAKINGDLL=1
echo *** WIN32 BC++ Release DLL ***
make -f makefile.b32 cleanall FINAL=1 WXMAKINGDLL=1
make -f makefile.b32 DLL=1 FINAL=1
if not direxist %BUILDDEST%\BC50ReleaseDLL mkdir /S %BUILDDEST%\BC50ReleaseDLL
erase /F /Y %BUILDDEST%\BC50ReleaseDLL
copy %WXDIR%\lib\*.dll %BUILDDEST%\BC50ReleaseDLL
Rem Make one sample, for a sanity check
cd %WXDIR%\samples\controls
make -f makefile.b32 WXUSINGDLL=1 FINAL=1
copy controls.exe %BUILDDEST%\BC50ReleaseDLL
make -f makefile.b32 clean FINAL=1
cd %WXDIR%\src\msw
make -f makefile.b32 cleanall
if "%CARRYON" == "0" goto end
:docygwin11
echo === Cygwin 1.1 ===
echo ==================
call cygwin11
echo *** Cygwin Debug ***
Rem Cygwin Release
cd %WXDIR%\src\msw
make -f makefile.g95 cleanall
make -f makefile.g95 FINAL=1
if not direxist %BUILDDEST%\Cygwin11Release mkdir /S %BUILDDEST%\Cygwin11Release
erase /F /Y %BUILDDEST%\Cygwin11Release
cd %WXDIR%\samples
make -f makefile.g95 clean FINAL=1
if not direxist %BUILDDEST%\Cygwin11Release mkdir /S %BUILDDEST%\Cygwin11Release
erase /F /Y %BUILDDEST%\Cygwin11Release
cd %WXDIR%\samples
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
Rem Copy all executables to Cygwin11Release
copy /S *.exe %BUILDDEST%\Cygwin11Release
make -f makefile.g95 clean FINAL=1
cd %WXDIR%\demos
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
Rem Copy all executables to Cygwin11Release
copy /S *.exe %BUILDDEST%\Cygwin11Release
make -f makefile.g95 clean FINAL=1
Rem Compile OGL
cd %WXDIR%\contrib\src\ogl
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
cd %WXDIR%\contrib\samples\ogl\ogledit
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
copy *.exe %BUILDDEST%\Cygwin11Release
make -f makefile.g95 clean FINAL=1
cd %WXDIR%\contrib\samples\ogl\studio
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
copy *.exe %BUILDDEST%\Cygwin11Release
make -f makefile.g95 clean FINAL=1
cd %WXDIR%\contrib\src\ogl
make -f makefile.g95 clean FINAL=1
Rem Compile Dialog Editor
cd %WXDIR%\utils\dialoged\src
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
copy *.exe %BUILDDEST%\Cygwin11Release
make -f makefile.g95 clean FINAL=1
Rem Compile Tex2RTF
cd %WXDIR%\utils\tex2rtf\src
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
copy *.exe %BUILDDEST%\Cygwin11Release
make -f makefile.g95 clean FINAL=1
echo Stripping executables...
strip %BUILDDEST%\Cygwin11Release\*.exe
Rem Cleanup
cd %WXDIR%\src\msw
make -f makefile.g95 cleanall
if "%CARRYON" == "0" goto end
:doming2952
echo === Mingw32 2.95.2 ===
echo ======================
call ming2952
echo *** Cygwin Debug ***
Rem Cygwin Release
cd %WXDIR%\src\msw
make -f makefile.g95 cleanall
make -f makefile.g95 FINAL=1
if not direxist %BUILDDEST%\Ming2952Release mkdir /S %BUILDDEST%\Ming2952Release
erase /F /Y %BUILDDEST%\Ming2952Release
cd %WXDIR%\samples
make -f makefile.g95 clean FINAL=1
if not direxist %BUILDDEST%\Ming2952Release mkdir /S %BUILDDEST%\Ming2952Release
erase /F /Y %BUILDDEST%\Ming2952Release
cd %WXDIR%\samples
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
Rem Copy all executables to Ming2952Release
copy /S *.exe %BUILDDEST%\Ming2952Release
make -f makefile.g95 clean FINAL=1
cd %WXDIR%\demos
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
Rem Copy all executables to Ming2952Release
copy /S *.exe %BUILDDEST%\Ming2952Release
make -f makefile.g95 clean FINAL=1
Rem Compile OGL
cd %WXDIR%\contrib\src\ogl
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
cd %WXDIR%\contrib\samples\ogl\ogledit
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
copy *.exe %BUILDDEST%\Ming2952Release
make -f makefile.g95 clean FINAL=1
cd %WXDIR%\contrib\samples\ogl\studio
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
copy *.exe %BUILDDEST%\Ming2952Release
make -f makefile.g95 clean FINAL=1
cd %WXDIR%\contrib\src\ogl
make -f makefile.g95 clean FINAL=1
Rem Compile Dialog Editor
cd %WXDIR%\utils\dialoged\src
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
copy *.exe %BUILDDEST%\Ming2952Release
make -f makefile.g95 clean FINAL=1
Rem Compile Tex2RTF
cd %WXDIR%\utils\tex2rtf\src
make -f makefile.g95 clean FINAL=1
make -f makefile.g95 FINAL=1
copy *.exe %BUILDDEST%\Ming2952Release
make -f makefile.g95 clean FINAL=1
echo Stripping executables...
strip %BUILDDEST%\Ming2952Release\*.exe
Rem Cleanup
cd %WXDIR%\src\msw
make -f makefile.g95 cleanall
if "%CARRYON" == "0" goto end
:dovc1
echo === 16-bit VC++ ===
echo ===================
Rem Set up the environment
call msvc1
Rem Needs full wxWindows path for making libraries
set WXWIN=%FULLWXWIN%
echo *** VC++ Debug ***
Rem VC++ Debug
cd %WXDIR%\src\msw
nmake -f makefile.dos cleanall
nmake -f makefile.dos
if not direxist %BUILDDEST%\VC1Debug mkdir /S %BUILDDEST%\VC1Debug
erase /F /Y %BUILDDEST%\VC1Debug
Rem Make one sample, just to make sure Debug mode is OK
cd %WXDIR%\samples\minimal
nmake -f makefile.dos clean
Rem Needs FAT wxWindows path for making executables
set WXWIN=%FATWXWIN%
nmake -f makefile.dos
copy minimal.exe /S %BUILDDEST%\VC1Debug
nmake -f makefile.dos clean
cd %WXDIR%\src\msw
nmake -f makefile.dos cleanall
Rem Needs full wxWindows path for making libraries
set WXWIN=%FULLWXWIN%
echo *** VC++ Release ***
nmake -f makefile.dos cleanall FINAL=1
nmake -f makefile.dos FINAL=1
if not direxist %BUILDDEST%\VC1Release mkdir /S %BUILDDEST%\VC1Release
erase /F /Y %BUILDDEST%\VC1Release
Rem Make one sample, just to make sure Release mode is OK
cd %WXDIR%\samples\minimal
nmake -f makefile.dos clean
nmake -f makefile.dos FINAL=1
Rem Needs FAT wxWindows path for making executables
set WXWIN=%FATWXWIN%
nmake -f makefile.dos FINAL=1
copy minimal.exe /S %BUILDDEST%\VC1Release
nmake -f makefile.dos clean
set WXWIN=%tmpwxwin%
Rem Clean up
cd %WXDIR%\src\msw
nmake -f makefile.dos cleanall FINAL=1
if "%CARRYON" == "0" goto end
:dobc16
echo === 16-bit BC++ ===
echo ===================
Rem Set up the environment
call borland
echo *** 16-bit BC++ Debug ***
Rem 16-bit BC++ Debug
cd %WXDIR%\src\msw
nmake -f makefile.bcc cleanall
nmake -f makefile.bcc
if not direxist %BUILDDEST%\BC16Debug mkdir /S %BUILDDEST%\BC16Debug
erase /F /Y %BUILDDEST%\BC16Debug
Rem Make one sample, just to make sure Debug mode is OK
cd %WXDIR%\samples\minimal
nmake -f makefile.bcc clean
nmake -f makefile.bcc
copy minimal.exe /S %BUILDDEST%\BC16Debug
nmake -f makefile.bcc clean
cd %WXDIR%\src\msw
nmake -f makefile.bcc cleanall
echo *** 16-bit BC++ Release ***
nmake -f makefile.bcc cleanall FINAL=1
nmake -f makefile.bcc FINAL=1
if not direxist %BUILDDEST%\BC16Release mkdir /S %BUILDDEST%\BC16Release
erase /F /Y %BUILDDEST%\BC16Release
Rem Make one sample, just to make sure Release mode is OK
cd %WXDIR%\samples\minimal
nmake -f makefile.bcc clean
nmake -f makefile.bcc FINAL=1
copy minimal.exe /S %BUILDDEST%\BC16Release
nmake -f makefile.bcc clean
Rem Clean up
cd %WXDIR%\src\msw
nmake -f makefile.bcc cleanall FINAL=1
:end
echo Finished wxWindows build at %_TIME, %_DATE

View File

@@ -1,7 +1,7 @@
Document Type: WSE
item: Global
Version=5.0
Title=wxWindows 2.2.0 Installation
Title=wxWindows 2.2.1 Installation
Flags=00000100
Split=1420
Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -47,7 +47,7 @@ item: End Block
end
item: Set Variable
Variable=APPTITLE
Value=wxWindows 2.2.0
Value=wxWindows 2.2.1
end
item: Set Variable
Variable=GROUP

View File

@@ -179,6 +179,7 @@ copy %src\bin\dialoged.exe bin
copy %src\bin\tex2rtf.exe bin
copy %src\bin\dbgview.* bin
copy %src\bin\life.exe bin
copy %src\demos\life\breeder.lif bin
copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin
copy %src\docs\winhelp\tex2rtf.hlp %src\docs\winhelp\tex2rtf.cnt bin

View File

@@ -52,7 +52,7 @@ wxMotif:
Documentation:
- Added preliminary wxGrid documentation.
- Added wxDb documentation.
- Added notes for Cygwin 1.1 to MSW install.txt.
2.2.0

122
docs/html/makedist.htm Normal file
View File

@@ -0,0 +1,122 @@
<HTML>
<HEAD>
<TITLE>Making a wxMSW distribution</TITLE>
</HEAD>
<BODY BGCOLOR="#FFFFFF" TEXT=#000000 LINK=#FF0000 VLINK=#000000>
<font face="Arial, Lucida Sans, Helvetica">
<a name="top"></a>
<table width=100% border=0 cellpadding=5 cellspacing=0>
<tr>
<td bgcolor="#C4ECF9">
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
Making a wxMSW distribution
</font>
</td>
</tr>
</table>
<P>
These are some notes on the steps involved in making up a wxMSW distribution from
a CVS hierarchy.
Currently only Julian Smart does this, but in the event of the duty being
transferred, or to allow people to produce custom distributions, the following may be helpful.<P>
The distribution scripts are in the distrib/msw directory.<P>
<H3>Requirements</H3>
<ol>
<li>A wxWindows hierarchy from CVS.
<li>A copy of Tex2RTF in your path.
<li>32-bit zip and unzip utilities. I use zip 2.0.1 by Mark Adler and others, and unzip 5.12
by Info-ZIP. I call them zip32 and unzip32 in the scripts.
<li>Adobe Acrobat to generate the PDF documentation.
<li>The scripts use 4DOS, so you will need a copy (the evaluation copy should do).
<li>Several Windows compilers to test out the distribution (see below). VC++ is assumed, for
running some of the scripts, e.g. the makefile for running Tex2RTF.
<li>To make the setup.exe version of the distribution, a copy of WISE Installer
(I use version 5.0: I don't know if the scripts are compatible with
other versions).
<li>If you need to extract the top and bottom from the wxWindows WISE script after editing it with WISE (so that
the distribution script can automatically rebuild the .wse script from the distribution files + .wse script top and bottom),
you will need to compile distrib/msw/splitwise.cpp into distrib/msw/splitwise.exe, a DOS command line program.
<li><a href="http://wildsau.idv.uni-linz.ac.at/mfx/upx.html" target=_top>UPX</a>, for compressing executables.
<li>A <i>lot</i> of disk space.
</ol>
<H3>Steps</H3>
<ol>
<li>Compile utils/projgen if necessary and run, to generate the .dsp/.dsw files for the samples, demos and utils
using VC++ 5/6. In fact when wxWindows is fairly stable and new samples haven't been added and settings
changed, this step isn't necessary.<P>
<li>Alter WXVERSION or other version-related variables in src/makevc.env, src/makeg95.env, src/makeb32.env.<P>
<li>Alter the DLL version in the VC++ project files using distrib/msw/vcupdate.bat (no arguments).<P>
<li>Check setup.h is correct for the distribution (e.g. wxUSE_ODBC = 1, wxUSE_UNICODE = 0, etc.).<P>
<li>Regenerate makefiles from the tmake templates, if necessary. Most makefiles have a target to do this using the makefile name,
or else 'self'. Or you can use the 'makeall.bat' script in distrib\msw\tmake.<P>
<li>Using VC++ 6, make a WIN32 release executable of Dialog Editor and place it in the top-level <b>bin</b> directory
in your CVS hierarchy. Similarly for Tex2RTF and Life!. Compress them with UPX to save space.<P>
<li>Ensure that the library and most of the samples/demos compile for the popular compilers. Currently I check
with the following compilers:<P>
VC++ 1.5, VC++ 4.0, VC++ 5.0, VC++ 6.0 (static and DLL), BC++ 4.5 (WIN16/WIN32), BC++ 5.0 (WIN16/WIN32), C++Builder 3,
Watcom C++ 10.6, Cygwin b20, Mingw32 2.95. For VC++ 6 and BC++ 5.0, check compilation using both the
makefiles and the project files (wxvc.dsp, wxvc_dll.dsp, bc32.ide). See distrib/msw/makeall.bat for a script
to build wxWindows and samples for a variety of compilers.<P>
<li>Ensure that all .rsp files, that list the files to go in the distribution, are up-to-date.
For example, samples or demos may have been added to the hierarchy. The same applies to projgen (see above).<P>
<li>Likewise, ensure that vc.rsp contains references to all the sample project files (that have been generated
by projgen).<P>
<li>Ensure include/wx/version.h specifies the correct wxWindows version.<P>
<li>Ensure docs/msw/install.txt is up-to-date (detail any gotchas for particular compiler versions, etc.).<P>
<li>Update docs/readme.txt, docs/changes.txt (summarize from CVS change notifications).<P>
<li>Update the date in docs/latex/wx/manual.tex, and build the WinHelp, HTML, and PDF documentation
via the VC++ makefile, src/msw/makefile.vc. You can use e.g. the targets <b>cleandocs alldocs</b>. Check the
output of the Windows Help Compiler for missing links, and edit/recompile the docs if necessary. The PDF documentation is produced from the Word RTF
document, and read into Word. Select all, press F9 to reformat the fields. Check the table of contents for
overspill from the body of a section into the TOC. If there's a problem, it's due to the lack of a
blank line at the end of the relevant .tex file. Insert the blank line, regenerate the RTF, and reload into Word.
Then use Adobe Distiller to generate the PDF.<P>
<li>Edit distrib/msw/zipdist.bat and change the <b>version</b> variable to the appropriate version.<P>
<li>You need to edit the WISE script to change the version number, and any other changes you wish to make.
For simple changes, you can edit distrib/msw/wisetop.txt directly with a text editor. If you
wish to use WISE Installer directly, you will need to make a full wxwin2.wse file first,
by: (a) making up the distribution (next step), (b) editing wxwin2.wse with WISE Installer, (c)
running the distrib/msw/splitwise program to produce wisetop.txt, wisebott.txt, (d) executing the
next step again to remake the distribution programatically (or just run WISE directly: but remember
to run splitwise to be in sync for future reference). For more details, please see distrib/msw/readme.txt.<P>
<li>Make a <b>deliver</b> directory in the top-level wxWin hierarchy, change directory to distrib\msw,
and run <b>zipdist wise</b> (omit 'wise' if you don't want to build the setup.exe files).<P>
<li>You should now have lots of .zip files in your <b>deliver</b> folder, some setup.* files,
plus a <b>wx</b> hierarchy (extracted
from the zips) that you can now delete.<P>
<li>Test the setup.exe distribution by installing it, preferably compiling using several compilers
e.g. using distrib\msw\makeall.bat.<P>
<li>Go into Linux, unpack the distribution zip files, then call the Linux distribution script
to create .tgz files for wxMotif.<P>
<li>Upload the appropriate files to the SourceGear ftp site.<P>
<li>Download Robert's wxGTK files and upload to the SourceGear ftp site.<P>
<li>If updating the CD-ROM hierarchy as well, follow these steps using the CD-ROM makefile:
<ol>
<li>Edit WXDISTDIR in the makefile and change to the correct distribution directory for this version.
<li>Run the makefile with <b>copydist</b>. This copies the distribution to the correct place
on the CD-ROM.
<li>Run the makefile with <b>copydocs</b>. This copies the wxWindows 2 manuals to the correct
place on the CD-ROM.
<li>Copy any project file zips that didn't need updating from an old distribution, e.g. wxWindows-x.y.z-wat.zip.
<li>Copy Robert's wxGTK files to the directory by hand.
</ol><P>
</ol>
</font>
</BODY>
</HTML>

View File

@@ -1,5 +1,5 @@
[OPTIONS]
BMROOT=d:\wx2\wxWind~1\docs\latex\wx ; Assume that bitmaps are where the source is
BMROOT=d:\wx2\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is
TITLE=wxWindows Manual
CONTENTS=Contents
COMPRESS=HIGH

View File

@@ -135,7 +135,7 @@ To build the DLL version using makefiles:
suitable precompiled header file for compiling applications.
The resulting libraries are called:
wx\lib\wx[version].lib(dll) (debug version)
wx\lib\wx[version]d.lib(dll) (debug version)
wx\lib\wx[version].lib(dll) (release version, using FINAL=1)
2. Invoke a sample makefile with 'nmake -f makefile.vc WXUSINGDLL=1'
@@ -412,8 +412,8 @@ options, the linker gives up. So the date/time option is switched
off for Watcom C++. Also, wxAutomationObject is not compiled with
Watcom C++.
Note (3): if Watcom can't read the precompiled header when
building a sample, try deleting src\msw\watcom.pch and
compiling the sample again.
building a sample or library, try deleting src\msw\watcom.pch and
compiling again.
Note (4): if you get _popen_ and _pclose_ link errors, try
recompiling wxWindows with XPM support disabled in setup.h.
Alternatively, make sure these lines exist at the top of

View File

@@ -43,7 +43,7 @@ DLL=0
!if "$(WXMAKINGDLL)" == "1"
DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
WXLIB= $(WXLIBDIR)\wx220.lib
WXLIB= $(WXLIBDIR)\wx221.lib
!else
@@ -51,7 +51,7 @@ LINK_FLAGS= /aa /c
!if "$(WXUSINGDLL)" == "1"
DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
WXLIB= $(WXLIBDIR)\wx220.lib
WXLIB= $(WXLIBDIR)\wx221.lib
!else
DLL_FLAGS=
WXLIB= $(WXLIBDIR)\wx32.lib

View File

@@ -18,7 +18,7 @@ MINGW32=1
MINGW32VERSION=2.95
# If building DLL, the version
WXVERSION=22_0
WXVERSION=22_1
# Say yes if you have a "modern" linker that supports --shared option.
# Note that you're probably going to wait forever for dlltool/gcc/etc

View File

@@ -8,7 +8,7 @@
#
!include <ntwin32.mak>
WXVERSION=22_0
WXVERSION=22_1
WIN95=1
!if "$(WIN95)" == "0"