diff options
author | Richard Levitte <levitte@openssl.org> | 2019-01-31 00:06:50 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-02-11 16:03:46 +0100 |
commit | 1842f369e5541d8ed9b2716cdd7d516005994733 (patch) | |
tree | 584cf9491c0801fc62d9ed3e9aa16e9ea93ff1fd /Configurations/windows-makefile.tmpl | |
parent | a43ce58f5569a160272c492c680f2e42d38ec769 (diff) |
ENGINE modules aren't special, so call them MODULES
The only thing that makes an ENGINE module special is its entry
points. Other than that, it's a normal dynamically loadable module,
nothing special about it. This change has us stop pretending anything
else.
We retain using ENGINE as a term for installation, because it's
related to a specific installation directory, and we therefore also
mark ENGINE modules specifically as such with an attribute in the
build.info files.
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/8147)
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
-rw-r--r-- | Configurations/windows-makefile.tmpl | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 0cd1e863d3..6d38cfe15f 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -45,8 +45,8 @@ 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}}) -} -ENGINES={- join(" ", map { platform->dso($_) } @{$unified_info{engines}}) -} -ENGINEPDBS={- join(" ", map { platform->dsopdb($_) } @{$unified_info{engines}}) -} +MODULES={- join(" ", map { platform->dso($_) } @{$unified_info{modules}}) -} +MODULEPDBS={- join(" ", map { platform->dsopdb($_) } @{$unified_info{modules}}) -} PROGRAMS={- our @PROGRAMS = map { platform->bin($_) } @{$unified_info{programs}}; join(" ", @PROGRAMS) -} PROGRAMPDBS={- join(" ", map { $_.".pdb" } @{$unified_info{programs}}) -} SCRIPTS={- join(" ", @{$unified_info{scripts}}) -} @@ -79,13 +79,15 @@ INSTALL_SHLIBPDBS={- -} INSTALL_ENGINES={- join(" ", map { quotify1(platform->dso($_)) } - grep { !$unified_info{attributes}->{$_}->{noinst} } - @{$unified_info{engines}}) + grep { !$unified_info{attributes}->{$_}->{noinst} + && $unified_info{attributes}->{$_}->{engine} } + @{$unified_info{modules}}) -} INSTALL_ENGINEPDBS={- join(" ", map { quotify1(platform->dsopdb($_)) } - grep { !$unified_info{attributes}->{$_}->{noinst} } - @{$unified_info{engines}}) + grep { !$unified_info{attributes}->{$_}->{noinst} + && $unified_info{attributes}->{$_}->{engine} } + @{$unified_info{modules}}) -} INSTALL_PROGRAMS={- join(" ", map { quotify1(platform->bin($_)) } @@ -311,14 +313,14 @@ PROCESSOR= {- $config{processor} -} # The main targets ################################################### -{- dependmagic('all'); -}: build_libs_nodep build_engines_nodep build_programs_nodep +{- dependmagic('all'); -}: build_libs_nodep build_modules_nodep build_programs_nodep {- dependmagic('build_libs'); -}: build_libs_nodep -{- dependmagic('build_engines'); -}: build_engines_nodep +{- dependmagic('build_modules'); -}: build_modules_nodep {- dependmagic('build_programs'); -}: build_programs_nodep build_generated: $(GENERATED_MANDATORY) build_libs_nodep: $(LIBS) {- join(" ",map { platform->sharedlib_import($_) // () } @{$unified_info{libraries}}) -} -build_engines_nodep: $(ENGINES) +build_modules_nodep: $(MODULES) build_programs_nodep: $(PROGRAMS) $(SCRIPTS) # Kept around for backward compatibility @@ -334,7 +336,7 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) @{- output_on() if $disabled{makedepend}; "" -} test: tests -{- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep +{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep @{- output_off() if $disabled{tests}; "" -} -mkdir $(BLDDIR)\test\test-runs set SRCTOP=$(SRCDIR) @@ -366,7 +368,7 @@ libclean: clean: libclean {- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) -} - -del /Q /F $(ENGINES) + -del /Q /F $(MODULES) -del /Q /F $(SCRIPTS) -del /Q /F $(GENERATED_MANDATORY) -del /Q /F $(GENERATED) @@ -432,13 +434,13 @@ install_dev: install_runtime_libs uninstall_dev: -install_engines: install_runtime_libs build_engines +install_engines: install_runtime_libs build_modules @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) - @$(ECHO) "*** Installing engines" + @$(ECHO) "*** Installing ENGINE modules" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(ENGINESDIR)" - @if not "$(ENGINES)"=="" \ + @if not "$(INSTALL_ENGINES)"=="" \ "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_ENGINES) "$(ENGINESDIR)" - @if not "$(ENGINES)"=="" \ + @if not "$(INSTALL_ENGINES)"=="" \ "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_ENGINEPDBS) "$(ENGINESDIR)" uninstall_engines: |