From 8304fb4e947272485a026830e4b9912099959f35 Mon Sep 17 00:00:00 2001 From: Richard Russon Date: Tue, 17 Jul 2018 01:16:05 +0100 Subject: [PATCH] fix build --- .travis.yml | 44 ++++++-- .travis/deploy.sh | 84 --------------- .travis/generate-webpage.sh | 169 ------------------------------- .travis/prep.sh | 17 ---- .travis/stats.sh | 24 ----- .travis/travis-deploy-github.enc | Bin 3248 -> 0 bytes functions.h | 1 + init.h | 1 + 8 files changed, 38 insertions(+), 302 deletions(-) delete mode 100755 .travis/deploy.sh delete mode 100755 .travis/generate-webpage.sh delete mode 100755 .travis/prep.sh delete mode 100755 .travis/stats.sh delete mode 100644 .travis/travis-deploy-github.enc diff --git a/.travis.yml b/.travis.yml index c41f91035..957e61833 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,23 +10,51 @@ dist: trusty language: c compiler: gcc +cache: ccache addons: apt: packages: + - autopoint + - docbook-simple + - docbook-xsl - gettext + - libdb-dev + - libgdbm-dev + - libgnutls-dev + - libgpgme11-dev + - libgss-dev + - libkyotocabinet-dev + - liblmdb-dev + - liblua5.2-dev + - libnotmuch-dev + - libqdbm-dev + - libsasl2-dev + - libslang2-dev + - libssl-dev + - libtokyocabinet-dev + - libxml2-utils + - lua5.2 + - lynx + - xsltproc git: depth: 3 -env: - global: - - DEPLOY_REPO="git@github.com:neomutt/neomutt.github.io.git" - - DEPLOY_DIR="~/website" - - DEPLOY_FILE="translate.html" +install: + - git clone --depth 1 https://github.com/neomutt/travis-build.git ~/config + +before_script: + - ccache --zero-stats + - export ANSI_CLEAR + - export -f travis_fold + - export -f travis_nanoseconds + - export -f travis_time_finish + - export -f travis_time_start script: -- .travis/stats.sh + - ~/config/build + +after_script: + - ccache --show-stats -after_success: -- .travis/deploy.sh diff --git a/.travis/deploy.sh b/.travis/deploy.sh deleted file mode 100755 index 234650547..000000000 --- a/.travis/deploy.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -set -o errexit # set -e -set -o nounset # set -u - -function calc_percentage() -{ - local FILE="$1" - local TNUM=0 - local FNUM=0 - local UNUM=0 - local LINE - - LINE="$(msgfmt --statistics -c -o /dev/null "$FILE" 2>&1 | sed 's/ \(message\|translation\)s*\.*//g')" - - # filename: 104 translated, 22 fuzzy, 11 untranslated - if [[ "$LINE" =~ ([0-9]+)[[:space:]]translated,[[:space:]]([0-9]+)[[:space:]]fuzzy,[[:space:]]([0-9]+)[[:space:]]untranslated ]]; then - TNUM=${BASH_REMATCH[1]} # translated - FNUM=${BASH_REMATCH[2]} # fuzzy - UNUM=${BASH_REMATCH[3]} # untranslated - # filename: 320 translated, 20 untranslated - elif [[ "$LINE" =~ ([0-9]+)[[:space:]]translated,[[:space:]]([0-9]+)[[:space:]]untranslated ]]; then - TNUM=${BASH_REMATCH[1]} # translated - UNUM=${BASH_REMATCH[2]} # untranslated - # filename: 5 translated, 13 fuzzy - elif [[ "$LINE" =~ ([0-9]+)[[:space:]]translated,[[:space:]]([0-9]+)[[:space:]]fuzzy ]]; then - TNUM=${BASH_REMATCH[1]} # translated - FNUM=${BASH_REMATCH[2]} # fuzzy - # filename: 63 translated - elif [[ "$LINE" =~ ([0-9]+)[[:space:]]translated ]]; then - TNUM=${BASH_REMATCH[1]} # translated - fi - - # number of translated strings - local TOTAL=$((TNUM+FNUM+UNUM)) - # percentage complete - echo $((100*TNUM/TOTAL)) -} - - -echo "DEPLOY_DIR = $DEPLOY_DIR" -echo "DEPLOY_FILE = $DEPLOY_FILE" -echo "DEPLOY_REPO = $DEPLOY_REPO" -echo "TRAVIS_BRANCH = $TRAVIS_BRANCH" -echo "TRAVIS_COMMIT = $TRAVIS_COMMIT" -echo "TRAVIS_PULL_REQUEST = $TRAVIS_PULL_REQUEST" - -if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then - echo "This is a Pull Request. Done." - exit 0 -fi - -if [ "$TRAVIS_BRANCH" != "translate" ]; then - echo "This isn't branch 'translate'. Done." - exit 0 -fi - -FILES="$(git diff --name-only "$TRAVIS_COMMIT^..$TRAVIS_COMMIT" -- 'po/*.po')" -FILE_COUNT="$(echo "$FILES" | wc -w)" - -if [ "$FILE_COUNT" = 1 ]; then - AUTHOR="$(git log -n1 --format="%aN" "$TRAVIS_COMMIT")" - PO="${FILES##*/}" - PO="${PO%.po}" - PCT=$(calc_percentage "$FILES") - MESSAGE="$AUTHOR, $PO, $PCT%" -else - MESSAGE="update leaderboard" -fi - -.travis/prep.sh - -set -v -eval "$(ssh-agent -s)" -ssh-add .travis/travis-deploy-github.pem - -git clone "$DEPLOY_REPO" "$DEPLOY_DIR" -.travis/generate-webpage.sh po/*.po > "$DEPLOY_DIR/$DEPLOY_FILE" - -cd "$DEPLOY_DIR" -git add "$DEPLOY_FILE" -git commit -m "[AUTO] translation: $MESSAGE" -m "[ci skip]" -git push origin - diff --git a/.travis/generate-webpage.sh b/.travis/generate-webpage.sh deleted file mode 100755 index 50db59250..000000000 --- a/.travis/generate-webpage.sh +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/bash - -function lookup_lang() -{ - case "${1##*/}" in - eu) IMG="basque.png"; NAME="Basque";; - bg) IMG="bulgarian.png"; NAME="Bulgarian";; - ca) IMG="catalan.png"; NAME="Catalan";; - zh_CN) IMG="chinese-simplified.png"; NAME="Chinese (Simplified)";; - zh_TW) IMG="chinese-traditional.png"; NAME="Chinese (Traditional)";; - cs) IMG="czech.png"; NAME="Czech";; - da) IMG="danish.png"; NAME="Danish";; - nl) IMG="dutch.png"; NAME="Dutch";; - en_GB) IMG="english.png"; NAME="English (British)";; - eo) IMG="esperanto.png"; NAME="Esperanto";; - et) IMG="estonian.png"; NAME="Estonian";; - fr) IMG="french.png"; NAME="French";; - gl) IMG="galician.png"; NAME="Galician";; - de) IMG="german.png"; NAME="German";; - el) IMG="greek.png"; NAME="Greek";; - hu) IMG="hungarian.png"; NAME="Hungarian";; - id) IMG="indonesian.png"; NAME="Indonesian";; - ga) IMG="irish.png"; NAME="Irish";; - it) IMG="italian.png"; NAME="Italian";; - ja) IMG="japanese.png"; NAME="Japanese";; - ko) IMG="korean.png"; NAME="Korean";; - lt) IMG="lithuanian.png"; NAME="Lithuanian";; - pl) IMG="polish.png"; NAME="Polish";; - pt_BR) IMG="portuguese-brazil.png"; NAME="Portuguese (Brazil)";; - ru) IMG="russian.png"; NAME="Russian";; - sk) IMG="slovak.png"; NAME="Slovak";; - es) IMG="spanish.png"; NAME="Spanish";; - sv) IMG="swedish.png"; NAME="Swedish";; - tr) IMG="turkish.png"; NAME="Turkish";; - uk) IMG="ukrainian.png"; NAME="Ukrainian";; - esac -} - -function html_header() -{ - echo "---" - echo "layout: concertina" - echo "title: Translations" - echo "---" - echo "" - echo "

