From 10064e4dac1de2d5e754387907e921d1639c948b Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Fri, 2 Nov 2018 11:30:28 -0400 Subject: [PATCH] Yank the docs out of the build framework, moving to online only distribution of handbooks and guides. Ticket: #54915 --- Makefile | 2 -- Makefile.inc1 | 11 +------- build/profiles/fn_head/jail.pyd | 11 -------- build/profiles/fn_head/packages.pyd | 5 ---- build/profiles/fn_head/packages/docs/config | 18 ------------ build/profiles/fn_head/ports-freenas.pyd | 31 --------------------- build/profiles/fn_head/repos.pyd | 17 ----------- build/profiles/freenas/jail.pyd | 12 -------- build/profiles/freenas/packages.pyd | 5 ---- build/profiles/freenas/packages/docs/config | 18 ------------ build/profiles/freenas/ports-freenas.pyd | 31 --------------------- build/profiles/freenas/repos.pyd | 16 ----------- 12 files changed, 1 insertion(+), 176 deletions(-) delete mode 100644 build/profiles/fn_head/packages/docs/config delete mode 100644 build/profiles/freenas/packages/docs/config diff --git a/Makefile b/Makefile index 9e3dd03..3714469 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,6 @@ GIT_LOCATION != cat ${GIT_REPO_SETTING} BE_ROOT := ${BUILD_ROOT}/${PROFILE}/_BE OBJDIR := ${BE_ROOT}/objs -DOC_PATH := ${BE_ROOT}/freenas-docs API_PATH := ${BE_ROOT}/freenas/docs .if exists(${BUILD_ROOT}/.git-ref-path) @@ -83,7 +82,6 @@ GIT_REF_PATH ?= /build/gitrefs .export BE_ROOT .export OBJDIR -.export DOC_PATH .export API_PATH .export GIT_REF_PATH diff --git a/Makefile.inc1 b/Makefile.inc1 index 6e7b162..3412869 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -41,7 +41,7 @@ RELEASE_LOGFILE?=${BE_ROOT}/release.build.log all: check-root build -.PHONY: world build packages checkout update dumpenv clean release ports docs tests +.PHONY: world build packages checkout update dumpenv clean release ports tests check-root: @[ `id -u` -eq 0 ] || ( echo "Sorry, you must be running as root to build this."; exit 1 ) @@ -242,14 +242,6 @@ select-profile: debug: @${BUILD_TOOLS}/build-debug.py -docs: - @env CHECKOUT_ONLY="freenas-docs" ${BUILD_TOOLS}/checkout.py -.if ${PRODUCT} == "TrueNAS" - (make SPHINXOPTS="-t truenas" -C ${DOC_PATH}/userguide html) -.else - (make -C ${DOC_PATH}/userguide html) -.endif - api-docs: @env CHECKOUT_ONLY="freenas" ${BUILD_TOOLS}/checkout.py .if ${PRODUCT} == "TrueNAS" @@ -259,5 +251,4 @@ api-docs: .endif clean-docs: - make -C ${DOC_PATH}/userguide clean make -C ${API_PATH}/api clean diff --git a/build/profiles/fn_head/jail.pyd b/build/profiles/fn_head/jail.pyd index 6719064..24d9d06 100644 --- a/build/profiles/fn_head/jail.pyd +++ b/build/profiles/fn_head/jail.pyd @@ -30,17 +30,6 @@ link += { "flags": "ro", } -if PRODUCT != "TrueNAS": - copy += { - "source": "${BE_ROOT}/freenas-docs", - "dest": "/usr/freenas_docs" - } - -copy += { - "source": "${BE_ROOT}/freenas-docs-legacy", - "dest": "/usr/freenas_docs_legacy" -} - copy += { "source": "${BE_ROOT}/freenas/src", "dest": "/usr/nas_source" diff --git a/build/profiles/fn_head/packages.pyd b/build/profiles/fn_head/packages.pyd index d6af355..ca18855 100644 --- a/build/profiles/fn_head/packages.pyd +++ b/build/profiles/fn_head/packages.pyd @@ -28,11 +28,6 @@ packages += { "template": "${PROFILE_ROOT}/packages/base-os" } -packages += { - "name": "docs", - "template": "${PROFILE_ROOT}/packages/docs" -} - packages += { "name": "freebsd-pkgdb", "template": "${PROFILE_ROOT}/packages/freebsd-pkgdb" diff --git a/build/profiles/fn_head/packages/docs/config b/build/profiles/fn_head/packages/docs/config deleted file mode 100644 index e7ef83f..0000000 --- a/build/profiles/fn_head/packages/docs/config +++ /dev/null @@ -1,18 +0,0 @@ -[Package] -name = docs -comment = "Release documentation" -desc = "Release documentation" -www = http://www.freenas.org/ -origin = freenas/os -maintainer = dev@ixsystems.com -prefix = / -arch = freebsd:9:x86:64 -licenselogic = or -licenses = [BSD, MIT, GPL] - -requires-reboot = False - -post-upgrade = true - -[Files] -include = /usr/local/www/data/docs \ No newline at end of file diff --git a/build/profiles/fn_head/ports-freenas.pyd b/build/profiles/fn_head/ports-freenas.pyd index 0af80c3..1ea6086 100644 --- a/build/profiles/fn_head/ports-freenas.pyd +++ b/build/profiles/fn_head/ports-freenas.pyd @@ -36,15 +36,6 @@ iocage_git_rev = sh("git -C ${BE_ROOT}/iocage log -1 --pretty=format:%ct") \ if exists("${BE_ROOT}/iocage") \ else "0" -if PRODUCT != "TrueNAS": - docs_git_rev = sh("git -C ${BE_ROOT}/freenas-docs log -1 --pretty=format:%ct") \ - if exists("${BE_ROOT}/freenas-docs") \ - else "0" - -docs_legacy_git_rev = sh("git -C ${BE_ROOT}/freenas-docs-legacy log -1 --pretty=format:%ct") \ - if exists("${BE_ROOT}/freenas-docs-legacy") \ - else "0" - ports += { "name": "freenas/freenas-files", "options": [ @@ -130,28 +121,6 @@ ports += { ] } -if PRODUCT != "TrueNAS": - ports += { - "name": "freenas/freenas-docs", - "options": [ - "PRODUCT=${PRODUCT}", - "PRODUCT_VERSION=${VERSION}", - "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}", - "REVISION=" + docs_git_rev - ] - } - - -ports += { - "name": "freenas/freenas-docs-legacy", - "options": [ - "PRODUCT=${PRODUCT}", - "PRODUCT_VERSION=${VERSION}", - "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}", - "REVISION=" + docs_legacy_git_rev - ] -} - ports += { "name": "freenas/pcbsd-warden", "options": [ diff --git a/build/profiles/fn_head/repos.pyd b/build/profiles/fn_head/repos.pyd index 9dac227..6f26de7 100644 --- a/build/profiles/fn_head/repos.pyd +++ b/build/profiles/fn_head/repos.pyd @@ -55,23 +55,6 @@ repos += { } -repos += { - "name": "freenas-docs-legacy", - "path": "freenas-docs-legacy", - "url": "http://github.com/freenas/freenas-docs.git", - "branch": "master" -} - - -if PRODUCT != "TrueNAS": - repos += { - "name": "freenas-docs", - "path": "freenas-docs", - "url": "http://github.com/freenas/freenas-docs.git", - "branch": "angulargui" - } - - repos += { "name": "ports", "path": "ports", diff --git a/build/profiles/freenas/jail.pyd b/build/profiles/freenas/jail.pyd index f2be57e..24d9d06 100644 --- a/build/profiles/freenas/jail.pyd +++ b/build/profiles/freenas/jail.pyd @@ -30,18 +30,6 @@ link += { "flags": "ro", } -if PRODUCT != "TrueNAS": - copy += { - "source": "${BE_ROOT}/freenas-docs", - "dest": "/usr/freenas_docs" - } - - -copy += { - "source": "${BE_ROOT}/freenas-docs-legacy", - "dest": "/usr/freenas_docs_legacy" -} - copy += { "source": "${BE_ROOT}/freenas/src", "dest": "/usr/nas_source" diff --git a/build/profiles/freenas/packages.pyd b/build/profiles/freenas/packages.pyd index d6af355..ca18855 100644 --- a/build/profiles/freenas/packages.pyd +++ b/build/profiles/freenas/packages.pyd @@ -28,11 +28,6 @@ packages += { "template": "${PROFILE_ROOT}/packages/base-os" } -packages += { - "name": "docs", - "template": "${PROFILE_ROOT}/packages/docs" -} - packages += { "name": "freebsd-pkgdb", "template": "${PROFILE_ROOT}/packages/freebsd-pkgdb" diff --git a/build/profiles/freenas/packages/docs/config b/build/profiles/freenas/packages/docs/config deleted file mode 100644 index e7ef83f..0000000 --- a/build/profiles/freenas/packages/docs/config +++ /dev/null @@ -1,18 +0,0 @@ -[Package] -name = docs -comment = "Release documentation" -desc = "Release documentation" -www = http://www.freenas.org/ -origin = freenas/os -maintainer = dev@ixsystems.com -prefix = / -arch = freebsd:9:x86:64 -licenselogic = or -licenses = [BSD, MIT, GPL] - -requires-reboot = False - -post-upgrade = true - -[Files] -include = /usr/local/www/data/docs \ No newline at end of file diff --git a/build/profiles/freenas/ports-freenas.pyd b/build/profiles/freenas/ports-freenas.pyd index 0af80c3..1ea6086 100644 --- a/build/profiles/freenas/ports-freenas.pyd +++ b/build/profiles/freenas/ports-freenas.pyd @@ -36,15 +36,6 @@ iocage_git_rev = sh("git -C ${BE_ROOT}/iocage log -1 --pretty=format:%ct") \ if exists("${BE_ROOT}/iocage") \ else "0" -if PRODUCT != "TrueNAS": - docs_git_rev = sh("git -C ${BE_ROOT}/freenas-docs log -1 --pretty=format:%ct") \ - if exists("${BE_ROOT}/freenas-docs") \ - else "0" - -docs_legacy_git_rev = sh("git -C ${BE_ROOT}/freenas-docs-legacy log -1 --pretty=format:%ct") \ - if exists("${BE_ROOT}/freenas-docs-legacy") \ - else "0" - ports += { "name": "freenas/freenas-files", "options": [ @@ -130,28 +121,6 @@ ports += { ] } -if PRODUCT != "TrueNAS": - ports += { - "name": "freenas/freenas-docs", - "options": [ - "PRODUCT=${PRODUCT}", - "PRODUCT_VERSION=${VERSION}", - "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}", - "REVISION=" + docs_git_rev - ] - } - - -ports += { - "name": "freenas/freenas-docs-legacy", - "options": [ - "PRODUCT=${PRODUCT}", - "PRODUCT_VERSION=${VERSION}", - "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}", - "REVISION=" + docs_legacy_git_rev - ] -} - ports += { "name": "freenas/pcbsd-warden", "options": [ diff --git a/build/profiles/freenas/repos.pyd b/build/profiles/freenas/repos.pyd index e3a401d..4b0e5fb 100644 --- a/build/profiles/freenas/repos.pyd +++ b/build/profiles/freenas/repos.pyd @@ -54,22 +54,6 @@ repos += { "branch": "master" } -repos += { - "name": "freenas-docs-legacy", - "path": "freenas-docs-legacy", - "url": "http://github.com/freenas/freenas-docs.git", - "branch": "master" -} - - -if PRODUCT != "TrueNAS": - repos += { - "name": "freenas-docs", - "path": "freenas-docs", - "url": "http://github.com/freenas/freenas-docs.git", - "branch": "angulargui" - } - repos += { "name": "ports", "path": "ports",