X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Configurations%2Fdescrip.mms.tmpl;h=f277bcec630cc9b436325a0de4bc8cef65b42b47;hp=0d5c7ba69596851addf34202dded8cc6696f5e98;hb=5386287cfcf0a4165fac742aa21455db3d49b3ab;hpb=e84193e43dbd3da23845ef9fcfcb5e364049a396 diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 0d5c7ba695..f277bcec63 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -105,16 +105,18 @@ 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); -} -# INSTALL_PREFIX is for package builders so that they can configure for, say, +# DESTDIR is for package builders so that they can configure for, say, # SYS$COMMON:[OPENSSL] and yet have everything installed in STAGING:[USER]. # In that case, configure with --prefix=SYS$COMMON:[OPENSSL] and then run -# MMS with /MACROS=(INSTALL_PREFIX=STAGING:[USER]). The result will end -# up in STAGING:[USER.OPENSSL]. -# Note that INSTALL_PREFIX can also be given at configuration time, with -# --install_prefix. +# MMS with /MACROS=(DESTDIR=STAGING:[USER]). The result will end up in +# STAGING:[USER.OPENSSL]. # Normally it is left empty. -INSTALL_PREFIX={- $config{install_prefix} -} +DESTDIR= # Do not edit this manually. Use Configure --prefix=DIR to change this! INSTALLTOP={- catdir($config{prefix}) || "SYS\$COMMON:[OPENSSL-\$(MAJOR).\$(MINOR)]" -} @@ -154,13 +156,13 @@ 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.;" $(NODEBUG) DEFINE openssl 'openssl_inc1','openssl_inc2' $(NODEBUG) DEFINE internal 'internal_inc1','internal_inc2','internal_inc3' - $(NODEBUG) staging_dir = "$(INSTALL_PREFIX)" + $(NODEBUG) staging_dir = "$(DESTDIR)" $(NODEBUG) IF staging_dir .NES. "" THEN - staging_dir = F$PARSE("A.;",staging_dir,"[]",,"SYNTAX_ONLY") - "A.;" $(NODEBUG) ! @@ -179,7 +181,7 @@ NODEBUG=@ $(NODEBUG) ! $(NODEBUG) datatop = F$PARSE("$(OPENSSLDIR)","[000000]A.;",,,"SYNTAX_ONLY") - - "]A.;" + ".]" - $(NODEBUG) IF "$(INSTALL_PREFIX)" .EQS. "" THEN - + $(NODEBUG) IF "$(DESTDIR)" .EQS. "" THEN - DEFINE ossl_dataroot 'datatop' $(NODEBUG) ! $(NODEBUG) ! Figure out the architecture @@ -193,7 +195,7 @@ NODEBUG=@ .LAST : $(NODEBUG) {- join("\n\t\$(NODEBUG) ", map { "DEASSIGN ".uc($_) } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) || "!" -} - $(NODEBUG) IF "$(INSTALL_PREFIX)" .EQS. "" THEN DEASSIGN ossl_dataroot + $(NODEBUG) IF "$(DESTDIR)" .EQS. "" THEN DEASSIGN ossl_dataroot $(NODEBUG) DEASSIGN ossl_installroot $(NODEBUG) DEASSIGN internal $(NODEBUG) DEASSIGN openssl @@ -202,9 +204,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, rehash SET DEFAULT [.test]{- move("test") -} DEFINE SRCTOP {- sourcedir() -} DEFINE BLDTOP {- builddir() -} @@ -226,6 +241,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)" .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 : uninstall_docs uninstall_sw @@ -239,37 +263,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 "$(INSTALL_PREFIX)" .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 @@ -283,22 +292,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}; "" -} ! {- 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 $config{no_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] @@ -310,16 +319,16 @@ install_runtime : check_INSTALLTOP install_engines : check_INSTALLTOP @ {- output_off() if $config{no_shared}; "" -} ! @ 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'] + COPY/PROT=W:RE [.ENGINES]*.EXE ossl_installroot:[ENGINES.'arch'] + @ {- output_on() if $config{no_shared}; "" -} ! install_config : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com - check_INSTALLTOP - IF "$(INSTALL_PREFIX)" .EQS. "" THEN - + IF "$(DESTDIR)" .EQS. "" THEN - IF F$SEARCH("OSSL_DATAROOT:[000000]CERTS.DIR;1") .EQS. "" THEN - CREATE/DIR/PROT=(S:RWED,O:RWE,G:RE,W:RE) OSSL_DATAROOT:[CERTS] - IF "$(INSTALL_PREFIX)" .EQS. "" THEN - + IF "$(DESTDIR)" .EQS. "" THEN - IF F$SEARCH("OSSL_DATAROOT:[000000]PRIVATE.DIR;1") .EQS. "" THEN - CREATE/DIR/PROT=(S:RWED,O:RWE,G:,W:) OSSL_DATAROOT:[PRIVATE] CREATE/DIR ossl_installroot:[SYS$STARTUP] @@ -342,7 +351,7 @@ 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;" @@ -374,7 +383,7 @@ check_INSTALLTOP : # Helper targets ##################################################### -rehash : [.apps]openssl.exe, copy-certs +rehash : copy-certs, build_apps_nodep !MCR [.apps]openssl.exe rehash {- builddir("certs", "demo") -} $(PERL) [.tools]c_rehash. [.certs.demo] @@ -388,13 +397,13 @@ copy-certs : debug_logicals : SH LOGICAL/PROC openssl,internal,ossl_installroot - IF "$(INSTALL_PREFIX)" .EQS. "" THEN - + IF "$(DESTDIR)" .EQS. "" THEN - SH LOGICAL/PROC ossl_dataroot # Building targets ################################################### -descrip.mms : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCDIR)Configure ! $(SRCDIR)config.com - @ WRITE SYS$OUTPUT "descrip.mms is older than $?." +configdata.pm : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCDIR)Configure ! $(SRCDIR)config.com + @ WRITE SYS$OUTPUT "Detected changed: $?" @ WRITE SYS$OUTPUT "Reconfiguring..." perl $(SRCDIR)Configure reconf @ WRITE SYS$OUTPUT "*************************************************" @@ -402,47 +411,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}; @@ -471,7 +444,14 @@ EOF my $after = $unified_info{after}->{$obj.".OBJ"} || "\@ !"; return <<"EOF"; -$obj.OBJ : $deps +$obj.MMS : $deps + ${before} + SET DEFAULT $forward + \$(CC) \$(CFLAGS)${incs} /MMS=(FILE=${objd}${objn}.MMS,TARGET=$obj.OBJ) /NOOBJECT $srcs + SET DEFAULT $backward + ${after} + - PURGE $obj.MMS +$obj.OBJ : $obj.MMS ${before} SET DEFAULT $forward \$(CC) \$(CFLAGS)${incs} /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs @@ -532,7 +512,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); @@ -625,7 +605,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