stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

call it spectrum2

Browse source
This commit is contained in:
HanzZ 2011-06-16 23:19:37 +02:00
parent 57b59b8220
commit fe3aa40faa
7 changed files with 48 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
backends/libircclient-qt/CMakeLists.txt
View file

@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp)
FILE(GLOB HEADERS *.h)
QT4_WRAP_CPP(SRC ${HEADERS})
ADD_EXECUTABLE(libircclient-qt_backend ${SRC})
ADD_EXECUTABLE(spectrum_libircclient-qt_backend ${SRC})
target_link_libraries(libircclient-qt_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport)
target_link_libraries(spectrum_libircclient-qt_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport)
INSTALL(TARGETS spectrum_libircclient-qt_backend RUNTIME DESTINATION bin)

6
backends/libpurple/CMakeLists.txt
View file

@ -1,7 +1,9 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp)
ADD_EXECUTABLE(libpurple_backend ${SRC})
ADD_EXECUTABLE(spectrum_libpurple_backend ${SRC})
target_link_libraries(libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport)
target_link_libraries(spectrum_libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport)
INSTALL(TARGETS spectrum_libpurple_backend RUNTIME DESTINATION bin)

15
spectrum/src/CMakeLists.txt
View file

@ -1,10 +1,17 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp)
ADD_EXECUTABLE(spectrum ${SRC})
ADD_EXECUTABLE(spectrum2 ${SRC})
ADD_DEPENDENCIES(spectrum libpurple_backend)
ADD_DEPENDENCIES(spectrum libircclient-qt_backend)
ADD_DEPENDENCIES(spectrum2 libpurple_backend)
ADD_DEPENDENCIES(spectrum2 libircclient-qt_backend)
target_link_libraries(spectrum transport)
target_link_libraries(spectrum2 transport)
INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin)
INSTALL(FILES
sample2.cfg
RENAME spectrum.cfg.example
DESTINATION /etc/spectrum2
)

8
spectrum/src/main.cpp
View file

@ -26,23 +26,23 @@ int main(int argc, char **argv)
if(vm.count("help"))
{
std::cout << desc << "\n";
exit(1);
return 1;
}
}
catch (std::runtime_error& e)
{
std::cout << desc << "\n";
exit(1);
return 1;
}
catch (...)
{
std::cout << desc << "\n";
exit(1);
return 1;
}
if (argc != 2) {
std::cout << desc << "\n";
exit(1);
return 1;
}

21
spectrum/src/sample2.cfg Normal file
View file

@ -0,0 +1,21 @@
[service]
jid = localhost
password = secret
server = 127.0.0.1
port = 5222
server_mode = 1
backend_host=localhost # < this option doesn't work yet
backend_port=10001
#cert= #patch to PKCS#12 certificate
#cert_password= #password to that certificate if any
users_per_backend=2
backend=spectrum_libpurple_backend
#backend=spectrum_libircclient-qt_backend
protocol=prpl-jabber
#protocol=prpl-msn
#protocol=prpl-icq
[database]
type = none # "sqlite3" or "none" without database backend
database = test.sql
#prefix=icq

4
src/CMakeLists.txt
View file

@ -19,5 +19,5 @@ SET_TARGET_PROPERTIES(transport PROPERTIES
INSTALL(TARGETS transport LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc")
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig)
#CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc")
#INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig)

4
src/config.cpp
View file

@ -55,8 +55,8 @@ bool Config::load(const std::string &configfile, boost::program_options::options
("database.prefix", value<std::string>()->default_value(""), "Prefix of tables in database")
;
store(parse_config_file(ifs, opts), m_variables);
notify(m_variables);
// store(parse_config_file(ifs, opts), m_variables);
// notify(m_variables);
m_file = configfile;