Small MSVC build fixes.

- "/Ox /O2 /Ob2" get's reduced to "/O2", the reason being:

    /Ox = /Ob2 /Og /Oi /Ot /Oy /Gs
    /O2 = /Ob2 /Og /Oi /Ot /Oy /Gs /GF /Gy

- apps/openssl.cnf gets installed.

- always delete files quietly, as they might not be there.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1075)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index f928d1f2b5eb8f8aff264f0a15db7224b42045a2..84d33232a5c8652cb0d2adfd43d000aa86cc8d7a 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1267,7 +1267,7 @@ sub vms_info {
                                        release =>
                                        sub {
                                            ($disabled{shared} ? "" : "/MD")
                                        release =>
                                        sub {
                                            ($disabled{shared} ? "" : "/MD")

-                                               ." /Ox /O2 /Ob2";
+                                               ." /O2";

                                        })),
         lib_cflags       => add(sub { $disabled{shared} ? "/MT /Zl" : () }),
         # Following might/should appears controversial, i.e. defining
                                        })),
         lib_cflags       => add(sub { $disabled{shared} ? "/MT /Zl" : () }),
         # Following might/should appears controversial, i.e. defining

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 408a87fc6eaed11524b9957d09c929dcaf76d250..b04d850e6dc66855dc61f5eccd62d0b88c2a2472 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -168,7 +168,7 @@ uninstall: uninstall_docs uninstall_sw
 libclean:
        $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS)
        -del /Q /F $(LIBS)
 libclean:
        $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS)
        -del /Q /F $(LIBS)

-       -del ossl_static.pdb
+       -del /Q ossl_static.pdb

 
 clean: libclean
        -del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)
 
 clean: libclean
        -del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)


@@ -195,6 +195,8 @@ uninstall_docs:
 install_ssldirs:
        @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\certs"
        @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\private"
 install_ssldirs:
        @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\certs"
        @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\private"

+       @$(PERL) $(SRCDIR)\util\copy.pl $(SRCDIR)\apps\openssl.cnf \
+                                       "$(DESTDIR)$(OPENSSLDIR)"

 
 install_dev:
        @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
 
 install_dev:
        @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )


@@ -390,8 +392,8 @@ $target: $deps $ordinalsfile $mkdef_pl
                /implib:\$@ \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< || (DEL /Q \$(\@B).* $shlib.* && EXIT 1)
 $objs $shlib.res$linklibs \$(EX_LIBS)
 <<
                /implib:\$@ \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< || (DEL /Q \$(\@B).* $shlib.* && EXIT 1)
 $objs $shlib.res$linklibs \$(EX_LIBS)
 <<

-       DEL /F apps\\$shlib$shlibext
-       DEL /F test\\$shlib$shlibext
+       DEL /Q /F apps\\$shlib$shlibext
+       DEL /Q /F test\\$shlib$shlibext

        COPY $shlib$shlibext apps
        COPY $shlib$shlibext test
 EOF
        COPY $shlib$shlibext apps
        COPY $shlib$shlibext test
 EOF