Changeset 3eedfa6 in nscp

Timestamp:

11/12/09 23:32:23 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

d05c3f0

Parents:

818b54e

Message:

fixed so we have a settings subsytem (ini files) which work on linux

Files:

• include/settings/settings_ini.hpp (modified) (2 diffs)
• include/simpleini/simpleini.h (modified) (4 diffs)
• service/CMakeLists.txt (modified) (4 diffs)

include/settings/settings_ini.hpp

@@ -4 +4 @@
 #include <map>
 #include <settings/Settings.h>
+
 #include <simpleini/simpleini.h>
 #include <error.hpp>
@@ -227 +228 @@
       if (_wfopen_s(&fp, filename.c_str(), L"rb") != 0)
         return false;
+#elif WIN32
+      fp = _wfopen(filename.c_str(), L"rb");
 #else
-      fp = _wfopen(filename.c_str(), L"rb");
+      fp = fopen(to_string(filename).c_str(), "rb");
 #endif
       if (!fp)

include/simpleini/simpleini.h

@@ -252 +252 @@
 #endif // _WIN32
 
-#define SI_CONVERT_ICU
-
 #if defined(SI_CONVERT_ICU)
 # include <unicode/ustring.h>
@@ -264 +262 @@
 # define SI_HAS_WIDE_FILE
 # define SI_WCHAR_T     UChar
+#else
+# define SI_HAS_WIDE_FILE
+# define SI_WCHAR_T     wchar_t
 #endif
 
@@ -1128 +1129 @@
     fclose(fp);
     return rc;
+#else //_WIN32
+#if SI_CONVERT_ICU
+  char szFile[256];
+  u_austrncpy(szFile, a_pwszFile, sizeof(szFile));
+  return LoadFile(szFile);
 #else // SI_CONVERT_ICU
-    char szFile[256];
-    u_austrncpy(szFile, a_pwszFile, sizeof(szFile));
-    return LoadFile(szFile);
-#endif
+  return LoadFile(to_string(std::wstring(a_pwszFile)).c_str());
+#endif // SI_CONVERT_ICU
+#endif //_WIN32
 }
 #endif // SI_HAS_WIDE_FILE
@@ -1944 +1949 @@
     fclose(fp);
     return rc;
+#else // _WIN32
+#ifdef SI_CONVERT_ICU
+  char szFile[256];
+  u_austrncpy(szFile, a_pwszFile, sizeof(szFile));
+  return SaveFile(szFile, a_bAddSignature);
 #else // SI_CONVERT_ICU
-    char szFile[256];
-    u_austrncpy(szFile, a_pwszFile, sizeof(szFile));
-    return SaveFile(szFile, a_bAddSignature);
-#endif
+  return SaveFile(to_string(std::wstring(a_pwszFile)).c_str(), a_bAddSignature);
+#endif // SI_CONVERT_ICU
+#endif // _WIN32
 }
 #endif // SI_HAS_WIDE_FILE

service/CMakeLists.txt

@@ -2 +2 @@
   
 PROJECT(NSCP)
-SET(CMAKE_MODULE_PATH ${NSCP_SOURCE_DIR})
+#SET(CMAKE_MODULE_PATH ${NSCP_SOURCE_DIR})
 
 SET(VERSION_SERIES 0)
@@ -62 +62 @@
 ENDIF(WIN32)
 
-find_package(Boost COMPONENTS system filesystem thread REQUIRED)
+#SET(CMAKE_MODULE_PATH "../cmake/")
+FIND_PACKAGE(Boost COMPONENTS system filesystem thread REQUIRED)
 
 #INCLUDE(../cmake/WtFindBoost.txt)
 #INCLUDE(../cmake/WtFindAsio.txt)
 INCLUDE(../cmake/WtFindSsl.txt)
+#INCLUDE(../cmake/FindICU.cmake)
+
+#IF(NOT WIN32)
+# FIND_PACKAGE(ICU REQUIRED)
+# IF(NOT ICU_FOUND)
+#   MESSAGE(FATAL_ERROR "ICU package not found..")
+# ELSE(NOT ICU_FOUND)
+#   ADD_DEFINITIONS( -DSI_CONVERT_ICU )
+# ENDIF(NOT ICU_FOUND)
+#ENDIF(NOT WIN32)
+
+IF(NOT WIN32)
+  FIND_PACKAGE(Threads REQUIRED)
+  IF (NOT CMAKE_USE_PTHREADS_INIT)
+    message(FATAL_ERROR "Could not find POSIX threads")
+  ELSE (NOT CMAKE_USE_PTHREADS_INIT)
+    #add_definitions(-D_REENTRANT)
+  ENDIF (NOT CMAKE_USE_PTHREADS_INIT)
+  FIND_PACKAGE(Threads REQUIRED)
+ENDIF(NOT WIN32)
+
+
 
 # Boost is used nearly everywhere, so we can put these here
@@ -105 +128 @@
   ../include/NSCHelper.cpp
   ../include/arrayBuffer.cpp
+  ../include/simpleini/ConvertUTF.c
 # ../include/ServiceCmd.cpp
   ../include/b64/b64.c
@@ -112 +136 @@
   ${Boost_FILESYSTEM_LIBRARY}
   ${Boost_LIBRARIES}
+  ${CMAKE_THREAD_LIBS_INIT}
   ${EXTRA_LIBS}
 )