This email list is read-only. Emails sent to this list will be discarded
----------------------------------
ChangeLog | 12 +++
configure.in | 14 ++-
moblin-system-daemon/Makefile.am | 6 +-
scripts/Makefile.am | 2 +-
scripts/buildtest | 191 ++++++++++++++++++++++++++++++++++++++
scripts/distclean | 34 +++++++
scripts/moblin-settings.spec | 1 +
7 files changed, 253 insertions(+), 7 deletions(-)
New commits:
commit d55a4bbfb17de35cf530d0d73f6e161fb6374574
Author: Todd Brandt <[EMAIL PROTECTED]>
Date: Thu Sep 4 16:24:43 2008 -0700
bug fixes and tests
Diff in this email is a maximum of 400 lines.
diff --git a/ChangeLog b/ChangeLog
index 831d905..a6a4f51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+moblin-settings (2.19)
+
+ * Added a buildtest script which runs through the different configure
+ options to ensure that they don't fail
+ * Changed the installation of the moblin-system-daemon and
+ moblin-kernel-modules init.d scripts to be installed with +x
+ permissions
+ * Added docbook-utils to the list of dependencies and check for
+ docbook2man in the configure script
+
+ -- Todd Brandt <[EMAIL PROTECTED]> Thu Sep 4 16:18:29 PDT 2008
+
moblin-settings (2.18)
* Added moblin-system-tool man page
diff --git a/configure.in b/configure.in
index 7cc0f73..edbafc5 100644
--- a/configure.in
+++ b/configure.in
@@ -65,15 +65,21 @@ SYMBOL_DEFINES=" dnl
# Package Dependencies #
########################
+PKG_CHECK_MODULES(DBUS, glib-2.0 >= 2.9.1 dbus-1 >= 0.70 dbus-glib-1 >= 0.70)
+AC_SUBST(DBUS_CFLAGS)
+AC_SUBST(DBUS_LIBS)
+
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
if test x"$GLIB_GENMARSHAL" = xno; then
- AC_MSG_ERROR([glib-genmarshal executable not found in your path - should be
installed with glib])
+ AC_MSG_ERROR([glib-genmarshal executable not found in your path - should be
installed with glib2-devel])
fi
AC_SUBST(GLIB_GENMARSHAL)
-PKG_CHECK_MODULES(DBUS, glib-2.0 >= 2.9.1 dbus-1 >= 0.70 dbus-glib-1 >= 0.70)
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
+AC_PATH_PROG(DOCBOOK2MAN, docbook2man, no)
+if test x"$DOCBOOK2MAN" = xno; then
+ AC_MSG_ERROR([docbook2man executable not found in your path - should be
installed with docbook-utils])
+fi
+AC_SUBST(DOCBOOK2MAN)
AC_MSG_CHECKING([if GLib is version 2.14.0 or newer])
if pkg-config --atleast-version=2.14.0 glib-2.0; then
diff --git a/moblin-system-daemon/Makefile.am b/moblin-system-daemon/Makefile.am
index 6ba7ab1..f36ac1e 100644
--- a/moblin-system-daemon/Makefile.am
+++ b/moblin-system-daemon/Makefile.am
@@ -110,7 +110,7 @@ msd-infos.xml: $(dbus_xmlfiles)
man1_MANS = moblin-system-tool.1
moblin-system-tool.1: moblin-system-tool.sgml
- docbook2man $<
+ @DOCBOOK2MAN@ $<
moblin-system-tool.sgml: $(sgml_manfiles)
cat $(sgml_manfiles) > $@
@@ -135,7 +135,9 @@ org.moblin.SystemDaemon.service:
org.moblin.SystemDaemon.service.in Makefile
EXTRA_DIST = $(Dbusapi_DATA) \
moblin-system-daemon.pc.in \
org.moblin.SystemDaemon.service.in moblin-system-marshal.list
-CLEANFILES = msd-infos.xml $(BUILT_SOURCES) $(service_DATA)
+CLEANFILES = msd-infos.xml $(BUILT_SOURCES) $(service_DATA) \
+ manpage.links manpage.refs moblin-system-tool.1 \
+ moblin-system-tool.sgml
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = moblin-system-daemon.pc
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 62aca4d..7d84bb0 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1 +1 @@
-init_DATA = moblin-kernel-modules moblin-system-daemon
+init_SCRIPTS = moblin-kernel-modules moblin-system-daemon
diff --git a/scripts/buildtest b/scripts/buildtest
new file mode 100755
index 0000000..c30b756
--- /dev/null
+++ b/scripts/buildtest
@@ -0,0 +1,191 @@
+#! /bin/sh
+
+LC_ALL=C
+export LC_ALL
+
+distclean() {
+ make distclean >& /dev/null
+ find . -name \*.la | xargs rm -f
+ find . -name \*.lo | xargs rm -f
+ find . -name \*.o | xargs rm -f
+ find . -name Makefile.in | xargs rm -f
+ find . -name Makefile | xargs rm -f
+ find . -name .deps | xargs rm -rf
+ find . -name .libs | xargs rm -rf
+ rm -rf autom4te.cache
+ rm -f aclocal.m4 build-stamp config.guess config.sub configure
configure-stamp
+}
+
+CHECK=`pwd | tr '/' '\n' | tail -1`
+ROOT=`pwd`
+if [ "$CHECK" = "scripts" ]; then
+ cd ..
+ ROOT=`pwd`
+fi
+if [ -e configure.in ]; then
+ CHECK=`grep AC_INIT configure.in | grep "[moblin-settings]"`
+ if [ -z "$CHECK" ]; then
+ echo "This doesn't appear to be the moblin-settings source tree"
+ exit
+ fi
+else
+ echo "You must be in the moblin-settings root or scripts folder to run
this"
+ exit
+fi
+
+OUTFILE="$ROOT/scripts/output.txt"
+MFILE="$ROOT/scripts/make.txt"
+MERRFILE="$ROOT/scripts/make_error.txt"
+cd $ROOT
+
+distclean
+./autogen.sh
+
+ARGS=""
+echo "./configure $ARGS --sysconfdir=/etc prefix=/usr"
+./configure $ARGS --sysconfdir=/etc prefix=/usr > $OUTFILE
+CHECK=`cat $OUTFILE | tail -1 | grep "executing depfiles commands"`
+if [ -z "$CHECK" ]; then
+ echo "CONFIGURE FAILED"
+ exit
+else
+ echo "CONFIGURE PASSED"
+fi
+make > $MFILE 2>$MERRFILE
+if [ -s $MERRFILE ]; then
+ echo "MAKE FAILED"
+ exit
+else
+ echo "MAKE PASSED"
+fi
+
+distclean
+./autogen.sh
+
+ARGS="--disable-datetime"
+echo "./configure $ARGS --sysconfdir=/etc prefix=/usr"
+./configure $ARGS --sysconfdir=/etc prefix=/usr > $OUTFILE
+CHECK=`cat $OUTFILE | tail -1 | grep "executing depfiles commands"`
+if [ -z "$CHECK" ]; then
+ echo "CONFIGURE FAILED"
+ exit
+else
+ echo "CONFIGURE PASSED"
+fi
+make > $MFILE 2>$MERRFILE
+if [ -s $MERRFILE ]; then
+ echo "MAKE FAILED"
+ exit
+else
+ echo "MAKE PASSED"
+fi
+
+
+distclean
+./autogen.sh
+
+ARGS="--disable-touchscreen"
+echo "./configure $ARGS --sysconfdir=/etc prefix=/usr"
+./configure $ARGS --sysconfdir=/etc prefix=/usr > $OUTFILE
+CHECK=`cat $OUTFILE | tail -1 | grep "executing depfiles commands"`
+if [ -z "$CHECK" ]; then
+ echo "CONFIGURE FAILED"
+ exit
+else
+ echo "CONFIGURE PASSED"
+fi
+make > $MFILE 2>$MERRFILE
+if [ -s $MERRFILE ]; then
+ echo "MAKE FAILED"
+ exit
+else
+ echo "MAKE PASSED"
+fi
+
+
+distclean
+./autogen.sh
+
+ARGS="--disable-battery"
+echo "./configure $ARGS --sysconfdir=/etc prefix=/usr"
+./configure $ARGS --sysconfdir=/etc prefix=/usr > $OUTFILE
+CHECK=`cat $OUTFILE | tail -1 | grep "executing depfiles commands"`
+if [ -z "$CHECK" ]; then
+ echo "CONFIGURE FAILED"
+ exit
+else
+ echo "CONFIGURE PASSED"
+fi
+make > $MFILE 2>$MERRFILE
+if [ -s $MERRFILE ]; then
+ echo "MAKE FAILED"
+ exit
+else
+ echo "MAKE PASSED"
+fi
+
+
+distclean
+./autogen.sh
+
+ARGS="--disable-lcdbacklight"
+echo "./configure $ARGS --sysconfdir=/etc prefix=/usr"
+./configure $ARGS --sysconfdir=/etc prefix=/usr > $OUTFILE
+CHECK=`cat $OUTFILE | tail -1 | grep "executing depfiles commands"`
+if [ -z "$CHECK" ]; then
+ echo "CONFIGURE FAILED"
+ exit
+else
+ echo "CONFIGURE PASSED"
+fi
+make > $MFILE 2>$MERRFILE
+if [ -s $MERRFILE ]; then
+ echo "MAKE FAILED"
+ exit
+else
+ echo "MAKE PASSED"
+fi
+
+
+distclean
+./autogen.sh
+
+ARGS="--disable-sound"
+echo "./configure $ARGS --sysconfdir=/etc prefix=/usr"
+./configure $ARGS --sysconfdir=/etc prefix=/usr > $OUTFILE
+CHECK=`cat $OUTFILE | tail -1 | grep "executing depfiles commands"`
+if [ -z "$CHECK" ]; then
+ echo "CONFIGURE FAILED"
+ exit
+else
+ echo "CONFIGURE PASSED"
+fi
+make > $MFILE 2>$MERRFILE
+if [ -s $MERRFILE ]; then
+ echo "MAKE FAILED"
+ exit
+else
+ echo "MAKE PASSED"
+fi
+
+distclean
+./autogen.sh
+
+ARGS="--disable-touchscreen --disable-sound"
+echo "./configure $ARGS --sysconfdir=/etc prefix=/usr"
+./configure $ARGS --sysconfdir=/etc prefix=/usr > $OUTFILE
+CHECK=`cat $OUTFILE | tail -1 | grep "executing depfiles commands"`
+if [ -z "$CHECK" ]; then
+ echo "CONFIGURE FAILED"
+ exit
+else
+ echo "CONFIGURE PASSED"
+fi
+make > $MFILE 2>$MERRFILE
+if [ -s $MERRFILE ]; then
+ echo "MAKE FAILED"
+ exit
+else
+ echo "MAKE PASSED"
+fi
+
diff --git a/scripts/distclean b/scripts/distclean
new file mode 100755
index 0000000..9d06689
--- /dev/null
+++ b/scripts/distclean
@@ -0,0 +1,34 @@
+#! /bin/sh
+
+LC_ALL=C
+export LC_ALL
+
+CHECK=`pwd | tr '/' '\n' | tail -1`
+ROOT=`pwd`
+if [ "$CHECK" = "scripts" ]; then
+ cd ..
+ ROOT=`pwd`
+fi
+if [ -e configure.in ]; then
+ CHECK=`grep AC_INIT configure.in | grep "[moblin-settings]"`
+ if [ -z "$CHECK" ]; then
+ echo "This doesn't appear to be the moblin-settings source tree"
+ exit
+ fi
+else
+ echo "You must be in the moblin-settings root or scripts folder to run
this"
+ exit
+fi
+
+cd $ROOT
+make distclean >& /dev/null
+find . -name \*.la | xargs rm -f
+find . -name \*.lo | xargs rm -f
+find . -name \*.o | xargs rm -f
+find . -name Makefile.in | xargs rm -f
+find . -name Makefile | xargs rm -f
+find . -name .deps | xargs rm -rf
+find . -name .libs | xargs rm -rf
+rm -rf autom4te.cache
+rm -f aclocal.m4 build-stamp config.guess config.sub configure configure-stamp
+rm -f scripts/make.txt scripts/make_error.txt scripts/output.txt
diff --git a/scripts/moblin-settings.spec b/scripts/moblin-settings.spec
index 5414664..5f39921 100644
--- a/scripts/moblin-settings.spec
+++ b/scripts/moblin-settings.spec
@@ -20,6 +20,7 @@ BuildRequires: PolicyKit-devel >= 0.7
BuildRequires: alsa-lib-devel >= 0.9.0
BuildRequires: hal >= 0.5.8
BuildRequires: libX11-devel
+BuildRequires: docbook-utils
Requires: dbus >= 0.90
Requires: dbus-glib >= 0.70
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
