diff options
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | docs/source/conf.py | 4 | ||||
| -rw-r--r-- | docs/source/faq.rst | 5 | ||||
| -rw-r--r-- | docs/source/index.rst | 5 | ||||
| -rwxr-xr-x | travis/add_deploy_key.sh | 8 | ||||
| -rwxr-xr-x | travis/before_install.sh | 6 | ||||
| -rwxr-xr-x | travis/build_docs.sh | 7 | ||||
| -rwxr-xr-x | travis/deploy_website.sh | 23 | ||||
| -rwxr-xr-x | travis/docker.sh | 8 | ||||
| -rw-r--r-- | travis/projdocs-private.key.enc | bin | 0 -> 1680 bytes |
10 files changed, 72 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index b7d6dc68..7761baad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,23 +3,23 @@ language: c -sudo: false +services: + docker compiler: - gcc - - clang +# - clang os: - linux - - osx +# - osx matrix: exclude: - os: osx compiler: gcc -before_install: - - pip install --user cpp-coveralls +before_install: ./travis/before_install.sh install: # prepare build files @@ -104,6 +104,9 @@ script: after_success: - coveralls --extension .c + - echo "$TRAVIS_SECURE_ENV_VARS" + - sh -c "./travis/build_docs.sh" + - sh -c 'if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "master"; then echo "publish website"; ./travis/add_deploy_key.sh; ./travis/deploy_website.sh $TRAVIS_BUILD_DIR/docs/build /tmp; fi' notifications: #email: diff --git a/docs/source/conf.py b/docs/source/conf.py index 5f6f3125..c7277947 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -49,7 +49,7 @@ master_doc = 'index' # General information about the project. project = u'proj.4' -copyright = u'1992-2016, Gerald Evenden, Frank Warmerdam, and others' +copyright = u'1986?-2016' author = u'Gerald Evenden' # The version info for the project you're documenting, acts as replacement for @@ -214,7 +214,7 @@ html_static_path = ['_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' +html_last_updated_fmt = '%d %b %Y' # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. diff --git a/docs/source/faq.rst b/docs/source/faq.rst index a289494c..929386df 100644 --- a/docs/source/faq.rst +++ b/docs/source/faq.rst @@ -4,6 +4,11 @@ FAQ ****************************************************************************** +.. contents:: Contents + :depth: 3 + :backlinks: none + + Where can I find the list of projections and their arguments? -------------------------------------------------------------------------------- diff --git a/docs/source/index.rst b/docs/source/index.rst index 86dda51f..1e9e3509 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -4,6 +4,11 @@ proj.4 ****************************************************************************** +proj.4 is a standard Unix filter function which converts geographic longitude +and latitude coordinates into cartesian coordinates (and vice versa), and it is +a C API for software developers to include coordinate transformation in their +own software. + ============= ================================================================ Platform Test Status and Coverage diff --git a/travis/add_deploy_key.sh b/travis/add_deploy_key.sh new file mode 100755 index 00000000..6f451aed --- /dev/null +++ b/travis/add_deploy_key.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +openssl aes-256-cbc -K $encrypted_38e0a668034a_key -iv $encrypted_38e0a668034a_iv -in travis/projdocs-private.key.enc -out travis/projdocs-private.key -d +cp travis/projdocs-private.key ~/.ssh/id_rsa +chmod 600 ~/.ssh/id_rsa +echo -e "Host *\n\tStrictHostKeyChecking no\n" > ~/.ssh/config + + diff --git a/travis/before_install.sh b/travis/before_install.sh new file mode 100755 index 00000000..8a4bbd24 --- /dev/null +++ b/travis/before_install.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +pip install --user cpp-coveralls +./travis/docker.sh + + diff --git a/travis/build_docs.sh b/travis/build_docs.sh new file mode 100755 index 00000000..cc8f5ccd --- /dev/null +++ b/travis/build_docs.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +cd docs +echo "building docs for $TRAVIS_BUILD_DIR/docs" +docker run -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj.4 make html + + diff --git a/travis/deploy_website.sh b/travis/deploy_website.sh new file mode 100755 index 00000000..9a3e6dfc --- /dev/null +++ b/travis/deploy_website.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +builddir=$1 +destdir=$2 + + +git clone git@github.com:OSGeo/proj.4.git $destdir/proj4docs +cd $destdir/proj4docs +git checkout gh-pages + + +cd $builddir/html +cp -rf * $destdir/proj4docs + +cd $destdir/proj4docs +git config user.email "proj4bot@proj4.bot" +git config user.name "proj.4 deploybot" + + +git add -A +git commit -m "update with results of commit https://github.com/OSGeo/proj.4/commit/$TRAVIS_COMMIT" +git push origin gh-pages + diff --git a/travis/docker.sh b/travis/docker.sh new file mode 100755 index 00000000..aef7f2d2 --- /dev/null +++ b/travis/docker.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# proj.4 image has all of the Sphinx +# dependencies need to build proj.4's docs + +docker pull osgeo/proj.4 + + diff --git a/travis/projdocs-private.key.enc b/travis/projdocs-private.key.enc Binary files differnew file mode 100644 index 00000000..b2aab438 --- /dev/null +++ b/travis/projdocs-private.key.enc |