merge(dev): into master

.gitlab-ci.yml

-image: 192.168.228.37:5000/ircad-ihu-rd-docker-envdev:11.0.7
-
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
 stages:
-  - debug
-  - release
+  - lint
+  - build
+  - deploy
 
-debug:arcalibration:
-  stage: debug
+sheldon-mr:
+  image: ${DOCKER_ENVDEV_CLANG6}
+  stage: lint
   script:
-    - mkdir $CI_PROJECT_DIR/BinPkgs $CI_PROJECT_DIR/install $CI_PROJECT_DIR/build
-    # Install BinPkgs (BinPkgs-Debug-11.0.6-16-g5f5a099-Linux_Mint18)
-    - curl https://owncloud.ircad.fr/index.php/s/ZIQXAiEK8f4lSzq/download | tar xzf - -C $CI_PROJECT_DIR/BinPkgs --strip-components=1 > /dev/null
-    - cd build/
+    - export ORIG_BRANCH_COMMIT_SHA=$(git merge-base dev origin/${CI_COMMIT_REF_NAME})
+    - git -c http.sslVerify=false clone --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@git.ircad.fr/Sight/sight-git.git -b dev
+    # Execute sheldon, on all commits from the merge request
+    - sight-git/hooks/sheldon ${ORIG_BRANCH_COMMIT_SHA}..${CI_COMMIT_SHA}
+  only:
+    - merge-requests
+
+sheldon:
+  image: ${DOCKER_ENVDEV_CLANG6}
+  stage: lint
+  script:
+    - git -c http.sslVerify=false clone --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@git.ircad.fr/Sight/sight-git.git -b dev
+    - sight-git/hooks/sheldon HEAD^ HEAD
+  except:
+    - dev
+    - master
+
+build:release-mr:
+  image: ${DOCKER_ENVDEV_CLANG6}
+  stage: build
+  before_script:
+    - export CC=/usr/bin/clang-6.0
+    - export CXX=/usr/bin/clang++-6.0
+    - mkdir $CI_PROJECT_DIR/install $CI_PROJECT_DIR/build
+    - cd $CI_PROJECT_DIR/build/
     - >
-      cmake $CI_PROJECT_DIR/fw4spl
+     cmake $CI_PROJECT_DIR/sight
      -G Ninja
-      -DEXTERNAL_LIBRARIES=$CI_PROJECT_DIR/BinPkgs
-      -DADDITIONAL_PROJECTS="$CI_PROJECT_DIR/fw4spl-ar"
+     -DUSE_CONAN=ON
      -DCMAKE_INSTALL_PREFIX=$CI_PROJECT_DIR/install
-      -DCMAKE_BUILD_TYPE=Debug
-      -DBUILD_TESTS=ON
+     -DCMAKE_BUILD_TYPE=Release
+     -DBUILD_TESTS=OFF
      -DBUILD_DOCUMENTATION=OFF
      -DENABLE_PCH=ON
      -DPROJECTS_TO_BUILD=ARCalibration
-      -DPROJECTS_TO_INSTALL=ARCalibration
-    - ninja ARCalibration
-
-release:arcalibration:
-  stage: release
+  script:
+    - ninja
   only:
-    - tags
-  when: manual
+    - merge-requests
+
+build:release-mint18:
+  extends: build:release-mr
   script:
