Skip to content

Commit 37aa451

Browse files
authored
Merge pull request #1814 from larsewi/build-docs
ENT-12600: Removed scripts related to building docs
2 parents 48e1c36 + bc28275 commit 37aa451

3 files changed

Lines changed: 4 additions & 44 deletions

File tree

build-remote

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ usage() {
4545
echo "-d /var/cfengine, --workdir=/var/cfengine"
4646
echo " Specify directory which will be CFEngine's workdir. Does not work for"
4747
echo " Windows binaries."
48-
echo "--release|--debug|--docs|--release-and-debug"
48+
echo "--release|--debug|--release-and-debug"
4949
echo " With or without debug symbols."
5050
echo "-v, --verbose"
5151
echo " Whether or not to echo the log as the build progresses."
@@ -64,7 +64,7 @@ usage() {
6464
}
6565

6666
opts() {
67-
OPTS=`getopt -o p:b:w:c:d:vht: --long project:,branch:,wix-machine:,cross-target:,workdir:,verbose,source:,role:,version:,release,debug,docs,help,test-machine:,test-shell,no-tests -n build-remote -- "$@"`
67+
OPTS=`getopt -o p:b:w:c:d:vht: --long project:,branch:,wix-machine:,cross-target:,workdir:,verbose,source:,role:,version:,release,debug,help,test-machine:,test-shell,no-tests -n build-remote -- "$@"`
6868

6969
eval set -- "$OPTS"
7070
echo "$?"
@@ -75,7 +75,6 @@ opts() {
7575
exit 1
7676
fi
7777

78-
DOCS=no
7978
PROJECT=nova
8079
BRANCH=master
8180
BUILD_TYPE=DEBUG
@@ -112,9 +111,6 @@ opts() {
112111
--debug)
113112
BUILD_TYPE=DEBUG
114113
shift;;
115-
--docs)
116-
DOCS=yes
117-
shift;;
118114
--source)
119115
SOURCE="$2"
120116
shift 2;;
@@ -161,7 +157,7 @@ opts() {
161157
REPOSITORY=$PROJECT-$BRANCH
162158
HOST=$1
163159

164-
export PROJECT BRANCH WIX_MACHINE CROSS_TARGET HOST BUILD_TYPE BUILD_NUMBER DOCS EXPLICIT_ROLE EXPLICIT_VERSION TEST_MACHINE TEST_SHELL PREFIX
160+
export PROJECT BRANCH WIX_MACHINE CROSS_TARGET HOST BUILD_TYPE BUILD_NUMBER EXPLICIT_ROLE EXPLICIT_VERSION TEST_MACHINE TEST_SHELL PREFIX
165161

166162
export SCHEDULER=$PROJECT-$BRANCH-localbuild
167163
}
@@ -279,12 +275,6 @@ checkout() {
279275
esac
280276
}
281277

282-
build_docs() {
283-
remote_script configure-docs
284-
remote_script compile
285-
remote_script upload-docs
286-
}
287-
288278
build() {
289279
remote_script configure
290280
remote_script compile
@@ -318,12 +308,7 @@ common_build() {
318308
remote_script clean-buildmachine
319309
remote_script install-dependencies
320310

321-
case "$DOCS" in
322-
yes)
323-
build_docs;;
324-
no)
325-
build;;
326-
esac
311+
build
327312
}
328313

329314
opts "$@"

build-scripts/configure-docs

Lines changed: 0 additions & 11 deletions
This file was deleted.

build-scripts/upload-docs

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)