switch to boost filesystem

CMakeLists.txt

@@ -99,9 +99,9 @@ find_package(LibOVR REQUIRED)
 find_package(OpenMP REQUIRED)
 find_package(Lua52 REQUIRED)
 
-
-if(REGEX_USE_BOOST)
-find_package(Boost REQUIRED regex)
+if(USE_BOOST)
+message("find ${USE_BOOST}")
+find_package(Boost REQUIRED ${USE_BOOST})
 endif()
 
 if(OPENMP_FOUND)

cmake/PlatformLinuxGCC.cmake

@@ -13,10 +13,14 @@ else()
 endif()
 
 if(GCC_VERSION VERSION_LESS 4.9)
-    set(REGEX_USE_BOOST TRUE)
+    set(USE_BOOST ${USE_BOOST} regex)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DREGEX_USE_BOOST")
 endif()
 
+set(USE_BOOST ${USE_BOOST} system filesystem)  # until gcc implements <filesystem>
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DFILESYSTEM_USE_BOOST")
+
+
 set(LINUX_COMPILE_DEFS
 	LINUX	                  # Linux system
 	PIC		                  # Position-independent code

lib/setup_libs.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 sudo apt-get install -y build-essential xorg-dev libglu1-mesa-dev cmake \
-    libboost-regex1.54-dev libudev-dev libopenal-dev libsndfile1-dev libjpeg-dev liblua5.2-dev
+    libboost-regex1.54-dev libboost-filesystem1.54-dev libudev-dev \
+    libopenal-dev libsndfile1-dev libjpeg-dev liblua5.2-dev
 
 pushd `dirname $0`
 

src/utils/def_filesystem.h

@@ -0,0 +1,8 @@
+
+#ifdef FILESYSTEM_USE_BOOST
+#include <boost/filesystem.hpp>
+namespace filesystem = boost::filesystem;
+#else
+#include <filesystem>
+namespace filesystem = std::tr2::sys;
+#endif

src/utils/filesystem.cpp

@@ -1,49 +1,27 @@
 #include "filesystem.h"
 
-#ifdef WIN32
-#include <filesystem>
-namespace std {
-    namespace sys = tr2::sys;
-}
-#else
-#include <dirent.h>
-#include <unistd.h>
-#endif
-
 #include <fstream>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
 #include <stdlib.h>
 
+#include "def_filesystem.h"
 
 bool FileSystem::exists(const std::string& path) {
-    struct stat info;
-    if (stat(path.c_str(), &info) != 0) {
-        return false;
-    } else {
-        int exists = info.st_mode & (S_IFREG | S_IFDIR); // is file or directory
-        return exists != 0;
-    }
+    return filesystem::exists(filesystem::path(path));
 }
 
 bool FileSystem::removeFile(const std::string& path) {
-    return ::remove(path.c_str()) == 0;
+    return filesystem::remove(filesystem::path(path));
 }
 
 bool FileSystem::createDirectory(const std::string& path) {
-#ifdef WIN32
-    return std::sys::create_directory(std::sys::path(path));
-#else
-    return mkdir(path.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0;
-#endif
+    return filesystem::create_directory(filesystem::path(path));
 }
 
 bool FileSystem::removeDirectory(const std::string& path) {
-#ifdef WIN32 
-    return std::sys::remove_directory(std::sys::path(path));
+#ifdef WIN32
+    return filesystem::remove_directory(filesystem::path(path));
 #else
-    return rmdir(path.c_str()) == 0;
+    return filesystem::remove(filesystem::path(path));
 #endif
 }
 

test/property/testproperty.cpp

@@ -167,6 +167,7 @@ go_bandit([](){
 
         it("can iterate directories", [&]() {
             std::string dir = FileSystem::userConfigDir() + "/test";
+            AssertThat(FileSystem::exists(dir), Equals(false));
             FileSystem::createDirectory(dir);
 
             std::ofstream(dir + "/test1.txt").close();
@@ -182,6 +183,7 @@ go_bandit([](){
             FileSystem::removeFile(dir + "/test2.txt");
             FileSystem::removeDirectory(dir + "/test3");
             FileSystem::removeDirectory(dir);
+
         });
     });
 });