# HG changeset patch
# User Myhailo Danylenko
# Date 1235354705 -7200
# Node ID 7d87d323c8893f9d2e2f2f96dc91e2740fbe383e
# Parent 65cbecad22b4184bb0fc53734e6588f28bacc56c
Fixes and improvement
* style changed
* documentation
* various fixes
* unregistering commands (see TODO)
diff -r 65cbecad22b4 -r 7d87d323c889 CMakeLists.txt
--- a/CMakeLists.txt Sun Feb 22 23:14:24 2009 +0200
+++ b/CMakeLists.txt Mon Feb 23 04:05:05 2009 +0200
@@ -4,7 +4,7 @@
## User options
option(DEBUG "Enable debugging output" ON)
-option(MCABBER_INCLUDE_DIR "Path to mcabber include files" "/home/isbear/src/mcabber/hglm/mcabber/src")
+set(MCABBER_INCLUDE_DIR "/home/isbear/src/mcabber/hglm/mcabber/src" CACHE FILEPATH "Path to mcabber headers")
## Define targets
add_library(mcabber-lua MODULE main.c util.c)
@@ -38,19 +38,20 @@
find_package(PkgConfig REQUIRED)
pkg_check_modules(GLIB REQUIRED glib-2.0)
pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
-#find_package(Perl)
+pkg_check_modules(LM REQUIRED loudmouth-1.0)
+find_package(Perl)
## Set up compiler
configure_file(config.h.in config.h)
-include_directories(SYSTEM ${LUA_INCLUDE_DIR} ${GLIB_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS})
+include_directories(SYSTEM ${LUA_INCLUDE_DIR} ${GLIB_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS} ${LM_INCLUDE_DIRS})
target_link_libraries(mcabber-lua ${LUA_LIBRARIES} ${GLIB_LIBRARIES} ${GMODULE_LIBRARIES})
include_directories(${mcabber-lua_SOURCE_DIR} ${mcabber-lua_BINARY_DIR} ${MCABBER_INCLUDE_DIR})
## Extra targets
-#if(PERL_FOUND)
-# add_custom_command(OUTPUT ${lua-lm_BINARY_DIR}/loudmouth.html COMMAND ${PERL_EXECUTABLE} ${lua-lm_SOURCE_DIR}/docgen.pl ${lua-lm_SOURCES} > ${lua-lm_BINARY_DIR}/loudmouth.html DEPENDS ${lua-lm_SOURCE_DIR}/docgen.pl ${lua-lm_SOURCES} WORKING_DIRECTORY ${lua-lm_SOURCE_DIR})
-# add_custom_target(doc ALL DEPENDS ${lua-lm_BINARY_DIR}/loudmouth.html)
-#endif()
+if(PERL_FOUND)
+ add_custom_command(OUTPUT ${mcabber-lua_BINARY_DIR}/mcabber-lua.html COMMAND ${PERL_EXECUTABLE} ${mcabber-lua_SOURCE_DIR}/docgen.pl ${mcabber-lua_SOURCES} > ${mcabber-lua_BINARY_DIR}/mcabber-lua.html DEPENDS ${mcabber-lua_SOURCE_DIR}/docgen.pl ${mcabber-lua_SOURCES} WORKING_DIRECTORY ${mcabber-lua_SOURCE_DIR})
+ add_custom_target(doc ALL DEPENDS ${mcabber-lua_BINARY_DIR}/mcabber-lua.html)
+endif()
#add_custom_target(test COMMAND env "LUA_PATH=${lua-lm_SOURCE_DIR}/?.lua;${LUA_PATH}" "LUA_CPATH=${lua-lm_SOURCE_DIR}/?.so;${lua-lm_BINARY_DIR}/?.so;${LUA_CPATH}" lua ${lua-lm_SOURCE_DIR}/test.lua DEPENDS loudmouth VERBATIM)
#add_custom_target(test1 COMMAND env "LUA_PATH=${lua-lm_SOURCE_DIR}/?.lua;${LUA_PATH}" "LUA_CPATH=${lua-lm_SOURCE_DIR}/?.so;${lua-lm_BINARY_DIR}/?.so;${LUA_CPATH}" lua ${lua-lm_BINARY_DIR}/test.lua DEPENDS loudmouth VERBATIM)
@@ -58,9 +59,9 @@
install(TARGETS mcabber-lua DESTINATION lib/mcabber)
#install(FILES lm.lua DESTINATION share/lua/5.1)
#install(FILES test.lua DESTINATION share/doc/${CPACK_PACKAGE_NAME}/examples)
-#if(PERL_FOUND)
-# install(FILES ${lua-lm_BINARY_DIR}/loudmouth.html DESTINATION share/doc/${CPACK_PACKAGE_NAME})
-#endif()
+if(PERL_FOUND)
+ install(FILES ${mcabber-lua_BINARY_DIR}/mcabber-lua.html DESTINATION share/doc/${CPACK_PACKAGE_NAME})
+endif()
install(FILES README DESTINATION share/doc/${CPACK_PACKAGE_NAME})
install(FILES TODO DESTINATION share/doc/${CPACK_PACKAGE_NAME})
install(FILES COPYING DESTINATION share/doc/${CPACK_PACKAGE_NAME})
diff -r 65cbecad22b4 -r 7d87d323c889 TODO
--- a/TODO Sun Feb 22 23:14:24 2009 +0200
+++ b/TODO Mon Feb 23 04:05:05 2009 +0200
@@ -1,8 +1,8 @@
-improve global print to work on other types. or improve types :)
+print should allow other types to be printed
finish roster list information
-implement dopath() thing instead of main.config_file()
settings list?
non-setting settings?
-...
+set package searching paths?
+register commands inside of lua object too, then unregister them on exit
diff -r 65cbecad22b4 -r 7d87d323c889 config.h.in
--- a/config.h.in Sun Feb 22 23:14:24 2009 +0200
+++ b/config.h.in Mon Feb 23 04:05:05 2009 +0200
@@ -5,6 +5,9 @@
// define this to enable debugging output
#cmakedefine DEBUG
+// hack for mcabber headers
+#define MODULES_ENABLE
+
#ifdef DEBUG
# include
diff -r 65cbecad22b4 -r 7d87d323c889 docgen.pl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docgen.pl Mon Feb 23 04:05:05 2009 +0200
@@ -0,0 +1,108 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+my %docs;
+my @tags;
+my $inside;
+my $harvest;
+my @values;
+
+foreach my $file (@ARGV) {
+ if ( not open SOURCE, '<', $file ) {
+ print STDERR "Cannot open $file\n";
+ next;
+ }
+
+ my $chunk = 0;
+
+ while (
"
+ }
+ print "
";
+}
+
+print "