Mercurial Mercurial > mod-mcabber-lua / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Package/module name change
authorMyhailo Danylenko <isbear@ukrpost.net>
Fri, 23 Oct 2009 13:14:19 +0300
changeset 83 794e54ea1022
parent 82 546ee60a3b91
child 84 c0db7efde255
Package/module name change
CMakeLists.txt file | annotate | diff | comparison | revisions
examples/lua.rc file | annotate | diff | comparison | revisions
main.c file | annotate | diff | comparison | revisions 
--- a/CMakeLists.txt	Fri Oct 23 13:13:50 2009 +0300
+++ b/CMakeLists.txt	Fri Oct 23 13:14:19 2009 +0300
@@ -1,8 +1,8 @@
 
 ## Copyright 2009 Myhailo Danylenko
-# This file is part of mcabber-lua.
+# This file is part of lua.
 #
-# mcabber-lua is free software: you can redistribute it and/or modify
+# lua 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.
@@ -16,30 +16,30 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 cmake_minimum_required(VERSION 2.6)
-project(mcabber-lua C)
+project(lua C)
 
 ## User options
 option(DEBUG "Enable debugging output" ON)
 option(LLM_CONNECTION_ENABLE "Enable exposing of mcabber loudmouth connection to lua" ON)
 option(LLM_LOG_HANDLER "Enable registration of log messages handler for lua-loudmouth library's messages" ON)
-set(MCABBER_INCLUDE_DIR "${mcabber-lua_SOURCE_DIR}/include" CACHE FILEPATH "Path to mcabber headers")
+set(MCABBER_INCLUDE_DIR "${lua_SOURCE_DIR}/include" CACHE FILEPATH "Path to mcabber headers")
 set(ML_SOURCE_PRIORITY G_PRIORITY_HIGH_IDLE CACHE STRING "Glib event source priority for timeout and bgread")
 set(ML_BGREAD_BUFFER 4096 CACHE STRING "Background pipe reading buffer size")
 
 ## Define targets
-add_library(mcabber-lua MODULE main.c util.c)
-get_target_property(mcabber-lua_SOURCES mcabber-lua SOURCES)
+add_library(lua MODULE main.c util.c)
+get_target_property(lua_SOURCES lua SOURCES)
 
 ## Packaging information
-set(CPACK_PACKAGE_NAME mcabber-lua)
-set(CPACK_PACKAGE_VERSION "0.0.0")
+set(CPACK_PACKAGE_NAME libmcabber-lua)
+set(CPACK_PACKAGE_VERSION "0.0.1")
 set(CPACK_PACKAGE_VENDOR "IsBear")
 set(CPACK_PACKAGE_CONTACT "Myhailo Danylenko <isbear@ukrpost.net>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber lua module")
-set(CPACK_PACKAGE_DESCRIPTION_FILE ${mcabber-lua_SOURCE_DIR}/README)
-set(CPACK_RESOURCE_FILE_LICENSE ${mcabber-lua_SOURCE_DIR}/COPYING)
-set(CPACK_RESOURCE_FILE_README ${mcabber-lua_SOURCE_DIR}/README)
-set(CPACK_RESOURCE_FILE_WELCOME ${mcabber-lua_SOURCE_DIR}/README)
+set(CPACK_PACKAGE_DESCRIPTION_FILE ${lua_SOURCE_DIR}/README)
+set(CPACK_RESOURCE_FILE_LICENSE ${lua_SOURCE_DIR}/COPYING)
+set(CPACK_RESOURCE_FILE_README ${lua_SOURCE_DIR}/README)
+set(CPACK_RESOURCE_FILE_WELCOME ${lua_SOURCE_DIR}/README)
 set(CPACK_SOURCE_GENERATOR TBZ2)
 set(CPACK_GENERATOR DEB CACHE STRING "Binary package generator, eg DEB, RPM, TGZ, NSIS...")
 # XXX
@@ -72,19 +72,19 @@
 ## Set up compiler
 configure_file(config.h.in config.h ESCAPE_QUOTES)
 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})
+target_link_libraries(lua ${LUA_LIBRARIES} ${GLIB_LIBRARIES} ${GMODULE_LIBRARIES})
+include_directories(${lua_SOURCE_DIR} ${lua_BINARY_DIR} ${MCABBER_INCLUDE_DIR})
 
 ## Extra targets
 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)
+	add_custom_command(OUTPUT ${lua_BINARY_DIR}/lua.html COMMAND ${PERL_EXECUTABLE} ${lua_SOURCE_DIR}/docgen.pl ${lua_SOURCES} > ${lua_BINARY_DIR}/lua.html DEPENDS ${lua_SOURCE_DIR}/docgen.pl ${lua_SOURCES} WORKING_DIRECTORY ${lua_SOURCE_DIR})
+	add_custom_target(doc ALL DEPENDS ${lua_BINARY_DIR}/lua.html)
 endif()
 
 ## Set up installer
-install(TARGETS mcabber-lua DESTINATION lib/mcabber)
+install(TARGETS lua DESTINATION lib/mcabber)
 if(PERL_FOUND)
-	install(FILES ${mcabber-lua_BINARY_DIR}/mcabber-lua.html DESTINATION share/doc/${CPACK_PACKAGE_NAME})
+	install(FILES ${lua_BINARY_DIR}/lua.html DESTINATION share/doc/${CPACK_PACKAGE_NAME})
 endif()
 install(DIRECTORY examples DESTINATION share/doc/${CPACK_PACKAGE_NAME} PATTERN "*~" EXCLUDE)
 install(FILES README DESTINATION share/doc/${CPACK_PACKAGE_NAME})
--- a/examples/lua.rc	Fri Oct 23 13:13:50 2009 +0300
+++ b/examples/lua.rc	Fri Oct 23 13:14:19 2009 +0300
@@ -29,5 +29,5 @@
 # filter evil stanzas
 set lua_filter_evil      = 0
 
-load mcabber-lua
+load lua
 
--- a/main.c	Fri Oct 23 13:13:50 2009 +0300
+++ b/main.c	Fri Oct 23 13:14:19 2009 +0300
@@ -1150,6 +1150,8 @@
 	cb->source = source;
 	lua_bgreads = g_slist_prepend (lua_bgreads, (gpointer) source);
 
+	// unref?
+
 	return 0;
 }
mod-mcabber-lua