git subrepo pull (merge) ore

subrepo:
  subdir:   "ore"
  merged:   "cb4b23889e"
upstream:
  origin:   "git@gitlab.acadiasoft.net:qs/ore.git"
  branch:   "master"
  commit:   "eb9d47f4d5"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

Author: jenkins

.github/workflows/build_windows.yaml

@@ -0,0 +1,46 @@
+name: C/C++ CI Windows
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+    types: [ready_for_review, opened, synchronize, reopened]
+    paths:
+      - .github/workflows/linux_build.yaml
+      - ./App/**
+      - ./OREAnalytics/**
+      - '!./OREAnalytics/doc/**'
+      - ./OREData/**
+      - '!./OREData/doc/**'
+      - ./ORETest/**
+      - ./QuantExt/**
+      - '!./QuantExt/doc/**'
+      - CMakeLists.txt
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: building
+    runs-on: windows-2022
+    steps:
+    - uses: actions/checkout@v3
+    - name: get QuantLib
+      run: |
+        git submodule update --init
+    - name: Set up Boost
+      run: |
+        $Url = "https://boostorg.jfrog.io/artifactory/main/release/1.72.0/binaries/boost_1_72_0-msvc-14.2-64.exe"
+        (New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
+        Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=C:\local\boost"
+        choco install -y ninja
+    - name: cmake configure and build
+      env:
+        BOOST_ROOT: C:\local\boost
+      shell: cmd
+      run: |
+        mkdir build
+        cd build
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Vc\Auxiliary\Build\vcvarsall.bat" amd64 -vcvars_ver=14.3 || exit 1
+        cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DQL_BUILD_EXAMPLES=false -DQL_BUILD_TEST_SUITE=false -DQL_BUILD_BENCHMARK=false -DQL_ENABLE_SESSIONS=true -DORE_BUILD_DOC=false -DBOOST_INCLUDEDIR=C:\local\boost -DBOOST_LIBRARYDIR=C:\local\boost\lib64-msvc-14.3 -L
+        cmake --build . -j 2 --verbose

.github/workflows/linux_build.yaml

@@ -1,10 +1,10 @@
-name: C/C++ CI
+name: C/C++ CI Ubuntu
 
 on:
   push:
-    branches: master
+    branches: [master]
   pull_request:
-    branches: master
+    branches: [master]
     types: [ready_for_review, opened, synchronize, reopened]
     paths:
       - .github/workflows/linux_build.yaml

.gitmodules

@@ -1,5 +1,5 @@
 [submodule "QuantLib"]
 	path = QuantLib
-	url = https://github.com/OpenSourceRisk/QuantLib.git
+	url = git@gitlab.acadiasoft.net:qs/quantlib.git
 	branch = master
 	ignore = dirty

App/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 
 project(App CXX)
 
-include("../cmake/commonSettings.cmake")
+include(commonSettings)
 
 get_library_name("OREPlusBase" OREPBASE_LIB_NAME)
 get_library_name("OREAnalytics" OREA_LIB_NAME)

CMakeLists.txt

@@ -14,7 +14,11 @@ option(ORE_USE_ZLIB "Use compression for boost::iostreams" OFF)
 
 include(CTest)
 
-include("cmake/commonSettings.cmake")
+# Path for local cmake modules
+if(NOT "${CMAKE_CURRENT_LIST_DIR}/cmake" IN_LIST CMAKE_MODULE_PATH)
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+endif()
+include(commonSettings)
 
 set(USE_GLOBAL_ORE_BUILD ON)
 

CMakePresets.json

@@ -158,6 +158,26 @@
         "QL_BUILD_TEST_SUITE": false,
         "QL_BUILD_BENCHMARK": false,
         "QL_ENABLE_SESSIONS": true,
+        "ORE_BUILD_DOC": false,
+        "BUILD_SHARED_LIBS": false
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      }
+    },
+    {
+      "name": "linux-clang-base",
+      "hidden": true,
+      "binaryDir": "${sourceDir}/build/${presetName}",
+      "cacheVariables": {
+        "CMAKE_CXX_COMPILER": "clang++",
+        "BOOST_ROOT": "$env{BOOST}",
+        "QL_BUILD_EXAMPLES": false,
+        "QL_BUILD_TEST_SUITE": false,
+        "QL_BUILD_BENCHMARK": false,
+        "QL_ENABLE_SESSIONS": true,
         "ORE_BUILD_DOC": false
       },
       "condition": {
@@ -192,6 +212,11 @@
       "hidden": true,
       "generator": "Ninja"
     },
+    {
+      "name": "_make",
+      "hidden": true,
+      "generator": "Unix Makefiles"
+    },
     {
       "name": "linux-gcc-ninja-debug",
       "inherits": [
@@ -215,6 +240,54 @@
         "_ninja",
         "_relwithdebinfo"
       ]
+    },
+    {
+      "name": "linux-clang-debug",
+      "inherits": [
+        "linux-clang-base",
+        "_make",
+        "_debug"
+      ]
+    },
+    {
+      "name": "linux-clang-release",
+      "inherits": [
+        "linux-clang-base",
+        "_make",
+        "_release"
+      ]
+    },
+    {
+      "name": "linux-clang-relwithdebinfo",
+      "inherits": [
+        "linux-clang-base",
+        "_make",
+        "_relwithdebinfo"
+      ]
+    },
+    {
+      "name": "linux-clang-ninja-debug",
+      "inherits": [
+        "linux-clang-base",
+        "_ninja",
+        "_debug"
+      ]
+    },
+    {
+      "name": "linux-clang-ninja-release",
+      "inherits": [
+        "linux-clang-base",
+        "_ninja",
+        "_release"
+      ]
+    },
+    {
+      "name": "linux-clang-ninja-relwithdebinfo",
+      "inherits": [
+        "linux-clang-base",
+        "_ninja",
+        "_relwithdebinfo"
+      ]
     }
   ],
   "buildPresets": [

Docker/CMakeLists_ORE.txt

@@ -10,7 +10,11 @@ option(ORE_USE_ZLIB "Use compression for boost::iostreams" ON)
 
 include(CTest)
 
-include("cmake/commonSettings.cmake")
+# Path for local cmake modules
+if(NOT "${CMAKE_CURRENT_LIST_DIR}/cmake" IN_LIST CMAKE_MODULE_PATH)
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+endif()
+include(commonSettings)
 
 add_link_directory_if_exists("${QUANTLIB_SOURCE_DIR}/build/ql")
 

Docker/Dockerfile-Boost

@@ -1,44 +1,51 @@
-# syntax = nexus3.acadiasoft.net:4445/docker/dockerfile:experimental
-ARG quantlib_version=${QL_TAG}
-ARG cmake_build_type=${CMAKE_BUILD_TYPE}
-FROM env_quantlib:${quantlib_version}
+# syntax = docker/dockerfile:1.2
+ARG debian_tag
+FROM debian:${debian_tag}
 
 MAINTAINER Quaternion Risk Management
-LABEL Description="Build ORE and add to the QuantLib build environment"
+LABEL Description="Build QuantLib and add to the Boost build environment"
 
 # Argument for number of cores to use while building
 ARG num_cores
 
-# install Eigen
-RUN apt-get install -f -y libeigen3-dev
+# Argument that chooses cmake build type
+ARG cmake_build_type
 
-# Copy ORE sources for libs and app
+RUN apt-get update \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential libbz2-dev autoconf libtool cmake ninja-build zlib1g-dev opencl-headers ocl-icd-opencl-dev libboost-all-dev doxygen graphviz ccache libeigen3-dev \
+  && apt-get clean
+
+# Exclusions are performed by .dockerignore
+COPY QuantLib /ore/QuantLib
+COPY CMakeLists.txt /ore/CMakeLists.txt
+COPY QuantLib /ore/QuantLib
 COPY QuantExt /ore/QuantExt
 COPY OREData /ore/OREData
 COPY OREAnalytics /ore/OREAnalytics
 COPY App /ore/App
 COPY ThirdPartyLibs /ore/ThirdPartyLibs
 COPY ORETest /ore/ORETest
 COPY cmake /ore/cmake
-COPY Docker /ore/Docker
 
-# Need the dos2unix all if building from Windows because the shell 
-# scripts fail if there are CRLF present in the files
+ENV PATH="/usr/lib/ccache:$PATH"
+ENV CCACHE_DIR="/ccache"
+ENV CCACHE_MAXSIZE="10G"
+# needed if QL_USE_PCH is ON
+#ENV CCACHE_SLOPPINESS="pch_defines,time_macros,pch_defines,time_macros,include_file_mtime,include_file_ctim"
+
+# - add  -fpch-preprocess to CMAKE_CXX_FLAGS when QL_USE_PCH is set to ON
 RUN cd /ore \
-  && find -regex ".*\.\(sh\|in\|ac\|am\)" -exec dos2unix {} ';' \
-  && cp Docker/CMakeLists_ORE.txt CMakeLists.txt \
   && mkdir -p build.ore && cd build.ore \
-  && cmake .. -DQL_USE_PCH=OFF -DORE_BUILD_DOC=ON -DCMAKE_BUILD_TYPE=${cmake_build_type} -DCMAKE_CXX_FLAGS="-mavx2" -DORE_ENABLE_PARALLEL_UNIT_TEST_RUNNER=ON -DORE_USE_ZLIB=ON -D ORE_ENABLE_OPENCL=ON
-
+  && cmake .. -GNinja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQL_USE_PCH=OFF -DORE_BUILD_DOC=ON -DCMAKE_BUILD_TYPE=${cmake_build_type} -DCMAKE_CXX_FLAGS="-D BOOST_ENABLE_ASSERT_HANDLER -mavx2" -DQL_ENABLE_SESSIONS=ON -DQL_ENABLE_PARALLEL_UNIT_TEST_RUNNER=ON -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_BENCHMARK=OFF -DORE_ENABLE_PARALLEL_UNIT_TEST_RUNNER=ON -DORE_USE_ZLIB=ON -D ORE_ENABLE_OPENCL=ON
+ 
 WORKDIR /ore/build.ore
 RUN --mount=type=cache,target=/ccache/ ccache -z \
-  && make -j ${num_cores} \
+  && cmake --build . -- -j ${num_cores} install \
   && ccache -s \
-  && make install \
   && make doc_quantext 2>&1 | grep -v "ignoring unsupported tag" \
   && make doc_ored 2>&1 | grep -v "ignoring unsupported tag" \
   && make doc_orea 2>&1 | grep -v "ignoring unsupported tag" 
-  
+
 WORKDIR / 
 RUN mkdir -p html \
   && mkdir /html/ored && cp -r /ore/OREData/doc/html/* /html/ored \