libtransport.git Changeset - fe3aa40faa22

Changeset - fe3aa40faa22

Parent rev.

Child rev.

[Not reviewed]

0 6 1

HanzZ - 14 years ago 2011-06-16 23:19:37
hanzz.k@gmail.com

call it spectrum2

7 files changed with 48 insertions and 16 deletions:

backends/libircclient-qt/CMakeLists.txt

backends/libpurple/CMakeLists.txt

spectrum/src/CMakeLists.txt

spectrum/src/main.cpp

spectrum/src/sample2.cfg

src/CMakeLists.txt

src/config.cpp

0 comments (0 inline, 0 general)

backends/libircclient-qt/CMakeLists.txt

➞

Show inline comments

@@ @@ -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)

backends/libpurple/CMakeLists.txt

➞

Show inline comments

 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)

spectrum/src/CMakeLists.txt

➞

Show inline comments

 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
+	)

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -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;
+	}

spectrum/src/sample2.cfg

➞

Show inline comments

@@ new file 100644 @@
 [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

src/CMakeLists.txt

➞

Show inline comments

@@ @@ -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)

src/config.cpp

➞

Show inline comments

 		("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;

0 comments (0 inline, 0 general)