Translating NeoMutt

" - echo "" - echo "

" - echo " NeoMutt has been translated into 30 languages." - echo " Unfortunately, some of the translations are out-of-date." - echo "

" - echo "" - echo "

" - echo " Do YOU speak one of these languages?" - echo " If so, please help us." - echo "

" - echo "" - echo "

" - echo " Read more about what would be involved in" - echo " translating NeoMutt." - echo "

" - echo "" - echo "" - echo " " - echo " " - echo " " - echo " " - echo " " - echo " " - echo " " - echo " " - echo " " - echo " " - echo " " -} - -function html_line() -{ - local LINE="$1" - local LANG="" - local TNUM=0 - local FNUM=0 - local UNUM=0 - - # filename: 104 translated, 22 fuzzy, 11 untranslated - if [[ "$LINE" =~ (.*):[[:space:]]+([0-9]+)[[:space:]]translated,[[:space:]]([0-9]+)[[:space:]]fuzzy,[[:space:]]([0-9]+)[[:space:]]untranslated ]]; then - LANG="${BASH_REMATCH[1]}" - TNUM=${BASH_REMATCH[2]} # translated - FNUM=${BASH_REMATCH[3]} # fuzzy - UNUM=${BASH_REMATCH[4]} # untranslated - # filename: 320 translated, 20 untranslated - elif [[ "$LINE" =~ (.*):[[:space:]]+([0-9]+)[[:space:]]translated,[[:space:]]([0-9]+)[[:space:]]untranslated ]]; then - LANG="${BASH_REMATCH[1]}" - TNUM=${BASH_REMATCH[2]} # translated - UNUM=${BASH_REMATCH[3]} # untranslated - # filename: 5 translated, 13 fuzzy - elif [[ "$LINE" =~ (.*):[[:space:]]+([0-9]+)[[:space:]]translated,[[:space:]]([0-9]+)[[:space:]]fuzzy ]]; then - LANG="${BASH_REMATCH[1]}" - TNUM=${BASH_REMATCH[2]} # translated - FNUM=${BASH_REMATCH[3]} # fuzzy - # filename: 63 translated - elif [[ "$LINE" =~ (.*):[[:space:]]+([0-9]+)[[:space:]]translated ]]; then - LANG="${BASH_REMATCH[1]}" - TNUM=${BASH_REMATCH[2]} # translated - else - return - fi - - lookup_lang "$LANG" - - local TOTAL=$((TNUM+FNUM+UNUM)) # number of translated strings - local PC=$((100*TNUM/TOTAL)) # percentage complete - - local TPX=$((500*TNUM/TOTAL)) # pixels for translated - local FPX=$((500*FNUM/TOTAL)) # pixels for fuzzy - local UPX=$((500*UNUM/TOTAL)) # pixels for untranslated - - [ $FPX -gt 0 ] && [ $FPX -lt 10 ] && TPX=$((TPX-5)) # adjust for the size of a non-breaking space - [ $UPX -gt 0 ] && [ $UPX -lt 10 ] && TPX=$((TPX-7)) - - local TITLE="$NAME: $TNUM translated" - [ $FNUM -gt 0 ] && TITLE="$TITLE, $FNUM fuzzy" - [ $UNUM -gt 0 ] && TITLE="$TITLE, $UNUM untranslated" - - echo " " - echo " " - echo " " - echo " " -} - -function html_footer() -{ - echo " " - echo "
Language" - echo " Complete" - echo " Fuzzy" - echo " Incomplete" - echo "
English" - echo "
Base Language
$NAME" - if [ $TPX -gt 0 ]; then - echo "
${PC}%
" - fi - if [ $FPX -gt 0 ]; then - echo "
 
