diff options
| author | Chris Johns <chrisj@rtems.org> | 2019-10-31 17:19:35 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2019-10-31 17:19:35 +1100 |
| commit | 88cbb73f073d09a9c789c36d24b6656e6e9668cd (patch) | |
| tree | e4aabf8da070edadcbe470c9a6f06aab4e6c9077 | |
| parent | cron: Fix the SMTP host on sync. (diff) | |
| download | rtems-release-88cbb73f073d09a9c789c36d24b6656e6e9668cd.tar.bz2 | |
notes: Update to 5.
| -rwxr-xr-x | rtems-release-notes | 27 | ||||
| -rwxr-xr-x | rtems-release-package-start | 12 |
2 files changed, 26 insertions, 13 deletions
diff --git a/rtems-release-notes b/rtems-release-notes index e2dd1c4..79553b5 100755 --- a/rtems-release-notes +++ b/rtems-release-notes @@ -1,7 +1,7 @@ #! /bin/sh # # RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2017 Chris Johns (chrisj@rtems.org) +# Copyright 2017,2019 Chris Johns (chrisj@rtems.org) # All rights reserved. # # This file is part of the RTEMS Tools package in 'rtems-tools'. @@ -29,6 +29,8 @@ # POSSIBILITY OF SUCH DAMAGE. # +set -e + # # This worker script to build the doco. # @@ -110,16 +112,19 @@ pdfs="" rev=0 while [ ${rev} -le ${revision_no} ] do - rel=${version}.${rev} - echo "Creating the ${rel} PDF" - wkhtmltopdf --user-style-sheet file://${ws_pwd}/trac-rtems-style.html \ - -L 5mm -R 5mm \ - ${release_pages}/${version}/${version}.${rev} \ - ${page_options} \ - --header-left "RTEMS ${rel} Release Notes" ${header} \ - ${footer} \ - p${rev}.pdf - pdfs="p${rev}.pdf ${pdfs}" + even_odd=$(( ${rev} % 2 )) + if [ ${version} -lt 5 -o ${even_odd} -ne 0 ]; then + rel=${version}.${rev} + echo "Creating the ${rel} PDF" + wkhtmltopdf --user-style-sheet file://${ws_pwd}/trac-rtems-style.html \ + -L 5mm -R 5mm \ + ${release_pages}/${version}/${version}.${rev} \ + ${page_options} \ + --header-left "RTEMS ${rel} Release Notes" ${header} \ + ${footer} \ + p${rev}.pdf + pdfs="p${rev}.pdf ${pdfs}" + fi rev=$(expr ${rev} + 1) done diff --git a/rtems-release-package-start b/rtems-release-package-start index fe00de4..19efbcd 100755 --- a/rtems-release-package-start +++ b/rtems-release-package-start @@ -1,5 +1,5 @@ # RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2015,2016 Chris Johns (chrisj@rtems.org) +# Copyright 2015,2016,2019 Chris Johns (chrisj@rtems.org) # All rights reserved. # # This file is part of the RTEMS Tools package in 'rtems-tools'. @@ -57,7 +57,15 @@ else worker= fi -revision_no=$(echo ${revision} | sed -e 's/\-.*$//') +if [ ${version} -lt 5 ]; then + revision_no=$(echo ${revision} | sed -e 's/\-.*$//') +else + revision_no=$(echo ${revision} | sed -e 's/\..*$//') + even_odd=$(( ${revision_no} % 2 )) + if [ ${even_odd} -eq 0 ]; then + revision_no=$(expr ${revision_no} + 1) + fi +fi release=${version}.${revision} prefix=${package}-${release} |