From 67de990506ff40e6df7a1b6af3937b19fb5b698c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 27 Jan 2022 20:34:11 +0000 Subject: [PATCH] HTML formatting fixes --- Doc/Manual/Contents.html | 5 ++--- Doc/Manual/Php.html | 17 ++++++++--------- Doc/Manual/Windows.html | 41 ++++++++++++++++++++-------------------- 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html index cf72febef..bee39a741 100644 --- a/Doc/Manual/Contents.html +++ b/Doc/Manual/Contents.html @@ -91,17 +91,16 @@
  • Instructions for using the Examples with other compilers -
  • SWIG on Cygwin and MinGW -
  • Microsoft extensions and other Windows quirks diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html index a887471f3..8963a6c8d 100644 --- a/Doc/Manual/Php.html +++ b/Doc/Manual/Php.html @@ -60,8 +60,6 @@ Support for PHP5 was removed in SWIG 4.0.0 and support for PHP4 was removed in SWIG 1.3.37. There never was a PHP6 release.

    -

    -

    In order to use this module, you will need to have a copy of the PHP include files to compile the SWIG generated C/C++ sources. If you installed @@ -360,14 +358,15 @@ the "php:type" %feature. This has three settings:

    diff --git a/Doc/Manual/Windows.html b/Doc/Manual/Windows.html index cba1db3dd..9bd45e032 100644 --- a/Doc/Manual/Windows.html +++ b/Doc/Manual/Windows.html @@ -250,12 +250,13 @@ For fully working build steps always check the Continuous Integration (CI) setup

  • Unfortunately, PCRE2 is not yet available on Nuget. Instead we will use CMake to build and install PCRE2 to C:\Tools\pcre2 using the following commands: 
    -        cd C:\
-        SET PATH=C:\Tools\CMake\CMake-win64.3.15.5\bin;%PATH%
-        git clone https://github.com/PhilipHazel/pcre2.git
-        cd pcre2
-        cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:/Tools/pcre2 -S . -B build
-        cmake --build build --config Release --target install
    +cd C:\ +SET PATH=C:\Tools\CMake\CMake-win64.3.15.5\bin;%PATH% +git clone https://github.com/PhilipHazel/pcre2.git +cd pcre2 +cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:/Tools/pcre2 -S . -B build +cmake --build build --config Release --target install + Alternatively, set WITH_PCRE=OFF to disable PCRE2 support if you are sure you do not require it.
  • @@ -270,19 +271,19 @@ For fully working build steps always check the Continuous Integration (CI) setup architecture. We add the required build tools to the system PATH, and then build a Release version of SWIG. If all runs successfully a new swig.exe should be generated in the C:/swig/install2/bin folder.

    -
    - 
    -    cd C:\swig
-    SET PATH=C:\Tools\CMake\CMake-win64.3.15.5\bin;C:\Tools\bison\bison-win32.2.4.1.1\tools\native\bin;%PATH%
-    SET PCRE_ROOT=C:/Tools/pcre2
-    SET PCRE_PLATFORM=x64
-    cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="%CD:\=/%/install2" -DCMAKE_C_FLAGS="/DPCRE2_STATIC" ^
-    -DCMAKE_CXX_FLAGS="/DPCRE2_STATIC" -DPCRE2_INCLUDE_DIR=%PCRE_ROOT%/include -DPCRE2_LIBRARY=%PCRE_ROOT%/lib/pcre2-8-static.lib -S . -B build
-    cmake --build build --config Release --target install
-    
-    REM to test the exe
-    cd install2/bin
-    swig.exe -help
    + 
    +cd C:\swig
+SET PATH=C:\Tools\CMake\CMake-win64.3.15.5\bin;C:\Tools\bison\bison-win32.2.4.1.1\tools\native\bin;%PATH%
+SET PCRE_ROOT=C:/Tools/pcre2
+SET PCRE_PLATFORM=x64
+cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="%CD:\=/%/install2" -DCMAKE_C_FLAGS="/DPCRE2_STATIC" ^
+-DCMAKE_CXX_FLAGS="/DPCRE2_STATIC" -DPCRE2_INCLUDE_DIR=%PCRE_ROOT%/include -DPCRE2_LIBRARY=%PCRE_ROOT%/lib/pcre2-8-static.lib -S . -B build
+cmake --build build --config Release --target install
+
+REM to test the exe
+cd install2/bin
+swig.exe -help
+

    • @@ -292,7 +293,7 @@ For fully working build steps always check the Continuous Integration (CI) setup 

    cmake --build build --config Debug

    - A Visual Studio solution file should be generated named swig.sln. This can be opened and debugged by running the swig project and setting Properties > Debugging > Command Arguments. For example to debug one of the test-suite .i files included with the SWIG source use the following: + A Visual Studio solution file should be generated named swig.sln. This can be opened and debugged by running the swig project and setting Properties > Debugging > Command Arguments. For example to debug one of the test-suite .i files included with the SWIG source use the following: 

    -python -c++ -o C:\Temp\doxygen_parsing.cpp C:\swig\Examples\test-suite\doxygen_parsing.i