Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch msvc-openssl-winxp Excluding Merge-Ins
This is equivalent to a diff from 85cfdd19 to 771ab194
2022-01-31
| ||
05:42 | For the MSVC makefile, fix forwarding of XPCFLAGS and XPLDFLAGS to OpenSSL. This is only relevant if the MSVC makefile is used to build OpenSSL as a sub-project (FOSSIL_BUILD_SSL=1) for Windows XP (FOSSIL_ENABLE_WINXP=1). XPLDFLAGS only matters for the shared library case (FOSSIL_DYNAMIC_BUILD=1), and is applied in a post build step -- somewhat whacky, but fixes the problem, and there's a lot of comments and diagnostic output to help with troubleshooting. ... (check-in: fa3f60f6 user: florian tags: trunk) | |
05:32 | Update the makemake.tcl script. ... (Closed-Leaf check-in: 771ab194 user: florian tags: msvc-openssl-winxp) | |
05:29 | Keep the verbose output as it's helpful for debugging, and because Fossil build output is also very detailed. ... (check-in: c62f663e user: florian tags: msvc-openssl-winxp) | |
2022-01-21
| ||
11:38 | Fix the previous check-in to list environment variables used by the CGI Server Extensions feature in the correct place. ... (check-in: 6eeb7ec1 user: florian tags: trunk) | |
06:49 | Forward XPCFLAGS and XPLDFLAGS to the OpenSSL build process to fix Windows XP builds with MSVC. This affects builds with FOSSIL_ENABLE_WINXP=1 and FOSSIL_BUILD_SSL=1. XPLDFLAGS is only relevant if FOSSIL_DYNAMIC_BUILD=1 also set, and is applied in a post-build step to work around the difficulties to append (MSVC) linker flags to the OpenSSL defaults. NOTE: Pending more tests, and back-porting to tools/makemake.tcl. ... (check-in: b9d40d68 user: florian tags: msvc-openssl-winxp) | |
06:12 | Add a few environment variables mentioned in recent check-in comments to the documentation. ... (check-in: 85cfdd19 user: florian tags: trunk) | |
2022-01-20
| ||
21:43 | The test-httpmsg command does not need to open a repository. ... (check-in: b145f19d user: drh tags: trunk) | |
Changes to tools/makemake.tcl.
︙ | |||
1569 1570 1571 1572 1573 1574 1575 | 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 | - | SSLDIR = $(B)\compat\openssl SSLINCDIR = $(SSLDIR)\include !if $(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR = $(SSLDIR) !else SSLLIBDIR = $(SSLDIR) !endif |
︙ | |||
1641 1642 1643 1644 1645 1646 1647 1648 | 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 | + + + + - + - + + + + + + + + | !else LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO !endif !if $(FOSSIL_ENABLE_WINXP)!=0 XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1 CFLAGS = $(CFLAGS) $(XPCFLAGS) # # NOTE: For regular builds, /OSVERSION defaults to the /SUBSYSTEM version and # explicit initialization is redundant, but is required for post-built edits. # !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
︙ | |||
1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 | 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 | + + + + - - + + + + + + + + + + + + + + + + + + - - + + + + + | clean-zlib: @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd !if $(FOSSIL_ENABLE_SSL)!=0 openssl: @echo Building OpenSSL from "$(SSLDIR)"... !if $(FOSSIL_ENABLE_WINXP)!=0 @echo Passing XPCFLAGS = [ $(XPCFLAGS) ] to the OpenSSL configuration... !endif !ifdef PERLDIR @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd !else @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd !endif @pushd "$(SSLDIR)" && $(MAKE) && popd |
︙ |
Changes to win/Makefile.msc.
︙ | |||
114 115 116 117 118 119 120 | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 | - | SSLDIR = $(B)\compat\openssl SSLINCDIR = $(SSLDIR)\include !if $(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR = $(SSLDIR) !else SSLLIBDIR = $(SSLDIR) !endif |
︙ | |||
186 187 188 189 190 191 192 193 | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 | + + + + - + - + + + + + + + + | !else LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO !endif !if $(FOSSIL_ENABLE_WINXP)!=0 XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1 CFLAGS = $(CFLAGS) $(XPCFLAGS) # # NOTE: For regular builds, /OSVERSION defaults to the /SUBSYSTEM version and # explicit initialization is redundant, but is required for post-built edits. # !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
︙ | |||
792 793 794 795 796 797 798 799 800 801 802 803 | 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 | + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + | clean-zlib: @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd !if $(FOSSIL_ENABLE_SSL)!=0 openssl: @echo Building OpenSSL from "$(SSLDIR)"... !if $(FOSSIL_ENABLE_WINXP)!=0 @echo Passing XPCFLAGS = [ $(XPCFLAGS) ] to the OpenSSL configuration... !endif !ifdef PERLDIR @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd !else @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd !endif @pushd "$(SSLDIR)" && $(MAKE) && popd |
︙ |