fixed scripts and compilation errors in linux and CMake config issues…

… as well
faburaya · Nov 26, 2017 · 694a4b4 · 694a4b4
1 parent 62d4a18
commit 694a4b4
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 22 deletions.
diff --git a/3FD/CMakeLists.txt b/3FD/CMakeLists.txt
@@ -78,5 +78,5 @@ add_library(3FD STATIC
 
 install(
     TARGETS 3FD
-    DESTINATION "${PROJECT_SOURCE_DIR}/../build/bin"
+    DESTINATION "${PROJECT_SOURCE_DIR}/../build/lib"
 )
diff --git a/3FD/runtime.cpp b/3FD/runtime.cpp
@@ -5,14 +5,16 @@
 #include "logger.h"
 #include "gc.h"
 
-#ifdef _USING_V110_SDK71_
-#   include <ObjBase.h>
-#else
-#   include <roapi.h>
+#ifdef _WIN32
+#    ifdef _USING_V110_SDK71_
+#        include <ObjBase.h>
+#    else
+#        include <roapi.h>
+#    endif
 #endif
 
 #ifdef _3FD_PLATFORM_WINRT
-#	include "sqlite3.h"
+#    include "sqlite3.h"
 #endif
 
 #include <codecvt>
@@ -208,4 +210,4 @@ namespace core
 	}
 
 }// end of namespace core
-}// end of namespace _3fd
+}// end of namespace _3fd
diff --git a/3FD/sqlite_prepstatement.cpp b/3FD/sqlite_prepstatement.cpp
@@ -4,6 +4,7 @@
 #include "exceptions.h"
 #include <cassert>
 #include <codecvt>
+#include <locale>
 #include <sstream>
 #include <algorithm>
 

diff --git a/3FD/utils_io.h b/3FD/utils_io.h
@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <cinttypes>
 #include <cstdio>
+#include <cstring>
 #include <sstream>
 #include <string>
 #include <array>

diff --git a/3FD/utils_memorypool.cpp b/3FD/utils_memorypool.cpp
@@ -3,6 +3,7 @@
 #include "exceptions.h"
 
 #include <sstream>
+#include <cstring>
 #include <cassert>
 
 namespace _3fd

diff --git a/IntegrationTests/CMakeLists.txt b/IntegrationTests/CMakeLists.txt
@@ -69,7 +69,7 @@ endif()
 # Place the configuration file along with the executable:
 add_custom_command(
    OUTPUT IntegrationTests.3fd.config
-   COMMAND cp ${PROJECT_SOURCE_DIR}/application.config ${CMAKE_CURRENT_BINARY_DIR}/IntegrationTests.3fd.config
+   COMMAND cp ${PROJECT_SOURCE_DIR}/application.config ${PROJECT_SOURCE_DIR}/../build/bin/IntegrationTests.3fd.config
    DEPENDS ${PROJECT_SOURCE_DIR}/application.config
 )
 
@@ -99,4 +99,4 @@ target_link_libraries(IntegrationTests
 install(
     TARGETS IntegrationTests
     DESTINATION "${PROJECT_SOURCE_DIR}/../build/bin"
-)
+)
diff --git a/UnitTests/CMakeLists.txt b/UnitTests/CMakeLists.txt
@@ -56,7 +56,7 @@ endif()
 # Place the configuration file along with the executable:
 add_custom_command(
    OUTPUT UnitTests.3fd.config
-   COMMAND cp ${PROJECT_SOURCE_DIR}/application.config ${CMAKE_CURRENT_BINARY_DIR}/UnitTests.3fd.config
+   COMMAND cp ${PROJECT_SOURCE_DIR}/application.config ${PROJECT_SOURCE_DIR}/../build/bin/UnitTests.3fd.config
    DEPENDS ${PROJECT_SOURCE_DIR}/application.config
 )
 
@@ -87,4 +87,4 @@ target_link_libraries(UnitTests
 install(
     TARGETS UnitTests
     DESTINATION "${PROJECT_SOURCE_DIR}/../build/bin"
-)
+)
diff --git a/build.sh b/build.sh
@@ -3,7 +3,7 @@
 { ls build || printf 'Run configure.sh first!'; } &> /dev/null
 
 cd gtest
-make install
+make
 cd ../3FD
 make install
 cd ../UnitTests

diff --git a/configure.sh b/configure.sh
@@ -2,7 +2,7 @@
 
 MODE=$1
 
-if [[ $MODE == $(echo $MODE | grep -i 'debug\|release') ]];
+if [[ -n $MODE ]] && [[ $MODE == $(echo $MODE | grep -i 'debug\|release') ]];
 then
     CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=$MODE -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS=\"-std=c++11\""
 else

diff --git a/setup.sh b/setup.sh
@@ -8,8 +8,7 @@ AMAZON=$(cat /etc/issue | grep -i "amazon linux ami release" | awk -F" " '{print
 #
 
 if [ -n "$UBUNTU" ] && [ $UBUNTU -gt 14 ]; then
-    apt install -y clang
-    apt install -y cmake
+    apt install -y clang cmake unixodbc unixodbc-dev openssl libssl-dev
 
 elif [ -n "$AMAZON" ] && [ $AMAZON -gt 2017 ]; then
     yum groups install -y development
@@ -58,12 +57,15 @@ rm "$boostLabel.tar.bz2"
 # INSTALL POCO
 #
 pocoLabel='poco-1.7.8p3'
-wget "https://pocoproject.org/releases/poco-1.7.8/$pocoLabel.tar.gz"
-tar -xf "$pocoLabel.tar.gz"
-cd $pocoLabel
-./configure --config=Linux-clang --static --no-tests --no-samples --prefix="/opt/$pocoLabel"
-make -s -j2
+pocoTarFile=$pocoLabel"-all.tar.gz"
+pocoXDir=$pocoLabel"-all"
+wget "https://pocoproject.org/releases/poco-1.7.8/$pocoTarFile"
+tar -xf $pocoTarFile
+cd $pocoXDir
+./configure --omit=Data/MySQL,MongoDB,PageCompiler --config=Linux-clang --static --no-tests --no-samples --prefix="/opt/$pocoLabel"
+make -s -j2 || exit
 make install
 cd ..
-rm -rf $pocoLabel
-rm "$pocoLabel.tar.gz"
+rm -rf $pocoXDir
+rm $pocoTarFile
+