From 86a2918a63cbf19152b12382438e283c8ec511a4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Wed, 13 Jul 2011 09:03:58 +0000 Subject: [PATCH] removed lua support, monitoring page is now using jquery and json http requests --- Makefile.in | 2 - config.h.in | 3 - configure | 175 ---------------------------------------- configure.ac | 18 ----- debian/control | 2 +- pixmaps/14x14/Makefile.in | 2 - pixmaps/16x16/Makefile.in | 2 - pixmaps/22x22/Makefile.in | 2 - pixmaps/24x24/Makefile.in | 2 - pixmaps/32x32/Makefile.in | 2 - pixmaps/48x48/Makefile.in | 2 - pixmaps/64x64/Makefile.in | 2 - pixmaps/scalable/Makefile.in | 2 - po/Makefile.in | 2 +- po/POTFILES.in | 1 - po/fr.po | 84 +++++++++---------- po/psensor.pot | 66 +++++---------- po/tr.po | 66 +++++---------- po/zh_CN.po | 66 +++++---------- src/Makefile.am | 2 - src/Makefile.in | 4 +- src/glade/Makefile.in | 2 - src/lib/Makefile.in | 2 - src/libpsensor_json/Makefile.in | 2 - src/plib/Makefile.am | 10 --- src/plib/Makefile.in | 41 +--------- src/plib/plib_luatpl.c | 157 ----------------------------------- src/plib/plib_luatpl.h | 78 ------------------ src/server/Makefile.am | 7 -- src/server/Makefile.in | 32 +++----- src/server/server.c | 44 +--------- src/server/server_lua.c | 161 ------------------------------------ src/server/server_lua.h | 27 ------- src/unity/Makefile.in | 2 - tests/Makefile.in | 2 - ubuntu-packaging/debian/control | 2 +- www/Makefile.am | 2 +- www/Makefile.in | 4 +- 38 files changed, 110 insertions(+), 972 deletions(-) delete mode 100644 src/plib/plib_luatpl.c delete mode 100644 src/plib/plib_luatpl.h delete mode 100644 src/server/server_lua.c delete mode 100644 src/server/server_lua.h diff --git a/Makefile.in b/Makefile.in index 00ca575..ed81ee3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -182,8 +182,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/config.h.in b/config.h.in index 24e96bb..f4776a0 100644 --- a/config.h.in +++ b/config.h.in @@ -58,9 +58,6 @@ /* Define to 1 if you have the `sensors' library (-lsensors). */ #undef HAVE_LIBSENSORS -/* Use Lua5.1 */ -#undef HAVE_LUA - /* Define to 1 if your system has a GNU libc compatible `malloc' function, and to 0 otherwise. */ #undef HAVE_MALLOC diff --git a/configure b/configure index 91d1844..554ad91 100755 --- a/configure +++ b/configure @@ -607,10 +607,6 @@ LIBMICROHTTPD_FALSE LIBMICROHTTPD_TRUE LIBMICROHTTPD_LIBS LIBMICROHTTPD_CFLAGS -LUA_FALSE -LUA_TRUE -LUA_LIBS -LUA_CFLAGS UNITY_FALSE UNITY_TRUE UNITY_LIBS @@ -798,8 +794,6 @@ JSON_CFLAGS JSON_LIBS UNITY_CFLAGS UNITY_LIBS -LUA_CFLAGS -LUA_LIBS LIBMICROHTTPD_CFLAGS LIBMICROHTTPD_LIBS GTOP_CFLAGS @@ -1483,8 +1477,6 @@ Some influential environment variables: UNITY_CFLAGS C compiler flags for UNITY, overriding pkg-config UNITY_LIBS linker flags for UNITY, overriding pkg-config - LUA_CFLAGS C compiler flags for LUA, overriding pkg-config - LUA_LIBS linker flags for LUA, overriding pkg-config LIBMICROHTTPD_CFLAGS C compiler flags for LIBMICROHTTPD, overriding pkg-config LIBMICROHTTPD_LIBS @@ -8074,169 +8066,6 @@ fi ############### psensor-server -# Checks Lua 5.1 -LUA_LIBS= - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -$as_echo_n "checking for LUA... " >&6; } - -if test -n "$LUA_CFLAGS"; then - pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua\""; } >&5 - ($PKG_CONFIG --exists --print-errors "lua") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LUA_LIBS"; then - pkg_cv_LUA_LIBS="$LUA_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua\""; } >&5 - ($PKG_CONFIG --exists --print-errors "lua") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua" 2>&1` - else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Lua not present" >&5 -$as_echo "$as_me: WARNING: Lua not present" >&2;} -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Lua not present" >&5 -$as_echo "$as_me: WARNING: Lua not present" >&2;} -else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_LUA 1" >>confdefs.h - -fi - -# Ubuntu pkg module is lua5.1 not lua -if test "$LUA_LIBS" == ""; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -$as_echo_n "checking for LUA... " >&6; } - -if test -n "$LUA_CFLAGS"; then - pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LUA_LIBS"; then - pkg_cv_LUA_LIBS="$LUA_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1" 2>&1` - else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Lua5.1 not present" >&5 -$as_echo "$as_me: WARNING: Lua5.1 not present" >&2;} -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Lua5.1 not present" >&5 -$as_echo "$as_me: WARNING: Lua5.1 not present" >&2;} -else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_LUA 1" >>confdefs.h - -fi -fi - if test -n "$LUA_LIBS"; then - LUA_TRUE= - LUA_FALSE='#' -else - LUA_TRUE='#' - LUA_FALSE= -fi - - - - # libmicrohttpd, mandatory for psensor-server LIBMICROHTTPD_LIBS= @@ -8608,10 +8437,6 @@ if test -z "${UNITY_TRUE}" && test -z "${UNITY_FALSE}"; then as_fn_error $? "conditional \"UNITY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${LUA_TRUE}" && test -z "${LUA_FALSE}"; then - as_fn_error $? "conditional \"LUA\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${LIBMICROHTTPD_TRUE}" && test -z "${LIBMICROHTTPD_FALSE}"; then as_fn_error $? "conditional \"LIBMICROHTTPD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index 4bfa149..9e8c101 100644 --- a/configure.ac +++ b/configure.ac @@ -153,24 +153,6 @@ AM_CONDITIONAL(UNITY, test -n "$UNITY_LIBS") ############### psensor-server -# Checks Lua 5.1 -LUA_LIBS= -PKG_CHECK_MODULES(LUA, - lua, - [AC_DEFINE([HAVE_LUA],[1],[Use Lua])], - [AC_MSG_WARN(Lua not present, checks Lua5.1)]) - -# Ubuntu pkg module is lua5.1 not lua -if test "$LUA_LIBS" == ""; then - PKG_CHECK_MODULES(LUA, - lua5.1, - [AC_DEFINE([HAVE_LUA],[1],[Use Lua5.1])], - [AC_MSG_WARN(Lua5.1 not present, psensor-server will NOT be built")]) -fi -AM_CONDITIONAL(LUA, test -n "$LUA_LIBS") -AC_SUBST(LUA_CFLAGS) -AC_SUBST(LUA_LIBS) - # libmicrohttpd, mandatory for psensor-server LIBMICROHTTPD_LIBS= PKG_CHECK_MODULES(LIBMICROHTTPD, diff --git a/debian/control b/debian/control index ec3db3c..faf5d65 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: psensor Section: utils Priority: optional Maintainer: Jean-Philippe Orsini -Build-Depends: debhelper (>= 7.0.50~),autoconf,automake,gettext,autopoint,libgtk2.0-dev,libgconf2-dev,libnotify-dev,libsensors4-dev,help2man,libcurl4-openssl-dev,libjson0-dev,liblua5.1-0-dev,libmicrohttpd-dev,libgtop2-dev,perl +Build-Depends: debhelper (>= 7.0.50~),autoconf,automake,gettext,autopoint,libgtk2.0-dev,libgconf2-dev,libnotify-dev,libsensors4-dev,help2man,libcurl4-openssl-dev,libjson0-dev,libmicrohttpd-dev,libgtop2-dev,perl Standards-Version: 3.9.1 Homepage: http://wpitchoune.net/psensor diff --git a/pixmaps/14x14/Makefile.in b/pixmaps/14x14/Makefile.in index 4daf27a..071f3a3 100644 --- a/pixmaps/14x14/Makefile.in +++ b/pixmaps/14x14/Makefile.in @@ -125,8 +125,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/pixmaps/16x16/Makefile.in b/pixmaps/16x16/Makefile.in index b7809ed..1ac7109 100644 --- a/pixmaps/16x16/Makefile.in +++ b/pixmaps/16x16/Makefile.in @@ -125,8 +125,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/pixmaps/22x22/Makefile.in b/pixmaps/22x22/Makefile.in index df4c086..8422ad6 100644 --- a/pixmaps/22x22/Makefile.in +++ b/pixmaps/22x22/Makefile.in @@ -125,8 +125,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/pixmaps/24x24/Makefile.in b/pixmaps/24x24/Makefile.in index 103a673..61de751 100644 --- a/pixmaps/24x24/Makefile.in +++ b/pixmaps/24x24/Makefile.in @@ -125,8 +125,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/pixmaps/32x32/Makefile.in b/pixmaps/32x32/Makefile.in index 043f70c..7b5aa92 100644 --- a/pixmaps/32x32/Makefile.in +++ b/pixmaps/32x32/Makefile.in @@ -125,8 +125,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/pixmaps/48x48/Makefile.in b/pixmaps/48x48/Makefile.in index 6f44c26..2c8866f 100644 --- a/pixmaps/48x48/Makefile.in +++ b/pixmaps/48x48/Makefile.in @@ -125,8 +125,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/pixmaps/64x64/Makefile.in b/pixmaps/64x64/Makefile.in index b8dc0a4..e78cb3e 100644 --- a/pixmaps/64x64/Makefile.in +++ b/pixmaps/64x64/Makefile.in @@ -125,8 +125,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/pixmaps/scalable/Makefile.in b/pixmaps/scalable/Makefile.in index 42e6aba..0897652 100644 --- a/pixmaps/scalable/Makefile.in +++ b/pixmaps/scalable/Makefile.in @@ -125,8 +125,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/po/Makefile.in b/po/Makefile.in index c6150d4..03604dc 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -21,7 +21,7 @@ srcdir = . top_srcdir = .. -prefix = /home/jporsini/tmp +prefix = /usr/local exec_prefix = ${prefix} datarootdir = ${prefix}/share datadir = ${datarootdir} diff --git a/po/POTFILES.in b/po/POTFILES.in index a5b4fef..a732feb 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,7 +7,6 @@ src/ui_notify.c src/ui_pref.c src/ui_sensorpref.c src/rsensor.c -src/plib/plib_luatpl.c src/server/server.c src/lib/hdd.c src/lib/nvidia.c diff --git a/po/fr.po b/po/fr.po index 044ce1f..48d8e38 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.6.0.9\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-07-10 23:30+0200\n" +"POT-Creation-Date: 2011-07-13 11:01+0200\n" "PO-Revision-Date: 2011-02-07 21:18+0100\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Oriya\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/main.c:72 src/server/server.c:80 +#: src/main.c:72 src/server/server.c:76 #, fuzzy, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -33,7 +33,7 @@ msgstr "" "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" "autorisees par la loi applicable.\n" -#: src/main.c:82 src/server/server.c:90 +#: src/main.c:82 src/server/server.c:86 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Utilisation: %s [OPTION]...\n" @@ -50,7 +50,7 @@ msgstr "" msgid "Options:" msgstr "Options:" -#: src/main.c:89 src/server/server.c:97 +#: src/main.c:89 src/server/server.c:93 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -65,17 +65,17 @@ msgid "" msgstr "" " -u, --url=URL l'URL de psensor-server, example: http://hostname:3131" -#: src/main.c:101 src/server/server.c:110 +#: src/main.c:101 src/server/server.c:106 #, c-format msgid "Report bugs to: %s\n" msgstr "Signaler les bugs à: %s\n" -#: src/main.c:103 src/server/server.c:112 +#: src/main.c:103 src/server/server.c:108 #, c-format msgid "%s home page: <%s>\n" msgstr "%s page d'acceuil: <%s>\n" -#: src/main.c:323 src/server/server.c:388 +#: src/main.c:323 src/server/server.c:346 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Essayez `%s --help' pour plus d'informations.\n" @@ -225,49 +225,19 @@ msgstr "ERREUR: Contenu invalide: %s\n" msgid "ERROR: Invalid JSON: %s\n" msgstr "ERREUR: Invalide JSON: %s\n" -#: src/plib/plib_luatpl.c:121 -#, c-format -msgid "LUATPL Error: failed to load Lua script: %s.\n" -msgstr "LUATPL Erreur: échec du chargement du script LUA: %s.\n" - -#: src/plib/plib_luatpl.c:127 -#, c-format -msgid "LUATPL Error: failed to call init function: %s.\n" -msgstr "LUATPL Erreur: échec du lancement de la fonction init: %s.\n" - -#: src/plib/plib_luatpl.c:133 -#, c-format -msgid "LUATPL Error:failed to execute Lua script (%s): %s.\n" -msgstr "LUATP Erreur: échec de l'exécution du script Lua (%s): %s.\n" - -#: src/plib/plib_luatpl.c:140 -#, c-format -msgid "LUATPL Error:lua script (%s) returned a wrong type.\n" -msgstr "LUATPL Errur: le script Lua (%s) a retourné le mauvais type.\n" - -#: src/plib/plib_luatpl.c:147 -#, c-format -msgid "LUATPL Error:failed to open lua state.\n" -msgstr "LUATPL Errur: écher de creation du Lua state.\n" - -#: src/plib/plib_luatpl.c:154 -#, c-format -msgid "LUATPL Error: code: %d.\n" -msgstr "LUATPL Erreur: code: %d.\n" - -#: src/server/server.c:56 +#: src/server/server.c:52 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:88 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server est un serveur HTTP pour surveiller à distance les sondes " "matérielles." -#: src/server/server.c:103 +#: src/server/server.c:99 #, fuzzy msgid "" " -d,--debug run in debug mode\n" @@ -277,41 +247,41 @@ msgstr "" " -p,--port=PORT port du serveur Web\n" " -w,--wdir=DIR répertoire contenant les pages du serveur Web" -#: src/server/server.c:190 +#: src/server/server.c:173 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:326 +#: src/server/server.c:284 #, c-format msgid "HTTP Request: %s\n" msgstr "Requete HTTP: %s\n" -#: src/server/server.c:394 +#: src/server/server.c:352 #, c-format msgid "ERROR: failed to init lm-sensors\n" msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n" -#: src/server/server.c:401 +#: src/server/server.c:359 #, c-format msgid "ERROR: no sensors detected\n" msgstr "ERREUR: Aucune sonde detectee\n" -#: src/server/server.c:408 +#: src/server/server.c:366 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "ERREUR: Echec de la creation du serveur Web\n" -#: src/server/server.c:412 +#: src/server/server.c:370 #, c-format msgid "Web server started on port: %d\n" msgstr "Server Web demarre sur le port: %d\n" -#: src/server/server.c:413 +#: src/server/server.c:371 #, c-format msgid "WWW directory: %s\n" msgstr "WWW repertoire: %s\n" -#: src/server/server.c:414 +#: src/server/server.c:372 #, c-format msgid "URL: http://localhost:%d\n" msgstr "URL: http://localhost:%d\n" @@ -504,6 +474,24 @@ msgstr "Dessiner la courbe de la sonde" msgid "°C" msgstr "°C" +#~ msgid "LUATPL Error: failed to load Lua script: %s.\n" +#~ msgstr "LUATPL Erreur: échec du chargement du script LUA: %s.\n" + +#~ msgid "LUATPL Error: failed to call init function: %s.\n" +#~ msgstr "LUATPL Erreur: échec du lancement de la fonction init: %s.\n" + +#~ msgid "LUATPL Error:failed to execute Lua script (%s): %s.\n" +#~ msgstr "LUATP Erreur: échec de l'exécution du script Lua (%s): %s.\n" + +#~ msgid "LUATPL Error:lua script (%s) returned a wrong type.\n" +#~ msgstr "LUATPL Errur: le script Lua (%s) a retourné le mauvais type.\n" + +#~ msgid "LUATPL Error:failed to open lua state.\n" +#~ msgstr "LUATPL Errur: écher de creation du Lua state.\n" + +#~ msgid "LUATPL Error: code: %d.\n" +#~ msgstr "LUATPL Erreur: code: %d.\n" + #~ msgid "ERROR: nvidia initialization failure\n" #~ msgstr "ERREUR: échec de l'initialisation nvidia\n" diff --git a/po/psensor.pot b/po/psensor.pot index 41dab25..91bf893 100644 --- a/po/psensor.pot +++ b/po/psensor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-07-10 23:30+0200\n" +"POT-Creation-Date: 2011-07-13 11:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/main.c:72 src/server/server.c:80 +#: src/main.c:72 src/server/server.c:76 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -27,7 +27,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:82 src/server/server.c:90 +#: src/main.c:82 src/server/server.c:86 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" @@ -42,7 +42,7 @@ msgstr "" msgid "Options:" msgstr "" -#: src/main.c:89 src/server/server.c:97 +#: src/main.c:89 src/server/server.c:93 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -54,17 +54,17 @@ msgid "" "hostname:3131" msgstr "" -#: src/main.c:101 src/server/server.c:110 +#: src/main.c:101 src/server/server.c:106 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:103 src/server/server.c:112 +#: src/main.c:103 src/server/server.c:108 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:323 src/server/server.c:388 +#: src/main.c:323 src/server/server.c:346 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -204,88 +204,58 @@ msgstr "" msgid "ERROR: Invalid JSON: %s\n" msgstr "" -#: src/plib/plib_luatpl.c:121 -#, c-format -msgid "LUATPL Error: failed to load Lua script: %s.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:127 -#, c-format -msgid "LUATPL Error: failed to call init function: %s.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:133 -#, c-format -msgid "LUATPL Error:failed to execute Lua script (%s): %s.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:140 -#, c-format -msgid "LUATPL Error:lua script (%s) returned a wrong type.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:147 -#, c-format -msgid "LUATPL Error:failed to open lua state.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:154 -#, c-format -msgid "LUATPL Error: code: %d.\n" -msgstr "" - -#: src/server/server.c:56 +#: src/server/server.c:52 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:88 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:103 +#: src/server/server.c:99 msgid "" " -d,--debug run in debug mode\n" " -p,--port=PORT webserver port\n" " -w,--wdir=DIR directory containing webserver pages" msgstr "" -#: src/server/server.c:190 +#: src/server/server.c:173 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:326 +#: src/server/server.c:284 #, c-format msgid "HTTP Request: %s\n" msgstr "" -#: src/server/server.c:394 +#: src/server/server.c:352 #, c-format msgid "ERROR: failed to init lm-sensors\n" msgstr "" -#: src/server/server.c:401 +#: src/server/server.c:359 #, c-format msgid "ERROR: no sensors detected\n" msgstr "" -#: src/server/server.c:408 +#: src/server/server.c:366 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "" -#: src/server/server.c:412 +#: src/server/server.c:370 #, c-format msgid "Web server started on port: %d\n" msgstr "" -#: src/server/server.c:413 +#: src/server/server.c:371 #, c-format msgid "WWW directory: %s\n" msgstr "" -#: src/server/server.c:414 +#: src/server/server.c:372 #, c-format msgid "URL: http://localhost:%d\n" msgstr "" diff --git a/po/tr.po b/po/tr.po index 8b94203..5cd299a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-07-10 23:30+0200\n" +"POT-Creation-Date: 2011-07-13 11:01+0200\n" "PO-Revision-Date: 2011-04-10 13:11+0000\n" "Last-Translator: zeugma \n" "Language-Team: Turkish \n" @@ -18,7 +18,7 @@ msgstr "" "X-Launchpad-Export-Date: 2011-04-11 05:41+0000\n" "X-Generator: Launchpad (build 12735)\n" -#: src/main.c:72 src/server/server.c:80 +#: src/main.c:72 src/server/server.c:76 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -28,7 +28,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:82 src/server/server.c:90 +#: src/main.c:82 src/server/server.c:86 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Kullanım: %s [SEÇENEK]...\n" @@ -43,7 +43,7 @@ msgstr "" msgid "Options:" msgstr "" -#: src/main.c:89 src/server/server.c:97 +#: src/main.c:89 src/server/server.c:93 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -55,17 +55,17 @@ msgid "" "hostname:3131" msgstr "" -#: src/main.c:101 src/server/server.c:110 +#: src/main.c:101 src/server/server.c:106 #, c-format msgid "Report bugs to: %s\n" msgstr "Hataları rapor et:%s\n" -#: src/main.c:103 src/server/server.c:112 +#: src/main.c:103 src/server/server.c:108 #, c-format msgid "%s home page: <%s>\n" msgstr "%s ana sayfa: <%s>\n" -#: src/main.c:323 src/server/server.c:388 +#: src/main.c:323 src/server/server.c:346 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" @@ -209,88 +209,58 @@ msgstr "" msgid "ERROR: Invalid JSON: %s\n" msgstr "" -#: src/plib/plib_luatpl.c:121 -#, c-format -msgid "LUATPL Error: failed to load Lua script: %s.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:127 -#, c-format -msgid "LUATPL Error: failed to call init function: %s.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:133 -#, c-format -msgid "LUATPL Error:failed to execute Lua script (%s): %s.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:140 -#, c-format -msgid "LUATPL Error:lua script (%s) returned a wrong type.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:147 -#, c-format -msgid "LUATPL Error:failed to open lua state.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:154 -#, c-format -msgid "LUATPL Error: code: %d.\n" -msgstr "" - -#: src/server/server.c:56 +#: src/server/server.c:52 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:88 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:103 +#: src/server/server.c:99 msgid "" " -d,--debug run in debug mode\n" " -p,--port=PORT webserver port\n" " -w,--wdir=DIR directory containing webserver pages" msgstr "" -#: src/server/server.c:190 +#: src/server/server.c:173 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:326 +#: src/server/server.c:284 #, c-format msgid "HTTP Request: %s\n" msgstr "" -#: src/server/server.c:394 +#: src/server/server.c:352 #, c-format msgid "ERROR: failed to init lm-sensors\n" msgstr "" -#: src/server/server.c:401 +#: src/server/server.c:359 #, c-format msgid "ERROR: no sensors detected\n" msgstr "" -#: src/server/server.c:408 +#: src/server/server.c:366 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "" -#: src/server/server.c:412 +#: src/server/server.c:370 #, c-format msgid "Web server started on port: %d\n" msgstr "" -#: src/server/server.c:413 +#: src/server/server.c:371 #, c-format msgid "WWW directory: %s\n" msgstr "" -#: src/server/server.c:414 +#: src/server/server.c:372 #, c-format msgid "URL: http://localhost:%d\n" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index f769af9..be8c742 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.6.0.10\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-07-10 23:30+0200\n" +"POT-Creation-Date: 2011-07-13 11:01+0200\n" "PO-Revision-Date: 2011-06-06 08:57+0000\n" "Last-Translator: royclark \n" "Language-Team: Chinese (simplified)\n" @@ -18,7 +18,7 @@ msgstr "" "X-Launchpad-Export-Date: 2011-06-06 09:00+0000\n" "X-Generator: Launchpad (build 13144)\n" -#: src/main.c:72 src/server/server.c:80 +#: src/main.c:72 src/server/server.c:76 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -28,7 +28,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:82 src/server/server.c:90 +#: src/main.c:82 src/server/server.c:86 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "用法：%s [选项]...\n" @@ -43,7 +43,7 @@ msgstr "psensor 是一个 GTK 程序，用来监视硬件传感器，包括温 msgid "Options:" msgstr "" -#: src/main.c:89 src/server/server.c:97 +#: src/main.c:89 src/server/server.c:93 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -57,17 +57,17 @@ msgid "" "hostname:3131" msgstr " -u, --url=URL psensor服务器的 URL ，比如：http://hostname:3131" -#: src/main.c:101 src/server/server.c:110 +#: src/main.c:101 src/server/server.c:106 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:103 src/server/server.c:112 +#: src/main.c:103 src/server/server.c:108 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:323 src/server/server.c:388 +#: src/main.c:323 src/server/server.c:346 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -208,88 +208,58 @@ msgstr "" msgid "ERROR: Invalid JSON: %s\n" msgstr "" -#: src/plib/plib_luatpl.c:121 -#, c-format -msgid "LUATPL Error: failed to load Lua script: %s.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:127 -#, c-format -msgid "LUATPL Error: failed to call init function: %s.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:133 -#, c-format -msgid "LUATPL Error:failed to execute Lua script (%s): %s.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:140 -#, c-format -msgid "LUATPL Error:lua script (%s) returned a wrong type.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:147 -#, c-format -msgid "LUATPL Error:failed to open lua state.\n" -msgstr "" - -#: src/plib/plib_luatpl.c:154 -#, c-format -msgid "LUATPL Error: code: %d.\n" -msgstr "" - -#: src/server/server.c:56 +#: src/server/server.c:52 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:88 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "psensor 服务器是用来远程监视硬件的 HTTP 服务器。" -#: src/server/server.c:103 +#: src/server/server.c:99 msgid "" " -d,--debug run in debug mode\n" " -p,--port=PORT webserver port\n" " -w,--wdir=DIR directory containing webserver pages" msgstr "" -#: src/server/server.c:190 +#: src/server/server.c:173 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:326 +#: src/server/server.c:284 #, c-format msgid "HTTP Request: %s\n" msgstr "" -#: src/server/server.c:394 +#: src/server/server.c:352 #, c-format msgid "ERROR: failed to init lm-sensors\n" msgstr "" -#: src/server/server.c:401 +#: src/server/server.c:359 #, c-format msgid "ERROR: no sensors detected\n" msgstr "" -#: src/server/server.c:408 +#: src/server/server.c:366 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "" -#: src/server/server.c:412 +#: src/server/server.c:370 #, c-format msgid "Web server started on port: %d\n" msgstr "" -#: src/server/server.c:413 +#: src/server/server.c:371 #, c-format msgid "WWW directory: %s\n" msgstr "" -#: src/server/server.c:414 +#: src/server/server.c:372 #, c-format msgid "URL: http://localhost:%d\n" msgstr "" diff --git a/src/Makefile.am b/src/Makefile.am index 194ed36..bde5a54 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,11 +8,9 @@ endif if LIBMICROHTTPD if JSON -if LUA SUBDIRS += server endif endif -endif AM_CPPFLAGS = -Wall -pedantic -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\ -I$(top_srcdir)/src/lib \ diff --git a/src/Makefile.in b/src/Makefile.in index e008db2..23c9f25 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -35,7 +35,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @JSON_TRUE@am__append_1 = libpsensor_json -@JSON_TRUE@@LIBMICROHTTPD_TRUE@@LUA_TRUE@am__append_2 = server +@JSON_TRUE@@LIBMICROHTTPD_TRUE@am__append_2 = server bin_PROGRAMS = psensor$(EXEEXT) @LIBNOTIFY_TRUE@am__append_3 = ui_notify.h ui_notify.c @LIBNOTIFY_TRUE@am__append_4 = $(LIBNOTIFY_LIBS) @@ -211,8 +211,6 @@ LIBS = plib/libplib.a lib/libpsensor.a $(GTK_LIBS) $(GCONF_LIBS) \ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/src/glade/Makefile.in b/src/glade/Makefile.in index 2aca731..c96918b 100644 --- a/src/glade/Makefile.in +++ b/src/glade/Makefile.in @@ -125,8 +125,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 7e7dc61..88d36b1 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -127,8 +127,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/src/libpsensor_json/Makefile.in b/src/libpsensor_json/Makefile.in index 7436a20..a78a730 100644 --- a/src/libpsensor_json/Makefile.in +++ b/src/libpsensor_json/Makefile.in @@ -122,8 +122,6 @@ LIBS = ../lib/libpsensor.a \ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/src/plib/Makefile.am b/src/plib/Makefile.am index 6b6dd69..dbd537e 100644 --- a/src/plib/Makefile.am +++ b/src/plib/Makefile.am @@ -9,13 +9,3 @@ libplib_a_CFLAGS = -pedantic libplib_a_SOURCES = \ url.c url.h \ plib_io.h plib_io.c - -if LUA -noinst_LIBRARIES += libplib_luatpl.a - -libplib_luatpl_a_CFLAGS = -pedantic \ - $(LUA_CFLAGS) - -libplib_luatpl_a_SOURCES = \ - plib_luatpl.h plib_luatpl.c -endif \ No newline at end of file diff --git a/src/plib/Makefile.in b/src/plib/Makefile.in index cf60639..ef25b12 100644 --- a/src/plib/Makefile.in +++ b/src/plib/Makefile.in @@ -34,7 +34,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@LUA_TRUE@am__append_1 = libplib_luatpl.a subdir = src/plib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -53,12 +52,6 @@ libplib_a_LIBADD = am_libplib_a_OBJECTS = libplib_a-url.$(OBJEXT) \ libplib_a-plib_io.$(OBJEXT) libplib_a_OBJECTS = $(am_libplib_a_OBJECTS) -libplib_luatpl_a_AR = $(AR) $(ARFLAGS) -libplib_luatpl_a_LIBADD = -am__libplib_luatpl_a_SOURCES_DIST = plib_luatpl.h plib_luatpl.c -@LUA_TRUE@am_libplib_luatpl_a_OBJECTS = \ -@LUA_TRUE@ libplib_luatpl_a-plib_luatpl.$(OBJEXT) -libplib_luatpl_a_OBJECTS = $(am_libplib_luatpl_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -67,9 +60,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libplib_a_SOURCES) $(libplib_luatpl_a_SOURCES) -DIST_SOURCES = $(libplib_a_SOURCES) \ - $(am__libplib_luatpl_a_SOURCES_DIST) +SOURCES = $(libplib_a_SOURCES) +DIST_SOURCES = $(libplib_a_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -128,8 +120,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ @@ -220,18 +210,12 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = \ -I$(top_srcdir)/src -noinst_LIBRARIES = libplib.a $(am__append_1) +noinst_LIBRARIES = libplib.a libplib_a_CFLAGS = -pedantic libplib_a_SOURCES = \ url.c url.h \ plib_io.h plib_io.c -@LUA_TRUE@libplib_luatpl_a_CFLAGS = -pedantic \ -@LUA_TRUE@ $(LUA_CFLAGS) - -@LUA_TRUE@libplib_luatpl_a_SOURCES = \ -@LUA_TRUE@ plib_luatpl.h plib_luatpl.c - all: all-am .SUFFIXES: @@ -273,10 +257,6 @@ libplib.a: $(libplib_a_OBJECTS) $(libplib_a_DEPENDENCIES) -rm -f libplib.a $(libplib_a_AR) libplib.a $(libplib_a_OBJECTS) $(libplib_a_LIBADD) $(RANLIB) libplib.a -libplib_luatpl.a: $(libplib_luatpl_a_OBJECTS) $(libplib_luatpl_a_DEPENDENCIES) - -rm -f libplib_luatpl.a - $(libplib_luatpl_a_AR) libplib_luatpl.a $(libplib_luatpl_a_OBJECTS) $(libplib_luatpl_a_LIBADD) - $(RANLIB) libplib_luatpl.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -286,7 +266,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libplib_a-plib_io.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libplib_a-url.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libplib_luatpl_a-plib_luatpl.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -330,20 +309,6 @@ libplib_a-plib_io.obj: plib_io.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplib_a_CFLAGS) $(CFLAGS) -c -o libplib_a-plib_io.obj `if test -f 'plib_io.c'; then $(CYGPATH_W) 'plib_io.c'; else $(CYGPATH_W) '$(srcdir)/plib_io.c'; fi` -libplib_luatpl_a-plib_luatpl.o: plib_luatpl.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplib_luatpl_a_CFLAGS) $(CFLAGS) -MT libplib_luatpl_a-plib_luatpl.o -MD -MP -MF $(DEPDIR)/libplib_luatpl_a-plib_luatpl.Tpo -c -o libplib_luatpl_a-plib_luatpl.o `test -f 'plib_luatpl.c' || echo '$(srcdir)/'`plib_luatpl.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libplib_luatpl_a-plib_luatpl.Tpo $(DEPDIR)/libplib_luatpl_a-plib_luatpl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plib_luatpl.c' object='libplib_luatpl_a-plib_luatpl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplib_luatpl_a_CFLAGS) $(CFLAGS) -c -o libplib_luatpl_a-plib_luatpl.o `test -f 'plib_luatpl.c' || echo '$(srcdir)/'`plib_luatpl.c - -libplib_luatpl_a-plib_luatpl.obj: plib_luatpl.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplib_luatpl_a_CFLAGS) $(CFLAGS) -MT libplib_luatpl_a-plib_luatpl.obj -MD -MP -MF $(DEPDIR)/libplib_luatpl_a-plib_luatpl.Tpo -c -o libplib_luatpl_a-plib_luatpl.obj `if test -f 'plib_luatpl.c'; then $(CYGPATH_W) 'plib_luatpl.c'; else $(CYGPATH_W) '$(srcdir)/plib_luatpl.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libplib_luatpl_a-plib_luatpl.Tpo $(DEPDIR)/libplib_luatpl_a-plib_luatpl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plib_luatpl.c' object='libplib_luatpl_a-plib_luatpl.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libplib_luatpl_a_CFLAGS) $(CFLAGS) -c -o libplib_luatpl_a-plib_luatpl.obj `if test -f 'plib_luatpl.c'; then $(CYGPATH_W) 'plib_luatpl.c'; else $(CYGPATH_W) '$(srcdir)/plib_luatpl.c'; fi` - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ diff --git a/src/plib/plib_luatpl.c b/src/plib/plib_luatpl.c deleted file mode 100644 index b900e62..0000000 --- a/src/plib/plib_luatpl.c +++ /dev/null @@ -1,157 +0,0 @@ -/* - Copyright (C) 2010-2011 jeanfi@gmail.com - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ -#include -#include -#define _(str) gettext(str) - -#include -#include - -#include -#include - -#include "plib_luatpl.h" - -char * -luatpl_generate(const char *lua, - int (*init) (lua_State *, void *), - void *init_data, - struct luatpl_error *err) -{ - lua_State *L; - char *page = NULL; - - L = lua_open(); - if (!L) { - err->code = LUATPL_ERROR_LUA_STATE_OPEN; - return NULL; - } - - luaL_openlibs(L); - - if (!init || init(L, init_data)) { - - if (!luaL_loadfile(L, lua)) { - if (!lua_pcall(L, 0, 1, 0)) { - if (lua_isstring(L, -1)) - page = strdup(lua_tostring(L, -1)); - else - err->code = - LUATPL_ERROR_WRONG_RETURN_TYPE; - } else { - err->code = LUATPL_ERROR_LUA_EXECUTION; - err->message = strdup(lua_tostring(L, -1)); - } - } else { - err->code = LUATPL_ERROR_LUA_FILE_LOAD; - } - } else { - err->code = LUATPL_ERROR_INIT; - } - - lua_close(L); - - return page; -} - -int -luatpl_generate_file(const char *lua, - int (*init) (lua_State *, void *), - void *init_data, - const char *dst_path, - struct luatpl_error *err) -{ - FILE *f; - int ret; - char *content; - - ret = 1; - - content = luatpl_generate(lua, init, init_data, err); - - if (content) { - f = fopen(dst_path, "w"); - - if (f) { - if (fputs(content, f) == EOF) - ret = 0; - - if (fclose(f) == EOF) - ret = 0; - } else { - ret = 0; - } - - free(content); - } else { - ret = 0; - } - - return ret; -} - -void -luatpl_fprint_error(FILE *stream, - const struct luatpl_error *err, - const char *lua, - const char *dst_path) -{ - if (!err || !err->code) - return ; - - switch (err->code) { - case LUATPL_ERROR_LUA_FILE_LOAD: - fprintf(stream, - _("LUATPL Error: failed to load Lua script: %s.\n"), - lua); - break; - - case LUATPL_ERROR_INIT: - fprintf(stream, - _("LUATPL Error: failed to call init function: %s.\n"), - lua); - break; - - case LUATPL_ERROR_LUA_EXECUTION: - fprintf(stream, - _("LUATPL Error:" - "failed to execute Lua script (%s): %s.\n"), - lua, err->message); - break; - - case LUATPL_ERROR_WRONG_RETURN_TYPE: - fprintf(stream, - _("LUATPL Error:" - "lua script (%s) returned a wrong type.\n"), - lua); - break; - - case LUATPL_ERROR_LUA_STATE_OPEN: - fprintf(stream, - _("LUATPL Error:" - "failed to open lua state.\n")); - break; - - - default: - fprintf(stream, - _("LUATPL Error: code: %d.\n"), - err->code); - } -} diff --git a/src/plib/plib_luatpl.h b/src/plib/plib_luatpl.h deleted file mode 100644 index e8dc2c8..0000000 --- a/src/plib/plib_luatpl.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - Copyright (C) 2010-2011 jeanfi@gmail.com - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#ifndef _P_LUATPL_H -#define _P_LUATPL_H - -#include - -#define LUATPL_ERROR_LUA_FILE_LOAD 1 -#define LUATPL_ERROR_INIT 2 -#define LUATPL_ERROR_LUA_EXECUTION 3 -#define LUATPL_ERROR_WRONG_RETURN_TYPE 4 -#define LUATPL_ERROR_LUA_STATE_OPEN 5 - -struct luatpl_error { - unsigned int code; - - char *message; -}; - -/* - Generates a string which is the result of a Lua script execution. - - The string is retrieved from the top element of the Lua stack - after the Lua script execution. - - If not 'NULL' the 'init' function is called after Lua environment - setup and before Lua script execution. This function typically puts - input information for the Lua script into the stack. - - 'init_data' is passed to the second parameter of 'init' function - - Returns the generated string on success, or NULL on error. - */ -char *luatpl_generate(const char *lua, - int (*init) (lua_State *, void *), - void *init_data, - struct luatpl_error *err); - -/* - Generates a file which is the result of a Lua script execution. - - See luatpl_generate function for 'init', 'init_data', and 'err' - parameters. - - 'dst_path' is the path of the generated file - - Returns '1' on success, or '0' on error. - - */ -int luatpl_generate_file(const char *lua, - int (*init) (lua_State *, void *), - void *init_data, - const char *dst_path, - struct luatpl_error *err); - -void luatpl_fprint_error(FILE *stream, - const struct luatpl_error *err, - const char *lua, - const char *dst_path); - -#endif diff --git a/src/server/Makefile.am b/src/server/Makefile.am index 73192bf..3b42c56 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -19,13 +19,6 @@ LIBS = \ $(JSON_LIBS) \ $(LIBMICROHTTPD_LIBS) -if LUA -AM_CPPFLAGS += $(LUA_CFLAGS) -LIBS += ../plib/libplib_luatpl.a \ - $(LUA_LIBS) -psensor_server_SOURCES += server_lua.h server_lua.c -endif - if GTOP AM_CPPFLAGS += $(GTOP_CFLAGS) LIBS += $(GTOP_LIBS) diff --git a/src/server/Makefile.in b/src/server/Makefile.in index 5c25875..eefc54b 100644 --- a/src/server/Makefile.in +++ b/src/server/Makefile.in @@ -35,14 +35,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = psensor-server$(EXEEXT) -@LUA_TRUE@am__append_1 = $(LUA_CFLAGS) -@LUA_TRUE@am__append_2 = ../plib/libplib_luatpl.a \ -@LUA_TRUE@ $(LUA_LIBS) - -@LUA_TRUE@am__append_3 = server_lua.h server_lua.c -@GTOP_TRUE@am__append_4 = $(GTOP_CFLAGS) -@GTOP_TRUE@am__append_5 = $(GTOP_LIBS) -@GTOP_TRUE@am__append_6 = sysinfo.h sysinfo.c +@GTOP_TRUE@am__append_1 = $(GTOP_CFLAGS) +@GTOP_TRUE@am__append_2 = $(GTOP_LIBS) +@GTOP_TRUE@am__append_3 = sysinfo.h sysinfo.c subdir = src/server DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -56,12 +51,10 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) -am__psensor_server_SOURCES_DIST = server.c server.h server_lua.h \ - server_lua.c sysinfo.h sysinfo.c -@LUA_TRUE@am__objects_1 = server_lua.$(OBJEXT) -@GTOP_TRUE@am__objects_2 = sysinfo.$(OBJEXT) -am_psensor_server_OBJECTS = server.$(OBJEXT) $(am__objects_1) \ - $(am__objects_2) +am__psensor_server_SOURCES_DIST = server.c server.h sysinfo.h \ + sysinfo.c +@GTOP_TRUE@am__objects_1 = sysinfo.$(OBJEXT) +am_psensor_server_OBJECTS = server.$(OBJEXT) $(am__objects_1) psensor_server_OBJECTS = $(am_psensor_server_OBJECTS) psensor_server_LDADD = $(LDADD) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -154,13 +147,10 @@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = ../plib/libplib.a ../lib/libpsensor.a \ ../libpsensor_json/libpsensor_json.a $(SENSORS_LIBS) \ - $(JSON_LIBS) $(LIBMICROHTTPD_LIBS) $(am__append_2) \ - $(am__append_5) + $(JSON_LIBS) $(LIBMICROHTTPD_LIBS) $(am__append_2) LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ @@ -248,13 +238,12 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -psensor_server_SOURCES = server.c server.h $(am__append_3) \ - $(am__append_6) +psensor_server_SOURCES = server.c server.h $(am__append_3) AM_CPPFLAGS = -pedantic -Werror \ -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" -I$(top_srcdir)/src \ -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/libpsensor_json \ $(SENSORS_CFLAGS) $(JSON_CFLAGS) $(LIBMICROHTTPD_CFLAGS) \ - $(am__append_1) $(am__append_4) + $(am__append_1) @GTOP_TRUE@AM_LDFLAGS = -Wl,--as-needed dist_man_MANS = psensor-server.1 EXTRA_DIST = description.txt @@ -340,7 +329,6 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server_lua.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysinfo.Po@am__quote@ .c.o: diff --git a/src/server/server.c b/src/server/server.c index d75fc38..a40ff0a 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -40,10 +40,6 @@ #include "sysinfo.h" #endif -#ifdef HAVE_LUA -#include "server_lua.h" -#endif - #include "psensor_json.h" #include "plib/url.h" #include "plib/plib_io.h" @@ -113,19 +109,6 @@ void print_help() } /* - Returns '1' if the path denotates a Lua file, otherwise returns 0. - */ -int is_path_lua(const char *path) -{ - char *dot = rindex(path, '.'); - - if (dot && !strcasecmp(dot, ".lua")) - return 1; - - return 0; -} - -/* Returns the file path corresponding to a given URL */ char *get_path(const char *url, const char *www_dir) @@ -207,26 +190,6 @@ create_response_api(const char *nurl, } struct MHD_Response * -create_response_lua(const char *nurl, - const char *method, - unsigned int *rp_code, - const char *fpath) -{ -#ifdef HAVE_LUA - char *page = lua_to_html_page(&server_data, fpath); - - if (page) { - *rp_code = MHD_HTTP_OK; - - return MHD_create_response_from_data - (strlen(page), page, MHD_YES, MHD_NO); - } -#endif - - return NULL; -} - -struct MHD_Response * create_response_file(const char *nurl, const char *method, unsigned int *rp_code, @@ -270,12 +233,7 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code) } else { char *fpath = get_path(nurl, server_data.www_dir); - if (is_path_lua(fpath)) - resp = create_response_lua - (nurl, method, rp_code, fpath); - else - resp = create_response_file - (nurl, method, rp_code, fpath); + resp = create_response_file(nurl, method, rp_code, fpath); free(fpath); } diff --git a/src/server/server_lua.c b/src/server/server_lua.c deleted file mode 100644 index b59ac78..0000000 --- a/src/server/server_lua.c +++ /dev/null @@ -1,161 +0,0 @@ -/* - Copyright (C) 2010-2011 jeanfi@gmail.com - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#include -#include - -#include "server_lua.h" - -#include "plib/plib_luatpl.h" - -int init_lua(lua_State *L, void *data) -{ - struct server_data *server_data = data; - struct psensor **s_cur; - struct psensor **sensors = server_data->sensors; - int i; - static float load_scale = 1 << SI_LOAD_SHIFT; - - lua_newtable(L); - -#ifdef HAVE_GTOP - lua_pushstring(L, "load"); - lua_pushnumber(L, server_data->psysinfo.cpu_rate); - lua_settable(L, -3); -#endif - - lua_pushstring(L, "uptime"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.uptime); - lua_settable(L, -3); - - lua_pushstring(L, "load_1mn"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.loads[0] / load_scale); - lua_settable(L, -3); - - lua_pushstring(L, "load_5mn"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.loads[1] / load_scale); - lua_settable(L, -3); - - lua_pushstring(L, "load_15mn"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.loads[2] / load_scale); - lua_settable(L, -3); - - lua_pushstring(L, "freeram"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.freeram); - lua_settable(L, -3); - - lua_pushstring(L, "sharedram"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.sharedram); - lua_settable(L, -3); - - lua_pushstring(L, "bufferram"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.bufferram); - lua_settable(L, -3); - - lua_pushstring(L, "totalswap"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.totalswap); - lua_settable(L, -3); - - lua_pushstring(L, "freeswap"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.freeswap); - lua_settable(L, -3); - - lua_pushstring(L, "procs"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.procs); - lua_settable(L, -3); - - lua_pushstring(L, "totalhigh"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.totalhigh); - lua_settable(L, -3); - - lua_pushstring(L, "freehigh"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.freehigh); - lua_settable(L, -3); - - lua_pushstring(L, "totalram"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.totalram); - lua_settable(L, -3); - - lua_pushstring(L, "mem_unit"); - lua_pushnumber(L, server_data->psysinfo.sysinfo.mem_unit); - lua_settable(L, -3); - - lua_setglobal(L, "sysinfo"); - - lua_newtable(L); - - s_cur = sensors; - i = 1; - while (*s_cur) { - lua_pushnumber(L, i); - - lua_newtable(L); - - lua_pushstring(L, "name"); - lua_pushstring(L, (*s_cur)->name); - lua_settable(L, -3); - - lua_pushstring(L, "measure_last"); - lua_pushnumber(L, psensor_get_current_value(*s_cur)); - lua_settable(L, -3); - - lua_pushstring(L, "measure_min"); - lua_pushnumber(L, (*s_cur)->min); - lua_settable(L, -3); - - lua_pushstring(L, "measure_max"); - lua_pushnumber(L, (*s_cur)->max); - lua_settable(L, -3); - - lua_settable(L, -3); - - s_cur++; - i++; - } - - lua_setglobal(L, "sensors"); - - lua_pushstring(L, VERSION); - lua_setglobal(L, "psensor_version"); - - return 1; -} - -char *lua_to_html_page(struct server_data *server_data, const char *fpath) -{ - char *page = NULL; - struct luatpl_error err; - - err.message = NULL; - - page = luatpl_generate(fpath, - init_lua, - server_data, - &err); - - if (!page) { - luatpl_fprint_error(stderr, - &err, - fpath, - "outstring"); - free(err.message); - } - - return page; -} diff --git a/src/server/server_lua.h b/src/server/server_lua.h deleted file mode 100644 index 208186d..0000000 --- a/src/server/server_lua.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - Copyright (C) 2010-2011 jeanfi@gmail.com - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#ifndef _PSENSOR_SERVER_LUA_H_ -#define _PSENSOR_SERVER_LUA_H_ - -#include "server.h" - -char *lua_to_html_page(struct server_data *data, const char *fpath); - -#endif diff --git a/src/unity/Makefile.in b/src/unity/Makefile.in index ac339c4..92605dc 100644 --- a/src/unity/Makefile.in +++ b/src/unity/Makefile.in @@ -122,8 +122,6 @@ LIBS = @LIBS@ $(am__append_1) LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 8dd64a3..bfccbe7 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -101,8 +101,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ diff --git a/ubuntu-packaging/debian/control b/ubuntu-packaging/debian/control index 46e75d6..7cb9685 100644 --- a/ubuntu-packaging/debian/control +++ b/ubuntu-packaging/debian/control @@ -2,7 +2,7 @@ Source: psensor Section: utils Priority: optional Maintainer: Jean-Philippe Orsini -Build-Depends: debhelper (>= 7.0.50~),autoconf,automake,gettext,autopoint,libgtk2.0-dev,libgconf2-dev,libnotify-dev,libsensors4-dev,help2man,libcurl4-openssl-dev,libjson0-dev,liblua5.1-0-dev,libmicrohttpd-dev,libgtop2-dev,perl,libunity-dev,libappindicator-dev,nvidia-settings +Build-Depends: debhelper (>= 7.0.50~),autoconf,automake,gettext,autopoint,libgtk2.0-dev,libgconf2-dev,libnotify-dev,libsensors4-dev,help2man,libcurl4-openssl-dev,libjson0-dev,libmicrohttpd-dev,libgtop2-dev,perl,libunity-dev,libappindicator-dev,nvidia-settings Standards-Version: 3.9.2 Homepage: http://wpitchoune.net/psensor diff --git a/www/Makefile.am b/www/Makefile.am index 4ad4850..869ec53 100644 --- a/www/Makefile.am +++ b/www/Makefile.am @@ -1,4 +1,4 @@ defaultwwwdir = $(pkgdatadir)/www -defaultwww_DATA = index.html style.css favicon.ico index.lua monitor.html jquery.js +defaultwww_DATA = index.html style.css favicon.ico monitor.html jquery.js EXTRA_DIST=$(defaultwww_DATA) diff --git a/www/Makefile.in b/www/Makefile.in index 6bb66bb..c9a21a7 100644 --- a/www/Makefile.in +++ b/www/Makefile.in @@ -125,8 +125,6 @@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ @@ -215,7 +213,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ defaultwwwdir = $(pkgdatadir)/www -defaultwww_DATA = monitor.lua style.css favicon.ico index.lua monitor.html jquery.js +defaultwww_DATA = index.html style.css favicon.ico monitor.html jquery.js EXTRA_DIST = $(defaultwww_DATA) all: all-am -- 2.7.4