Commit 2ff4d293 authored by Richard Levitte's avatar Richard Levitte
Browse files

Install the scripts the same way on Windows and VMS as on Unix 



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

Configurations/descrip.mms.tmpl

+8 −3
Original line number Diff line number Diff line
@@ -113,6 +113,10 @@ DEPS={- our @deps = map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; } 
                    keys %{$unified_info{sources}};

        join(", ", map { "-\n\t".$_ } @deps); -}

{- output_on() if $disabled{makedepend}; "" -}

{- output_off() if $disabled{apps}; "" -}

BIN_SCRIPTS=[.tools]c_rehash.pl

MISC_SCRIPTS=[.apps]CA.pl, [.apps]tsget.pl

{- output_on() if $disabled{apps}; "" -}



# DESTDIR is for package builders so that they can configure for, say,

# SYS$COMMON:[OPENSSL] and yet have everything installed in STAGING:[USER].
@@ -347,9 +351,7 @@ install_runtime : check_INSTALLTOP 
        COPY/PROT=W:RE [.APPS]openssl.EXE ossl_installroot:[EXE.'arch']

        @ ! Install scripts

        - CREATE/DIR ossl_installroot:[EXE]

        COPY/PROT=W:RE [.APPS]CA.pl ossl_installroot:[EXE]

        COPY/PROT=W:RE [.APPS]tsget.pl ossl_installroot:[EXE]

        COPY/PROT=W:RE [.TOOLS]c_rehash.pl ossl_installroot:[EXE]

        COPY/PROT=W:RE $(BIN_SCRIPTS) ossl_installroot:[EXE]

        @ ! {- output_on() if $disabled{apps}; "" -}

        @ ! Install configuration file

        - CREATE/DIR ossl_dataroot:[000000]
@@ -371,6 +373,8 @@ install_config : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com - 
                CREATE/DIR/PROT=(S:RWED,O:RWE,G:RE,W:RE) OSSL_DATAROOT:[CERTS]

        IF F$SEARCH("OSSL_DATAROOT:[000000]PRIVATE.DIR;1") .EQS. "" THEN -

                CREATE/DIR/PROT=(S:RWED,O:RWE,G,W) OSSL_DATAROOT:[PRIVATE]

        IF F$SEARCH("OSSL_DATAROOT:[000000]MISC.DIR;1") .EQS. "" THEN -

                CREATE/DIR/PROT=(S:RWED,O:RWE,G,W) OSSL_DATAROOT:[MISC]

        - CREATE/DIR ossl_installroot:[SYS$STARTUP]

        COPY/PROT=W:RE -

                [.VMS]openssl_startup.com,openssl_shutdown.com -
@@ -378,6 +382,7 @@ install_config : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com - 
        COPY/PROT=W:RE -

                {- sourcefile("VMS", "openssl_utils.com") -} -

                ossl_installroot:[SYS$STARTUP]

        COPY/PROT=W:RE $(MISC_SCRIPTS) OSSL_DATAROOT:[MISC]



[.VMS]openssl_startup.com : vmsconfig.pm {- sourcefile("VMS", "openssl_startup.com.in") -}

        - CREATE/DIR [.VMS]

Configurations/windows-makefile.tmpl

+8 −3
Original line number Diff line number Diff line
@@ -67,6 +67,10 @@ PROGRAMS={- join(" ", map { $_.$exeext } grep { !m|^test\\| } @{$unified_info{pr 
PROGRAMPDBS={- join(" ", map { $_.".pdb" } grep { !m|^test\\| } @{$unified_info{programs}}) -}

TESTPROGS={- join(" ", map { $_.$exeext } grep { m|^test\\| } @{$unified_info{programs}}) -}

SCRIPTS={- join(" ", @{$unified_info{scripts}}) -}

{- output_off() if $disabled{apps}; "" -}

BIN_SCRIPTS=$(BLDDIR)\tools\c_rehash.pl

MISC_SCRIPTS=$(BLDDIR)\apps\CA.pl $(BLDDIR)\apps\tsget.pl

{- output_on() if $disabled{apps}; "" -}



{- output_off() if $disabled{makedepend}; "" -}

DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; }
@@ -197,8 +201,11 @@ uninstall_docs: 
install_ssldirs:

	@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\certs"

	@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\private"

	@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\misc"

	@$(PERL) $(SRCDIR)\util\copy.pl $(SRCDIR)\apps\openssl.cnf \

                                       "$(DESTDIR)$(OPENSSLDIR)"

	@$(PERL) $(SRCDIR)\util\copy.pl $(MISC_SCRIPTS) \

                                        "$(DESTDIR)$(OPENSSLDIR)\misc"



install_dev:

	@if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
@@ -241,9 +248,7 @@ install_runtime: 
                                        "$(DESTDIR)$(INSTALLTOP)\bin"

	@$(PERL) $(SRCDIR)\util\copy.pl $(PROGRAMPDBS) \

                                        "$(DESTDIR)$(INSTALLTOP)\bin"

	@$(PERL) $(SRCDIR)\util\copy.pl $(SCRIPTS) \

                                        "$(DESTDIR)$(INSTALLTOP)\bin"

	@$(PERL) $(SRCDIR)\util\copy.pl tools\c_rehash.pl \

	@$(PERL) $(SRCDIR)\util\copy.pl $(BIN_SCRIPTS) \

                                        "$(DESTDIR)$(INSTALLTOP)\bin"



uninstall_runtime: