Windows makefile: handle the case with space in source directory This applies when building out-of-source. RT#4486 NOTE: we can't do the same for Unix, as Unix make doesn't handle this type of issue. Also, directory specs are much less likely to have spaces on Unix... Reviewed-by: Matt Caswell <matt@openssl.org>
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 454f2ed..9a8109f 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl
@@ -161,7 +161,7 @@ set SRCTOP=$(SRCDIR) set BLDTOP=$(BLDDIR) set PERL=$(PERL) - $(PERL) $(SRCDIR)\test\run_tests.pl $(TESTS) + "$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS) @rem {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} @echo "Tests are not supported with your chosen Configure options" @rem {- output_on() if !$disabled{tests}; "" -} @@ -169,16 +169,16 @@ list-tests: @set TOP=$(SRCDIR) @set PERL=$(PERL) - @$(PERL) $(SRCDIR)\test\run_tests.pl list + @"$(PERL)" "$(SRCDIR)\test\run_tests.pl" list install: install_sw install_ssldirs install_docs uninstall: uninstall_docs uninstall_sw libclean: - $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS) - $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """apps/$$1.*"""; } @ARGV" $(SHLIBS) - $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """test/$$1.*"""; } @ARGV" $(SHLIBS) + "$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS) + "$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """apps/$$1.*"""; } @ARGV" $(SHLIBS) + "$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """test/$$1.*"""; } @ARGV" $(SHLIBS) -del /Q /F $(LIBS) -del /Q ossl_static.pdb @@ -204,33 +204,33 @@ uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev install_docs: - $(PERL) $(SRCDIR)\util\process_docs.pl \ + "$(PERL)" "$(SRCDIR)\util\process_docs.pl" \ "--destdir=$(DESTDIR)$(INSTALLTOP)\html" --type=html 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 \ + @"$(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) \ + @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(MISC_SCRIPTS) \ "$(DESTDIR)$(OPENSSLDIR)\misc" install_dev: @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) @echo *** Installing development files - @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(INSTALLTOP)\include\openssl" - @$(PERL) $(SRCDIR)\util\copy.pl $(SRCDIR)\include\openssl\*.h \ + @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(INSTALLTOP)\include\openssl" + @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\include\openssl\*.h" \ "$(DESTDIR)$(INSTALLTOP)\include\openssl" - @$(PERL) $(SRCDIR)\util\copy.pl $(BLDDIR)\include\openssl\*.h \ + @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BLDDIR)\include\openssl\*.h \ "$(DESTDIR)$(INSTALLTOP)\include\openssl" - @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)" - @$(PERL) $(SRCDIR)\util\copy.pl $(LIBS) \ + @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)" + @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(LIBS) \ "$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)" @if "$(SHLIBS)"=="" \ - $(PERL) $(SRCDIR)\util\copy.pl ossl_static.pdb \ + "$(PERL)" "$(SRCDIR)\util\copy.pl" ossl_static.pdb \ "$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)" uninstall_dev: @@ -238,38 +238,38 @@ install_engines: @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) @echo *** Installing engines - @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(ENGINESDIR)" + @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(ENGINESDIR)" @if not "$(ENGINES)"=="" \ - $(PERL) $(SRCDIR)\util\copy.pl $(ENGINES) "$(DESTDIR)$(ENGINESDIR)" + "$(PERL)" "$(SRCDIR)\util\copy.pl" $(ENGINES) "$(DESTDIR)$(ENGINESDIR)" @if not "$(ENGINES)"=="" \ - $(PERL) $(SRCDIR)\util\copy.pl $(ENGINEPDBS) "$(DESTDIR)$(ENGINESDIR)" + "$(PERL)" "$(SRCDIR)\util\copy.pl" $(ENGINEPDBS) "$(DESTDIR)$(ENGINESDIR)" uninstall_engines: install_runtime: @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) @echo *** Installing runtime files - @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(INSTALLTOP)\bin" + @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(INSTALLTOP)\bin" @if not "$(SHLIBS)"=="" \ - $(PERL) $(SRCDIR)\util\copy.pl $(SHLIBS) "$(DESTDIR)$(INSTALLTOP)\bin" + "$(PERL)" "$(SRCDIR)\util\copy.pl" $(SHLIBS) "$(DESTDIR)$(INSTALLTOP)\bin" @if not "$(SHLIBS)"=="" \ - $(PERL) $(SRCDIR)\util\copy.pl $(SHLIBPDBS) \ + "$(PERL)" "$(SRCDIR)\util\copy.pl" $(SHLIBPDBS) \ "$(DESTDIR)$(INSTALLTOP)\bin" - @$(PERL) $(SRCDIR)\util\copy.pl $(PROGRAMS) \ + @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(PROGRAMS) \ "$(DESTDIR)$(INSTALLTOP)\bin" - @$(PERL) $(SRCDIR)\util\copy.pl $(PROGRAMPDBS) \ + @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(PROGRAMPDBS) \ "$(DESTDIR)$(INSTALLTOP)\bin" - @$(PERL) $(SRCDIR)\util\copy.pl $(BIN_SCRIPTS) \ + @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BIN_SCRIPTS) \ "$(DESTDIR)$(INSTALLTOP)\bin" uninstall_runtime: # Building targets ################################################### -configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure +configdata.pm: "{- $config{build_file_template} -}" "$(SRCDIR)\Configure" @echo "Detected changed: $?" @echo "Reconfiguring..." - $(PERL) $(SRCDIR)\Configure reconf + "$(PERL)" "$(SRCDIR)\Configure" reconf @echo "**************************************************" @echo "*** ***" @echo "*** Please run the same make command again ***" @@ -293,19 +293,20 @@ sub generatesrc { my %args = @_; (my $target = $args{src}) =~ s/\.[sS]$/.asm/; - my $generator = join(" ", @{$args{generator}}); - my $generator_incs = join("", map { " -I".$_ } @{$args{generator_incs}}); - my $incs = join("", map { " /I ".$_ } @{$args{incs}}); - my $deps = join(" ", @{$args{generator_deps}}, @{$args{deps}}); + my $generator = '"'.join('" "', @{$args{generator}}).'"'; + my $generator_incs = join("", map { " -I \"$_\"" } @{$args{generator_incs}}); + my $incs = join("", map { " /I \"$_\"" } @{$args{incs}}); + my $deps = @{$args{deps}} ? + '"'.join('" "', @{$args{generator_deps}}, @{$args{deps}}).'"' : ''; if ($target !~ /\.asm$/) { return <<"EOF"; -$target: $args{generator}->[0] $deps - \$(PERL)$generator_incs $generator > \$@ +$target: "$args{generator}->[0]" $deps + "\$(PERL)"$generator_incs $generator > \$@ EOF } else { if ($args{generator}->[0] =~ /\.pl$/) { - $generator = '$(PERL)'.$generator_incs.' '.$generator; + $generator = '"$(PERL)"'.$generator_incs.' '.$generator; } elsif ($args{generator}->[0] =~ /\.S$/) { $generator = undef; } else { @@ -317,7 +318,7 @@ # end up generating foo.s in two steps. if ($args{src} =~ /\.S$/) { return <<"EOF"; -$target: $args{generator}->[0] $deps +$target: "$args{generator}->[0]" $deps set ASM=\$(AS) $generator \$@.S \$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@.i && move /Y \$@.i \$@ @@ -326,14 +327,14 @@ } # Otherwise.... return <<"EOF"; -$target: $args{generator}->[0] $deps +$target: "$args{generator}->[0]" $deps set ASM=\$(AS) $generator \$@ EOF } return <<"EOF"; -$target: $args{generator}->[0] $deps - \$(CC) \$(CFLAGS) $incs /EP /C $args{generator}->[0] > \$@.i && move /Y \$@.i \$@ +$target: "$args{generator}->[0]" $deps + \$(CC) \$(CFLAGS) $incs /EP /C "$args{generator}->[0]" > \$@.i && move /Y \$@.i \$@ EOF } } @@ -343,12 +344,12 @@ my $obj = $args{obj}; my @srcs = map { (my $x = $_) =~ s/\.s$/.asm/; $x } ( @{$args{srcs}} ); - my $srcs = join(" ", @srcs); - my $deps = join(" ", @srcs, @{$args{deps}}); - my $incs = join("", map { " /I ".$_ } @{$args{incs}}); + my $srcs = '"'.join('" "', @srcs).'"'; + my $deps = '"'.join('" "', @srcs, @{$args{deps}}).'"'; + my $incs = join("", map { ' /I "'.$_.'"' } @{$args{incs}}); unless ($disabled{zlib}) { if ($withargs{zlib_include}) { - $incs .= " /I ".$withargs{zlib_include}; + $incs .= ' /I "'.$withargs{zlib_include}.'"'; } } my $ecflags = { lib => '$(LIB_CFLAGS)', @@ -364,7 +365,7 @@ return <<"EOF" if (!$disabled{makedepend}); $obj$depext: $deps \$(CC) \$(CFLAGS) $ecflags$inc /Zs /showIncludes $srcs 2>&1 | \\ - \$(PERL) -n << > $obj$depext + "\$(PERL)" -n << > $obj$depext chomp; s/^Note: including file: *//; \$\$collect{\$\$_} = 1; @@ -404,11 +405,11 @@ rel2abs($config{builddir})); my $target = shlib_import($lib); return <<"EOF" -$target: $deps $ordinalsfile $mkdef_pl - \$(PERL) $mkdef_pl "$mkdef_key" 32 > $shlib.def - \$(PERL) -i.tmp -pe "s|^LIBRARY\\s+${mkdef_key}32|LIBRARY $shlib|;" $shlib.def +$target: $deps "$ordinalsfile" "$mkdef_pl" + "\$(PERL)" "$mkdef_pl" "$mkdef_key" 32 > $shlib.def + "\$(PERL)" -i.tmp -pe "s|^LIBRARY\\s+${mkdef_key}32|LIBRARY $shlib|;" $shlib.def DEL $shlib.def.tmp - \$(PERL) $mkrc_pl $shlib$shlibext > $shlib.rc + "\$(PERL)" "$mkrc_pl" $shlib$shlibext > $shlib.rc \$(RC) \$(RCOUTFLAG)$shlib.res $shlib.rc \$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\ /implib:\$@ \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< || (DEL /Q \$(\@B).* $shlib.* && EXIT 1) @@ -478,13 +479,13 @@ sub in2script { my %args = @_; my $script = $args{script}; - my $sources = join(" ", @{$args{sources}}); + my $sources = '"'.join('" "', @{$args{sources}}).'"'; my $dofile = abs2rel(rel2abs(catfile($config{sourcedir}, "util", "dofile.pl")), rel2abs($config{builddir})); return <<"EOF"; $script: $sources - \$(PERL) "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\ + "\$(PERL)" "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\ "-o$target{build_file}" $sources > "$script" EOF }