diff --git a/distrib/msw/makeall.bat b/distrib/msw/makeall.bat index 1b386c418d..10836924ea 100755 --- a/distrib/msw/makeall.bat +++ b/distrib/msw/makeall.bat @@ -92,7 +92,7 @@ Rem Euch, this is the only way I can think of right now Rem to copy them to the same directory. Daft but... erase %TEMP%\temp.zip zip16 -r %TEMP%\temp.zip *.exe -unzip32 %TEMP%\temp.zip -d %BUILDDEST%\VC6Release +unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\VC6Release nmake -f makefile.vc clean FINAL=1 cd %WXDIR%\demos @@ -101,7 +101,7 @@ nmake -f makefile.vc FINAL=1 Rem Copy all executables to VC6Release erase %TEMP%\temp.zip zip16 -r %TEMP%\temp.zip *.exe -unzip32 %TEMP%\temp.zip -d %BUILDDEST%\VC6Release +unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\VC6Release nmake -f makefile.vc clean FINAL=1 Rem Compile OGL @@ -206,9 +206,28 @@ make -f makefile.b32 copy controls.exe %BUILDDEST%\BC55Debug make -f makefile.b32 clean +Rem Compile OGL +cd %WXDIR%\contrib\src\ogl +make -f makefile.b32 clean +make -f makefile.b32 +cd %WXDIR%\contrib\samples\ogl\ogledit +make -f makefile.b32 clean +make -f makefile.b32 +copy *.exe %BUILDDEST%\BC55Release +make -f makefile.b32 clean +cd %WXDIR%\contrib\samples\ogl\studio +make -f makefile.b32 clean +make -f makefile.b32 +copy *.exe %BUILDDEST%\BC55Release +make -f makefile.b32 clean +cd %WXDIR%\contrib\src\ogl +make -f makefile.b32 clean + cd %WXDIR%\src\msw make -f makefile.b32 cleanall +goto bcdebugdll + echo *** WIN32 BC++ Release *** make -f makefile.b32 cleanall FINAL=1 @@ -223,7 +242,7 @@ make -f makefile.b32 FINAL=1 Rem Copy all executables to BC55Release erase %TEMP%\temp.zip zip16 -r %TEMP%\temp.zip *.exe -unzip32 %TEMP%\temp.zip -d %BUILDDEST%\BC55Release +unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\BC55Release make -f makefile.b32 clean FINAL=1 cd %WXDIR%\demos @@ -232,7 +251,7 @@ make -f makefile.b32 FINAL=1 Rem Copy all executables to BC55Release erase %TEMP%\temp.zip zip16 -r %TEMP%\temp.zip *.exe -unzip32 %TEMP%\temp.zip -d %BUILDDEST%\BC55Release +unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\BC55Release make -f makefile.b32 clean FINAL=1 Rem Compile OGL @@ -271,10 +290,12 @@ Rem Clean up cd %WXDIR%\src\msw make -f makefile.b32 cleanall FINAL=1 +:bcdebugdll + echo *** WIN32 BC++ Debug DLL *** -make -f makefile.b32 cleanall WXMAKINGDLL=1 -make -f makefile.b32 DLL=1 +make -f makefile.b32 cleanall +make -f makefile.b32 dll if not direxist %BUILDDEST%\BC55DebugDLL mkdir /S %BUILDDEST%\BC55DebugDLL erase /F /Y %BUILDDEST%\BC55DebugDLL @@ -288,26 +309,6 @@ 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 @@ -341,108 +342,6 @@ 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 -erase %TEMP%\temp.zip -zip16 -r %TEMP%\temp.zip *.exe -unzip32 %TEMP%\temp.zip -d %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 -erase %TEMP%\temp.zip -zip16 -r %TEMP%\temp.zip *.exe -unzip32 %TEMP%\temp.zip -d %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 @@ -473,7 +372,7 @@ make -f makefile.g95 FINAL=1 Rem Copy all executables to Cygwin11Release erase %TEMP%\temp.zip zip16 -r %TEMP%\temp.zip *.exe -unzip32 %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release +unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release make -f makefile.g95 clean FINAL=1 cd %WXDIR%\demos @@ -482,7 +381,7 @@ make -f makefile.g95 FINAL=1 Rem Copy all executables to Cygwin11Release erase %TEMP%\temp.zip zip16 -r %TEMP%\temp.zip *.exe -unzip32 %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release +unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release make -f makefile.g95 clean FINAL=1 Rem Compile OGL @@ -553,7 +452,7 @@ make -f makefile.g95 FINAL=1 Rem Copy all executables to Ming2952Release erase %TEMP%\temp.zip zip16 -r %TEMP%\temp.zip *.exe -unzip32 %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release +unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release make -f makefile.g95 clean FINAL=1 cd %WXDIR%\demos @@ -562,7 +461,7 @@ make -f makefile.g95 FINAL=1 Rem Copy all executables to Ming2952Release erase %TEMP%\temp.zip zip16 -r %TEMP%\temp.zip *.exe -unzip32 %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release +unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release make -f makefile.g95 clean FINAL=1 Rem Compile OGL diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp index 952d1e6847..77d7c063f9 100644 --- a/distrib/msw/msw.rsp +++ b/distrib/msw/msw.rsp @@ -8,6 +8,7 @@ lib/watcom/*.bat lib/bcc16/*.lib docs/licence.txt +docs/base/*.txt docs/msw/*.txt docs/wine/*.txt docs/wine/COPYING.LIB @@ -18,6 +19,11 @@ distrib/msw/*.bat tools/gettext/*.exe tools/gettext/*.sed +wxBase.dsp +wxBase.dsw +wxBaseDll.dsp +wxBaseDll.dsw + src/makeb32.env src/makeprog.b32 src/makelib.b32 diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp index 67bffaec61..2682813c0d 100644 --- a/distrib/msw/vc.rsp +++ b/distrib/msw/vc.rsp @@ -1,3 +1,8 @@ +wxBase.dsp +wxBase.dsw +wxBaseDll.dsp +wxBaseDll.dsw + src/wxvc.dsp src/wxvc.dsw src/wxvc_dll.dsp diff --git a/docs/base/install.txt b/docs/base/install.txt index 37f5284ed7..ef1d72d5b0 100644 --- a/docs/base/install.txt +++ b/docs/base/install.txt @@ -30,7 +30,7 @@ a) under Win32 with Visual C++: open the provided wxBase.dsw workspace. From if you managed to do this, please let me know so that your makefiles could be included in the next distribution. -b) under Unix/BeOS: use configure with --disab;e-gui argument. Building wxBase +b) under Unix/BeOS: use configure with --disable-gui argument. Building wxBase in a separate directory is recommended, i.e.: $ gunzip -c wxBase-x.y.z.tar.gz | tar xvf - diff --git a/docs/html/makedist.htm b/docs/html/makedist.htm index e3650fd846..0dd474b27b 100644 --- a/docs/html/makedist.htm +++ b/docs/html/makedist.htm @@ -57,8 +57,16 @@ you will need to compile distrib/msw/splitwise.cpp into distrib/msw/splitwise.ex
  • 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.

    -

  • Alter WXVERSION or other version-related variables in src/makevc.env, src/makeg95.env, src/makeb32.env.

    -

  • Alter the DLL version in the VC++ project files using distrib/msw/vcupdate.bat (no arguments).

    +

  • Update version numbers: + +

  • Check setup.h is correct for the distribution (e.g. wxUSE_ODBC = 1, wxUSE_UNICODE = 0, etc.).

  • 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.

    @@ -74,17 +82,15 @@ to build wxWindows and samples for a variety of compilers.

    For example, samples or demos may have been added to the hierarchy. The same applies to projgen (see above).

  • Likewise, ensure that vc.rsp contains references to all the sample project files (that have been generated by projgen).

    -

  • Ensure include/wx/version.h specifies the correct wxWindows version.

  • Ensure docs/msw/install.txt is up-to-date (detail any gotchas for particular compiler versions, etc.).

  • Update docs/readme.txt, docs/changes.txt (summarize from CVS change notifications).

    -

  • Update the date in docs/latex/wx/manual.tex, and build the WinHelp, HTML, and PDF documentation +
  • Build the WinHelp, HTML, and PDF documentation via the VC++ makefile, src/msw/makefile.vc. You can use e.g. the targets cleandocs alldocs. 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.

    -

  • Edit distrib/msw/zipdist.bat and change the version variable to the appropriate version.

  • 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, diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex index 18099a48a4..e61fe146d7 100644 --- a/docs/latex/wx/manual.tex +++ b/docs/latex/wx/manual.tex @@ -31,7 +31,7 @@ }} \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin, Robin Dunn, et al} -\date{July 9th 2000} +\date{August 13th 2000} } \makeindex \begin{document} diff --git a/docs/latex/wx/postscpt.tex b/docs/latex/wx/postscpt.tex index 541f3158c0..2aa032dbe9 100644 --- a/docs/latex/wx/postscpt.tex +++ b/docs/latex/wx/postscpt.tex @@ -35,6 +35,12 @@ get PostScript printing settings. This constructor and the global printer settings are now deprecated; use the wxPrintData constructor instead. +\membersection{wxPostScriptDC::GetResolution}\label{wxpostscriptdcgetresolution} + +\func{static int}{GetResolution}{\void} + +Return resolution used in PostScript output. See +\helpref{SetResolution}{wxpostscriptdcsetresolution}. \membersection{wxPostScriptDC::SetResolution}\label{wxpostscriptdcsetresolution} @@ -43,9 +49,3 @@ use the wxPrintData constructor instead. Set resolution (in pixels per inch) that will be used in PostScript output. Default is 720ppi. -\membersection{wxPostScriptDC::GetResolution}\label{wxpostscriptdcgetresolution} - -\func{static int}{GetResolution}{\void} - -Return resolution used in PostScript output. See -\helpref{SetResolution}{wxpostscriptdcsetresolution}. diff --git a/docs/msw/install.txt b/docs/msw/install.txt index 67bd58249a..aedbcdcc1e 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -45,6 +45,9 @@ Other add-on packages are available from the wxWindows Web site, such as: - tex2rtf3.zip. Tex2RTF: create Windows Help, HTML, and Word RTF files from the same document source. +For instructions on compiling wxBase (wxWindows-without-GUI), +please see docs/base/install.txt. + General installation notes -------------------------- diff --git a/src/makelib.g95 b/src/makelib.g95 index 462cff120d..e6dce1f863 100644 --- a/src/makelib.g95 +++ b/src/makelib.g95 @@ -7,7 +7,7 @@ # # Include file for Cygwin/Mingw32 libraries -WXDIR = $(WXWIN) +# WXDIR = $(WXWIN) # All common UNIX compiler flags and options are now in # this central makefile.