* Revert erroneous changes from the accidental commit
76654bcb643c29ad4fe922fcb61d574cf4355a18.
* Disable RPC agent and Python API/Shell in Windows build
Signed-off-by: Zane Bitter <zbitter(a)redhat.com>
---
src/CMakeLists.txt | 2 ++
src/broker/CMakeLists.txt | 2 ++
src/broker/broker_federation.c | 4 ++--
src/lib/CMakeLists.txt | 7 ++++++-
src/python/CMakeLists.txt | 2 ++
src/rpc/CMakeLists.txt | 2 ++
6 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 63f3ae8..6c087f0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -109,8 +109,10 @@ SET(CMAKE_REQUIRED_LIBRARIES ${glib_LIBRARIES})
check_function_exists (g_list_free_full HAVE_G_LIST_FREE_FULL)
# Python
+if(NOT WIN32)
pkg_check_modules(python REQUIRED python)
include_directories(${python_INCLUDE_DIRS})
+endif(NOT WIN32)
# cURL
if(NOT WIN32)
diff --git a/src/broker/CMakeLists.txt b/src/broker/CMakeLists.txt
index bce39ed..f5959c6 100644
--- a/src/broker/CMakeLists.txt
+++ b/src/broker/CMakeLists.txt
@@ -1,6 +1,7 @@
SET(BROKER_DAEMON "matahari-brokerd")
if(WITH-QMF)
+if(NOT WIN32)
add_executable(${BROKER_DAEMON} broker.c broker_federation.c broker_${VARIANT}.c)
target_link_libraries(${BROKER_DAEMON} ${glib_LIBRARIES} mcommon)
@@ -33,5 +34,6 @@ if(WITH-QMF)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/matahari-broker.service DESTINATION
${systemdunitdir})
endif(systemd_FOUND)
+endif(NOT WIN32)
endif(WITH-QMF)
diff --git a/src/broker/broker_federation.c b/src/broker/broker_federation.c
index ba3b14d..20ffc14 100644
--- a/src/broker/broker_federation.c
+++ b/src/broker/broker_federation.c
@@ -120,7 +120,7 @@ broker_federation_configure(void)
const char *proxy_service_dir = getenv("VP_G_HOST_DIR");
char local[16];
char peers[1024];
- char *peer;
+ char *peer = NULL;
if (g_file_test(proxy_service_dir, G_FILE_TEST_IS_DIR)) {
char remote[16];
@@ -132,7 +132,7 @@ broker_federation_configure(void)
mh_string_copy(peers, brokers, sizeof(peers));
- while ((peer = strtok(peers, ",; ")) != NULL) {
+ while ((peer = strtok(peer ? NULL : peers, ",; ")) != NULL) {
if (IS_DNS_SRV(peer, TCP) || IS_DNS_SRV(peer, TLS)) {
peer = broker_lookup(peer);
}
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 5d21b9e..6d11d5f 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -1,6 +1,9 @@
# Library
-set(LIBS mcommon mhost mnetwork mrpc mservice msysconfig)
+set(LIBS mcommon mhost mnetwork mservice msysconfig)
+if(NOT WIN32)
+ set(LIBS ${LIBS} mrpc)
+endif(NOT WIN32)
include_directories(${pcre_INCLUDE_DIRS})
# See
http://sourceware.org/autobook/autobook/autobook_91.html for
@@ -22,9 +25,11 @@ add_library (mnetwork SHARED network.c network_${VARIANT}.c)
set_target_properties(mnetwork PROPERTIES SOVERSION 1.0.0)
target_link_libraries(mnetwork ${pcre_LIBRARIES} mcommon ${SIGAR} ${glib_LIBRARIES})
+if(NOT WIN32)
add_library (mrpc SHARED rpc.c rpc-python.c)
set_target_properties(mrpc PROPERTIES SOVERSION 1.0.0)
target_link_libraries(mrpc mcommon ${python_LIBRARIES})
+endif(NOT WIN32)
add_library (mservice SHARED services.c services_${VARIANT}.c)
set_target_properties(mservice PROPERTIES SOVERSION 1.0.0)
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index 0a8a428..6afb289 100644
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -1,3 +1,4 @@
+if(NOT WIN32)
FIND_PACKAGE(PythonInterp)
macro(py_module MODULE DIRECTORY)
@@ -38,4 +39,5 @@ if(WITH-QMF)
DESTINATION bin)
endif(WITH-QMF)
+endif(NOT WIN32)
diff --git a/src/rpc/CMakeLists.txt b/src/rpc/CMakeLists.txt
index a6794c3..f5595fb 100644
--- a/src/rpc/CMakeLists.txt
+++ b/src/rpc/CMakeLists.txt
@@ -4,6 +4,7 @@ set(QMF_AGENT "matahari-qmf-${BASE}d")
# QMF daemon
if(WITH-QMF)
+if(NOT WIN32)
set(SCHEMA_SOURCES
${CMAKE_CURRENT_BINARY_DIR}/qmf/org/matahariproject/rpc/QmfPackage.cpp)
generate_qmf_schemas(${CMAKE_CURRENT_SOURCE_DIR}/schema.xml ${SCHEMA_SOURCES})
include_directories(${CMAKE_CURRENT_BINARY_DIR})
@@ -17,5 +18,6 @@ if(WITH-QMF)
install(TARGETS ${QMF_AGENT} DESTINATION sbin)
install(CODE "file(MAKE_DIRECTORY
\$ENV{DESTDIR}/usr/lib/matahari/plugins)")
+endif(NOT WIN32)
endif(WITH-QMF)