From: Regina Obe Date: Sun, 18 Mar 2018 04:59:30 +0000 (+0000) Subject: Fix sed replace that injects UTC date and SVN revision number X-Git-Tag: 2.5.0alpha~59 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2baed741bf5b1f0e69f553b938b7588a7c90d01;p=postgis Fix sed replace that injects UTC date and SVN revision number Change to just build BR and DE for now References #4047 git-svn-id: http://svn.osgeo.org/postgis/trunk@16468 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh index d600acc77..580e0cf9f 100644 --- a/ci/debbie/postgis_release_docs.sh +++ b/ci/debbie/postgis_release_docs.sh @@ -48,9 +48,13 @@ cd doc echo "Micro: $POSTGIS_MICRO_VERSION" #inject a development time stamp if we are in development branch if [[ "$POSTGIS_MICRO_VERSION" == *"dev"* ]]; then - mv postgis.xml postgis.xml.orig + #mv postgis.xml postgis.xml.orig export GIT_TIMESTAMP=`git log -1 --pretty=format:%ct` - sed -e "s::REV: ${VREV} DEV TIMESTAMP (${GIT_TIMESTAMP}):" postgis.xml.orig > postgis.xml + export GIT_TIMESTAMP="`date -d @$GIT_TIMESTAMP`" #convert to UTC date + echo "GIT_TIMESTAMP: ${GIT_TIMESTAMP}" + export part_old="" + export part_new="DEV ($GIT_TIMESTAMP r$VREV)" + sed -i 's,'"$part_old"','"$part_new"',' postgis.xml fi make pdf @@ -60,14 +64,13 @@ cp html/images/* images make epub make -e chunked-html 2>&1 | tee -a doc-errors.log -#if [[ "$reference" == *"trunk"* ]]; then #only do this for trunk because only trunk follows transifex - #make update-po - # make -C po/it_IT/ local-html - # make -C po/pt_BR/ local-html - # make -C po/ja/ local-html - # make -C po/de/ local-html - # make -C po/pt_BR/ local-html - # make -C po/ko_KR/ local-html +if [[ "$reference" == *"trunk"* ]]; then #only do this for trunk because only trunk follows transifex + #make update-po + #make -C po/it_IT/ local-html + make -C po/pt_BR/ local-html + #make -C po/ja/ local-html + make -C po/de/ local-html + #make -C po/ko_KR/ local-html #make pdf-localized #fi @@ -93,4 +96,3 @@ if [[ "$POSTGIS_MICRO_VERSION" == *"dev"* ]]; then #rename the files without the mv /var/www/postgis_stuff/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf /var/www/postgis_stuff/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.pdf mv /var/www/postgis_stuff/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.epub /var/www/postgis_stuff/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.epub fi -