prod: allow building without documentation

egidx · Mar 23, 2020 · 692ba08 · 692ba08
1 parent 3d7fa31
commit 692ba08
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/releng/build-omnetpp-in-docker b/releng/build-omnetpp-in-docker
@@ -6,6 +6,7 @@ export BUILD_CORE_DISTRO=true
 export BUILD_LINUX_DISTRO=true
 export BUILD_WIN64_DISTRO=true
 export BUILD_MACOSX_DISTRO=true
+export BUILD_DOC=true
 export GIT_VERSION=master
 
 . $(dirname $0)/docker-build.sh
diff --git a/releng/docker-build.sh b/releng/docker-build.sh
@@ -3,7 +3,7 @@
 cd `dirname $0`/..
 OMNETPP_ROOT=`pwd`
 
-docker run --network none -v "$OMNETPP_ROOT":/root/omnetpp-repo -e what -e GIT_VERSION \
+docker run --network none -v "$OMNETPP_ROOT":/root/omnetpp-repo -e what -e GIT_VERSION -e BUILD_DOC \
        -e BUILD_CORE_DISTRO -e BUILD_LINUX_DISTRO -e BUILD_WIN64_DISTRO -e BUILD_MACOSX_DISTRO \
        omnetpp/distrobuild:eclipse4.14-tools190729-191219 && \
 docker cp $(docker ps -lq):/root/omnetpp/out/dist/ releng && \

diff --git a/releng/makedist b/releng/makedist
@@ -176,28 +176,31 @@ git reset
 
 ###############################
 # copy the generated documentation
-echo Copying generated documentation
-
-checkfile doc/SimulationManual.pdf               'SimulationManual.pdf must exist in doc/'
-checkfile doc/UserGuide.pdf            'UserGuide.pdf must exist in doc/'
-checkfile doc/IDE-CustomizationGuide.pdf      'IDE-CustomizationGuide.pdf must exist in doc/'
-checkfile doc/IDE-DevelopersGuide.pdf      'IDE-DevelopersGuide.pdf must exist in doc/'
-checkfile doc/InstallGuide.pdf    'InstallGuide.pdf must exist in doc/'
-
-cp -r doc/api $DISTDIR/$what-$VERSION/doc/api
-cp -r doc/parsim-api $DISTDIR/$what-$VERSION/doc/parsim-api
-cp -r doc/nedxml-api $DISTDIR/$what-$VERSION/doc/nedxml-api
-cp -r doc/manual $DISTDIR/$what-$VERSION/doc/manual
-# cp -r doc/ide-customization-guide $DISTDIR/$what-$VERSION/doc/ide-customization-guide
-# cp -r doc/ide-developersguide $DISTDIR/$what-$VERSION/doc/ide-developersguide
-# cp -r doc/userguide $DISTDIR/$what-$VERSION/doc/userguide
-cp doc/SimulationManual.pdf $DISTDIR/$what-$VERSION/doc
-cp doc/InstallGuide.pdf $DISTDIR/$what-$VERSION/doc
-cp doc/UserGuide.pdf $DISTDIR/$what-$VERSION/doc
-cp doc/IDE-CustomizationGuide.pdf $DISTDIR/$what-$VERSION/doc
-cp doc/IDE-DevelopersGuide.pdf $DISTDIR/$what-$VERSION/doc
-cp doc/IDE-Overview.pdf $DISTDIR/$what-$VERSION/doc
-cp ui/ChangeLog $DISTDIR/$what-$VERSION/doc/IDE-Changes
+if test -z "$BUILD_DOC"; then
+
+  echo Copying generated documentation
+
+  checkfile doc/SimulationManual.pdf               'SimulationManual.pdf must exist in doc/'
+  checkfile doc/UserGuide.pdf            'UserGuide.pdf must exist in doc/'
+  checkfile doc/IDE-CustomizationGuide.pdf      'IDE-CustomizationGuide.pdf must exist in doc/'
+  checkfile doc/IDE-DevelopersGuide.pdf      'IDE-DevelopersGuide.pdf must exist in doc/'
+  checkfile doc/InstallGuide.pdf    'InstallGuide.pdf must exist in doc/'
+
+  cp -r doc/api $DISTDIR/$what-$VERSION/doc/api
+  cp -r doc/parsim-api $DISTDIR/$what-$VERSION/doc/parsim-api
+  cp -r doc/nedxml-api $DISTDIR/$what-$VERSION/doc/nedxml-api
+  cp -r doc/manual $DISTDIR/$what-$VERSION/doc/manual
+  # cp -r doc/ide-customization-guide $DISTDIR/$what-$VERSION/doc/ide-customization-guide
+  # cp -r doc/ide-developersguide $DISTDIR/$what-$VERSION/doc/ide-developersguide
+  # cp -r doc/userguide $DISTDIR/$what-$VERSION/doc/userguide
+  cp doc/SimulationManual.pdf $DISTDIR/$what-$VERSION/doc
+  cp doc/InstallGuide.pdf $DISTDIR/$what-$VERSION/doc
+  cp doc/UserGuide.pdf $DISTDIR/$what-$VERSION/doc
+  cp doc/IDE-CustomizationGuide.pdf $DISTDIR/$what-$VERSION/doc
+  cp doc/IDE-DevelopersGuide.pdf $DISTDIR/$what-$VERSION/doc
+  cp doc/IDE-Overview.pdf $DISTDIR/$what-$VERSION/doc
+  cp ui/ChangeLog $DISTDIR/$what-$VERSION/doc/IDE-Changes
+fi
 
 ###############################
 # copy the "ide" directory