" - fi - if [ $UPX -gt 0 ]; then - echo "
 
" - fi - echo "
" - echo "
" - echo "Last updated: $(date --utc '+%F %R') UTC" -} - - -[ $# = 0 ] && ARGS="*.po" || ARGS="$*" - -html_header -for i in $ARGS; do - echo -ne "${i%.po}:\t" - msgfmt --statistics -c -o /dev/null "$i" 2>&1 -done \ - | grep -wv "en_GB" \ - | sed 's/ \(message\|translation\)s*\.*//g' \ - | sort -nr -k2 -k4 -k6 \ - | while read -r line; do - html_line "$line" -done -html_footer - diff --git a/.travis/prep.sh b/.travis/prep.sh deleted file mode 100755 index 7edfd871b..000000000 --- a/.travis/prep.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -o errexit # set -e -set -o nounset # set -u - -git config --global user.email "rich@flatcap.org" -git config --global user.name "Richard Russon (DEPLOY)" - -mkdir -p ~/.ssh -echo "Host github.com" >> ~/.ssh/config -echo " StrictHostKeyChecking no" >> ~/.ssh/config -chmod 600 ~/.ssh/config - -cd .travis -openssl aes-256-cbc -K $encrypted_ff1b3f8609ac_key -iv $encrypted_ff1b3f8609ac_iv -in travis-deploy-github.enc -out travis-deploy-github.pem -d -chmod 0400 travis-deploy-github.pem - diff --git a/.travis/stats.sh b/.travis/stats.sh deleted file mode 100755 index 7b967ea77..000000000 --- a/.travis/stats.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -if [ $# = 0 ]; then - [ -d po ] && ARGS="po/*.po" || ARGS="*.po" -else - ARGS="$*" -fi - -ERROR=0 - -TMP_FILE=$(mktemp) - -for i in $ARGS; do - L=${i##*/} - echo -ne "${L%.po}:\\t" - msgfmt --statistics -c -o /dev/null "$i" 2>&1 - [ $? = 1 ] && ERROR=1 -done > "$TMP_FILE" - -sed 's/ \(message\|translation\)s*\.*//g' "$TMP_FILE" | sort -nr -k2 -k4 -k6 -rm -f "$TMP_FILE" - -exit $ERROR - diff --git a/.travis/travis-deploy-github.enc b/.travis/travis-deploy-github.enc deleted file mode 100644 index d65a1e175bacfa09d7bbcab38b4783c9311f31cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3248 zcmV;h3{Uf(HF^*lmwt`tJ}{y0;lQEs`TL#O6D%@fF7oPbuh?o{=7(zNIU8lam6^vn z?~9{QH(&q}JA6Agsd#3g1$>gf0zq8E`0jUK4+^ADjmSqp7zq|G>@e*HKZZ*CrIpF)uEw zRMz!)KFDX&1HbE3jWT+$1u9p`Cv0=5)vp;4-yv64(mQj2@|@VUp75a4oo$a(>bIYY zW&zP385B+=gmD8OngH0bJB{B0)!g~|6dP(+q?>z5l9S!Zn#8nydU3;U!9bZdt~B*Aw1NRM#VKkh#TUtBML^-X^A~=lRzYb=ZF&`?I#Sup5Pdj3jX+1q zczuWNyPTuYvR&5KdC#!A!jE>Ib4MX~rL9j=?UEP>x_M-K#l6F)p1Je;i)MFHb8;x- zoFp=|zdaO2g!&n0#D@zHp_e8Rs2chEP#p4}{rj!cldf`4Q)<^sI*eh1l)cDCB9MIEiGKM%_^X@6~>Dd@~^?3n#jdx3qPu&Y7L2wXfJuS=-2Bqfd0{F5R zO^gm6*@!940J+@G)IFa?MRxjt!69ApJPNL?52jZBeJyxzD*{JYGAXbkFP_8tWKtop z4koV1$>V9~5_-QOLb4N*%*4mdo9Bo26y<-RklLgkK$@BrH zbqarUH6MM?&a|4FM_Wxrt?ccJ`;8!SzgZP z6!2JSBYQTp2&&h6U5KVI>H*dqstlWAwIBHTYD8fuVgxP&m@7<1)SZ>f?QS4->k%G?MMdK@{8K-n;soQTxLcWr&}V=&DWYVMLbKI> z`moJ!_O7YBu=N@Wh+uL=R7kaJW$+n@cF77_J}yeF{FCajXN+1+Mii_MXmF9OpM=p) z+NptiD?AZAhPaAnzqsLzMFhBwUUsHbrp|v4Q5>Szs^&KLL+vbHQAf+i^_rmihk;3jbwl z0zPil_?F#Mr&({z1i4A?*^B!O8BDp)Sn4$!dK_Lf>2f8W^q2qdhgjjj@Ub}H%}|7k zm&vc~)Fi|t@$QvI92$ayRXG)qvD3{9i#BPjP4U{@OYr4t#2=0s^!!x# z*=v&z{O2t|+a7_fy(pnA8NaArtIK>q-Q`X^5oD>l>(ECTQ%)<5h}|mgUW#dyd&%1L2e9AF?_4?u!ub=UU^lH} zk8usdW-v2_dqnYtr7z%w{;t!B}Pb2nj^WAa|#uvUEe_y&x0s) z^fLnsHTLbA4U+|2@;~RIJ>M1Fv&&&kXQWVTJo9*Q|Eb)rUUD0GH6CI}gL&}%S6ywX zrgNQtOb7&{_SMGH@9)~8zVDJYV8c;RrH_twE!b5%eeFGkOezntvm2+wBC^( z0^my*=1YXoMojO$^BjlY4rGrs2mE>sN@Ox>azUYif^{#PzsLXSj zl`ox&oJb1w#`sye0sR>zAu=Dh8i#$@2W;g-XFObuNRRHi6JW%sHodQ834035ThezE zWj_?7x|sf~jfl{43JgI9&-ByxWL+hagm2VVkH+)^3CRP}WJ9o<>rfWPS2I#B3xBl- zr!3^4kq*2E2tK5gK}L*gr}?$2q#Z zB)faoaWqZS0PW`JJ@@6C+gqV&8Qo+0ACEVNcBNZqA6QmCKF>(#11BcLV7oKHgRDT2 z9CM#cjb2Qr^5d7oE=3xy&#(a*D>FI|;FX#qukKz*zw!PJ$)AT_c_IVY*ik14i@E%6 zBI})TsYwUpAU0@h*-gO6p=}}g^>^f1B)h=MTFoL0sC8tU3x0Br^t6&DzLDk=qfwl&)(o9ry+Ng=WHmRDW!L|ek=RWvh&Pw#? zw?x+LuOHaFV(77$lW=zjxjc$Fb^LMG(bA$xmbLLp1%g58=G11&52z*^14NKBI#i^3 iBtL(&cKMS**)#<2=>F}s4Mm&TBRNq diff --git a/init.h b/init.h index 2240392c4..65c31687b 100644 --- a/init.h +++ b/init.h @@ -25,6 +25,7 @@ #define _MUTT_INIT_H #ifdef _MAKEDOC +#include "config.h" #include "doc/makedoc_defs.h" #else #include -- 2.40.0