X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Configurations%2Fdescrip.mms.tmpl;h=95262fe638016516fd274682dfad354a01a00230;hp=8c29db30a32338fc1818cf39b9f019af262831f9;hb=b7c9aa645e4eddf5d198d2b20f1c6a74ab96f98e;hpb=e8fb12957a68c8bf550ae9f5c96c6cc14fa47ee1 diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 8c29db30a3..95262fe638 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -43,8 +43,7 @@ # Because we need to make two computations of these data, # we store them in arrays for reuse our @shlibs = map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}; - our @programs = grep { !m|^\[\.test\]| } @{$unified_info{programs}}; - our @testprogs = grep { m|^\[\.test\]| } @{$unified_info{programs}}; + our @install_shlibs = map { $unified_info{sharednames}->{$_} || () } @{$unified_info{install}->{libraries}}; our @generated = ( ( map { (my $x = $_) =~ s|\.S$|\.s|; $x } grep { defined $unified_info{generate}->{$_} } map { @{$unified_info{sources}->{$_}} } @@ -118,8 +117,7 @@ DEP_EXT=.D LIBS={- join(", ", map { "-\n\t".$_.".OLB" } @{$unified_info{libraries}}) -} SHLIBS={- join(", ", map { "-\n\t".$_.".EXE" } @shlibs) -} ENGINES={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{engines}}) -} -PROGRAMS={- join(", ", map { "-\n\t".$_.".EXE" } @programs) -} -TESTPROGS={- join(", ", map { "-\n\t".$_.".EXE" } @testprogs) -} +PROGRAMS={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{programs}}) -} SCRIPTS={- join(", ", map { "-\n\t".$_ } @{$unified_info{scripts}}) -} {- output_off() if $disabled{makedepend}; "" -} DEPS={- our @deps = map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; } @@ -130,6 +128,10 @@ DEPS={- our @deps = map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; } GENERATED_MANDATORY={- join(", ", map { "-\n\t".$_ } @{$unified_info{depends}->{""}} ) -} GENERATED={- join(", ", map { "-\n\t".$_ } @generated) -} +INSTALL_LIBS={- join(", ", map { "-\n\t".$_.".OLB" } @{$unified_info{install}->{libraries}}) -} +INSTALL_SHLIBS={- join(", ", map { "-\n\t".$_.".EXE" } @install_shlibs) -} +INSTALL_ENGINES={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{install}->{engines}}) -} +INSTALL_PROGRAMS={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{install}->{programs}}) -} {- output_off() if $disabled{apps}; "" -} BIN_SCRIPTS=[.tools]c_rehash.pl MISC_SCRIPTS=[.apps]CA.pl, [.apps]tsget.pl @@ -149,14 +151,16 @@ INSTALLTOP={- our $installtop = $installtop -} SYSTARTUP={- catdir($installtop, '[.SYS$STARTUP]'); -} # This is the standard central area to store certificates, private keys... -OPENSSLDIR={- catdir($config{openssldir}) || +OPENSSLDIR={- catdir($config{openssldir}) or $config{prefix} ? catdir($config{prefix},"COMMON") : "SYS\$COMMON:[OPENSSL-COMMON]" -} -# Where installed engines reside -ENGINESDIR={- $osslprefix -}ENGINES{- $sover -}: +# The same, but for C +OPENSSLDIR_C={- $osslprefix -}DATAROOT:[000000] +# Where installed engines reside, for C +ENGINESDIR_C={- $osslprefix -}ENGINES{- $sover.$target{pointer_size} -}: CC= {- $target{cc} -} -CFLAGS= /DEFINE=({- join(",", @{$target{defines}}, @{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR)\"\"\"") -}) {- $target{cflags} -} {- $config{cflags} -} +CFLAGS= /DEFINE=({- join(",", @{$target{defines}}, @{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR_C)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR_C)\"\"\"") -}) {- $target{cflags} -} {- $config{cflags} -} CFLAGS_Q=$(CFLAGS) DEPFLAG= /DEFINE=({- join(",", @{$config{depdefines}}) -}) LDFLAGS= {- $target{lflags} -} @@ -164,6 +168,9 @@ EX_LIBS= {- $target{ex_libs} ? ",".$target{ex_libs} : "" -}{- $config{ex_libs} ? LIB_CFLAGS={- $target{lib_cflags} || "" -} DSO_CFLAGS={- $target{dso_cflags} || "" -} BIN_CFLAGS={- $target{bin_cflags} || "" -} +NO_INST_LIB_CFLAGS={- $target{no_inst_lib_cflags} || '$(LIB_CFLAGS)' -} +NO_INST_DSO_CFLAGS={- $target{no_inst_dso_cflags} || '$(DSO_CFLAGS)' -} +NO_INST_BIN_CFLAGS={- $target{no_inst_bin_cflags} || '$(BIN_CFLAGS)' -} PERL={- $config{perl} -} @@ -238,22 +245,22 @@ NODEBUG=@ # The main targets ################################################### all : build_generated, - - build_libs_nodep, build_engines_nodep, build_apps_nodep, - + build_libs_nodep, build_engines_nodep, build_programs_nodep, - depend build_libs : build_generated, build_libs_nodep, depend build_libs_nodep : $(LIBS), $(SHLIBS) build_engines : build_generated, build_engines_nodep, depend build_engines_nodep : $(ENGINES) -build_apps : build_generated, build_apps_nodep, depend -build_apps_nodep : $(PROGRAMS), $(SCRIPTS) -build_tests : build_generated, build_tests_nodep, depend -build_tests_nodep : $(TESTPROGS) +build_programs : build_generated, build_programs_nodep, depend +build_programs_nodep : $(PROGRAMS), $(SCRIPTS) build_generated : $(GENERATED_MANDATORY) -test tests : build_generated, - - build_apps_nodep, build_engines_nodep, build_tests_nodep, - +# Kept around for backward compatibility +build_apps build_tests : build_programs + +test tests : build_generated, build_programs_nodep, build_engines_nodep, - depend @ ! {- output_off() if $disabled{tests}; "" -} SET DEFAULT [.test]{- move("test") -} @@ -286,8 +293,8 @@ install : install_sw install_ssldirs install_docs @ IF "$(DESTDIR)" .EQS. "" THEN - PIPE ( WRITE SYS$OUTPUT "Installation complete" ; - WRITE SYS$OUTPUT "" ; - - WRITE SYS$OUTPUT "Run @$(INSTALLTOP)openssl_startup{- $osslver -} to set up logical names" ; - - WRITE SYS$OUTPUT "then run @$(INSTALLTOP)openssl_utils{- $osslver -} to define commands" ; - + WRITE SYS$OUTPUT "Run @$(SYSTARTUP)openssl_startup{- $osslver -} to set up logical names" ; - + WRITE SYS$OUTPUT "then run @$(SYSTARTUP)openssl_utils{- $osslver -} to define commands" ; - WRITE SYS$OUTPUT "" ) @ IF "$(DESTDIR)" .NES. "" THEN - PIPE ( WRITE SYS$OUTPUT "Staging installation complete" ; - @@ -310,14 +317,13 @@ check_install : uninstall : uninstall_docs uninstall_sw # Because VMS wants the generation number (or *) to delete files, we can't -# use $(LIBS), $(PROGRAMS), $(GENERATED), $(ENGINES) and $(TESTPROGS) directly. +# use $(LIBS), $(PROGRAMS), $(GENERATED) and $(ENGINES)directly. libclean : {- join("\n\t", map { "- DELETE $_.OLB;*" } @{$unified_info{libraries}}) || "@ !" -} {- join("\n\t", map { "- DELETE $_.EXE;*,$_.MAP;*,$_.OPT;*" } @shlibs) || "@ !" -} clean : libclean - {- join("\n\t", map { "- DELETE $_.EXE;*,$_.OPT;*" } @programs) || "@ !" -} - {- join("\n\t", map { "- DELETE $_.EXE;*,$_.OPT;*" } @testprogs) || "@ !" -} + {- join("\n\t", map { "- DELETE $_.EXE;*,$_.OPT;*" } @{$unified_info{programs}}) || "@ !" -} {- join("\n\t", map { "- DELETE $_.EXE;*,$_.OPT;*" } @{$unified_info{engines}}) || "@ !" -} {- join("\n\t", map { "- DELETE $_;*" } @{$unified_info{scripts}}) || "@ !" -} {- join("\n\t", map { "- DELETE $_;*" } @generated) || "@ !" -} @@ -350,9 +356,13 @@ descrip.mms : FORCE # Install helper targets ############################################# -install_sw : all install_dev install_engines install_runtime install_startup install_ivp +install_sw : all install_shared _install_dev_ns - + install_engines _install_runtime_ns - + install_startup install_ivp -uninstall_sw : uninstall_dev uninstall_engines uninstall_runtime uninstall_startup uninstall_ivp +uninstall_sw : uninstall_shared _uninstall_dev_ns - + uninstall_engines _uninstall_runtime_ns - + uninstall_startup uninstall_ivp install_docs : install_html_docs @@ -368,45 +378,59 @@ install_ssldirs : check_INSTALLTOP CREATE/DIR/PROT=(S:RWED,O:RWE,G,W) OSSL_DATAROOT:[MISC] COPY/PROT=W:RE $(MISC_SCRIPTS) OSSL_DATAROOT:[MISC] @ ! Install configuration file - COPY/PROT=W:RE {- sourcefile("apps", "openssl-vms.cnf") -} - - ossl_dataroot:[000000]openssl.cnf + COPY/PROT=W:R {- sourcefile("apps", "openssl-vms.cnf") -} - + ossl_dataroot:[000000]openssl.cnf-dist + IF F$SEARCH("OSSL_DATAROOT:[000000]openssl.cnf") .EQS. "" THEN - + COPY/PROT=W:R {- sourcefile("apps", "openssl-vms.cnf") -} - + ossl_dataroot:[000000]openssl.cnf + @ ! Install CTLOG configuration file + COPY/PROT=W:R {- sourcefile("apps", "ct_log_list.cnf") -} - + ossl_dataroot:[000000]ct_log_list.cnf-dist + IF F$SEARCH("OSSL_DATAROOT:[000000]ct_log_list.cnf") .EQS. "" THEN - + COPY/PROT=W:R {- sourcefile("apps", "ct_log_list.cnf") -} - + ossl_dataroot:[000000]ct_log_list.cnf + +install_shared : check_INSTALLTOP + @ {- output_off() if $disabled{shared}; "" -} ! + @ WRITE SYS$OUTPUT "*** Installing shareable images" + @ ! Install shared (runtime) libraries + - CREATE/DIR ossl_installroot:[LIB.'arch'] + {- join("\n ", + map { "COPY/PROT=W:R $_.EXE ossl_installroot:[LIB.'arch']" } + @install_shlibs) -} + @ {- output_on() if $disabled{shared}; "" -} ! -install_dev : check_INSTALLTOP +_install_dev_ns : check_INSTALLTOP @ WRITE SYS$OUTPUT "*** Installing development files" @ ! Install header files - CREATE/DIR ossl_installroot:[include.openssl] COPY/PROT=W:R openssl:*.h ossl_installroot:[include.openssl] - @ ! Install libraries + @ ! Install static (development) libraries - CREATE/DIR ossl_installroot:[LIB.'arch'] {- join("\n ", map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" } - @{$unified_info{libraries}}) -} - @ {- output_off() if $disabled{shared}; "" -} ! - {- join("\n ", - map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[LIB.'arch']" } - map { $unified_info{sharednames}->{$_} || () } - @{$unified_info{libraries}}) -} - @ {- output_on() if $disabled{shared}; "" -} ! + @{$unified_info{install}->{libraries}}) -} + +install_dev : install_shared _install_dev_ns -install_runtime : check_INSTALLTOP - @ ! {- output_off() if $disabled{apps}; "" -} - @ WRITE SYS$OUTPUT "*** Installing runtime files" +_install_runtime_ns : check_INSTALLTOP @ ! Install the main program - CREATE/DIR ossl_installroot:[EXE.'arch'] COPY/PROT=W:RE [.APPS]openssl.EXE - ossl_installroot:[EXE.'arch']openssl{- $osslver -}.EXE @ ! Install scripts - - CREATE/DIR ossl_installroot:[EXE] COPY/PROT=W:RE $(BIN_SCRIPTS) ossl_installroot:[EXE] @ ! {- output_on() if $disabled{apps}; "" -} +install_runtime : install_shared _install_runtime_ns + install_engines : check_INSTALLTOP @ {- output_off() unless scalar @{$unified_info{engines}}; "" -} ! @ WRITE SYS$OUTPUT "*** Installing engines" - - CREATE/DIR ossl_installroot:[ENGINES{- $sover -}.'arch'] + - CREATE/DIR ossl_installroot:[ENGINES{- $sover.$target{pointer_size} -}.'arch'] {- join("\n ", - map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES$sover.'arch']" } - grep(!m|ossltest$|i, @{$unified_info{engines}})) -} + map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES$sover$target{pointer_size}.'arch']" } + @{$unified_info{install}->{engines}}) -} @ {- output_on() unless scalar @{$unified_info{engines}}; "" -} ! install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com - @@ -473,8 +497,10 @@ vmsconfig.pm : configdata.pm CLOSE CONFIG install_html_docs : check_INSTALLTOP - @ $(PERL) {- sourcefile("util", "process_docs.pl") -} - - --destdir=ossl_installroot:[HTML] --type=html + sourcedir = F$PARSE("{- $sourcedir -}A.;","[]") - "]A.;" + ".DOC]" + $(PERL) {- sourcefile("util", "process_docs.pl") -} - + --sourcedir='sourcedir' --destdir=ossl_installroot:[HTML] - + --type=html check_INSTALLTOP : @ IF "$(INSTALLTOP)" .EQS. "" THEN - @@ -491,7 +517,7 @@ debug_logicals : # Building targets ################################################### -configdata.pm : {- join(" ", sourcefile("Configurations", "descrip.mms.tmpl"), sourcefile("Configurations", "common.tmpl")) -} $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_infos}}) -} +configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -} @ WRITE SYS$OUTPUT "Reconfiguring..." perl $(SRCDIR)Configure reconf @ WRITE SYS$OUTPUT "*************************************************" @@ -550,9 +576,16 @@ EOF my $srcs = join(", ", map { abs2rel(rel2abs($_), rel2abs($forward)) } @{$args{srcs}}); - my $ecflags = { lib => '$(LIB_CFLAGS)', - dso => '$(DSO_CFLAGS)', - bin => '$(BIN_CFLAGS)' } -> {$args{intent}}; + my $ecflags; + if ($args{installed}) { + $ecflags = { lib => '$(LIB_CFLAGS)', + dso => '$(DSO_CFLAGS)', + bin => '$(BIN_CFLAGS)' } -> {$args{intent}}; + } else { + $ecflags = { lib => '$(NO_INST_LIB_CFLAGS)', + dso => '$(NO_INST_DSO_CFLAGS)', + bin => '$(NO_INST_BIN_CFLAGS)' } -> {$args{intent}}; + } my $incs_on = "\@ !"; my $incs_off = "\@ !"; my $incs = ""; @@ -660,10 +693,11 @@ EOF # previous line's file spec as default, so if no directory spec # is present in the current line and the previous line has one that # doesn't apply, you're in for a surprise. - my $write_opt = + my $write_opt1 = join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_; "WRITE OPT_FILE \"$x" } @objs). - "\"\n\t". + "\""; + my $write_opt2 = join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_; $x =~ s|(\.EXE)|$1/SHARE|; $x =~ s|(\.OLB)|$1/LIB|; @@ -673,7 +707,8 @@ EOF $lib.EXE : $deps OPEN/WRITE/SHARE=READ OPT_FILE $lib.OPT TYPE $engine_opt /OUTPUT=OPT_FILE: - $write_opt + $write_opt1 + $write_opt2 CLOSE OPT_FILE LINK /MAP=$lib.MAP /FULL/SHARE=$lib.EXE $lib.OPT/OPT \$(EX_LIBS) - PURGE $lib.EXE,$lib.OPT,$lib.MAP @@ -706,10 +741,11 @@ EOF # previous line's file spec as default, so if no directory spec # is present in the current line and the previous line has one that # doesn't apply, you're in for a surprise. - my $write_opt = + my $write_opt1 = join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_; "WRITE OPT_FILE \"$x" } @objs). - "\"\n\t". + "\""; + my $write_opt2 = join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_; $x =~ s|(\.EXE)|$1/SHARE|; $x =~ s|(\.OLB)|$1/LIB|; @@ -718,7 +754,8 @@ EOF return <<"EOF"; $bin.EXE : $deps OPEN/WRITE/SHARE=READ OPT_FILE $bin.OPT - $write_opt + $write_opt1 + $write_opt2 CLOSE OPT_FILE LINK/EXEC=$bin.EXE \$(LDFLAGS) $bin.OPT/OPT \$(EX_LIBS) - PURGE $bin.EXE,$bin.OPT