Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
1 年多 前同步成功

通知 10
Star 18
Fork 1
T
Third Party Openssl
提交 cb663908 编写于 作者: R Richard Levitte
浏览文件
操作

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: NMatt Caswell <matt@openssl.org>
上级 a3a08f81
隐藏空白更改
内联 并排
Showing with 51 addition and 50 deletion
Configurations/windows-makefile.tmpl
浏览文件 @ cb663908
...@@ -161,7 +161,7 @@ tests: build_tests_nodep build_apps_nodep build_engines_nodep depend ...@@ -161,7 +161,7 @@ tests: build_tests_nodep build_apps_nodep build_engines_nodep depend
set SRCTOP=$(SRCDIR) set SRCTOP=$(SRCDIR)
set BLDTOP=$(BLDDIR) set BLDTOP=$(BLDDIR)
set PERL=$(PERL) 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(); } "" -} @rem {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
@echo "Tests are not supported with your chosen Configure options" @echo "Tests are not supported with your chosen Configure options"
@rem {- output_on() if !$disabled{tests}; "" -} @rem {- output_on() if !$disabled{tests}; "" -}
...@@ -169,16 +169,16 @@ tests: build_tests_nodep build_apps_nodep build_engines_nodep depend ...@@ -169,16 +169,16 @@ tests: build_tests_nodep build_apps_nodep build_engines_nodep depend
list-tests: list-tests:
@set TOP=$(SRCDIR) @set TOP=$(SRCDIR)
@set PERL=$(PERL) @set PERL=$(PERL)
@$(PERL) $(SRCDIR)\test\run_tests.pl list @"$(PERL)" "$(SRCDIR)\test\run_tests.pl" list
install: install_sw install_ssldirs install_docs install: install_sw install_ssldirs install_docs
uninstall: uninstall_docs uninstall_sw uninstall: uninstall_docs uninstall_sw
libclean: libclean:
$(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$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 """apps/$$1.*"""; } @ARGV" $(SHLIBS)
$(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """test/$$1.*"""; } @ARGV" $(SHLIBS) "$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """test/$$1.*"""; } @ARGV" $(SHLIBS)
-del /Q /F $(LIBS) -del /Q /F $(LIBS)
-del /Q ossl_static.pdb -del /Q ossl_static.pdb
...@@ -204,33 +204,33 @@ install_sw: all install_dev install_engines install_runtime ...@@ -204,33 +204,33 @@ install_sw: all install_dev install_engines install_runtime
uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
install_docs: install_docs:
$(PERL) $(SRCDIR)\util\process_docs.pl \ "$(PERL)" "$(SRCDIR)\util\process_docs.pl" \
"--destdir=$(DESTDIR)$(INSTALLTOP)\html" --type=html "--destdir=$(DESTDIR)$(INSTALLTOP)\html" --type=html
uninstall_docs: uninstall_docs:
install_ssldirs: install_ssldirs:
@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\certs" @"$(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)\private"
@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\misc" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(OPENSSLDIR)\misc"
@$(PERL) $(SRCDIR)\util\copy.pl $(SRCDIR)\apps\openssl.cnf \ @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\apps\openssl.cnf" \
"$(DESTDIR)$(OPENSSLDIR)" "$(DESTDIR)$(OPENSSLDIR)"
@$(PERL) $(SRCDIR)\util\copy.pl $(MISC_SCRIPTS) \ @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(MISC_SCRIPTS) \
"$(DESTDIR)$(OPENSSLDIR)\misc" "$(DESTDIR)$(OPENSSLDIR)\misc"
install_dev: install_dev:
@if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
@echo *** Installing development files @echo *** Installing development files
@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(INSTALLTOP)\include\openssl" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(INSTALLTOP)\include\openssl"
@$(PERL) $(SRCDIR)\util\copy.pl $(SRCDIR)\include\openssl\*.h \ @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\include\openssl\*.h" \
"$(DESTDIR)$(INSTALLTOP)\include\openssl" "$(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" "$(DESTDIR)$(INSTALLTOP)\include\openssl"
@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)"
@$(PERL) $(SRCDIR)\util\copy.pl $(LIBS) \ @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(LIBS) \
"$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)" "$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)"
@if "$(SHLIBS)"=="" \ @if "$(SHLIBS)"=="" \
$(PERL) $(SRCDIR)\util\copy.pl ossl_static.pdb \ "$(PERL)" "$(SRCDIR)\util\copy.pl" ossl_static.pdb \
"$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)" "$(DESTDIR)$(INSTALLTOP)\$(LIBDIR)"
uninstall_dev: uninstall_dev:
...@@ -238,38 +238,38 @@ uninstall_dev: ...@@ -238,38 +238,38 @@ uninstall_dev:
install_engines: install_engines:
@if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
@echo *** Installing engines @echo *** Installing engines
@$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(ENGINESDIR)" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(ENGINESDIR)"
@if not "$(ENGINES)"=="" \ @if not "$(ENGINES)"=="" \
$(PERL) $(SRCDIR)\util\copy.pl $(ENGINES) "$(DESTDIR)$(ENGINESDIR)" "$(PERL)" "$(SRCDIR)\util\copy.pl" $(ENGINES) "$(DESTDIR)$(ENGINESDIR)"
@if not "$(ENGINES)"=="" \ @if not "$(ENGINES)"=="" \
$(PERL) $(SRCDIR)\util\copy.pl $(ENGINEPDBS) "$(DESTDIR)$(ENGINESDIR)" "$(PERL)" "$(SRCDIR)\util\copy.pl" $(ENGINEPDBS) "$(DESTDIR)$(ENGINESDIR)"
uninstall_engines: uninstall_engines:
install_runtime: install_runtime:
@if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
@echo *** Installing runtime files @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)"=="" \ @if not "$(SHLIBS)"=="" \
$(PERL) $(SRCDIR)\util\copy.pl $(SHLIBS) "$(DESTDIR)$(INSTALLTOP)\bin" "$(PERL)" "$(SRCDIR)\util\copy.pl" $(SHLIBS) "$(DESTDIR)$(INSTALLTOP)\bin"
@if not "$(SHLIBS)"=="" \ @if not "$(SHLIBS)"=="" \
$(PERL) $(SRCDIR)\util\copy.pl $(SHLIBPDBS) \ "$(PERL)" "$(SRCDIR)\util\copy.pl" $(SHLIBPDBS) \
"$(DESTDIR)$(INSTALLTOP)\bin" "$(DESTDIR)$(INSTALLTOP)\bin"
@$(PERL) $(SRCDIR)\util\copy.pl $(PROGRAMS) \ @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(PROGRAMS) \
"$(DESTDIR)$(INSTALLTOP)\bin" "$(DESTDIR)$(INSTALLTOP)\bin"
@$(PERL) $(SRCDIR)\util\copy.pl $(PROGRAMPDBS) \ @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(PROGRAMPDBS) \
"$(DESTDIR)$(INSTALLTOP)\bin" "$(DESTDIR)$(INSTALLTOP)\bin"
@$(PERL) $(SRCDIR)\util\copy.pl $(BIN_SCRIPTS) \ @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BIN_SCRIPTS) \
"$(DESTDIR)$(INSTALLTOP)\bin" "$(DESTDIR)$(INSTALLTOP)\bin"
uninstall_runtime: uninstall_runtime:
# Building targets ################################################### # Building targets ###################################################
configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure configdata.pm: "{- $config{build_file_template} -}" "$(SRCDIR)\Configure"
@echo "Detected changed: $?" @echo "Detected changed: $?"
@echo "Reconfiguring..." @echo "Reconfiguring..."
$(PERL) $(SRCDIR)\Configure reconf "$(PERL)" "$(SRCDIR)\Configure" reconf
@echo "**************************************************" @echo "**************************************************"
@echo "*** ***" @echo "*** ***"
@echo "*** Please run the same make command again ***" @echo "*** Please run the same make command again ***"
...@@ -293,19 +293,20 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure ...@@ -293,19 +293,20 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure
sub generatesrc { sub generatesrc {
my %args = @_; my %args = @_;
(my $target = $args{src}) =~ s/\.[sS]$/.asm/; (my $target = $args{src}) =~ s/\.[sS]$/.asm/;
my $generator = join(" ", @{$args{generator}}); my $generator = '"'.join('" "', @{$args{generator}}).'"';
my $generator_incs = join("", map { " -I".$_ } @{$args{generator_incs}}); my $generator_incs = join("", map { " -I \"$_\"" } @{$args{generator_incs}});
my $incs = join("", map { " /I ".$_ } @{$args{incs}}); my $incs = join("", map { " /I \"$_\"" } @{$args{incs}});
my $deps = join(" ", @{$args{generator_deps}}, @{$args{deps}}); my $deps = @{$args{deps}} ?
'"'.join('" "', @{$args{generator_deps}}, @{$args{deps}}).'"' : '';
if ($target !~ /\.asm$/) { if ($target !~ /\.asm$/) {
return <<"EOF"; return <<"EOF";
$target: $args{generator}->[0] $deps $target: "$args{generator}->[0]" $deps
\$(PERL)$generator_incs $generator > \$@ "\$(PERL)"$generator_incs $generator > \$@
EOF EOF
} else { } else {
if ($args{generator}->[0] =~ /\.pl$/) { if ($args{generator}->[0] =~ /\.pl$/) {
$generator = '$(PERL)'.$generator_incs.' '.$generator; $generator = '"$(PERL)"'.$generator_incs.' '.$generator;
} elsif ($args{generator}->[0] =~ /\.S$/) { } elsif ($args{generator}->[0] =~ /\.S$/) {
$generator = undef; $generator = undef;
} else { } else {
...@@ -317,7 +318,7 @@ EOF ...@@ -317,7 +318,7 @@ EOF
# end up generating foo.s in two steps. # end up generating foo.s in two steps.
if ($args{src} =~ /\.S$/) { if ($args{src} =~ /\.S$/) {
return <<"EOF"; return <<"EOF";
$target: $args{generator}->[0] $deps $target: "$args{generator}->[0]" $deps
set ASM=\$(AS) set ASM=\$(AS)
$generator \$@.S $generator \$@.S
\$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@.i && move /Y \$@.i \$@ \$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@.i && move /Y \$@.i \$@
...@@ -326,14 +327,14 @@ EOF ...@@ -326,14 +327,14 @@ EOF
} }
# Otherwise.... # Otherwise....
return <<"EOF"; return <<"EOF";
$target: $args{generator}->[0] $deps $target: "$args{generator}->[0]" $deps
set ASM=\$(AS) set ASM=\$(AS)
$generator \$@ $generator \$@
EOF EOF
} }
return <<"EOF"; return <<"EOF";
$target: $args{generator}->[0] $deps $target: "$args{generator}->[0]" $deps
\$(CC) \$(CFLAGS) $incs /EP /C $args{generator}->[0] > \$@.i && move /Y \$@.i \$@ \$(CC) \$(CFLAGS) $incs /EP /C "$args{generator}->[0]" > \$@.i && move /Y \$@.i \$@
EOF EOF
} }
} }
...@@ -343,12 +344,12 @@ EOF ...@@ -343,12 +344,12 @@ EOF
my $obj = $args{obj}; my $obj = $args{obj};
my @srcs = map { (my $x = $_) =~ s/\.s$/.asm/; $x my @srcs = map { (my $x = $_) =~ s/\.s$/.asm/; $x
} ( @{$args{srcs}} ); } ( @{$args{srcs}} );
my $srcs = join(" ", @srcs); my $srcs = '"'.join('" "', @srcs).'"';
my $deps = join(" ", @srcs, @{$args{deps}}); my $deps = '"'.join('" "', @srcs, @{$args{deps}}).'"';
my $incs = join("", map { " /I ".$_ } @{$args{incs}}); my $incs = join("", map { ' /I "'.$_.'"' } @{$args{incs}});
unless ($disabled{zlib}) { unless ($disabled{zlib}) {
if ($withargs{zlib_include}) { if ($withargs{zlib_include}) {
$incs .= " /I ".$withargs{zlib_include}; $incs .= ' /I "'.$withargs{zlib_include}.'"';
} }
} }
my $ecflags = { lib => '$(LIB_CFLAGS)', my $ecflags = { lib => '$(LIB_CFLAGS)',
...@@ -364,7 +365,7 @@ EOF ...@@ -364,7 +365,7 @@ EOF
return <<"EOF" if (!$disabled{makedepend}); return <<"EOF" if (!$disabled{makedepend});
$obj$depext: $deps $obj$depext: $deps
\$(CC) \$(CFLAGS) $ecflags$inc /Zs /showIncludes $srcs 2>&1 | \\ \$(CC) \$(CFLAGS) $ecflags$inc /Zs /showIncludes $srcs 2>&1 | \\
\$(PERL) -n << > $obj$depext "\$(PERL)" -n << > $obj$depext
chomp; chomp;
s/^Note: including file: *//; s/^Note: including file: *//;
\$\$collect{\$\$_} = 1; \$\$collect{\$\$_} = 1;
...@@ -404,11 +405,11 @@ EOF ...@@ -404,11 +405,11 @@ EOF
rel2abs($config{builddir})); rel2abs($config{builddir}));
my $target = shlib_import($lib); my $target = shlib_import($lib);
return <<"EOF" return <<"EOF"
$target: $deps $ordinalsfile $mkdef_pl $target: $deps "$ordinalsfile" "$mkdef_pl"
\$(PERL) $mkdef_pl "$mkdef_key" 32 > $shlib.def "\$(PERL)" "$mkdef_pl" "$mkdef_key" 32 > $shlib.def
\$(PERL) -i.tmp -pe "s|^LIBRARY\\s+${mkdef_key}32|LIBRARY $shlib|;" $shlib.def "\$(PERL)" -i.tmp -pe "s|^LIBRARY\\s+${mkdef_key}32|LIBRARY $shlib|;" $shlib.def
DEL $shlib.def.tmp DEL $shlib.def.tmp
\$(PERL) $mkrc_pl $shlib$shlibext > $shlib.rc "\$(PERL)" "$mkrc_pl" $shlib$shlibext > $shlib.rc
\$(RC) \$(RCOUTFLAG)$shlib.res $shlib.rc \$(RC) \$(RCOUTFLAG)$shlib.res $shlib.rc
\$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\ \$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\
/implib:\$@ \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< || (DEL /Q \$(\@B).* $shlib.* && EXIT 1) /implib:\$@ \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< || (DEL /Q \$(\@B).* $shlib.* && EXIT 1)
...@@ -478,13 +479,13 @@ EOF ...@@ -478,13 +479,13 @@ EOF
sub in2script { sub in2script {
my %args = @_; my %args = @_;
my $script = $args{script}; my $script = $args{script};
my $sources = join(" ", @{$args{sources}}); my $sources = '"'.join('" "', @{$args{sources}}).'"';
my $dofile = abs2rel(rel2abs(catfile($config{sourcedir}, my $dofile = abs2rel(rel2abs(catfile($config{sourcedir},
"util", "dofile.pl")), "util", "dofile.pl")),
rel2abs($config{builddir})); rel2abs($config{builddir}));
return <<"EOF"; return <<"EOF";
$script: $sources $script: $sources
\$(PERL) "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\ "\$(PERL)" "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\
"-o$target{build_file}" $sources > "$script" "-o$target{build_file}" $sources > "$script"
EOF EOF
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或