diff options
author | VladimĂr Kotal <vladimir.kotal@oracle.com> | 2023-06-19 13:43:35 +0200 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2023-06-28 09:32:03 +1000 |
commit | 956b4c75dc3f8710bf7b4e1cf01b4ef6d5ca2b45 (patch) | |
tree | 03e5b4b81778829f68b92639aaa0df8f0ec36457 | |
parent | 32d2b5fdd93ceee192abefb3fd0ce8f9a1b329c2 (diff) |
add no-docs option
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21240)
-rw-r--r-- | .github/workflows/run-checker-daily.yml | 1 | ||||
-rw-r--r-- | Configurations/unix-Makefile.tmpl | 6 | ||||
-rw-r--r-- | Configurations/windows-makefile.tmpl | 6 | ||||
-rwxr-xr-x | Configure | 1 | ||||
-rw-r--r-- | INSTALL.md | 4 |
5 files changed, 12 insertions, 6 deletions
diff --git a/.github/workflows/run-checker-daily.yml b/.github/workflows/run-checker-daily.yml index db1f3dfbcb..d97f3f2ee0 100644 --- a/.github/workflows/run-checker-daily.yml +++ b/.github/workflows/run-checker-daily.yml @@ -49,6 +49,7 @@ jobs: no-des, no-devcryptoeng, no-dh, + no-docs, no-dsa, no-dtls1, no-dtls1_2, diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index c7989124bf..881310cf08 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -512,7 +512,7 @@ LANG=C {- dependmagic('build_modules', 'Build the modules (i.e. providers and engines)'); -}: build_modules_nodep {- dependmagic('build_programs', 'Build the openssl executables and scripts'); -}: build_programs_nodep -all: build_sw build_docs ## Build software and documentation +all: build_sw {- "build_docs" if !$disabled{docs}; -} ## Build software and documentation ##@ Documentation build_generated_pods: $(GENERATED_PODS) @@ -624,9 +624,9 @@ depend: Makefile # Install helper targets ############################################# ##@ Installation -install: install_sw install_ssldirs install_docs {- $disabled{fips} ? "" : "install_fips" -} ## Install software and documentation, create OpenSSL directories +install: install_sw install_ssldirs {- "install_docs" if !$disabled{docs}; -} {- $disabled{fips} ? "" : "install_fips" -} ## Install software and documentation, create OpenSSL directories -uninstall: uninstall_docs uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} ## Uninstall software and documentation +uninstall: {- "uninstall_docs" if !$disabled{docs}; -} uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} ## Uninstall software and documentation install_sw: install_dev install_engines install_modules install_runtime ## Install just the software and libraries diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index c05d03f369..7fd87e81cf 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -436,7 +436,7 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) build_docs @$(ECHO) " then make will fail..." @{- output_on() if $disabled{makedepend}; "\@rem" -} -all: build_sw build_docs +all: build_sw {- "build_docs" if !$disabled{docs}; -} test: tests {- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep copy-utils @@ -453,9 +453,9 @@ list-tests: @$(ECHO) "Tests are not supported with your chosen Configure options" @{- output_on() if !$disabled{tests}; "\@rem" -} -install: install_sw install_ssldirs install_docs {- $disabled{fips} ? "" : "install_fips" -} +install: install_sw install_ssldirs {- "install_docs" if !$disabled{docs}; -} {- $disabled{fips} ? "" : "install_fips" -} -uninstall: uninstall_docs uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} +uninstall: {- "uninstall_docs" if !$disabled{docs}; -} uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} libclean: "$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """{.,apps,test,fuzz}/$$1.*"""; } @ARGV" $(SHLIBS) @@ -441,6 +441,7 @@ my @disablables = ( "devcryptoeng", "dgram", "dh", + "docs", "dsa", "dso", "dtls", diff --git a/INSTALL.md b/INSTALL.md index a5747aaec7..3a73e56ec6 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -716,6 +716,10 @@ Don't build support for datagram based BIOs. Selecting this option will also force the disabling of DTLS. +### no-docs + +Don't build and install documentation, i.e. manual pages in various forms. + ### no-dso Don't build support for loading Dynamic Shared Objects (DSO) |