Fossil SCM
Defer output of status messages until relevant. Remove unnecessary FOR command variable expansions.
Commit
b2655b9c4d6006e393c62db6686d274e929417c432ae2073cdf5807afce8d4e7
Parent
b9d40d68dc77834…
1 file changed
+5
-3
+5
-3
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -198,11 +198,10 @@ | ||
| 198 | 198 | !else |
| 199 | 199 | XPLDFLAGS = $(XPLDFLAGS) /OSVERSION:5.01 /SUBSYSTEM:CONSOLE,5.01 |
| 200 | 200 | !endif |
| 201 | 201 | LDFLAGS = $(LDFLAGS) $(XPLDFLAGS) |
| 202 | 202 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 203 | -!message Passing XPCFLAGS = [ $(XPCFLAGS) ] to the OpenSSL configuration... | |
| 204 | 203 | SSLCONFIG = $(SSLCONFIG) $(XPCFLAGS) |
| 205 | 204 | !endif |
| 206 | 205 | !endif |
| 207 | 206 | |
| 208 | 207 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| @@ -801,10 +800,13 @@ | ||
| 801 | 800 | @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd |
| 802 | 801 | |
| 803 | 802 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 804 | 803 | openssl: |
| 805 | 804 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 805 | +!if $(FOSSIL_ENABLE_WINXP)!=0 | |
| 806 | + @echo Passing XPCFLAGS = [ $(XPCFLAGS) ] to the OpenSSL configuration... | |
| 807 | +!endif | |
| 806 | 808 | !ifdef PERLDIR |
| 807 | 809 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 808 | 810 | !else |
| 809 | 811 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 810 | 812 | !endif |
| @@ -828,12 +830,12 @@ | ||
| 828 | 830 | # WINDOWS to CONSOLE, but which has no effect on DLLs. |
| 829 | 831 | # |
| 830 | 832 | @echo Applying XPLDFLAGS = [ $(XPLDFLAGS) ] to the OpenSSL DLLs... |
| 831 | 833 | @for /F "usebackq delims=" %F in (`dir /A:-D/B "$(SSLDIR)\*.dll" 2^>nul`) \ |
| 832 | 834 | do @( \ |
| 833 | - echo %~nxF & \ | |
| 834 | - link /EDIT /NOLOGO $(XPLDFLAGS) "$(SSLDIR)\%~F" \ | |
| 835 | + echo %F & \ | |
| 836 | + link /EDIT /NOLOGO $(XPLDFLAGS) "$(SSLDIR)\%F" \ | |
| 835 | 837 | ) |
| 836 | 838 | !endif |
| 837 | 839 | |
| 838 | 840 | clean-openssl: |
| 839 | 841 | @pushd "$(SSLDIR)" && $(MAKE) clean && popd |
| 840 | 842 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -198,11 +198,10 @@ | |
| 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 | !message Passing XPCFLAGS = [ $(XPCFLAGS) ] to the OpenSSL configuration... |
| 204 | SSLCONFIG = $(SSLCONFIG) $(XPCFLAGS) |
| 205 | !endif |
| 206 | !endif |
| 207 | |
| 208 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| @@ -801,10 +800,13 @@ | |
| 801 | @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd |
| 802 | |
| 803 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 804 | openssl: |
| 805 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 806 | !ifdef PERLDIR |
| 807 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 808 | !else |
| 809 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 810 | !endif |
| @@ -828,12 +830,12 @@ | |
| 828 | # WINDOWS to CONSOLE, but which has no effect on DLLs. |
| 829 | # |
| 830 | @echo Applying XPLDFLAGS = [ $(XPLDFLAGS) ] to the OpenSSL DLLs... |
| 831 | @for /F "usebackq delims=" %F in (`dir /A:-D/B "$(SSLDIR)\*.dll" 2^>nul`) \ |
| 832 | do @( \ |
| 833 | echo %~nxF & \ |
| 834 | link /EDIT /NOLOGO $(XPLDFLAGS) "$(SSLDIR)\%~F" \ |
| 835 | ) |
| 836 | !endif |
| 837 | |
| 838 | clean-openssl: |
| 839 | @pushd "$(SSLDIR)" && $(MAKE) clean && popd |
| 840 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -198,11 +198,10 @@ | |
| 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 | |
| 207 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| @@ -801,10 +800,13 @@ | |
| 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 |
| @@ -828,12 +830,12 @@ | |
| 830 | # WINDOWS to CONSOLE, but which has no effect on DLLs. |
| 831 | # |
| 832 | @echo Applying XPLDFLAGS = [ $(XPLDFLAGS) ] to 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" \ |
| 837 | ) |
| 838 | !endif |
| 839 | |
| 840 | clean-openssl: |
| 841 | @pushd "$(SSLDIR)" && $(MAKE) clean && popd |
| 842 |