Don't put trytond-doc in 'modules' directory: updated userdoc.cfg and create-doc-symlinks.sh

This commit is contained in:
Guillem Barba 2013-05-07 10:56:51 +02:00
parent 953d246950
commit e242f392ef
2 changed files with 20 additions and 11 deletions

View File

@ -4,10 +4,10 @@
# src=$2
dst=../userdoc
src0=../trytond-doc
src=../trytond/trytond/modules
if [[ -z "$dst" || -z "$src" ]]; then
if [[ -z "$dst" || -z "$src" || -z "$src0" ]]; then
echo "Use create-symlinks.sh <destination_directory> <source_path>"
echo
echo "directory should point to the addons directory of the server"
@ -16,9 +16,17 @@ fi
if [ -d "$dst" ]; then
pushd $dst
srclog0=$(cd $src0 2>&1)
if [ -n "$srclog0" ]; then
echo "the '$src0' as source directory must exist."
echo
echo " Err: '$srclog0'"
echo
exit 1
fi
srclog=$(cd $src 2>&1)
if [ -n "$srclog" ]; then
echo "the '$src' as destination directory must exist."
echo "the '$src' as source directory must exist."
echo
echo " Err: '$srclog'"
echo
@ -50,10 +58,11 @@ fi
# exit 1
#fi
pushd $dst
pushd $dst
# We exclude paths with hidden directories
list=$(find $src -type d -iname "doc" | grep -v "/\.")
list=$(find $src -type d -name "doc" | grep -v "/\.")
list+=$(find $src0 -type d -name "doc" | grep -v "/\.")
for i in $list; do
# if ! test -f "$i/../tryton.cfg"; then
@ -74,6 +83,6 @@ for i in $list; do
done
echo "create symlink for the master_root file"
ln -s $src/trytond-doc/trytond_doc/userdoc/index.rst.es index.rst
ln -s $src0/trytond_doc/userdoc/index.rst.es index.rst
popd

View File

@ -3,7 +3,7 @@
# local.cfg
extensions = mr.developer
sources = sources
sources-dir = ../trytond/trytond/modules
trytond-doc-dir = ../trytond-doc
userdoc-dir = ../userdoc
# Shared directories:
@ -29,7 +29,7 @@ parts =
[sources]
trytond-doc = hg ssh://hg@bitbucket.org/trytonspain/trytond-doc egg=False
trytond-doc = hg ssh://hg@bitbucket.org/trytonspain/trytond-doc full-path=../trytond-doc egg=False
[userdoc-requirements]
@ -37,19 +37,19 @@ trytond-doc = hg ssh://hg@bitbucket.org/trytonspain/trytond-doc egg=False
#eggs =
# sphinxcontrib-inheritance
recipe = collective.recipe.template
input = ${buildout:sources-dir}/trytond-doc/trytond_doc/userdoc/requirements.txt
input = ${buildout:trytond-doc-dir}/trytond_doc/userdoc/requirements.txt
output = ${buildout:userdoc-dir}/requirements.txt
[userdoc-makefile]
recipe = collective.recipe.template
input = ${buildout:sources-dir}/trytond-doc/trytond_doc/userdoc/Makefile
input = ${buildout:trytond-doc-dir}/trytond_doc/userdoc/Makefile
output = ${buildout:userdoc-dir}/Makefile
[userdoc-config]
recipe = collective.recipe.template
input = ${buildout:sources-dir}/trytond-doc/trytond_doc/userdoc/conf.py.template
input = ${buildout:trytond-doc-dir}/trytond_doc/userdoc/conf.py.template
output = ${buildout:userdoc-dir}/conf.py
# Redefine variables you want to customize in the local.cfg file
project_title = u'Tryton'