X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Configurations%2Fwindows-makefile.tmpl;h=bcb092d045b6d9f493db6dd1d99765965f7bb1bc;hp=7bc09df78d551b0bfbb9133fb9c677e08ceb3684;hb=16f2a44435fccbd7466b0659220c765a17e5d0c0;hpb=b0940b33a60cbfab03153287181372d0066410a6 diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 7bc09df78d..bcb092d045 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -3,6 +3,8 @@ ## ## {- join("\n## ", @autowarntext) -} {- + use File::Basename; + our $sover_dirname = platform->shlib_version_as_filename(); my $build_scheme = $target{build_scheme}; @@ -27,7 +29,7 @@ sub dependmagic { my $target = shift; - return "$target: build_generated\n\t\$(MAKE) /\$(MAKEFLAGS) depend && \$(MAKE) /\$(MAKEFLAGS) _$target\n_$target"; + return "$target: build_generated\n\t\$(MAKE) /\$(MAKEFLAGS) depend\n\t\$(MAKE) /\$(MAKEFLAGS) _$target\n_$target"; } ''; -} @@ -35,6 +37,7 @@ PLATFORM={- $config{target} -} SRCDIR={- $config{sourcedir} -} BLDDIR={- $config{builddir} -} +FIPSKEY={- $config{FIPSKEY} -} VERSION={- "$config{full_version}" -} MAJOR={- $config{major} -} @@ -45,19 +48,30 @@ SHLIB_VERSION_NUMBER={- $config{shlib_version} -} LIBS={- join(" ", map { ( platform->sharedlib_import($_), platform->staticlib($_) ) } @{$unified_info{libraries}}) -} SHLIBS={- join(" ", map { platform->sharedlib($_) // () } @{$unified_info{libraries}}) -} SHLIBPDBS={- join(" ", map { platform->sharedlibpdb($_) // () } @{$unified_info{libraries}}) -} -MODULES={- join(" ", map { platform->dso($_) } @{$unified_info{modules}}) -} +MODULES={- our @MODULES = map { platform->dso($_) } @{$unified_info{modules}}; + join(" ", @MODULES) -} MODULEPDBS={- join(" ", map { platform->dsopdb($_) } @{$unified_info{modules}}) -} +FIPSMODULENAME={- # We do some extra checking here, as there should be only one + use File::Basename; + my @fipsmodules = + grep { !$unified_info{attributes}->{modules}->{$_}->{noinst} + && $unified_info{attributes}->{modules}->{$_}->{fips} } + @{$unified_info{modules}}; + die "More that one FIPS module" if scalar @fipsmodules > 1; + join(" ", map { basename(platform->dso($_)) } @fipsmodules) -} PROGRAMS={- our @PROGRAMS = map { platform->bin($_) } @{$unified_info{programs}}; join(" ", @PROGRAMS) -} PROGRAMPDBS={- join(" ", map { $_.".pdb" } @{$unified_info{programs}}) -} -SCRIPTS={- join(" ", @{$unified_info{scripts}}) -} +SCRIPTS={- our @SCRIPTS = @{$unified_info{scripts}}; join(" ", @SCRIPTS) -} {- output_off() if $disabled{makedepend}; "" -} DEPS={- join(" ", map { platform->isobj($_) ? platform->dep($_) : () } grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ } keys %{$unified_info{sources}}); -} {- output_on() if $disabled{makedepend}; "" -} -GENERATED_MANDATORY={- join(" ", @{$unified_info{depends}->{""}} ) -} +GENERATED_MANDATORY={- our @GENERATED_MANDATORY = @{$unified_info{depends}->{""}}; + join(" ", @GENERATED_MANDATORY) -} GENERATED={- # common0.tmpl provides @generated - join(" ", map { platform->convertext($_) } @generated) -} + our @GENERATED = map { platform->convertext($_) } @generated; + join(" ", @GENERATED) -} INSTALL_LIBS={- join(" ", map { quotify1(platform->sharedlib_import($_) @@ -89,6 +103,18 @@ INSTALL_ENGINEPDBS={- && $unified_info{attributes}->{modules}->{$_}->{engine} } @{$unified_info{modules}}) -} +INSTALL_MODULES={- + join(" ", map { platform->dso($_) } + grep { !$unified_info{attributes}->{modules}->{$_}->{noinst} + && !$unified_info{attributes}->{modules}->{$_}->{engine} } + @{$unified_info{modules}}) +-} +INSTALL_MODULEPDBS={- + join(" ", map { quotify1(platform->dsopdb($_)) } + grep { !$unified_info{attributes}->{modules}->{$_}->{noinst} + && !$unified_info{attributes}->{modules}->{$_}->{engine} } + @{$unified_info{modules}}) +-} INSTALL_PROGRAMS={- join(" ", map { quotify1(platform->bin($_)) } grep { !$unified_info{attributes}->{programs}->{$_}->{noinst} } @@ -111,13 +137,25 @@ MISC_SCRIPTS={- && $unified_info{attributes}->{scripts}->{$_}->{misc} } @{$unified_info{scripts}}) -} -HTMLDOCS1={- join(" ", @{$unified_info{htmldocs}->{man1}}) -} -HTMLDOCS3={- join(" ", @{$unified_info{htmldocs}->{man3}}) -} -HTMLDOCS5={- join(" ", @{$unified_info{htmldocs}->{man5}}) -} -HTMLDOCS7={- join(" ", @{$unified_info{htmldocs}->{man7}}) -} - -APPS_OPENSSL={- use File::Spec::Functions; - "\"".catfile("apps","openssl")."\"" -} +HTMLDOCS1={- our @HTMLDOCS1 = @{$unified_info{htmldocs}->{man1}}; + join(" ", @HTMLDOCS1) -} +HTMLDOCS3={- our @HTMLDOCS3 = @{$unified_info{htmldocs}->{man3}}; + join(" ", @HTMLDOCS3) -} +HTMLDOCS5={- our @HTMLDOCS5 = @{$unified_info{htmldocs}->{man5}}; + join(" ", @HTMLDOCS5) -} +HTMLDOCS7={- our @HTMLDOCS7 = @{$unified_info{htmldocs}->{man7}}; + join(" ", @HTMLDOCS7) -} +HTMLDOCS1_BLDDIRS={- my %dirs = map { dirname($_) => 1 } @HTMLDOCS1; + join(' ', sort keys %dirs) -} +HTMLDOCS3_BLDDIRS={- my %dirs = map { dirname($_) => 1 } @HTMLDOCS3; + join(' ', sort keys %dirs) -} +HTMLDOCS5_BLDDIRS={- my %dirs = map { dirname($_) => 1 } @HTMLDOCS5; + join(' ', sort keys %dirs) -} +HTMLDOCS7_BLDDIRS={- my %dirs = map { dirname($_) => 1 } @HTMLDOCS7; + join(' ', sort keys %dirs) -} + +APPS_OPENSSL="{- use File::Spec::Functions; + catfile("apps","openssl") -}" # Do not edit these manually. Use Configure with --prefix or --openssldir # to change this! Short explanation in the top comment in Configure @@ -187,29 +225,29 @@ libdir={- file_name_is_absolute($libdir) ##### User defined commands and flags ################################ -CC={- $config{CC} -} +CC="{- $config{CC} -}" CPP={- $config{CPP} -} CPPFLAGS={- our $cppflags1 = join(" ", (map { "-D".$_} @{$config{CPPDEFINES}}), - (map { " -I ".$_} @{$config{CPPINCLUDES}}), + (map { " -I".$_} @{$config{CPPINCLUDES}}), @{$config{CPPFLAGS}}) -} CFLAGS={- join(' ', @{$config{CFLAGS}}) -} -LD={- $config{LD} -} +LD="{- $config{LD} -}" LDFLAGS={- join(' ', @{$config{LDFLAGS}}) -} EX_LIBS={- join(' ', @{$config{LDLIBS}}) -} PERL={- $config{PERL} -} -AR={- $config{AR} -} +AR="{- $config{AR} -}" ARFLAGS= {- join(' ', @{$config{ARFLAGS}}) -} -MT={- $config{MT} -} +MT="{- $config{MT} -}" MTFLAGS= {- join(' ', @{$config{MTFLAGS}}) -} -AS={- $config{AS} -} +AS="{- $config{AS} -}" ASFLAGS={- join(' ', @{$config{ASFLAGS}}) -} -RC={- $config{RC} -} +RC="{- $config{RC} -}" RCFLAGS={- join(' ', @{$config{RCFLAGS}}) -} ECHO="$(PERL)" "$(SRCDIR)\util\echo.pl" @@ -234,8 +272,8 @@ CNF_CPPFLAGS={- our $cppfags2 = join(' ', $target{cppflags} || (), (map { '-D'.quotify1($_) } @{$target{defines}}, @{$config{defines}}), - (map { '-I'.quotify1($_) } @{$target{includes}}, - @{$config{includes}}), + (map { '-I'.'"'.$_.'"' } @{$target{includes}}, + @{$config{includes}}), @{$config{cppflags}}) -} CNF_CFLAGS={- join(' ', $target{cflags} || (), @{$config{cflags}}) -} @@ -320,6 +358,7 @@ BIN_ASFLAGS={- join(' ', $target{bin_asflags} || (), @{$config{bin_asflags}}, '$(CNF_ASFLAGS)', '$(ASFLAGS)') -} BIN_CPPFLAGS={- join(' ', $target{bin_cppflags} || (), + (map { '-D'.$_ } @{$config{bin_defines} || ()}), @{$config{bin_cppflags}}, '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -} BIN_CFLAGS={- join(' ', $target{bin_cflags} || (), @@ -342,18 +381,22 @@ PROCESSOR= {- $config{processor} -} # The main targets ################################################### -{- dependmagic('build_sw'); -}: build_libs_nodep build_modules_nodep build_programs_nodep +{- dependmagic('build_sw'); -}: build_libs_nodep build_modules_nodep build_programs_nodep copy-utils {- dependmagic('build_libs'); -}: build_libs_nodep {- dependmagic('build_modules'); -}: build_modules_nodep {- dependmagic('build_programs'); -}: build_programs_nodep build_docs: build_html_docs build_html_docs: $(HTMLDOCS1) $(HTMLDOCS3) $(HTMLDOCS5) $(HTMLDOCS7) - + @ build_generated: $(GENERATED_MANDATORY) + @ build_libs_nodep: $(LIBS) {- join(" ",map { platform->sharedlib_import($_) // () } @{$unified_info{libraries}}) -} + @ build_modules_nodep: $(MODULES) + @ build_programs_nodep: $(PROGRAMS) $(SCRIPTS) + @ # Kept around for backward compatibility build_apps build_tests: build_programs @@ -370,25 +413,16 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) build_docs all: build_sw build_docs test: tests -{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep +{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep copy-utils @{- output_off() if $disabled{tests}; "" -} - -mkdir $(BLDDIR)\test\test-runs - set SRCTOP=$(SRCDIR) - set BLDTOP=$(BLDDIR) - set RESULT_D=$(BLDDIR)\test\test-runs - set PERL=$(PERL) - set OPENSSL_ENGINES=$(MAKEDIR)\engines - set OPENSSL_MODULES=$(MAKEDIR)\providers - set OPENSSL_DEBUG_MEMORY=on - "$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS) + cmd /C "set "SRCTOP=$(SRCDIR)" & set "BLDTOP=$(BLDDIR)" & set "PERL=$(PERL)" & set "FIPSKEY=$(FIPSKEY)" & "$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS)" @{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} @$(ECHO) "Tests are not supported with your chosen Configure options" @{- output_on() if !$disabled{tests}; "" -} list-tests: @{- output_off() if $disabled{tests}; "" -} - @set SRCTOP=$(SRCDIR) - @"$(PERL)" "$(SRCDIR)\test\run_tests.pl" list + @cmd /C "set "SRCTOP=$(SRCDIR)" & "$(PERL)" "$(SRCDIR)\test\run_tests.pl" list" @{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} @$(ECHO) "Tests are not supported with your chosen Configure options" @{- output_on() if !$disabled{tests}; "" -} @@ -402,15 +436,15 @@ libclean: -del /Q /F $(LIBS) libcrypto.* libssl.* ossl_static.pdb clean: libclean - -rmdir /Q /S $(HTMLDOCS1) - -rmdir /Q /S $(HTMLDOCS3) - -rmdir /Q /S $(HTMLDOCS5) - -rmdir /Q /S $(HTMLDOCS7) + -rmdir /Q /S $(HTMLDOCS1_BLDDIRS) + -rmdir /Q /S $(HTMLDOCS3_BLDDIRS) + -rmdir /Q /S $(HTMLDOCS5_BLDDIRS) + -rmdir /Q /S $(HTMLDOCS7_BLDDIRS) {- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) -} - -del /Q /F $(MODULES) - -del /Q /F $(SCRIPTS) - -del /Q /F $(GENERATED_MANDATORY) - -del /Q /F $(GENERATED) + {- join("\n\t", map { "-del /Q /F $_" } @MODULES) -} + {- join("\n\t", map { "-del /Q /F $_" } @SCRIPTS) -} + {- join("\n\t", map { "-del /Q /F $_" } @GENERATED_MANDATORY) -} + {- join("\n\t", map { "-del /Q /F $_" } @GENERATED) -} -del /Q /S /F *.d *.obj *.pdb *.ilk *.manifest -del /Q /S /F engines\*.lib engines\*.exp -del /Q /S /F apps\*.lib apps\*.rc apps\*.res apps\*.exp @@ -428,14 +462,26 @@ depend: # Install helper targets ############################################# -install_sw: install_dev install_engines install_runtime +install_sw: install_dev install_engines install_modules install_runtime -uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev +uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev install_docs: install_html_docs uninstall_docs: uninstall_html_docs +install_fips: install_sw + @$(ECHO) "*** Installing FIPS module configuration" + @$(ECHO) "fipsinstall $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf" + @openssl fipsinstall -module $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME) \ + -out $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf \ + -macopt "key:$(FIPSKEY)" + +uninstall_fips: uninstall_sw + @$(ECHO) "*** Uninstalling FIPS module configuration" + @$(ECHO) "$(RM) $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf" + @$(RM) $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf + install_ssldirs: @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(OPENSSLDIR)\certs" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(OPENSSLDIR)\private" @@ -445,7 +491,8 @@ install_ssldirs: @IF NOT EXIST "$(OPENSSLDIR)\openssl.cnf" \ "$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\apps\openssl.cnf" \ "$(OPENSSLDIR)\openssl.cnf" - @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(MISC_SCRIPTS) \ + @if not "$(MISC_SCRIPTS)"=="" \ + "$(PERL)" "$(SRCDIR)\util\copy.pl" $(MISC_SCRIPTS) \ "$(OPENSSLDIR)\misc" @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\apps\ct_log_list.cnf" \ "$(OPENSSLDIR)\ct_log_list.cnf.dist" @@ -473,9 +520,11 @@ install_dev: install_runtime_libs uninstall_dev: -install_engines: install_runtime_libs build_modules +_install_modules_deps: install_runtime_libs build_modules + +install_engines: _install_modules_deps @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) - @$(ECHO) "*** Installing ENGINE modules" + @$(ECHO) "*** Installing engines" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(ENGINESDIR)" @if not "$(INSTALL_ENGINES)"=="" \ "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_ENGINES) "$(ENGINESDIR)" @@ -484,6 +533,17 @@ install_engines: install_runtime_libs build_modules uninstall_engines: +install_modules: _install_modules_deps + @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) + @$(ECHO) "*** Installing modules" + @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(MODULESDIR)" + @if not "$(INSTALL_MODULES)"=="" \ + "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_MODULES) "$(MODULESDIR)" + @if not "$(INSTALL_MODULES)"=="" \ + "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_MODULEPDBS) "$(MODULESDIR)" + +uninstall_modules: + install_runtime: install_programs install_runtime_libs: build_libs @@ -499,12 +559,16 @@ install_runtime_libs: build_libs install_programs: install_runtime_libs build_programs @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) @$(ECHO) "*** Installing runtime programs" - @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin" - @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMS) \ + @if not "$(INSTALL_PROGRAMS)"=="" \ + "$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin" + @if not "$(INSTALL_PROGRAMS)"=="" \ + "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMS) \ "$(INSTALLTOP)\bin" - @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMPDBS) \ + @if not "$(INSTALL_PROGRAMS)"=="" \ + "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMPDBS) \ "$(INSTALLTOP)\bin" - @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BIN_SCRIPTS) \ + @if not "$(INSTALL_PROGRAMS)"=="" \ + "$(PERL)" "$(SRCDIR)\util\copy.pl" $(BIN_SCRIPTS) \ "$(INSTALLTOP)\bin" uninstall_runtime: @@ -527,6 +591,18 @@ install_html_docs: build_html_docs uninstall_html_docs: +# Helper targets ##################################################### + +copy-utils: $(BLDDIR)\util\wrap.pl $(BLDDIR)\apps\openssl.cnf + +$(BLDDIR)\util\wrap.pl: configdata.pm + @if NOT EXIST "$(BLDDIR)\util" mkdir "$(BLDDIR)\util" + @if NOT "$(SRCDIR)"=="$(BLDDIR)" copy "$(SRCDIR)\util\$(@F)" "$(BLDDIR)\util" + +$(BLDDIR)\apps\openssl.cnf: configdata.pm + @if NOT EXIST "$(BLDDIR)\apps" mkdir "$(BLDDIR)\apps" + @if NOT "$(SRCDIR)"=="$(BLDDIR)" copy "$(SRCDIR)\apps\$(@F)" "$(BLDDIR)\apps" + # Building targets ################################################### configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -} @@ -544,7 +620,7 @@ reconfigure reconf: {- use File::Basename; - use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/; + use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs file_name_is_absolute/; # Helper function to figure out dependencies on libraries # It takes a list of library names and outputs a list of dependencies @@ -555,26 +631,46 @@ reconfigure reconf: return map { platform->sharedlib_import($_) // platform->staticlib($_) } @_; } + sub generatetarget { + my %args = @_; + my $deps = join(" ", @{$args{deps}}); + return <<"EOF"; +$args{target}: $deps +EOF + } + + # This function (and the next) avoids quoting paths of generated dependencies + # (in the build tree), but quotes paths of non-generated dependencies (in the + # source tree). This is a workaround for a limitation of C++Builder's make.exe + # in handling quoted paths: https://quality.embarcadero.com/browse/RSP-31756 sub generatesrc { my %args = @_; - my ($gen0, @gens) = @{$args{generator}}; - my $generator = '"'.$gen0.'"'.join('', map { " $_" } @gens); - my $generator_incs = join("", map { " -I \"$_\"" } @{$args{generator_incs}}); - my $incs = join("", map { " -I \"$_\"" } @{$args{incs}}); + my $gen0 = $args{generator}->[0]; + my $gen_args = join('', map { " $_" } + @{$args{generator}}[1..$#{$args{generator}}]); + my $gen_incs = join("", map { " -I\"$_\"" } @{$args{generator_incs}}); + my $incs = join("", map { " -I\"$_\"" } @{$args{incs}}); my $defs = join("", map { " -D".$_ } @{$args{defs}}); my $deps = @{$args{deps}} ? - '"'.join('" "', @{$args{generator_deps}}, @{$args{deps}}).'"' : ''; + join(' ', + map { file_name_is_absolute($_) || ($_ =~ m|^../|) ? "\"$_\"" : $_ } + (@{$args{generator_deps}}, @{$args{deps}})) + : ''; if ($args{src} =~ /\.html$/) { - my $title = basename($args{src}, ".html"); - return <<"EOF"; -$args{src}: $args{generator}->[0] - pod2html "--podroot=\$(SRCDIR)/doc" --htmldir=.. \\ - --podpath=man1:man3:man5:man7 "--infile=\$<" "--title=$title" \\ - | \$(PERL) -pe "s|href=\\"http://man\\.he\\.net/(man\d/[^\\"]+)(?:\\.html)?\\"|href=\\"../\$1.html|g;" \\ - > \$\@ + # + # HTML generator + # + my $title = basename($args{src}, ".html"); + my $pod = $gen0; + return <<"EOF"; +$args{src}: "$pod" + \$(PERL) \$(SRCDIR)/util/mkpod2html.pl -i "$pod" -o \$\@ -t "$title" -r "\$(SRCDIR)/doc" EOF } elsif (platform->isdef($args{src})) { + # + # Linker script-ish generator + # my $target = platform->def($args{src}); my $mkdef = abs2rel(rel2abs(catfile($config{sourcedir}, "util", "mkdef.pl")), @@ -583,31 +679,13 @@ EOF my $ord_name = $args{generator}->[1] || platform->dsoname($args{product}); return <<"EOF"; -$target: $args{generator}->[0] $deps $mkdef - "\$(PERL)" $mkdef$ord_ver --ordinals $args{generator}->[0] --name $ord_name --OS windows > $target -EOF - } elsif (!platform->isasm($args{src})) { - my $target = $args{src}; - if ($args{generator}->[0] =~ m|^.*\.in$|) { - my $dofile = abs2rel(rel2abs(catfile($config{sourcedir}, - "util", "dofile.pl")), - rel2abs($config{builddir})); - my @modules = ( 'configdata.pm', - grep { $_ =~ m|\.pm$| } @{$args{deps}} ); - my %moduleincs = map { '"-I'.dirname($_).'"' => 1 } @modules; - @modules = map { "-M".basename($_, '.pm') } @modules; - my $modules = join(' ', '', sort keys %moduleincs, @modules); - return <<"EOF"; -$target: "$args{generator}->[0]" $deps - "\$(PERL)"$modules "$dofile" "-o$target{build_file}" $generator > \$@ +$target: $gen0 $deps $mkdef + "\$(PERL)" $mkdef$ord_ver --ordinals $gen0 --name $ord_name --OS windows > $target EOF - } else { - return <<"EOF"; -$target: "$args{generator}->[0]" $deps - "\$(PERL)"$generator_incs $generator > \$@ -EOF - } - } else { + } elsif (platform->isasm($args{src})) { + # + # Assembler generator + # my $cppflags = { shlib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)', lib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)', @@ -616,13 +694,14 @@ EOF } -> {$args{intent}}; my $target = platform->asm($args{src}); - if ($args{generator}->[0] =~ /\.pl$/) { - $generator = '"$(PERL)"'.$generator_incs.' '.$generator + my $generator; + if ($gen0 =~ /\.pl$/) { + $generator = '"$(PERL)"'.$gen_incs.' '.$gen0.$gen_args .' "$(PERLASM_SCHEME)"'.$incs.' '.$cppflags.$defs.' $(PROCESSSOR)'; - } elsif ($args{generator}->[0] =~ /\.S$/) { + } elsif ($gen0 =~ /\.S$/) { $generator = undef; } else { - die "Generator type for $src unknown: $generator\n"; + die "Generator type for $src unknown: $gen0\n"; } if (defined($generator)) { @@ -630,23 +709,75 @@ EOF # end up generating foo.s in two steps. if ($args{src} =~ /\.S$/) { return <<"EOF"; -$target: "$args{generator}->[0]" $deps - set ASM=\$(AS) - $generator \$@.S - \$(CPP) $incs $cppflags $defs \$@.S > \$@.i && move /Y \$@.i \$@ +$target: "$gen0" $deps + cmd /C "set "ASM=\$(AS)" & $generator \$@.S" + \$(CPP) $incs $cppflags $defs \$@.S > \$@.i + move /Y \$@.i \$@ del /Q \$@.S EOF } # Otherwise.... return <<"EOF"; -$target: "$args{generator}->[0]" $deps - set ASM=\$(AS) - $generator \$@ +$target: "$gen0" $deps + cmd /C "set "ASM=\$(AS)" & $generator \$@" EOF } return <<"EOF"; -$target: "$args{generator}->[0]" $deps - \$(CPP) $incs $cppflags $defs "$args{generator}->[0]" > \$@.i && move /Y \$@.i \$@ +$target: "$gen0" $deps + \$(CPP) $incs $cppflags $defs "$gen0" > \$@.i + move /Y \$@.i \$@ +EOF + } elsif ($gen0 =~ m|^.*\.in$|) { + # + # "dofile" generator (file.in -> file) + # + my $dofile = abs2rel(rel2abs(catfile($config{sourcedir}, + "util", "dofile.pl")), + rel2abs($config{builddir})); + my @modules = ( 'configdata.pm', + grep { $_ =~ m|\.pm$| } @{$args{deps}} ); + my %moduleincs = map { '"-I'.dirname($_).'"' => 1 } @modules; + $deps = join(' ', $deps, @modules); + @modules = map { "-M".basename($_, '.pm') } @modules; + my $modules = join(' ', '', sort keys %moduleincs, @modules); + return <<"EOF"; +$args{src}: "$gen0" $deps + "\$(PERL)"$modules "$dofile" "-o$target{build_file}" "$gen0"$gen_args > \$@ +EOF + } elsif (grep { $_ eq $gen0 } @{$unified_info{programs}}) { + # + # Generic generator using OpenSSL programs + # + + # Redo $deps, because programs aren't expected to have deps of their + # own. This is a little more tricky, though, because running programs + # may have dependencies on all sorts of files, so we search through + # our database of programs and modules to see if our dependencies + # are one of those. + $deps = join(' ', map { my $x = $_; + if (grep { $x eq $_ } + @{$unified_info{programs}}) { + platform->bin($x); + } elsif (grep { $x eq $_ } + @{$unified_info{modules}}) { + platform->dso($x); + } else { + $x; + } + } @{$args{deps}}); + # Also redo $gen0, to ensure that we have the proper extension. + $gen0 = platform->bin($gen0); + return <<"EOF"; +$args{src}: $gen0 $deps + $gen0$gen_args > \$@ +EOF + } else { + # + # Generic generator using Perl + # + return <<"EOF"; +$args{src}: "$gen0" $deps + "\$(PERL)"$gen_incs $gen0$gen_args > \$@ EOF } } @@ -660,8 +791,10 @@ EOF ? platform->asm($x) : $x } ( @{$args{srcs}} ); my $srcs = '"'.join('" "', @srcs).'"'; - my $deps = '"'.join('" "', @srcs, @{$args{deps}}).'"'; - my $incs = join("", map { ' -I "'.$_.'"' } @{$args{incs}}); + my $deps = join(' ', + map { file_name_is_absolute($_) || ($_ =~ m|^../|) ? "\"$_\"" : $_ } + (@srcs, @{$args{deps}})); + my $incs = join("", map { ' -I"'.$_.'"' } @{$args{incs}}); my $defs = join("", map { " -D".$_ } @{$args{defs}}); my $cflags = { shlib => ' $(LIB_CFLAGS)', lib => ' $(LIB_CFLAGS)', @@ -694,7 +827,8 @@ EOF } elsif ($srcs[0] =~ /.S$/) { return <<"EOF"; $obj: $deps - \$(CC) /EP -D__ASSEMBLER__ $cflags $defs $srcs > \$@.asm && \$(AS) $asflags \$(ASOUTFLAG)\$\@ \$@.asm + \$(CC) /EP -D__ASSEMBLER__ $cflags $defs $srcs > \$@.asm + \$(AS) $asflags \$(ASOUTFLAG)\$\@ \$@.asm EOF } my $recipe = <<"EOF"; @@ -702,7 +836,7 @@ $obj: $deps \$(CC) $cflags $defs -c \$(COUTFLAG)\$\@ $srcs EOF $recipe .= <<"EOF" unless $disabled{makedepend}; - \$(CC) $cflags $defs /Zs /showIncludes $srcs 2>&1 > $dep + cmd /C "\$(CPP) $cflags $defs $target{cpp_depend_flags} $srcs > $dep 2>&1" EOF return $recipe; } @@ -714,31 +848,38 @@ EOF my %args = @_; my $lib = $args{lib}; my @objs = map { platform->convertext($_) } - grep { platform->isobj($_) || platform->isres($_) } + grep { platform->isobj($_) } + @{$args{objs}}; + my @ress = map { platform->convertext($_) } + grep { platform->isres($_) } @{$args{objs}}; my @defs = map { platform->def($_) } grep { platform->isdef($_) } @{$args{objs}}; my @deps = compute_lib_depends(@{$args{deps}}); die "More than one exported symbols list" if scalar @defs > 1; - my $linklibs = join("", map { "$_\n" } @deps); - my $objs = join("\n", @objs); - my $deps = join(" ", @objs, @defs, @deps); + my $linklibs = join("", map { "$_$target{ld_resp_delim}" } @deps); + my $objs = join($target{ld_resp_delim}, @objs); + my $ress = join($target{ld_resp_delim}, @ress); + my $deps = join(" ", @objs, @ress, @defs, @deps); my $import = platform->sharedlib_import($lib); my $dll = platform->sharedlib($lib); - my $shared_def = join("", map { " /def:$_" } @defs); + my $shared_def = $target{lddefflag} . join("", @defs); + my $implib_rule = $target{ld_implib_rule} || ""; + my $implib_flag = $target{ld_implib_flag} + ? "$target{ld_implib_flag}$import" + : ""; return <<"EOF" # The import library may look like a static library, but it is not. # We MUST make the import library depend on the DLL, in case someone # mistakenly removes the latter. $import: $dll + $implib_rule $dll: $deps IF EXIST $full.manifest DEL /F /Q $full.manifest IF EXIST \$@ DEL /F /Q \$@ - \$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\ - /implib:$import \$(LDOUTFLAG)$dll$shared_def @<< || (DEL /Q \$(\@B).* $import && EXIT 1) -$objs -$linklibs\$(LIB_EX_LIBS) + \$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) @<< $implib_flag || (DEL /Q \$(\@B).* $import; EXIT 1) +$objs$target{ld_resp_delim}\$(LDOUTFLAG)$dll$target{ldpostoutflag}$target{ld_resp_delim}$linklibs\$(LIB_EX_LIBS)$target{ld_resp_delim}$shared_def$target{ldresflag}$ress << IF EXIST $dll.manifest \\ \$(MT) \$(MTFLAGS) \$(MTINFLAG)$dll.manifest \$(MTOUTFLAG)$dll @@ -755,23 +896,26 @@ EOF my $dso = platform->dso($args{module}); my $dso_n = platform->dsoname($args{module}); my @objs = map { platform->convertext($_) } - grep { platform->isobj($_) || platform->isres($_) } + grep { platform->isobj($_) } + @{$args{objs}}; + my @ress = map { platform->convertext($_) } + grep { platform->isres($_) } @{$args{objs}}; my @defs = map { platform->def($_) } grep { platform->isdef($_) } @{$args{objs}}; my @deps = compute_lib_depends(@{$args{deps}}); - my $objs = join("\n", @objs); - my $linklibs = join("", map { "$_\n" } @deps); - my $deps = join(" ", @objs, @defs, @deps); - my $shared_def = join("", map { " /def:$_" } @defs); + die "More than one exported symbols list" if scalar @defs > 1; + my $objs = join($target{ld_resp_delim}, @objs); + my $ress = join($target{ld_resp_delim}, @ress); + my $linklibs = join("", map { "$_$target{ld_resp_delim}" } @deps); + my $deps = join(" ", @objs, @ress, @defs, @deps); + my $shared_def = $target{lddefflag} . join("", @defs); return <<"EOF"; $dso: $deps IF EXIST $dso.manifest DEL /F /Q $dso.manifest - \$(LD) \$(LDFLAGS) \$(DSO_LDFLAGS) \\ - \$(LDOUTFLAG)$dso$shared_def @<< || (DEL /Q \$(\@B).* $dso_n.* && EXIT 1) -$objs -$linklibs \$(DSO_EX_LIBS) + \$(LD) \$(LDFLAGS) \$(DSO_LDFLAGS) @<< || (DEL /Q \$(\@B).* $dso_n.*; EXIT 1) +$objs$target{ld_resp_delim}\$(LDOUTFLAG)$dso$target{ldpostoutflag}$target{ld_resp_delim}$linklibs \$(DSO_EX_LIBS)$target{ld_resp_delim}$shared_def$target{ldresflag}$ress << IF EXIST $dso.manifest \\ \$(MT) \$(MTFLAGS) \$(MTINFLAG)$dso.manifest \$(MTOUTFLAG)$dso @@ -781,7 +925,7 @@ EOF my %args = @_; my $lib = platform->staticlib($args{lib}); my @objs = map { platform->obj($_) } @{$args{objs}}; - my $objs = join("\n", @objs); + my $objs = join($target{ar_resp_delim}, @objs); my $deps = join(" ", @objs); return <<"EOF"; $lib: $deps @@ -794,19 +938,20 @@ EOF my %args = @_; my $bin = platform->bin($args{bin}); my @objs = map { platform->convertext($_) } - grep { platform->isobj($_) || platform->isres($_) } + grep { platform->isobj($_) } + @{$args{objs}}; + my @ress = map { platform->convertext($_) } + grep { platform->isres($_) } @{$args{objs}}; my @deps = compute_lib_depends(@{$args{deps}}); - my $objs = join("\n", @objs); - my $linklibs = join("", map { "$_\n" } @deps); - my $deps = join(" ", @objs, @deps); + my $objs = join($target{ld_resp_delim}, @objs); + my $linklibs = join("", map { "$_$target{ld_resp_delim}" } @deps); + my $deps = join(" ", @objs, @ress, @deps); return <<"EOF"; $bin: $deps IF EXIST $bin.manifest DEL /F /Q $bin.manifest - \$(LD) \$(LDFLAGS) \$(BIN_LDFLAGS) \$(LDOUTFLAG)$bin @<< -$objs -setargv.obj -$linklibs\$(BIN_EX_LIBS) + \$(LD) \$(LDFLAGS) \$(BIN_LDFLAGS) @<< +$objs$target{ld_resp_delim}\$(LDOUTFLAG)$bin$target{ldpostoutflag}$target{ld_resp_delim}$linklibs\$(BIN_EX_LIBS)$target{ldresflag}$target{ldresflag}$ress << IF EXIST $bin.manifest \\ \$(MT) \$(MTFLAGS) \$(MTINFLAG)$bin.manifest \$(MTOUTFLAG)$bin @@ -822,7 +967,7 @@ EOF return <<"EOF"; $script: $sources "\$(PERL)" "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\ - "-o$target{build_file}" $sources > "$script" + "-o$target{build_file}" $sources > \$@ EOF } sub generatedir {