X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Configurations%2Fdescrip.mms.tmpl;h=ef59d425e44ec54b7b45d05d2e56fe1ea2c28998;hp=4732782072529d0d3ed1a35afd57707f08b6dc1c;hb=2952b9b8115bdd852fb226e918f8b6d6a4a0bea2;hpb=3c65577f1af1109beb8de06420efa09188981628 diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 4732782072..ef59d425e4 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -50,15 +50,13 @@ } my $sd1 = sourcedir("ssl","record"); my $sd2 = sourcedir("ssl","statem"); - $unified_info{before}->{"[.crypto.ct]ct_lib.OBJ"} - = $unified_info{before}->{"[.test]heartbeat_test.OBJ"} + $unified_info{before}->{"[.test]heartbeat_test.OBJ"} = $unified_info{before}->{"[.test]ssltest.OBJ"} = qq(record = F\$PARSE("$sd1","A.;",,,"SYNTAX_ONLY") - "A.;" define record 'record' statem = F\$PARSE("$sd2","A.;",,,"SYNTAX_ONLY") - "A.;" define statem 'statem'); - $unified_info{after}->{"[.crypto.ct]ct_lib.OBJ"} - = $unified_info{after}->{"[.test]heartbeat_test.OBJ"} + $unified_info{after}->{"[.test]heartbeat_test.OBJ"} = $unified_info{after}->{"[.test]ssltest.OBJ"} = qq(deassign statem deassign record); @@ -105,6 +103,10 @@ ENGINES={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{engines}}) -} PROGRAMS={- join(", ", map { "-\n\t".$_.".EXE" } grep { !m|^\[\.test\]| } @{$unified_info{programs}}) -} TESTPROGS={- join(", ", map { "-\n\t".$_.".EXE" } grep { m|^\[\.test\]| } @{$unified_info{programs}}) -} SCRIPTS={- join(", ", map { "-\n\t".$_ } @{$unified_info{scripts}}) -} +DEPS={- our @deps = map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; } + grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ } + keys %{$unified_info{sources}}; + join(", ", map { "-\n\t".$_ } @deps); -} # DESTDIR is for package builders so that they can configure for, say, # SYS$COMMON:[OPENSSL] and yet have everything installed in STAGING:[USER]. @@ -124,10 +126,10 @@ OPENSSLDIR={- catdir($config{openssldir}) || ENGINESDIR={- $osslprefix -}ENGINES: CC= {- $target{cc} -} -CFLAGS= /DEFINE=({- join(",", @{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR)\"\"\"") -}) {- $config{cflags} -} +CFLAGS= /DEFINE=({- join(",", @{$target{defines}}, @{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR)\"\"\"") -}) {- $target{cflags} -} {- $config{cflags} -} DEPFLAG= /DEFINE=({- join(",", @{$config{depdefines}}) -}) -LDFLAGS= {- $config{lflags} -} -EX_LIBS= {- $config{ex_libs} ? ",".$config{ex_libs} : "" -} +LDFLAGS= {- $target{lflags} -} +EX_LIBS= {- $target{ex_libs} ? ",".$target{ex_libs} : "" -}{- $config{ex_libs} ? ",".$config{ex_libs} : "" -} PERL={- $config{perl} -} @@ -152,7 +154,7 @@ ASFLAG={- $target{asflags} -} NODEBUG=@ .FIRST : $(NODEBUG) openssl_inc1 = F$PARSE("[.include.openssl]","A.;",,,"syntax_only") - "A.;" - $(NODEBUG) openssl_inc2 = F$PARSE("{- catdir($config{sourcedir},"[.include.openssl]") -}","a.;",,,"SYNTAX_ONLY") - "A.;" + $(NODEBUG) openssl_inc2 = F$PARSE("{- catdir($config{sourcedir},"[.include.openssl]") -}","A.;",,,"SYNTAX_ONLY") - "A.;" $(NODEBUG) internal_inc1 = F$PARSE("[.crypto.include.internal]","A.;",,,"SYNTAX_ONLY") - "A.;" $(NODEBUG) internal_inc2 = F$PARSE("{- catdir($config{sourcedir},"[.include.internal]") -}","A.;",,,"SYNTAX_ONLY") - "A.;" $(NODEBUG) internal_inc3 = F$PARSE("{- catdir($config{sourcedir},"[.crypto.include.internal]") -}","A.;",,,"SYNTAX_ONLY") - "A.;" @@ -200,9 +202,22 @@ NODEBUG=@ # The main targets ################################################### -all : descrip.mms, $(LIBS), $(ENGINES), $(PROGRAMS), $(SCRIPTS), $(TESTPROGS) - -test tests : $(TESTPROGS), rehash +all : configdata.pm, - + build_libs_nodep, build_engines_nodep, build_apps_nodep, - + depend + +build_libs : configdata.pm, build_libs_nodep, depend +build_libs_nodep : $(LIBS) +build_engines : configdata.pm, build_engines_nodep, depend +build_engines_nodep : $(ENGINES) +build_apps : configdata.pm, build_apps_nodep, depend +build_apps_nodep : $(PROGRAMS), $(SCRIPTS) +build_tests : configdata.pm, build_tests_nodep, depend +build_tests_nodep : $(TESTPROGS) + +test tests : configdata.pm, - + build_apps_nodep, build_engines_nodep, build_tests_nodep, - + depend SET DEFAULT [.test]{- move("test") -} DEFINE SRCTOP {- sourcedir() -} DEFINE BLDTOP {- builddir() -} @@ -224,6 +239,15 @@ libclean : - DELETE []CXX$DEMANGLER_DB.;* install : install_sw install_docs + @ WRITE SYS$OUTPUT "" + @ WRITE SYS$OUTPUT "######################################################################" + @ WRITE SYS$OUTPUT "" + @ WRITE SYS$OUTPUT "Installation complete" + @ WRITE SYS$OUTPUT "" + @ IF "$(DESTDIR)" .EQS. "" THEN - + PIPE ( WRITE SYS$OUTPUT "Run @$(INSTALLTOP)openssl_startup to set up logical names" ; - + WRITE SYS$OUTPUT "then run @$(INSTALLTOP)openssl_setup to define commands" ; - + WRITE SYS$OUTPUT "" ) uninstall : uninstall_docs uninstall_sw @@ -237,37 +261,22 @@ clean : libclean - DELETE [.test]*.LOG;* - DELETE []*.MAP;* -DCLEAN_CMD=$(PERL) -pe "if (/^# DO NOT DELETE.*/) { exit(0); }" -dclean : - $(DCLEAN_CMD) < descrip.mms > descrip.mms.new - RENAME descrip.mms.new descrip.mms - PURGE descrip.mms - -{- our @deps = map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; } - grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ } - keys %{$unified_info{sources}}; - ""; -} -depend : {- join(",-\n\t", @deps); -} - $(DCLEAN_CMD) < descrip.mms > descrip.mms.new - OPEN/APPEND DESCRIP descrip.mms.new - WRITE DESCRIP "# DO NOT DELETE THIS LINE -- make depend depends on it." - {- join("\n\t", map { "TYPE $_ /OUTPUT=DESCRIP:" } @deps); -} - CLOSE DESCRIP - RENAME descrip.mms.new descrip.mms - PURGE descrip.mms +depend : descrip.mms +descrip.mms : FORCE + @ $(PERL) -pe "if (/^# DO NOT DELETE.*/) { exit(0); }" - + < descrip.mms > descrip.mms-new + @ OPEN/APPEND DESCRIP descrip.mms-new + @ WRITE DESCRIP "# DO NOT DELETE THIS LINE -- make depend depends on it." + {- join("\n\t", map { "\@ IF F\$SEARCH(\"$_\") .NES. \"\" THEN TYPE $_ /OUTPUT=DESCRIP:" } @deps); -} + @ CLOSE DESCRIP + @ PIPE ( $(PERL) -e "use File::Compare qw/compare_text/; my $x = compare_text(""descrip.mms"",""descrip.mms-new""); exit(0x10000000 + ($x == 0));" || - + RENAME descrip.mms-new descrip.mms ) + @ IF F$SEARCH("descrip.mms-new") .NES. "" THEN DELETE descrip.mms-new;* + -@ SPAWN/OUTPUT=NLA0: PURGE/NOLOG descrip.mms # Install helper targets ############################################# install_sw : all install_dev install_engines install_runtime install_config - @ WRITE SYS$OUTPUT "" - @ WRITE SYS$OUTPUT "######################################################################" - @ WRITE SYS$OUTPUT "" - @ WRITE SYS$OUTPUT "Installation complete" - @ WRITE SYS$OUTPUT "" - @ IF "$(DESTDIR)" .NES. "" THEN EXIT 1 - @ WRITE SYS$OUTPUT "Run @$(INSTALLTOP)openssl_startup to set up logical names" - @ WRITE SYS$OUTPUT "then run @$(INSTALLTOP)openssl_setup to define commands" - @ WRITE SYS$OUTPUT "" uninstall_sw : uninstall_dev uninstall_engines uninstall_runtime uninstall_config @@ -281,22 +290,22 @@ install_dev : check_INSTALLTOP CREATE/DIR ossl_installroot:[include.openssl] COPY/PROT=W:R openssl:*.h ossl_installroot:[include.openssl] @ ! Install libraries - CREATE/DIR ossl_installroot:['arch'.LIB] + CREATE/DIR ossl_installroot:[LIB.'arch'] {- join("\n ", - map { "COPY/PROT=W:R $_.OLB ossl_installroot:['arch'.LIB]" } + map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" } @{$unified_info{libraries}}) -} - @ {- output_off() if $config{no_shared}; "" -} ! + @ {- output_off() if $disabled{shared}; "" -} ! {- join("\n ", - map { "COPY/PROT=W:RE $_.EXE ossl_installroot:['arch'.LIB]" } - map { $unified_info{sharednames}->{$_} || () } + map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[LIB.'arch']" } + map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -} - @ {- output_on() -} ! + @ {- output_on() if $disabled{shared}; "" -} ! install_runtime : check_INSTALLTOP @ WRITE SYS$OUTPUT "*** Installing runtime files" @ ! Install the main program - CREATE/DIR ossl_installroot:['arch'.EXE] - COPY/PROT=W:RE [.APPS]openssl.EXE ossl_installroot:['arch'.EXE] + CREATE/DIR ossl_installroot:[EXE.'arch'] + 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] @@ -306,11 +315,13 @@ install_runtime : check_INSTALLTOP ossl_installroot:[000000]openssl.cnf install_engines : check_INSTALLTOP - @ {- output_off() if $config{no_shared}; "" -} ! + @ {- output_off() unless scalar @{$unified_info{engines}}; "" -} ! @ WRITE SYS$OUTPUT "*** Installing engines" - CREATE/DIR ossl_installroot:['arch'.ENGINES] - COPY/PROT=W:RE [.ENGINES]*.EXE ossl_installroot:['arch'.ENGINES] - @ {- output_on() -} ! + CREATE/DIR ossl_installroot:[ENGINES.'arch'] + {- join("\n ", + map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES.'arch']" } + grep(!m|ossltest$|i, @{$unified_info{engines}})) -} + @ {- output_on() unless scalar @{$unified_info{engines}}; "" -} ! install_config : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com - check_INSTALLTOP @@ -340,17 +351,17 @@ install_config : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com - {- sourcefile("VMS", "openssl_shutdown.com.in") -} - > [.VMS]openssl_shutdown.com -vmsconfig.pm : descrip.mms +vmsconfig.pm : configdata.pm OPEN/WRITE/SHARE=READ CONFIG []vmsconfig.pm WRITE CONFIG "package vmsconfig;" WRITE CONFIG "use strict; use warnings;" WRITE CONFIG "use Exporter;" WRITE CONFIG "our @ISA = qw(Exporter);" - WRITE CONFIG "our @EXPORT = qw(%config %target %withargs %unified_info);" + WRITE CONFIG "our @EXPORT = qw(%config %target %withargs %unified_info %disabled);" WRITE CONFIG "our %config = (" WRITE CONFIG " target => '{- $config{target} -}'," WRITE CONFIG " version => '$(MAJOR).$(MINOR)'," - WRITE CONFIG " no_shared => '","{- $config{no_shared} -}","'," + WRITE CONFIG " no_shared => '","{- $disabled{shared} -}","'," WRITE CONFIG " INSTALLTOP => '$(INSTALLTOP)'," WRITE CONFIG " OPENSSLDIR => '$(OPENSSLDIR)'," WRITE CONFIG " pointersize => '","{- $target{pointersize} -}","'," @@ -359,6 +370,7 @@ vmsconfig.pm : descrip.mms WRITE CONFIG " ]," WRITE CONFIG ");" WRITE CONFIG "our %target = ();" + WRITE CONFIG "our %disabled = ();" WRITE CONFIG "our %withargs = ();" WRITE CONFIG "our %unified_info = ();" WRITE CONFIG "1;" @@ -372,16 +384,6 @@ check_INSTALLTOP : # Helper targets ##################################################### -rehash : [.apps]openssl.exe, copy-certs - !MCR [.apps]openssl.exe rehash {- builddir("certs", "demo") -} - $(PERL) [.tools]c_rehash. [.certs.demo] - -copy-certs : - @ IF F$SEARCH("{- buildfile("certs.dir") -}") .EQS. "" THEN - - CREATE/DIR {- builddir("certs") -} - -@ IF "{- sourcedir("certs") -}" .NES. "{- builddir("certs") -}" THEN - - COPY {- tree(sourcedir("certs")) -}*.* {- tree(builddir("certs")) -} - # Developer targets ################################################## debug_logicals : @@ -391,8 +393,8 @@ debug_logicals : # Building targets ################################################### -descrip.mms : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCDIR)Configure ! $(SRCDIR)config.com - @ WRITE SYS$OUTPUT "descrip.mms is older than $?." +configdata.pm : {- join(" ", sourcefile("Configurations", "descrip.mms.tmpl"), sourcefile("Configurations", "common.tmpl")) -} $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_infos}}) -} + @ WRITE SYS$OUTPUT "Detected changed: $?" @ WRITE SYS$OUTPUT "Reconfiguring..." perl $(SRCDIR)Configure reconf @ WRITE SYS$OUTPUT "*************************************************" @@ -400,47 +402,11 @@ descrip.mms : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCDIR)Co @ WRITE SYS$OUTPUT "*** Please run the same mms command again ***" @ WRITE SYS$OUTPUT "*** ***" @ WRITE SYS$OUTPUT "*************************************************" - @ exit %10000000 + @ PIPE ( EXIT %X10000000 ) {- use File::Basename; use File::Spec::Functions qw/abs2rel rel2abs catfile catdir/; - sub src2dep { - my %args = @_; - my $dep = $args{obj}; - - # Because VMS C isn't very good at combining a /INCLUDE path with - # #includes having a relative directory (like '#include "../foo.h"), - # the best choice is to move to the first source file's intended - # directory before compiling, and make sure to write the object file - # in the correct position (important when the object tree is other - # than the source tree). - my $forward = dirname($args{srcs}->[0]); - my $backward = abs2rel(rel2abs("."), rel2abs($forward)); - my $depd = abs2rel(rel2abs(dirname($dep)), rel2abs($forward)); - my $depn = basename($dep); - my $srcs = - join(", ", - map { abs2rel(rel2abs($_), rel2abs($forward)) } @{$args{srcs}}); - my $incs = - "/INCLUDE=(".join(",", - map { - file_name_is_absolute($_) - ? $_ : catdir($backward,$_) - } @{$args{incs}}).")"; - my $before = $unified_info{before}->{$dep.".OBJ"} || "\@ !"; - my $after = $unified_info{after}->{$dep.".OBJ"} || "\@ !"; - - return <<"EOF"; -$dep.MMS : $srcs - ${before} - SET DEFAULT $forward - \$(CC) \$(CFLAGS)${incs} /MMS=(TARGET=.OBJ)/OBJECT=${depd}${depn}.MMS $srcs - SET DEFAULT $backward - ${after} - - PURGE $dep.MMS -EOF - } sub src2obj { my %args = @_; my $obj = $args{obj}; @@ -472,9 +438,12 @@ EOF $obj.OBJ : $deps ${before} SET DEFAULT $forward - \$(CC) \$(CFLAGS)${incs} /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs + \$(CC) \$(CFLAGS)${incs} /MMS=(FILE=${objd}${objn}.tmp-MMS,TARGET=$obj.OBJ) /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs SET DEFAULT $backward ${after} + \@ PIPE ( \$(PERL) -e "use File::Compare qw/compare_text/; my \$x = compare_text(""$obj.MMS"",""$obj.tmp-MMS""); exit(0x10000000 + (\$x == 0));" || - + RENAME $obj.tmp-MMS $obj.mms ) + \@ IF F\$SEARCH("$obj.tmp-MMS") .NES. "" THEN DELETE $obj.tmp-MMS;* - PURGE $obj.OBJ EOF } @@ -486,10 +455,10 @@ EOF my $libn = basename($lib); (my $mkdef_key = $libn) =~ s/^${osslprefix_q}lib//i; my @deps = map { - $config{no_shared} ? $_.".OLB" + $disabled{shared} ? $_.".OLB" : $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}}; my $deps = join(", -\n\t\t", @deps); - my $shlib_target = $config{no_shared} ? "" : $target{shared_target}; + my $shlib_target = $disabled{shared} ? "" : $target{shared_target}; my $ordinalsfile = defined($args{ordinals}) ? $args{ordinals}->[1] : ""; my $engine_opt = abs2rel(rel2abs(catfile($config{sourcedir}, "VMS", "engine.opt")), @@ -507,7 +476,7 @@ EOF my $write_opt = join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_; $x =~ s|(\.EXE)|$1/SHARE|; - $x =~ s|(\.LIB)|$1/LIB|; + $x =~ s|(\.OLB)|$1/LIB|; "WRITE OPT_FILE \"$x\"" } @deps) || "\@ !"; return <<"EOF"; @@ -530,7 +499,7 @@ $shlib.EXE : $lib.OLB $deps $ordinalsfile - PURGE $shlib.EXE,$shlib.OPT,$shlib.MAP EOF } - sub obj2dynlib { + sub obj2dso { my %args = @_; my $lib = $args{lib}; my $libd = dirname($lib); @@ -538,10 +507,10 @@ EOF (my $libn_nolib = $libn) =~ s/^lib//; my @objs = map { "$_.OBJ" } @{$args{objs}}; my @deps = map { - $config{no_shared} ? $_.".OLB" + $disabled{shared} ? $_.".OLB" : $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}}; my $deps = join(", -\n\t\t", @objs, @deps); - my $shlib_target = $config{no_shared} ? "" : $target{shared_target}; + my $shlib_target = $disabled{shared} ? "" : $target{shared_target}; my $engine_opt = abs2rel(rel2abs(catfile($config{sourcedir}, "VMS", "engine.opt")), rel2abs($config{builddir})); @@ -555,7 +524,7 @@ EOF "\"\n\t". join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_; $x =~ s|(\.EXE)|$1/SHARE|; - $x =~ s|(\.LIB)|$1/LIB|; + $x =~ s|(\.OLB)|$1/LIB|; "WRITE OPT_FILE \"$x\"" } @deps) || "\@ !"; return <<"EOF"; @@ -588,7 +557,7 @@ EOF my $binn = basename($bin); my @objs = map { "$_.OBJ" } @{$args{objs}}; my @deps = map { - $config{no_shared} ? $_.".OLB" + $disabled{shared} ? $_.".OLB" : $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}}; my $deps = join(", -\n\t\t", @objs, @deps); # The "[]" hack is because in .OPT files, each line inherits the @@ -623,7 +592,8 @@ EOF rel2abs($config{builddir})); return <<"EOF"; $script : $sources - \$(PERL) "-I\$(BUILDDIR)" "-Mconfigdata" $dofile $sources > $script + \$(PERL) "-I\$(BUILDDIR)" "-Mconfigdata" $dofile - + "-o$target{build_file}" $sources > $script SET FILE/PROT=(S:RWED,O:RWED,G:RE,W:RE) $script PURGE $script EOF