Fix osx iidc driver (#76)

* Minor fixes to build (particularly OSX):

 - Get correct library path for libdc1394 (fixing link errors in OSX)
 - Use QMap instead of std::hash (which also gave some linking errors in OSX)
 - Fix OSX package suffix
 - implement a retry mechanism for deploy script

* Replace QMap with QHash

* Try to improve OSX build speed by installing brew dependencies via travis.yml

* Use macOS 10.14 in travis build

* Restore previous brew installation script

Author: GuLinux

.travis.yml

@@ -13,6 +13,7 @@ matrix:
   include:
     - env: 'SKIP_TESTS=0 BUILD_OS_FAMILY=osx'
       os: osx
+      osx_image: xcode10.2
     - dist: xenial
       env: 'SKIP_TESTS=0 DOCKER_IMAGE=gulinux/planetaryimager_build:ubuntu-19.04-x86_64 IMAGE_ARCH=x86_64 BUILD_OS_FAMILY=linux CMAKE_BINARY=cmake'
       os: linux

scripts/release-travis.py

@@ -3,6 +3,8 @@
 from github.GithubException import UnknownObjectException
 import os
 import sys
+import traceback
+import time
 
 github = Github(os.environ['GITHUB_OAUTH_USER'], os.environ['GITHUB_OAUTH_TOKEN'])
 repo = github.get_repo('GuLinux/PlanetaryImager')
@@ -21,14 +23,24 @@
     except ValueError:
         pass
 
-if not pr:
+
+def find_pr()
     all_pulls = [pr for pr in repo.get_pulls(state='closed', sort='updated')]
     all_pulls.reverse()
     for merged_pr in all_pulls:
         if merged_pr.merge_commit_sha == commit_id:
-            pr = merged_pr
+            return merged_pr
+    return None
 
-    
+if not pr:
+    retry = 0
+    while not pr and retry < 5:
+        time.sleep(retry * 10)
+        try:
+            pr = find_pr()
+        except:
+            traceback.print_exc()
+            retry += 1
 
 if pr:
     release_body='''# {}  

scripts/travis/before_install

@@ -16,7 +16,6 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
 fi
 if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
     bash support/osx/install-deps
-    brew install python@3
 fi
 echo "export GIT_COMMIT_DATE=\"$(git show -s --format='%cd' --date=short | tr -d '-')\"" > ${TRAVIS_BUILD_DIR}/git_commit_date.sh
 cat ${TRAVIS_BUILD_DIR}/git_commit_date.sh

scripts/travis/ci-build

@@ -16,7 +16,7 @@ fi
 if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
     mkdir "$TRAVIS_BUILD_DIR/build"
     cd "$TRAVIS_BUILD_DIR/build"
-    bash "$TRAVIS_BUILD_DIR/support/osx/cmake" -DBUILD_DRIVER_iidc=Off -DCPACK_GENERATOR=DragNDrop \
+    bash "$TRAVIS_BUILD_DIR/support/osx/cmake" -DCPACK_GENERATOR=DragNDrop -DPACKAGE_SYSTEM_NAME=MacOSX \
         -DPACKAGE_VERSION_SUFFIX="_${GIT_COMMIT_DATE}_ci${TRAVIS_BUILD_NUMBER}" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_PLANETARYIMAGER_TESTING=${ENABLE_PLANETARYIMAGER_TESTING} \
         "$TRAVIS_BUILD_DIR"
     make -j4

src/drivers/iidc/CMakeLists.txt

@@ -4,7 +4,7 @@ add_driver(NAME iidc OS Linux Darwin DEFAULT_ON SRCS ${iidc_SRCS})
 
 if(BUILD_DRIVER_iidc)
     pkg_check_modules(LIBDC1394 libdc1394-2 REQUIRED)
+    find_library(IIDC_LIBRARIES ${LIBDC1394_LIBRARIES} HINTS ${LIBDC1394_LIBRARY_DIRS})
     include_directories(${LIBDC1394_INCLUDEDIR})
-    link_directories(${LIBDC1394_LIBRARY_DIRS})
-    target_link_libraries(iidc ${LIBDC1394_LIBRARIES})
+    target_link_libraries(iidc ${IIDC_LIBRARIES})
 endif()

src/drivers/iidc/iidc_imager.cpp

@@ -27,7 +27,7 @@
 #include <map>
 #include <QRect>
 #include "Qt/qt_strings_helper.h"
-#include <unordered_map>
+#include <QHash>
 
 using namespace std::chrono;
 
@@ -49,7 +49,7 @@ struct EnumHash
     size_t operator()(T t) const { return static_cast<size_t>(t); }
 };
 
-static std::unordered_map<dc1394color_coding_t, const char *, EnumHash> COLOR_CODING_NAME
+static QHash<dc1394color_coding_t, const char *> COLOR_CODING_NAME
 {
     { DC1394_COLOR_CODING_MONO8,   "Mono 8-bit"           },
     { DC1394_COLOR_CODING_YUV411,  "YUV411"               },
@@ -74,11 +74,11 @@ DPTR_IMPL(IIDCImager)
     dc1394video_modes_t  videoModes;
     dc1394video_mode_t   currentVidMode;
     dc1394color_coding_t currentPixFmt;
-    std::unordered_map<dc1394video_mode_t, dc1394framerates_t, EnumHash> frameRates; ///< Key: non-scalable video mode from 'videoModes'
-    std::unordered_map<dc1394video_mode_t, dc1394format7mode_t, EnumHash> fmt7Info; ///< Key: scalable video mode form 'videoModes'
+    QHash<dc1394video_mode_t, dc1394framerates_t> frameRates; ///< Key: non-scalable video mode from 'videoModes'
+    QHash<dc1394video_mode_t, dc1394format7mode_t> fmt7Info; ///< Key: scalable video mode form 'videoModes'
 
     dc1394featureset_t features;
-    std::unordered_map<dc1394feature_t, bool, EnumHash> hasAbsoluteControl;
+    QHash<dc1394feature_t, bool> hasAbsoluteControl;
 
     Properties properties;
 
@@ -190,7 +190,7 @@ Imager::Control IIDCImager::Private::getFrameRates(dc1394video_mode_t vidMode)
     const auto frloc = frameRates.find(vidMode);
     assert(frloc != frameRates.end());
 
-    const dc1394framerates_t &fr = frloc->second;
+    const dc1394framerates_t &fr = frloc.value();
 
     auto frameRatesCtrl = Imager::Control{ ControlID::FrameRate, "Fixed Frame Rate", Control::Combo };
 
@@ -232,14 +232,14 @@ IIDCImager::IIDCImager(std::unique_ptr<dc1394camera_t, Deleters::camera> camera,
 
         if (!dc1394_is_video_mode_scalable(vidMode))
         {
-            auto modeFrameRates = d->frameRates.emplace(vidMode, dc1394framerates_t{ });
-            IIDC_CHECK << dc1394_video_get_supported_framerates(d->camera.get(), vidMode, &modeFrameRates.first->second)
+            auto modeFrameRates = d->frameRates.insert(vidMode, dc1394framerates_t{ });
+            IIDC_CHECK << dc1394_video_get_supported_framerates(d->camera.get(), vidMode, &modeFrameRates.value())
                        << "Get supported frame rates";
         }
         else
         {
-            auto fmt7loc = d->fmt7Info.emplace(vidMode, dc1394format7mode_t{ });
-            dc1394format7mode_t &fmt7 = fmt7loc.first->second;
+            auto fmt7loc = d->fmt7Info.insert(vidMode, dc1394format7mode_t{ });
+            dc1394format7mode_t &fmt7 = fmt7loc.value();
             fmt7.present = DC1394_TRUE;
 
             IIDC_CHECK << dc1394_format7_get_mode_info(d->camera.get(), vidMode, &fmt7)
@@ -311,14 +311,14 @@ Imager::Properties IIDCImager::properties() const
 
     const auto maxImageWidth = std::max_element(d->fmt7Info.begin(), d->fmt7Info.end(),
                                           [](const auto &i1, const auto &i2)
-                                          { return i1.second.max_size_x < i2.second.max_size_x; });
+                                          { return i1.max_size_x < i2.max_size_x; });
 
     const auto maxImageHeight = std::max_element(d->fmt7Info.begin(), d->fmt7Info.end(),
                                           [](const auto &i1, const auto &i2)
-                                          { return i1.second.max_size_y < i2.second.max_size_y; });
+                                          { return i1.max_size_y < i2.max_size_y; });
 
-    properties.set_resolution({ (int)maxImageWidth->second.max_size_x,
-                                (int)maxImageHeight->second.max_size_y });
+    properties.set_resolution({ (int)maxImageWidth.value().max_size_x,
+                                (int)maxImageHeight.value().max_size_y });
 
 
     return properties;

support/docker/travis.py

@@ -32,7 +32,8 @@ def generate(self, args):
     if not 'osx' in args.exclude_images:
       includes.append({
         'os': 'osx',
-        'env': 'SKIP_TESTS={} BUILD_OS_FAMILY=osx'.format(b2i('osx' in args.skip_tests))
+        'env': 'SKIP_TESTS={} BUILD_OS_FAMILY=osx'.format(b2i('osx' in args.skip_tests)),
+        'osx_image': 'xcode10.2',
       })
     for image in self.images:
       exclude_image = False