mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RIP configure.in, welcome configure.ac. Update scripts and documentation

Browse Source 
accordingly.
This commit is contained in:
mmdolze
2013-03-24 14:04:21 +00:00
parent 099b0c6274
commit 3e2d42af69
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -11,6 +11,7 @@ v0.5dev (ongoing development)
* Fix build if compiled with --enable-permissive-menu-goto (#3599609) * Fix build if compiled with --enable-permissive-menu-goto (#3599609)
* glcd driver: Add direct support for framebuffer with paged memory layout * glcd driver: Add direct support for framebuffer with paged memory layout
+ hd44780: Added 'raspberrypi' connection type (P. Corner) + hd44780: Added 'raspberrypi' connection type (P. Corner)
* Build system: Rename configure.in to configure.ac
v0.5.6 v0.5.6
- Remove deprecated CFontz633 driver. Use CFontzPacket with Model=633 instead! - Remove deprecated CFontz633 driver. Use CFontzPacket with Model=633 instead!
autogen.sh
+1 -1
View File
@@ -42,7 +42,7 @@ fi
echo "Running aclocal ..." echo "Running aclocal ..."
$ACLOCAL $ACLOCAL
if grep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null; then if grep "^A[CM]_CONFIG_HEADER" configure.ac >/dev/null; then
echo "Running autoheader..." echo "Running autoheader..."
$AUTOHEADER $AUTOHEADER
fi fi
configure.in → configure.ac
View File
docs/lcdproc-dev/releasing.docbook
+1 -1
View File
@@ -214,7 +214,7 @@ release.
<title>Files that need version numbers updated</title> <title>Files that need version numbers updated</title>
<listitem><para><filename>BUGS</filename></para></listitem> <listitem><para><filename>BUGS</filename></para></listitem>
<listitem><para><filename>ChangeLog</filename></para></listitem> <listitem><para><filename>ChangeLog</filename></para></listitem>
<listitem><para><filename>configure.in</filename></para></listitem> <listitem><para><filename>configure.ac</filename></para></listitem>
<listitem><para><filename>server/menuscreens.c</filename></para></listitem> <listitem><para><filename>server/menuscreens.c</filename></para></listitem>
<listitem><para><filename>docs/lcdproc-dev/bookinfo.docbook</filename></para></listitem> <listitem><para><filename>docs/lcdproc-dev/bookinfo.docbook</filename></para></listitem>
<listitem><para><filename>docs/lcdproc-dev/driver-api.docbook</filename></para></listitem> <listitem><para><filename>docs/lcdproc-dev/driver-api.docbook</filename></para></listitem>
scripts/nightly/make-docs.sh
+4 -3
View File
@@ -15,20 +15,21 @@ RSYNC=/usr/bin/rsync
DOCSPATH=${NIGHTLY_DIR}/${BRANCH}/docs/lcdproc-${DOCS} DOCSPATH=${NIGHTLY_DIR}/${BRANCH}/docs/lcdproc-${DOCS}
DOCSFILE=${DOCSPATH}/lcdproc-${DOCS}.docbook DOCSFILE=${DOCSPATH}/lcdproc-${DOCS}.docbook
CSSFILE=${DOCSPATH}/lcdproc-${DOCS}.css
############################# #############################
test -d ${NIGHTLY_DIR} && cd ${NIGHTLY_DIR} test -d ${NIGHTLY_DIR} && cd ${NIGHTLY_DIR}
# Generate HTML # Generate HTML
${XMLTO} xhtml-nochunks ${DOCSFILE} >/dev/null 2>&1 ${XMLTO} xhtml-nochunks --stringparam html.stylesheet=${CSSFILE} ${DOCSFILE} >/dev/null 2>&1
mv lcdproc-${DOCS}.html ${BRANCH}-${DOCS}.html mv lcdproc-${DOCS}.html ${BRANCH}-${DOCS}.html
# Generate PDF # Generate PDF
#${XMLTO} pdf ${DOCSFILE} >/dev/null 2>&1 #${XMLTO} pdf ${DOCSFILE} >/dev/null 2>&1
#mv lcdproc-${DOCS}.pdf ${BRANCH}-${DOCS}.pdf #mv lcdproc-${DOCS}.pdf ${BRANCH}-${DOCS}.pdf
# Generate TXT # Generate TXT
${XMLTO} txt ${DOCSFILE} >/dev/null 2>&1 ${XMLTO} txt ${DOCSFILE} >/dev/null 2>&1
mv lcdproc-${DOCS}.txt ${BRANCH}-${DOCS}.txt mv lcdproc-${DOCS}.txt ${BRANCH}-${DOCS}.txt
# Upload to sf.net # Upload to sf.net
scripts/nightly/make-nightly.sh
+4 -4
View File
@@ -56,14 +56,14 @@ if [ -e README ] && [ -e ChangeLog ] && [ -e LCDd.conf ]; then
${CVS2CL} -l '-d yesterday<=' --stdout 2>/dev/null >> ChangeLog ${CVS2CL} -l '-d yesterday<=' --stdout 2>/dev/null >> ChangeLog
# Change the version number to CVS-${BRANCH}-${DATE} # Change the version number to CVS-${BRANCH}-${DATE}
cp -a configure.in configure.in.nightly-temp cp -a configure.ac configure.ac.nightly-temp
BRANCH=${BRANCH} \ BRANCH=${BRANCH} \
${PERL} -MPOSIX -i -p \ ${PERL} -MPOSIX -i -p \
-e '$version = "CVS-".$ENV{BRANCH}."-".strftime("%Y%m%d", localtime); -e '$version = "CVS-".$ENV{BRANCH}."-".strftime("%Y%m%d", localtime);
s/(AM_INIT_AUTOMAKE\s*)\(\s*(\[?lcdproc\]?)\s*,\s*[\w\d.-]+\s*\)/$1($2, $version)/; s/(AM_INIT_AUTOMAKE\s*)\(\s*(\[?lcdproc\]?)\s*,\s*[\w\d.-]+\s*\)/$1($2, $version)/;
s/(AC_INIT\s*)\(\s*(\[?lcdproc\]?)\s*,\s*[\w\d.-]+\s*\)/$1($2, $version)/; s/(AC_INIT\s*)\(\s*(\[?lcdproc\]?)\s*,\s*[\w\d.-]+\s*\)/$1($2, $version)/;
s/(AC_INIT\s*)\(\s*(\[?lcdproc\]?)\s*,\s*[\w\d.-]+(\s*[^)]+)\s*\)/$1($2, $version$3)/;' \ s/(AC_INIT\s*)\(\s*(\[?lcdproc\]?)\s*,\s*[\w\d.-]+(\s*[^)]+)\s*\)/$1($2, $version$3)/;' \
configure.in configure.ac
# Debian-specific stuff # Debian-specific stuff
for dir in debian scripts/debian ; do for dir in debian scripts/debian ; do
@@ -102,7 +102,7 @@ if [ -e README ] && [ -e ChangeLog ] && [ -e LCDd.conf ]; then
rm lcdproc-CVS-${BRANCH}.tar.bz2 rm lcdproc-CVS-${BRANCH}.tar.bz2
# Cleanup # Cleanup
mv configure.in.nightly-temp configure.in mv configure.ac.nightly-temp configure.ac
mv README.nightly-temp README mv README.nightly-temp README
mv ChangeLog.nightly-temp ChangeLog mv ChangeLog.nightly-temp ChangeLog
rm -f nightly-cvsChanges.txt last-nightly.txt rm -f nightly-cvsChanges.txt last-nightly.txt
@@ -117,7 +117,7 @@ if [ -e README ] && [ -e ChangeLog ] && [ -e LCDd.conf ]; then
# re-create files accidentially deleted # re-create files accidentially deleted
${CVS} update -d &> /dev/null ${CVS} update -d &> /dev/null
# build configure (& Makefile.in's ?) based on original configure.in from CVS # build configure (& Makefile.in's ?) based on original configure.ac from CVS
sh autogen.sh >/dev/null sh autogen.sh >/dev/null
fi fi