Commit 29d922d9 authored by Stefan Funk's avatar Stefan Funk
Browse files

Merge branch 'release/2019-01-25'

parents f7b288dd 78f15a41
[submodule "docs/submodules/oai-pmh"]
path = docs/submodules/oai-pmh
url = git://projects.gwdg.de/dariah-de/tg/textgrid-repository/oai-pmh.git
branch = develop
[submodule "docs/submodules/kolibri"]
path = docs/submodules/kolibri
url = git://projects.gwdg.de/dariah-de/kolibri.git
branch = develop
[submodule "docs/submodules/tg-crud"]
path = docs/submodules/tg-crud
url = git://projects.gwdg.de/dariah-de/tg/textgrid-repository/tg-crud.git
branch = develop
[submodule "docs/submodules/publikator"]
path = docs/submodules/publikator
url = git://projects.gwdg.de/dariah-de/dariah-de-repository/publikator.git
......@@ -14,3 +17,4 @@
[submodule "docs/submodules/tg-digilib"]
path = docs/submodules/tg-digilib
url = git://projects.gwdg.de/dariah-de/tg/textgrid-services/tg-digilib.git
branch = develop
......@@ -10,16 +10,15 @@ node {
stage('Build') {
sh '''
echo "-- Updating submodules"
git submodule init &&
echo "-- Initialising submodules"
git submodule init
echo "-- Updating submodules"
git submodule update --force --remote &&
umask 0022
cd docs
echo "-- Setting up Virtualenv"
echo "-- Setting up virtualenv"
virtualenv venv
pwd
. venv/bin/activate
......@@ -27,13 +26,46 @@ node {
echo "-- Installing requirements"
pip install -r requirements.txt
echo "-- Building HTML version within $(pwd)"
make clean html
echo "-- Building overall HTML and PDF version within $(pwd)"
make clean html latexpdf
echo "-- Copy overall PDF to HTMl folder"
cp _build/latex/dhrep_doc.pdf _build/html
echo "-- Building DH-publish PDF"
cd submodules/kolibri/kolibri-dhpublish-service/docs
make clean latexpdf
cp -f _build/latex/dhpublish_doc.pdf ../../../../_build/html/submodules/kolibri/kolibri-dhpublish-service/docs
cd ../../../..
echo "-- Building DH-import PDF"
echo "++ TODO ++"
echo "-- Building DH-digilib PDF"
cd submodules/tg-digilib/docs_dhrep
make clean latexpdf
cp -f _build/latex/dhdigilib_doc.pdf ../../../_build/html/submodules/tg-digilib/docs_dhrep
cd ../../..
echo "-- Building DH-oaipmh PDF"
cd submodules/oai-pmh/docs_dhrep
make clean latexpdf
cp -f _build/latex/dhoaipmh_doc.pdf ../../../_build/html/submodules/oai-pmh/docs_dhrep
cd ../../..
echo "-- Building Publikator PDF"
cd submodules/publikator/docs
make clean latexpdf
cp -f _build/latex/publikator_doc_en.pdf ../../../_build/html/submodules/publikator/docs
cp -f _build/latex/publikator_doc_de.pdf ../../../_build/html/submodules/publikator/docs
cd ../../..
echo "-- Building PDF version withn $(pwd)"
make latexpdf
echo "-- Building DH-crud PDF"
cd submodules/tg-crud/services/dhcrud-webapp-public/docs
make clean latexpdf;
cp -f _build/latex/dhcrud_doc.pdf ../../../../../_build/html/submodules/tg-crud/services/dhcrud-webapp-public/docs
cd ../../../../..
echo "-- Creating package"
echo "-- Creating Documentation DEB package"
VERSION=$(grep ^version conf.py | sed \'s/version = \'\\\'\'\\(.*\\)\'\\\'\'/\\1/g\')
fpm -t deb -a noarch -s dir --name dariah-de-doc \
......@@ -41,7 +73,7 @@ node {
--maintainer='DARIAH-DE <info@de.dariah.eu>' \
--vendor='DARIAH-DE' \
--url='https://de.dariah.eu' \
--iteration $(expr $BUILD_NUMBER + 299) \
--iteration $(expr $BUILD_NUMBER + 929) \
--version $VERSION \
-x ".git**" \
-x "**/.git**" \
......@@ -60,10 +92,10 @@ node {
def snapshot = dVersion.contains("SNAPSHOT")
if (snapshot) {
doDebSnapshot('dariah-de-doc', '.', dVersion, 'trusty')
doDebSnapshot('dariah-de-doc', './docs', dVersion, 'trusty')
}
else {
doDebRelease('dariah-de-doc', '.', dVersion, 'trusty')
doDebRelease('dariah-de-doc', './docs', dVersion, 'trusty')
}
}
}
......@@ -58,11 +58,12 @@ copyright = u'2019, DARIAH-DE'
# The short X.Y version.
# NOTE: Please use "2019-SNAPSHOT" for snapshot deployment, and
# "2019" (without suffix) for release deployment!
version = '2019-SNAPSHOT'
#version = '2019'
#version = '2019-SNAPSHOT'
version = '2019'
# The full version, including alpha/beta/rc tags.
release = '2019'
# Please put here the release date as release version!
release = '2019-0-25'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......@@ -204,10 +205,10 @@ htmlhelp_basename = 'DariahRepositoryDoc'
latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper',
'papersize': 'a4paper',
# The font size ('10pt', '11pt' or '12pt').
#'pointsize': '10pt',
'pointsize': '12pt',
# Additional stuff for the LaTeX preamble.
#'preamble': '',
......@@ -217,13 +218,13 @@ latex_elements = {
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
('index', 'DariahRepository.tex', u'DARIAH-DE Repository Documentation',
('index', 'dhrep_doc.tex', u'DARIAH-DE Repository Documentation',
u'DARIAH-DE', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
# the title page.
#latex_logo = None
latex_logo = '_static/dariah_logo.svg'
# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
......@@ -261,8 +262,8 @@ man_pages = [
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
('index', 'DARIAH-DE Repository Documentation', u'DARIAH-DE Data Repository Documentation',
u'DARIAH-DE', 'DariahRepository', 'One line description of project.',
('index', 'DARIAH-DE Repository Documentation', u'DARIAH-DE Repository Documentation',
u'DARIAH-DE', 'DariahRepository', 'DARIAH-DE Repository Documentation',
'Miscellaneous'),
]
......
......@@ -3,6 +3,8 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
A PFD version of the complete DARIAH-DE Repository Documentation you can find `HERE <./dhrep_doc.pdf>`__.
======================================
The DARIAH-DE Repository Documentation
......
kolibri @ 5a6d18f0
Subproject commit 8a79d662adf2dd1e610add159ee5334c98cbd569
Subproject commit 5a6d18f051d182c66e7d81b7ebb48483e9162a1e
publikator @ 877e06e3
Subproject commit 73a32a3e4ba999fab542fce230b7d79df5de9e86
Subproject commit 877e06e3cd60fecb1e65558641b6b902c4ccf71f
tg-digilib @ 040332bc
Subproject commit 85e327fa1268d7287204cc2c7166f7d25975ae73
Subproject commit 040332bcc844d03d626b8bcebcea50667a1a2b02
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment