Skip to content

Commit

Permalink
Code autogenerated from Kurento/doc-kurento@267cf88
Browse files Browse the repository at this point in the history
  • Loading branch information
jenkinskurento committed Mar 16, 2021
1 parent 4309751 commit ecf690d
Show file tree
Hide file tree
Showing 59 changed files with 871 additions and 939 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ help:
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
@echo " langdoc to make JavaDocs and JsDocs of the Kurento Clients"
@echo " dist to make <langdoc html epub latexpdf> and then pack"
@echo " all resulting files as kurento-doc-6.16.0.tgz"
@echo " all resulting files as kurento-doc-6.16.1-dev.tgz"
@echo " readthedocs to make <langdoc> and then copy the results to the"
@echo " Sphinx theme's static folder"
@echo ""
Expand Down Expand Up @@ -63,7 +63,7 @@ langdoc-client-java: langdoc-init
cd $(WORKPATH)
git clone https://github.com/Kurento/kurento-java.git
cd kurento-java
[ "true" = "true" ] && git checkout "6.16.0"
[ "false" = "true" ] && git checkout "6.16.0"
cd kurento-client || { echo "ERROR: 'cd' failed, ls:"; ls -lA; exit 1; }
mvn --batch-mode --quiet clean package \
-DskipTests || { echo "ERROR: 'mvn clean' failed"; exit 1; }
Expand All @@ -77,7 +77,7 @@ langdoc-client-js: langdoc-init
cd $(WORKPATH)
git clone https://github.com/Kurento/kurento-client-js.git
cd kurento-client-js
[ "true" = "true" ] && git checkout "6.16.0"
[ "false" = "true" ] && git checkout "6.16.0"
npm install --no-color
node_modules/.bin/grunt --no-color --force jsdoc \
|| { echo "ERROR: 'grunt jsdoc' failed"; exit 1; }
Expand All @@ -87,7 +87,7 @@ langdoc-utils-js: langdoc-init
cd $(WORKPATH)
git clone https://github.com/Kurento/kurento-utils-js.git
cd kurento-utils-js
[ "true" = "true" ] && git checkout "6.16.0"
[ "false" = "true" ] && git checkout "6.16.0"
npm install --no-color
node_modules/.bin/grunt --no-color --force jsdoc \
|| { echo "ERROR: 'grunt jsdoc' failed"; exit 1; }
Expand All @@ -96,7 +96,7 @@ langdoc-utils-js: langdoc-init
langdoc: langdoc-client-java langdoc-client-js langdoc-utils-js

dist: langdoc html epub latexpdf
$(eval DISTDIR := $(BUILDDIR)/dist/kurento-doc-6.16.0)
$(eval DISTDIR := $(BUILDDIR)/dist/kurento-doc-6.16.1-dev)
mkdir -p $(DISTDIR)
rsync -a $(BUILDDIR)/html $(BUILDDIR)/epub/Kurento.epub \
$(BUILDDIR)/latex/Kurento.pdf $(DISTDIR)
Expand Down
4 changes: 2 additions & 2 deletions VERSIONS.conf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# shellcheck disable=SC2034
declare -A PROJECT_VERSIONS=(
# Version of the documentation itself; it appears in the main menu
[VERSION_DOC]="6.16.0"
[VERSION_DOC]="6.16.1-dev"

# Version of Kurento Media Server
[VERSION_KMS]="6.16.0"
Expand All @@ -33,7 +33,7 @@ declare -A PROJECT_VERSIONS=(
# Indicates if the current state of this code is Release or Nightly.
# If "true", all mentioned repos will be checked out to the corresponding
# versions; otherwise, they will be kept at the default branch (master).
[VERSION_RELEASE]="true"
[VERSION_RELEASE]="false"
)

# If the build is not for a release, then some versions can be set to more
Expand Down
2 changes: 1 addition & 1 deletion source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# built documents.

# The short X.Y version.
version = '6.16.0'
version = '6.16.1-dev'

# The full version, including alpha/beta/rc tags.
release = version
Expand Down
4 changes: 2 additions & 2 deletions source/dev/dev_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ Run these commands to add the Kurento repository to your system configuration:
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5AFA7A83
# Get Ubuntu version definitions
source /etc/upstream-release/lsb-release 2>/dev/null || source /etc/lsb-release
source /etc/lsb-release
# Add the repository to Apt
sudo tee "/etc/apt/sources.list.d/kurento.list" >/dev/null <<EOF
Expand Down Expand Up @@ -317,7 +317,7 @@ After having :doc:`installed Kurento </user/installation>`, first thing to do is
--recv-keys F2EDC64DC5AEE1F6B9C621F0C8CAB6595FDFF622
# Get Ubuntu version definitions
source /etc/upstream-release/lsb-release 2>/dev/null || source /etc/lsb-release
source /etc/lsb-release
# Add the repository to Apt
sudo tee "/etc/apt/sources.list.d/ddebs.list" >/dev/null <<EOF
Expand Down

0 comments on commit ecf690d

Please sign in to comment.