Commit e8173157 authored by Richard Levitte's avatar Richard Levitte
Browse files

VMS: support VERBOSE and V in descrip.mms 



With Unixly Makefiles as well as with nmake, make variables are
transferred to the shell running the commands as envinronment
variables.  This principle doesn't apply with MMS, so we must
explicitely define VERBOSE as commands when it's needed.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent be6bdab6

Configurations/descrip.mms.tmpl

+5 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,10 @@ CONFIGURE_ARGS=({- join(", ",quotify_l(@{$config{perlargv}})) -}) 
SRCDIR={- $config{sourcedir} -}

SRCDIR={- $config{sourcedir} -}

BUILDDIR={- $config{builddir} -}

BUILDDIR={- $config{builddir} -}





# Allow both V and VERBOSE to indicate verbosity.  This only applies

# to testing.

VERBOSE=$(V)



VERSION={- $config{version} -}

VERSION={- $config{version} -}

MAJOR={- $config{major} -}

MAJOR={- $config{major} -}

MINOR={- $config{minor} -}

MINOR={- $config{minor} -}
@@ -234,6 +238,7 @@ test tests : configdata.pm, - 
        DEFINE SRCTOP {- sourcedir() -}

        DEFINE SRCTOP {- sourcedir() -}

        DEFINE BLDTOP {- builddir() -}

        DEFINE BLDTOP {- builddir() -}

        DEFINE OPENSSL_ENGINES {- builddir("engines") -}

        DEFINE OPENSSL_ENGINES {- builddir("engines") -}

        IF "$(VERBOSE)" .NES. "" THEN DEFINE VERBOSE "$(VERBOSE)"

        $(PERL) {- sourcefile("test", "run_tests.pl") -} $(TESTS)

        $(PERL) {- sourcefile("test", "run_tests.pl") -} $(TESTS)

        DEASSIGN OPENSSL_ENGINES

        DEASSIGN OPENSSL_ENGINES

        DEASSIGN BLDTOP

        DEASSIGN BLDTOP

INSTALL

+1 −2
Original line number Original line Diff line number Diff line
@@ -495,8 +495,7 @@ 




       $ make VERBOSE=1 test                            # Unix

       $ make VERBOSE=1 test                            # Unix





       $ DEFINE VERBOSE 1

       $ mms /macro=(VERBOSE=1) test                    ! OpenVMS

       $ mms test                                       ! OpenVMS





       $ nmake VERBOSE=1 test                           # Windows

       $ nmake VERBOSE=1 test                           # Windows