-    - mkdir $CI_PROJECT_DIR/BinPkgs $CI_PROJECT_DIR/install $CI_PROJECT_DIR/build
-    # Install BinPkgs (BinPkgs-Release-11.0.6-17-g3a65270-Linux_Mint18)
-    - curl https://owncloud.ircad.fr/index.php/s/2iis9cYE17paEs6/download | tar xzf - -C $CI_PROJECT_DIR/BinPkgs --strip-components=1 > /dev/null
-    - cd build/
+    - cd $CI_PROJECT_DIR/build/
+    - ninja
+    - ninja install
+    - ninja package
+  artifacts:
+    paths:
+      - $CI_PROJECT_DIR/build/packages/*.tar.gz
+  only:
+    - dev
+    - master
+
+build:release-windows:
+  stage: build
+  variables:
+    CONAN_USER_HOME: $CI_PROJECT_DIR/conan
+    CONAN_USER_HOME_SHORT: C:/$CI_JOB_ID
+  before_script:
+    - md "%CI_PROJECT_DIR%/install"
+    - md "%CI_PROJECT_DIR%/conan"
+    - md "%CI_PROJECT_DIR%/build"
+    - cd "%CI_PROJECT_DIR%/build"
+    - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
     - >
-      cmake $CI_PROJECT_DIR/fw4spl
+     cmake "%CI_PROJECT_DIR%\sight"
      -G Ninja
-      -DEXTERNAL_LIBRARIES=$CI_PROJECT_DIR/BinPkgs
-      -DADDITIONAL_PROJECTS="$CI_PROJECT_DIR/fw4spl-ar"
-      -DCMAKE_INSTALL_PREFIX=$CI_PROJECT_DIR/install
+     -DUSE_CONAN=ON
+     -DCMAKE_INSTALL_PREFIX="%CI_PROJECT_DIR%/install"
      -DCMAKE_BUILD_TYPE=Release
      -DBUILD_TESTS=OFF
      -DBUILD_DOCUMENTATION=OFF
      -DENABLE_PCH=ON
      -DPROJECTS_TO_BUILD=ARCalibration
-      -DPROJECTS_TO_INSTALL=ARCalibration
+  script:
+    - ninja
     - ninja install
     - ninja package
+  after_script:
+    - rd /S /Q "%CONAN_USER_HOME_SHORT%"
+  only:
+    - dev
+    - master
+  tags:
+    - shell
+    - windows
+  artifacts:
+    paths:
+      - build/*.exe

.gitlab/issue_templates/Bug.md

-Please read this!
-
-Before opening a new issue, verify the issue you're about to submit isn't a duplicate.
-
-Please remove this notice if you're confident your issue isn't a duplicate.
-
-------
-
 ### Summary
 
 (Summarize the bug encountered concisely)
@@ -41,4 +33,4 @@ logs, and code as it's very hard to read otherwise.)
 
 (If you can, link to the line of code that might be responsible for the problem)
 
-/label ~bug
+/label ~Type:bugfix

.gitlab/issue_templates/Feature.md

-Please read this!
-
-Before opening a new issue, verify the issue you're about to submit isn't a duplicate.
-
-Please remove this notice if you're confident your issue isn't a duplicate.
-
-------
-
 ### Description
 
 (Include problem, use cases, benefits, and/or goals)
@@ -24,4 +16,4 @@ Please remove this notice if you're confident your issue isn't a duplicate.
 
 During implementation, this can then be copied and used as a starter for the documentation.)
 
-/label ~feature
+/label ~Type:feature

.gitlab/merge_request_templates/Merge_Request.md

@@ -20,3 +20,11 @@
 
 - [ ] Build on Windows
 - [ ] ...
+
+## Associated Issues/Merge Requests
+
+- Issues
+  - Fixes repo#number
+
+- Merge requests
+  - repo!number

.gitmodules

-[submodule "fw4spl"]
-	path = fw4spl
-	url = ../../FW4SPL/fw4spl
-	branch = master
-[submodule "fw4spl-ar"]
-	path = fw4spl-ar
-	url = ../../FW4SPL/fw4spl-ar
-	branch = master
+[submodule "sight"]
+	path = sight
+	url = ../../Sight/sight

README.md

@@ -13,5 +13,5 @@ Generic instructions for fw4spl applications can be found here:
 To setup this specific repository you can adapt the following `cmake` command:
 
 ```
-cmake -G "Ninja" -DCMAKE_BUILD_TYPE:STRING="Release" -DBUILD_TESTS:BOOL=OFF -DPROJECTS_TO_BUILD:STRING="ARCalibration;charucoBoard" -DCMAKE_INSTALL_PREFIX:PATH=/path/to/ARCalibration/install/$DIR -DEXTERNAL_LIBRARIES:PATH=/path/to/fw4spl/deps/install/$DIR /path/to/ARCalibration/fw4spl
+cmake -G "Ninja" -DCMAKE_BUILD_TYPE:STRING="Release" -DBUILD_TESTS:BOOL=OFF -DPROJECTS_TO_BUILD:STRING="ARCalibration;charucoBoard" -DCMAKE_INSTALL_PREFIX:PATH=/path/to/ARCalibration/install/$DIR -DEXTERNAL_LIBRARIES:PATH=/path/to/sight-deps/install/$DIR /path/to/ARCalibration/sight
 ```

fw4spl @ 1ac6f5a3

-Subproject commit 1ac6f5a3b0678f118c05c41a0e95c2f45afbfd11

fw4spl-ar @ 445fc5dc

-Subproject commit 445fc5dc80bda4e144af87b999c7e43ee102571a

sight @ e6383060

+Subproject commit e63830601d744671fccb42e29a741589ae534220