From 4feaad97c4c27cee5b74231fc4f49826ce19f22e Mon Sep 17 00:00:00 2001 From: Mohamed Saad IBN SEDDIK Date: Sat, 2 Nov 2013 16:02:57 +0100 Subject: [PATCH 01/11] Now compiles on Windows using mingw 4.8 --- Essentials/pAntler/CMakeLists.txt | 2 +- Essentials/pLogger/MOOSLogger.cpp | 4 ++-- Essentials/pLogger/MOOSLogger.h | 5 +++++ Essentials/pShare/Listener.cpp | 19 +++++++++++----- Essentials/pShare/Share.cpp | 37 ++++++++++++++++++++++--------- 5 files changed, 47 insertions(+), 20 deletions(-) diff --git a/Essentials/pAntler/CMakeLists.txt b/Essentials/pAntler/CMakeLists.txt index 624d8cc..0765305 100644 --- a/Essentials/pAntler/CMakeLists.txt +++ b/Essentials/pAntler/CMakeLists.txt @@ -4,7 +4,7 @@ set(EXECNAME pAntler) find_package(MOOS 10) #what files are needed? -SET(SRCS AntlerMain.cpp Antler.cpp) +SET(SRCS AntlerMain.cpp Antler.cpp XPCProcess.cpp XPCProcessAttrib.cpp) include_directories( ${${EXECNAME}_INCLUDE_DIRS} ${MOOS_INCLUDE_DIRS} ${MOOS_DEPEND_INCLUDE_DIRS}) add_executable(${EXECNAME} ${SRCS} ) diff --git a/Essentials/pLogger/MOOSLogger.cpp b/Essentials/pLogger/MOOSLogger.cpp index 0e8d72b..7f23399 100644 --- a/Essentials/pLogger/MOOSLogger.cpp +++ b/Essentials/pLogger/MOOSLogger.cpp @@ -1031,7 +1031,7 @@ bool CMOOSLogger::CreateDirectory(const std::string & sDirectory) { #if _WIN32 - int bOK = ::CreateDirectory(sDirectory.c_str(),NULL); + int bOK = ::CreateDirectoryA(sDirectory.c_str(),NULL); if(!bOK) { @@ -1041,7 +1041,7 @@ bool CMOOSLogger::CreateDirectory(const std::string & sDirectory) { LPVOID lpMsgBuf; - FormatMessage( + FormatMessageA( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, diff --git a/Essentials/pLogger/MOOSLogger.h b/Essentials/pLogger/MOOSLogger.h index 4f07814..f58efd5 100644 --- a/Essentials/pLogger/MOOSLogger.h +++ b/Essentials/pLogger/MOOSLogger.h @@ -39,6 +39,11 @@ #include #include "Zipper.h" +#if _WIN32 + #include + #include +#endif // windows + typedef std::vector STRING_VECTOR; class CMOOSLogger : public CMOOSApp diff --git a/Essentials/pShare/Listener.cpp b/Essentials/pShare/Listener.cpp index a9c2e92..2e2e3ce 100644 --- a/Essentials/pShare/Listener.cpp +++ b/Essentials/pShare/Listener.cpp @@ -7,10 +7,17 @@ #ifndef _WIN32 #include "unistd.h" #endif +#ifdef UNIX + #include + #include + #include +#elif _WIN32 + #define _WIN32_WINNT 0x0600 //will only work with vista and above as XP does not support IPv6 + #include + #include + #include +#endif -#include -#include -#include #include #include #include @@ -52,7 +59,7 @@ bool Listener::ListenLoop() //we want to be able to resuse it (multiple folk are interested) int reuse = 1; - if (setsockopt(socket_fd, SOL_SOCKET,SO_REUSEADDR/* SO_REUSEPORT*/, &reuse, sizeof(reuse)) == -1) + if (setsockopt(socket_fd, SOL_SOCKET,SO_REUSEADDR/* SO_REUSEPORT*/, (char *)&reuse, sizeof(reuse)) == -1) throw std::runtime_error("Listener::ListenLoop::setsockopt::reuse"); /* if (setsockopt(socket_fd, SOL_SOCKET, SO_REUSEPORT, @@ -63,7 +70,7 @@ bool Listener::ListenLoop() //give ourselves plenty of receive space //set aside some space for receiving - just a few multiples of 64K int rx_buffer_size = 64*1024*28; - if (setsockopt(socket_fd, SOL_SOCKET, SO_RCVBUF, &rx_buffer_size, sizeof(rx_buffer_size)) == -1) + if (setsockopt(socket_fd, SOL_SOCKET, SO_RCVBUF, (char *)&rx_buffer_size, sizeof(rx_buffer_size)) == -1) throw std::runtime_error("Listener::ListenLoop()::setsockopt::rcvbuf"); @@ -91,7 +98,7 @@ bool Listener::ListenLoop() struct ip_mreq mreq; mreq.imr_multiaddr.s_addr = inet_addr(address_.host().c_str()); mreq.imr_interface.s_addr = INADDR_ANY; - if(setsockopt(socket_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq))==-1) + if(setsockopt(socket_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&mreq, sizeof(mreq))==-1) throw std::runtime_error("Listener::ListenLoop()::setsockopt::ADD_MEMBERSHIP"); } diff --git a/Essentials/pShare/Share.cpp b/Essentials/pShare/Share.cpp index d851f45..eb6d02e 100644 --- a/Essentials/pShare/Share.cpp +++ b/Essentials/pShare/Share.cpp @@ -4,9 +4,15 @@ * Created on: Aug 26, 2012 * Author: pnewman */ -#include -#include -#include +#ifdef UNIX + #include + #include + #include +#elif _WIN32 +// #define _WIN32_WINNT 0x0600 //will only work with vista and above as XP does not support IPv6 + #include + #include +#endif #include #include @@ -1021,7 +1027,7 @@ bool Share::Impl::ApplyRoutes(CMOOSMsg & msg) } //send here - if (sendto(relevant_socket.socket_fd, buffer.data(), buffer.size(), 0, + if (sendto(relevant_socket.socket_fd, (const char*)buffer.data(), buffer.size(), 0, (struct sockaddr*) (&relevant_socket.sock_addr), sizeof(relevant_socket.sock_addr)) < 0) { @@ -1066,7 +1072,7 @@ bool Share::Impl::AddOutputRoute(MOOS::IPV4Address address, bool multicast) int reuse = 1; if (setsockopt(new_socket.socket_fd, SOL_SOCKET, SO_REUSEADDR, - &reuse, sizeof(reuse)) == -1) + (char *)&reuse, sizeof(reuse)) == -1) throw std::runtime_error("failed to set resuse socket option"); /* if (setsockopt(new_socket.socket_fd, SOL_SOCKET, SO_REUSEPORT, @@ -1076,7 +1082,7 @@ bool Share::Impl::AddOutputRoute(MOOS::IPV4Address address, bool multicast) int send_buffer_size = 4 * 64 * 1024; if (setsockopt(new_socket.socket_fd, SOL_SOCKET, SO_SNDBUF, - &send_buffer_size, + (char *)&send_buffer_size, sizeof(send_buffer_size)) == -1) { throw std::runtime_error("failed to set size of socket send buffer"); @@ -1101,11 +1107,20 @@ bool Share::Impl::AddOutputRoute(MOOS::IPV4Address address, bool multicast) std::string dotted_ip = MOOS::IPV4Address::GetNumericAddress(new_socket.address.host()); - if(inet_aton(dotted_ip.c_str(), &new_socket.sock_addr.sin_addr)==0) - { - throw std::runtime_error("failed to intepret " - +dotted_ip+" as an ip address"); - } +#ifdef UNIX + if(inet_aton(dotted_ip.c_str(), &new_socket.sock_addr.sin_addr)==0) + { + throw std::runtime_error("failed to intepret " + +dotted_ip+" as an ip address"); + } +#elif _WIN32 + if( inet_pton(AF_INET,dotted_ip.c_str(), &new_socket.sock_addr.sin_addr)==0) + { + throw std::runtime_error("failed to intepret " + +dotted_ip+" as an ip address"); + } +#endif + //new_socket.sock_addr.sin_addr.s_addr = inet_addr(new_socket.address.ip_num.c_str()); new_socket.sock_addr.sin_port = htons(new_socket.address.port()); From 8fcd77c198312425f9a1a8ba7f05aa2885470fdb Mon Sep 17 00:00:00 2001 From: Mohamed Saad IBN SEDDIK Date: Sat, 2 Jan 2016 23:47:38 +0100 Subject: [PATCH 02/11] Adds CI scripts. --- .travis.yml | 33 +++++++++++++++++++++++++++++++++ appveyor.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 .travis.yml create mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..e3c59d8 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,33 @@ +language: cpp + +os: + - linux + - osx + +compiler: + - gcc + +env: + - BUILD_TYPE=Release + +before_script: + - if [ "`uname`" != "Darwin" ] ; then export MOOS_CXX_FLAGS="-fPIC -Wno-long-long"; fi + - cd .. + - git clone --depth=1 https://github.com/msis/core-moos + - cd core-moos + - mkdir build + - cd build + - cmake -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=$MOOS_CXX_FLAGS .. + - cmake --build . --config Release + - cmake --build . --config Release --target install + - cd $TRAVIS_BUILD_DIR + - mkdir build/ + + +script: + - cd build/ + - cmake -DBUILD_CONSOLE_TOOLS=ON -DBUILD_GRAPHICAL_TOOLS=ON -DBUILD_UPB=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE ../ + - cmake --build . --config Release + +after_script: + - cmake --build . --config Release --target install \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..54f8dce --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,40 @@ +version: devel-{build} + +platform: + - x64 + - x86 + +environment: + matrix: + - BUILD_TYPE: cmake + VS_VERSION: Visual Studio 11 2012 + + - BUILD_TYPE: cmake + VS_VERSION: Visual Studio 12 2013 + + - BUILD_TYPE: cmake + VS_VERSION: Visual Studio 14 2015 + +shallow_clone: true + +init: + - if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64 + - if "%platform%" == "x86" SET VS_FULL=%VS_VERSION% + - cd .. + - git clone --depth=1 https://github.com/msis/core-moos + - cd core-moos + - mkdir build + - cd build + - cmake -G "%VS_FULL%" -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE ../ + - cmake --build . --config Release + - cmake --build . --config Release --target install + - cd %APPVEYOR_BUILD_FOLDER% + - mkdir build + +build_script: + - cd build + - cmake -G "%VS_FULL%" -DBUILD_CONSOLE_TOOLS=ON -DBUILD_GRAPHICAL_TOOLS=ON -DBUILD_UPB=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE ../ + - cmake --build . --config Release + +on_success: + - cmake --build . --config Release --target install \ No newline at end of file From 736ad9f58d244c21608a1a021ce50bd817f4da88 Mon Sep 17 00:00:00 2001 From: Mohamed Saad IBN SEDDIK Date: Sun, 3 Jan 2016 00:15:33 +0100 Subject: [PATCH 03/11] Corrects a previously signaled problem by @jlblancoc a couple of years ago. + flags for less warnings for CI. --- .travis.yml | 3 ++- Essentials/pAntler/CMakeLists.txt | 6 +++++- appveyor.yml | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e3c59d8..546c64a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ before_script: - cd .. - git clone --depth=1 https://github.com/msis/core-moos - cd core-moos + - git checkout wOnlineCI - mkdir build - cd build - cmake -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=$MOOS_CXX_FLAGS .. @@ -26,7 +27,7 @@ before_script: script: - cd build/ - - cmake -DBUILD_CONSOLE_TOOLS=ON -DBUILD_GRAPHICAL_TOOLS=ON -DBUILD_UPB=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE ../ + - cmake -DBUILD_CONSOLE_TOOLS=ON -DBUILD_GRAPHICAL_TOOLS=ON -DBUILD_UPB=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=$MOOS_CXX_FLAGS ../ - cmake --build . --config Release after_script: diff --git a/Essentials/pAntler/CMakeLists.txt b/Essentials/pAntler/CMakeLists.txt index 0765305..12c43cd 100644 --- a/Essentials/pAntler/CMakeLists.txt +++ b/Essentials/pAntler/CMakeLists.txt @@ -4,7 +4,11 @@ set(EXECNAME pAntler) find_package(MOOS 10) #what files are needed? -SET(SRCS AntlerMain.cpp Antler.cpp XPCProcess.cpp XPCProcessAttrib.cpp) +SET(SRCS AntlerMain.cpp Antler.cpp) + +IF (WIN32) + SET(SRCS ${SRCS} XPCProcess.cpp XPCProcessAttrib.cpp) +ENDIF(WIN32) include_directories( ${${EXECNAME}_INCLUDE_DIRS} ${MOOS_INCLUDE_DIRS} ${MOOS_DEPEND_INCLUDE_DIRS}) add_executable(${EXECNAME} ${SRCS} ) diff --git a/appveyor.yml b/appveyor.yml index 54f8dce..2bb1535 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,9 +23,10 @@ init: - cd .. - git clone --depth=1 https://github.com/msis/core-moos - cd core-moos + - git checkout wOnlineCI - mkdir build - cd build - - cmake -G "%VS_FULL%" -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE ../ + - cmake -G "%VS_FULL%" -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} /w" ../ - cmake --build . --config Release - cmake --build . --config Release --target install - cd %APPVEYOR_BUILD_FOLDER% @@ -33,7 +34,7 @@ init: build_script: - cd build - - cmake -G "%VS_FULL%" -DBUILD_CONSOLE_TOOLS=ON -DBUILD_GRAPHICAL_TOOLS=ON -DBUILD_UPB=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE ../ + - cmake -G "%VS_FULL%" -DBUILD_CONSOLE_TOOLS=ON -DBUILD_GRAPHICAL_TOOLS=ON -DBUILD_UPB=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} /w" ../ - cmake --build . --config Release on_success: From 25aa78ad79e8a7abe33068dfec419591f5fdcbf9 Mon Sep 17 00:00:00 2001 From: Mohamed Saad IBN SEDDIK Date: Sun, 3 Jan 2016 00:23:22 +0100 Subject: [PATCH 04/11] Automatically checks out the right branch of core-moos. --- .travis.yml | 3 +-- appveyor.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 546c64a..9ff10a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,8 @@ env: before_script: - if [ "`uname`" != "Darwin" ] ; then export MOOS_CXX_FLAGS="-fPIC -Wno-long-long"; fi - cd .. - - git clone --depth=1 https://github.com/msis/core-moos + - git clone -b wOnlineCI --depth=1 https://github.com/msis/core-moos - cd core-moos - - git checkout wOnlineCI - mkdir build - cd build - cmake -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=$MOOS_CXX_FLAGS .. diff --git a/appveyor.yml b/appveyor.yml index 2bb1535..557d12a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,9 +21,8 @@ init: - if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64 - if "%platform%" == "x86" SET VS_FULL=%VS_VERSION% - cd .. - - git clone --depth=1 https://github.com/msis/core-moos + - git clone -b wOnlineCI --depth=1 https://github.com/msis/core-moos - cd core-moos - - git checkout wOnlineCI - mkdir build - cd build - cmake -G "%VS_FULL%" -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} /w" ../ From 31d3a51d79cc465240a54e72da66146bd97a9d90 Mon Sep 17 00:00:00 2001 From: Mohamed Saad IBN SEDDIK Date: Sun, 3 Jan 2016 00:33:55 +0100 Subject: [PATCH 05/11] Adds sudo to hopefully install on Linux. Correts a bug in the AppVeyor script. --- .travis.yml | 6 ++++-- appveyor.yml | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ff10a3..f4dd67d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: cpp +sudo: required + os: - linux - osx @@ -19,7 +21,7 @@ before_script: - cd build - cmake -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=$MOOS_CXX_FLAGS .. - cmake --build . --config Release - - cmake --build . --config Release --target install + - sudo cmake --build . --config Release --target install - cd $TRAVIS_BUILD_DIR - mkdir build/ @@ -30,4 +32,4 @@ script: - cmake --build . --config Release after_script: - - cmake --build . --config Release --target install \ No newline at end of file + - sudo cmake --build . --config Release --target install \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 557d12a..35ab7f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ init: - cd core-moos - mkdir build - cd build - - cmake -G "%VS_FULL%" -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} /w" ../ + - cmake -G "%VS_FULL%" -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS /w" ../ - cmake --build . --config Release - cmake --build . --config Release --target install - cd %APPVEYOR_BUILD_FOLDER% @@ -33,7 +33,7 @@ init: build_script: - cd build - - cmake -G "%VS_FULL%" -DBUILD_CONSOLE_TOOLS=ON -DBUILD_GRAPHICAL_TOOLS=ON -DBUILD_UPB=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} /w" ../ + - cmake -G "%VS_FULL%" -DBUILD_CONSOLE_TOOLS=ON -DBUILD_GRAPHICAL_TOOLS=ON -DBUILD_UPB=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS /w" ../ - cmake --build . --config Release on_success: From 986e6e97c383f5520c290ca45b01684187f9a8a6 Mon Sep 17 00:00:00 2001 From: Mohamed Saad IBN SEDDIK Date: Sun, 3 Jan 2016 00:39:17 +0100 Subject: [PATCH 06/11] The joy of AppVeyor :p --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 35ab7f0..abc49bb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ init: - cd core-moos - mkdir build - cd build - - cmake -G "%VS_FULL%" -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS /w" ../ + - cmake -G "%VS_FULL%" -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="/w" ../ - cmake --build . --config Release - cmake --build . --config Release --target install - cd %APPVEYOR_BUILD_FOLDER% @@ -33,7 +33,7 @@ init: build_script: - cd build - - cmake -G "%VS_FULL%" -DBUILD_CONSOLE_TOOLS=ON -DBUILD_GRAPHICAL_TOOLS=ON -DBUILD_UPB=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS /w" ../ + - cmake -G "%VS_FULL%" -DBUILD_CONSOLE_TOOLS=ON -DBUILD_GRAPHICAL_TOOLS=ON -DBUILD_UPB=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="/w" ../ - cmake --build . --config Release on_success: From 189742690ce36c099eb14dfe74c3bc495d5488a9 Mon Sep 17 00:00:00 2001 From: IBN SEDDIK Mohamed Saad Date: Sun, 3 Jan 2016 13:36:30 +0000 Subject: [PATCH 07/11] Removes the flags as they seem to pose an issue. --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index abc49bb..f33481a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ init: - cd core-moos - mkdir build - cd build - - cmake -G "%VS_FULL%" -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="/w" ../ + - cmake -G "%VS_FULL%" -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE ../ - cmake --build . --config Release - cmake --build . --config Release --target install - cd %APPVEYOR_BUILD_FOLDER% @@ -33,8 +33,8 @@ init: build_script: - cd build - - cmake -G "%VS_FULL%" -DBUILD_CONSOLE_TOOLS=ON -DBUILD_GRAPHICAL_TOOLS=ON -DBUILD_UPB=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="/w" ../ + - cmake -G "%VS_FULL%" -DBUILD_CONSOLE_TOOLS=ON -DBUILD_GRAPHICAL_TOOLS=ON -DBUILD_UPB=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE ../ - cmake --build . --config Release on_success: - - cmake --build . --config Release --target install \ No newline at end of file + - cmake --build . --config Release --target install From d1714773ee1bed17d307bbaceac38a8959b4d344 Mon Sep 17 00:00:00 2001 From: Mohamed Saad IBN SEDDIK Date: Sun, 3 Jan 2016 17:40:06 +0100 Subject: [PATCH 08/11] pMOOSBridge doesn't seem to compile w/ MSVC. --- Essentials/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Essentials/CMakeLists.txt b/Essentials/CMakeLists.txt index c424462..889fb5c 100644 --- a/Essentials/CMakeLists.txt +++ b/Essentials/CMakeLists.txt @@ -1,4 +1,6 @@ -add_subdirectory(pMOOSBridge) +IF (NOT WIN32) + add_subdirectory(pMOOSBridge) +ENDIF (NOT WIN32) add_subdirectory(pAntler) add_subdirectory(pLogger) add_subdirectory(pScheduler) From 1d75552b8dae45fc775a145e2bfb8fdb6739b840 Mon Sep 17 00:00:00 2001 From: IBN SEDDIK Mohamed Saad Date: Sat, 16 Jan 2016 18:28:02 +0100 Subject: [PATCH 09/11] Adds README file. --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..604d455 --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ +Essential-MOOS +============== +Essential-MOOS contains some useful tools for robotics to use with [Core-MOOS](https://github.com/themoos/core-moos) for Robotics purposes. + +# Build Statuses +OS|Build Status +--|------------ +Linux/OSX|[![Build Status](https://travis-ci.org/msis/essential-moos.svg?branch=devel)](https://travis-ci.org/msis/essential-moos) +Windows|[![Build status](https://ci.appveyor.com/api/projects/status/d3cm6s8l6lko5q6e?svg=true)](https://ci.appveyor.com/project/msis/essential-moos) + +# Build Instructions +(TODO, for now please refer to `.travis.yml` file for Linux/OSX and `appveyor.yml` for Windows.) From 184fa41d594f7f7ac7c795dbb5fef50aa7616fab Mon Sep 17 00:00:00 2001 From: IBN SEDDIK Mohamed Saad Date: Sun, 17 Jan 2016 15:46:17 +0100 Subject: [PATCH 10/11] Setting the table right. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 604d455..114d7b4 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ Essential-MOOS Essential-MOOS contains some useful tools for robotics to use with [Core-MOOS](https://github.com/themoos/core-moos) for Robotics purposes. # Build Statuses -OS|Build Status ---|------------ -Linux/OSX|[![Build Status](https://travis-ci.org/msis/essential-moos.svg?branch=devel)](https://travis-ci.org/msis/essential-moos) -Windows|[![Build status](https://ci.appveyor.com/api/projects/status/d3cm6s8l6lko5q6e?svg=true)](https://ci.appveyor.com/project/msis/essential-moos) +|OS|Build Status| +|:-|-----------:| +|Linux/OSX|[![Build Status](https://travis-ci.org/msis/essential-moos.svg?branch=devel)](https://travis-ci.org/msis/essential-moos)| +|Windows|[![Build status](https://ci.appveyor.com/api/projects/status/d3cm6s8l6lko5q6e?svg=true)](https://ci.appveyor.com/project/msis/essential-moos)| # Build Instructions (TODO, for now please refer to `.travis.yml` file for Linux/OSX and `appveyor.yml` for Windows.) From 934292f4ecf0b4abefb00d82b7f243f8dbb7334f Mon Sep 17 00:00:00 2001 From: IBN SEDDIK Mohamed Saad Date: Sun, 17 Jan 2016 15:48:23 +0100 Subject: [PATCH 11/11] missing spaces in the table. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 114d7b4..99e5bf2 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ Essential-MOOS Essential-MOOS contains some useful tools for robotics to use with [Core-MOOS](https://github.com/themoos/core-moos) for Robotics purposes. # Build Statuses -|OS|Build Status| -|:-|-----------:| +|OS |Build Status| +|:--------|-----------:| |Linux/OSX|[![Build Status](https://travis-ci.org/msis/essential-moos.svg?branch=devel)](https://travis-ci.org/msis/essential-moos)| -|Windows|[![Build status](https://ci.appveyor.com/api/projects/status/d3cm6s8l6lko5q6e?svg=true)](https://ci.appveyor.com/project/msis/essential-moos)| +|Windows |[![Build status](https://ci.appveyor.com/api/projects/status/d3cm6s8l6lko5q6e?svg=true)](https://ci.appveyor.com/project/msis/essential-moos)| # Build Instructions (TODO, for now please refer to `.travis.yml` file for Linux/OSX and `appveyor.yml` for Windows.)