Fossil SCM
Reduce output verbosity, but still provide enough hints in case of an error.
Commit
7dcf497daaea535048e905048e0475031c99813434be962e01f1e61df974804c
Parent
87dcc045dd473cb…
1 file changed
+6
-5
+6
-5
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -197,10 +197,14 @@ | ||
| 197 | 197 | XPLDFLAGS = $(XPLDFLAGS) /OSVERSION:5.02 /SUBSYSTEM:CONSOLE,5.02 |
| 198 | 198 | !else |
| 199 | 199 | XPLDFLAGS = $(XPLDFLAGS) /OSVERSION:5.01 /SUBSYSTEM:CONSOLE,5.01 |
| 200 | 200 | !endif |
| 201 | 201 | LDFLAGS = $(LDFLAGS) $(XPLDFLAGS) |
| 202 | +# | |
| 203 | +# NOTE: Only XPCFLAGS is forwarded to the OpenSSL configuration, and XPLDFLAGS | |
| 204 | +# is applied in a separate post-build step, see below for more information. | |
| 205 | +# | |
| 202 | 206 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 203 | 207 | SSLCONFIG = $(SSLCONFIG) $(XPCFLAGS) |
| 204 | 208 | !endif |
| 205 | 209 | !endif |
| 206 | 210 | |
| @@ -800,13 +804,10 @@ | ||
| 800 | 804 | @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd |
| 801 | 805 | |
| 802 | 806 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 803 | 807 | openssl: |
| 804 | 808 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 805 | -!if $(FOSSIL_ENABLE_WINXP)!=0 | |
| 806 | - @echo Passing XPCFLAGS = [ $(XPCFLAGS) ] to the OpenSSL configuration... | |
| 807 | -!endif | |
| 808 | 809 | !ifdef PERLDIR |
| 809 | 810 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 810 | 811 | !else |
| 811 | 812 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 812 | 813 | !endif |
| @@ -826,15 +827,15 @@ | ||
| 826 | 827 | # the OpenSSL makefile by hand. |
| 827 | 828 | # |
| 828 | 829 | # Also note that this step changes the subsystem for the OpenSSL DLLs from |
| 829 | 830 | # WINDOWS to CONSOLE, but which has no effect on DLLs. |
| 830 | 831 | # |
| 831 | - @echo Applying XPLDFLAGS = [ $(XPLDFLAGS) ] to the OpenSSL DLLs... | |
| 832 | + @echo Post-processing the OpenSSL DLLs... | |
| 832 | 833 | @for /F "usebackq delims=" %F in (`dir /A:-D/B "$(SSLDIR)\*.dll" 2^>nul`) \ |
| 833 | 834 | do @( \ |
| 834 | 835 | echo %F & \ |
| 835 | - link /EDIT /NOLOGO $(XPLDFLAGS) "$(SSLDIR)\%F" \ | |
| 836 | + link /EDIT /NOLOGO $(XPLDFLAGS) "$(SSLDIR)\%F" || exit 1 \ | |
| 836 | 837 | ) |
| 837 | 838 | !endif |
| 838 | 839 | |
| 839 | 840 | clean-openssl: |
| 840 | 841 | @pushd "$(SSLDIR)" && $(MAKE) clean && popd |
| 841 | 842 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -197,10 +197,14 @@ | |
| 197 | XPLDFLAGS = $(XPLDFLAGS) /OSVERSION:5.02 /SUBSYSTEM:CONSOLE,5.02 |
| 198 | !else |
| 199 | XPLDFLAGS = $(XPLDFLAGS) /OSVERSION:5.01 /SUBSYSTEM:CONSOLE,5.01 |
| 200 | !endif |
| 201 | LDFLAGS = $(LDFLAGS) $(XPLDFLAGS) |
| 202 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 203 | SSLCONFIG = $(SSLCONFIG) $(XPCFLAGS) |
| 204 | !endif |
| 205 | !endif |
| 206 | |
| @@ -800,13 +804,10 @@ | |
| 800 | @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd |
| 801 | |
| 802 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 803 | openssl: |
| 804 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 805 | !if $(FOSSIL_ENABLE_WINXP)!=0 |
| 806 | @echo Passing XPCFLAGS = [ $(XPCFLAGS) ] to the OpenSSL configuration... |
| 807 | !endif |
| 808 | !ifdef PERLDIR |
| 809 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 810 | !else |
| 811 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 812 | !endif |
| @@ -826,15 +827,15 @@ | |
| 826 | # the OpenSSL makefile by hand. |
| 827 | # |
| 828 | # Also note that this step changes the subsystem for the OpenSSL DLLs from |
| 829 | # WINDOWS to CONSOLE, but which has no effect on DLLs. |
| 830 | # |
| 831 | @echo Applying XPLDFLAGS = [ $(XPLDFLAGS) ] to the OpenSSL DLLs... |
| 832 | @for /F "usebackq delims=" %F in (`dir /A:-D/B "$(SSLDIR)\*.dll" 2^>nul`) \ |
| 833 | do @( \ |
| 834 | echo %F & \ |
| 835 | link /EDIT /NOLOGO $(XPLDFLAGS) "$(SSLDIR)\%F" \ |
| 836 | ) |
| 837 | !endif |
| 838 | |
| 839 | clean-openssl: |
| 840 | @pushd "$(SSLDIR)" && $(MAKE) clean && popd |
| 841 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -197,10 +197,14 @@ | |
| 197 | XPLDFLAGS = $(XPLDFLAGS) /OSVERSION:5.02 /SUBSYSTEM:CONSOLE,5.02 |
| 198 | !else |
| 199 | XPLDFLAGS = $(XPLDFLAGS) /OSVERSION:5.01 /SUBSYSTEM:CONSOLE,5.01 |
| 200 | !endif |
| 201 | LDFLAGS = $(LDFLAGS) $(XPLDFLAGS) |
| 202 | # |
| 203 | # NOTE: Only XPCFLAGS is forwarded to the OpenSSL configuration, and XPLDFLAGS |
| 204 | # is applied in a separate post-build step, see below for more information. |
| 205 | # |
| 206 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 207 | SSLCONFIG = $(SSLCONFIG) $(XPCFLAGS) |
| 208 | !endif |
| 209 | !endif |
| 210 | |
| @@ -800,13 +804,10 @@ | |
| 804 | @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd |
| 805 | |
| 806 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 807 | openssl: |
| 808 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 809 | !ifdef PERLDIR |
| 810 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 811 | !else |
| 812 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 813 | !endif |
| @@ -826,15 +827,15 @@ | |
| 827 | # the OpenSSL makefile by hand. |
| 828 | # |
| 829 | # Also note that this step changes the subsystem for the OpenSSL DLLs from |
| 830 | # WINDOWS to CONSOLE, but which has no effect on DLLs. |
| 831 | # |
| 832 | @echo Post-processing the OpenSSL DLLs... |
| 833 | @for /F "usebackq delims=" %F in (`dir /A:-D/B "$(SSLDIR)\*.dll" 2^>nul`) \ |
| 834 | do @( \ |
| 835 | echo %F & \ |
| 836 | link /EDIT /NOLOGO $(XPLDFLAGS) "$(SSLDIR)\%F" || exit 1 \ |
| 837 | ) |
| 838 | !endif |
| 839 | |
| 840 | clean-openssl: |
| 841 | @pushd "$(SSLDIR)" && $(MAKE) clean && popd |
| 842 |